summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation/ganeti')
-rw-r--r--app-emulation/ganeti/Manifest4
-rw-r--r--app-emulation/ganeti/files/ganeti-2.1.initd112
-rw-r--r--app-emulation/ganeti/files/ganeti-2.2.initd113
-rw-r--r--app-emulation/ganeti/files/ganeti-2.6-add-pgrep.patch38
-rw-r--r--app-emulation/ganeti/files/ganeti-2.6-fix-args.patch45
-rw-r--r--app-emulation/ganeti/files/ganeti-2.9-regex-builtin.patch22
-rw-r--r--app-emulation/ganeti/files/ganeti-fix-start-stop.patch47
-rw-r--r--app-emulation/ganeti/files/ganeti.confd16
-rw-r--r--app-emulation/ganeti/files/ganeti.initd57
-rw-r--r--app-emulation/ganeti/files/ganeti2.initd55
-rw-r--r--app-emulation/ganeti/ganeti-2.10.5-r4.ebuild175
-rw-r--r--app-emulation/ganeti/ganeti-2.12.1-r3.ebuild253
-rw-r--r--app-emulation/ganeti/ganeti-2.15.1-r1.ebuild309
-rw-r--r--app-emulation/ganeti/ganeti-2.15.1.ebuild309
-rw-r--r--app-emulation/ganeti/ganeti-2.15.2-r2.ebuild311
-rw-r--r--app-emulation/ganeti/ganeti-2.15.2.ebuild309
-rw-r--r--app-emulation/ganeti/ganeti-2.4.5-r1.ebuild90
-rw-r--r--app-emulation/ganeti/metadata.xml1
18 files changed, 0 insertions, 2266 deletions
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 7a8e1416f1a1..1f023944b0b7 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -1,9 +1,5 @@
-DIST ganeti-2.10.5.tar.gz 3855105 SHA256 7b66a0a13344f484bc1d1e90f84227438e2cdbb054f5667a9a4c216bce2b8532 SHA512 ab9fe4c18f975e13dcd403a086b725d4f5e4f84aaa5a2651cf4087b6abad59b38b470ed062f407e6783997f976eb217e755c9d7a3ebde1df63638c3ab63cd755 WHIRLPOOL 5bf83bae29f51cfd2980d3e57a03d25e598ae7495785646e8920d4ca7685d2e93cbac42624e86fbbf92236edd7311f724fa036580300f8ccc066818d3c9911a5
DIST ganeti-2.11.6.tar.gz 4145886 SHA256 db11659ae7aaab5933b55b35f703236edc91ec763e443ac80679a057ba57af5e SHA512 c68ba0661f7598b2fbd67a96fd897e9a8fe7c3a79e914200c08a8e6cb78ad7ea8a85ce7cfee157e22c07d5f46ae6ed61d946cf2cc3852624cd303deb96f1e449 WHIRLPOOL 9bd0acd85ed86b8d05164d6ee70ea960fd42128f9144739c148e70917675d53c1d808d22df981a1ea0d843dfc5fd14fd516d6d39330634beec7eb0ecae4cbe5b
-DIST ganeti-2.12.1.tar.gz 4353529 SHA256 bd1b33d12485f4de25cca74dcf2e5354067cdda5ee36b56333d402aa1c5351e0 SHA512 92f66b45b5adcfd4cca47a1cbd592489d6c3ec595d3c6ba7b4a9401cb588a51994288499078513d6f4c0369f15a403c796a526945a2e874e8d561aac2b962b7a WHIRLPOOL 60f446b851f0bcee536791ed01d470c7a5caf02b120891e370f491f07194c1b0d9fe991a0342c7f77f3762c4aaea1ae7b7cf731644d061f43f4ba38af36cf699
DIST ganeti-2.12.3.tar.gz 4373350 SHA256 e66fc4c3dde1e90d85749ceb5c1c90bd6eaed1d139796829833b74337d2d4148 SHA512 7715db8e472e4ac99bf184028cd9853495153485c6638bcddba2d05ce958b6b44d3be07290780bb27b22337ae646881d6b0a30bbe87b7249106ac34d22bdd6c2 WHIRLPOOL e24d695d5acc582905ae7ba003e3fe6e6aa6ea4f9135daf76b953864c392803cd1c6ed81eb0e96652038f289bf450f3ac1a428c46d7a2573bc39a9451a47694e
DIST ganeti-2.13.0.tar.gz 4573781 SHA256 30ccfa971b15d49b45a4bfb75bb9631c0993adbd7feac0562c11305ae8c13753 SHA512 bd847ae7e12cb978fae59a458a4d0e33fee470c51748964453b5d0ea6615e6d959519c84922e92229e942a88f1ad88a6d1cb655f58391d033d5f5dfc249ef941 WHIRLPOOL 925159e36fde1cd36214b4fe54b4e06958cc8bd3ded28e32bc4f99842aafcb4c53c701c8a651421559dc13b4d18ae2cc11f1b9d1d2da1e862561cca81d009bda
DIST ganeti-2.14.1.tar.gz 4655994 SHA256 ae90c69f0c02d2ee558363a1c021dfaaaf4ccb59b662a72fa6485b406766e133 SHA512 2d3927bf888ea56df6b6275a869979c53d4b01e2e527e2dddea2a4835c90e85831e9e7691162999e5c58e9d214e03a37690e84f8fde9f1a0631897b06db348c3 WHIRLPOOL 3554161afd646af41e587fffa9dc85788f6ef13102121c636802946b64161cdeaeea326103171b70577b06635eebf6988b2f3942024a944612642aefd92b89bb
-DIST ganeti-2.15.1.tar.gz 4701531 SHA256 a0bc6b9f78c8c9440ca67a73e2011d4499776e18ff42289dff66e90f0a532b72 SHA512 198dd17c8cb1670b1db39f9dd9fdcc416648d5a8c6ed9cbfc2ef3db32ed88a3b445729774a89516f60d443360f42c1fe3cf5c9c015127a4aa1c95027d86d96ba WHIRLPOOL df03b5334299533b34c063026edc57a1be76af74797266bbf1ffba9c3c36aa4fafb2c04687043d4ed734652c1c07d61a06e3c4281721021351845a21a17d8866
DIST ganeti-2.15.2.tar.gz 4723007 SHA256 1e09d29cae5020142d20a96165b23f3b62b5511b875051b6374d09c4c13c0b83 SHA512 e0707aa535857779622e0eb18cccb89bc34fe4acf373628c30524e3f7e572c4b3d628946ad219149c14615d6471c4d72dbd0c6e3e1855a9f3644b4605544df85 WHIRLPOOL a09a13d64e7c6fa7823072d767fa6495cd814bb22e7a5fc708c8b339103a41da4e45f38574a2c665fe89c8774f220a2715c3aba180eb674eae603730dd2d25ad
-DIST ganeti-2.4.5.tar.gz 1828118 SHA256 9141379f3802238fb209309ec12f7090d872b77d7a473c91fe766d1fcec97c89 SHA512 e3abc2fd7c031fbef41c6e993f4cb129fa1dd4cb8c44961a2574da23832fd8412b8b3664b2e05ba8236cb8e58e8d70c3c9081f3f1b6dba8ffdc28d298c8a5099 WHIRLPOOL 897c2b3cdf0c7b03232a4ec99314439dbd29afd65eb2502d21a9f197cc098323a4b9ec0671c24ef7aad44b5327316ee68731e7e5304c8730d03f8ca908b93b62
diff --git a/app-emulation/ganeti/files/ganeti-2.1.initd b/app-emulation/ganeti/files/ganeti-2.1.initd
deleted file mode 100644
index 111f75468999..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.1.initd
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount logger
- after bootmisc
-}
-
-DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
-
-check_config() {
- if ! $DAEMON_UTIL check-config ; then
- eend 0 "Incomplete configuration, will not run."
- fi
-}
-
-check_exitcode() {
- RC=${1}
- if errmsg=$(${DAEMON_UTIL} check-exitcode ${RC}) ; then
- eend 0 "${errmsg}"
- else
- eend 1 "${errmsg}"
- fi
-}
-
-start_action() {
- # called as start_action daemon-name
- local daemon="${1}"
- ebegin "Starting ${daemon}"
- ${DAEMON_UTIL} start "${@}"
- check_exitcode ${?}
-}
-
-stop_action() {
- # called as stop_action daemon-name
- local daemon="${1}"
- ebegin "Stopping ${daemon}"
- ${DAEMON_UTIL} stop "${@}"
- check_exitcode ${?}
-}
-
-maybe_do() {
- requested="${1}"; shift
- action="${1}"; shift
- target="${1}"
- if [ -z "${requested}" -o "${requested}" = "${target}" ] ; then
- ${action} "${@}"
- fi
-}
-
-get_master_node() {
- MASTER_NODE="$(gnt-cluster getmaster)"
- NODE_HOSTNAME="$(hostname -f)"
- if [ "$MASTER_NODE" == "$NODE_HOSTNAME" ] ; then
- MASTER=1
- else
- MASTER=0
- fi
-}
-
-start_all() {
- check_config
- get_master_node
- for i in $($DAEMON_UTIL list-start-daemons); do \
- GANETI_START_OPTS="${GANETI_OPTS}"
- case "${i}" in
- ganeti-masterd)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_MASTERD_OPTS}"
- ;;
- ganeti-rapid)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_RAPI_OPTS}"
- ;;
- ganeti-noded)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_NODED_OPTS}"
- ;;
- ganeti-confd)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_CONFD_OPTS}"
- ;;
- esac
- # Don't start if not master
- if [ $MASTER = 0 -a $i = "ganeti-masterd" ] ; then
- continue
- elif [ $MASTER = 0 -a $i = "ganeti-rapi" ] ; then
- continue
- else
- maybe_do "${1}" start_action ${i} ${GANETI_OPTS}
- fi
- done
-}
-
-stop_all() {
- get_master_node
- for i in $($DAEMON_UTIL list-stop-daemons) ; do \
- if [ $MASTER = 0 -a $i = "ganeti-masterd" ] ; then
- continue
- elif [ $MASTER = 0 -a $i = "ganeti-rapi" ] ; then
- continue
- else
- maybe_do "${1}" stop_action ${i} ${GANETI_OPTS}
- fi
- done
-}
-
-start() {
- start_all
-}
-
-stop() {
- stop_all
-}
diff --git a/app-emulation/ganeti/files/ganeti-2.2.initd b/app-emulation/ganeti/files/ganeti-2.2.initd
deleted file mode 100644
index a270ac831e93..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.2.initd
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount logger
- after bootmisc
- use net
-}
-
-DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
-
-check_config() {
- if ! $DAEMON_UTIL check-config ; then
- eend 0 "Incomplete configuration, will not run."
- fi
-}
-
-check_exitcode() {
- RC=${1}
- if errmsg=$(${DAEMON_UTIL} check-exitcode ${RC}) ; then
- eend 0 "${errmsg}"
- else
- eend 1 "${errmsg}"
- fi
-}
-
-start_action() {
- # called as start_action daemon-name
- local daemon="${1}"
- ebegin "Starting ${daemon}"
- ${DAEMON_UTIL} start "${@}"
- check_exitcode ${?}
-}
-
-stop_action() {
- # called as stop_action daemon-name
- local daemon="${1}"
- ebegin "Stopping ${daemon}"
- ${DAEMON_UTIL} stop "${@}"
- check_exitcode ${?}
-}
-
-maybe_do() {
- requested="${1}"; shift
- action="${1}"; shift
- target="${1}"
- if [ -z "${requested}" -o "${requested}" = "${target}" ] ; then
- ${action} "${@}"
- fi
-}
-
-get_master_node() {
- MASTER_NODE="$(gnt-cluster getmaster)"
- NODE_HOSTNAME="$(hostname -f)"
- if [ "$MASTER_NODE" == "$NODE_HOSTNAME" ] ; then
- MASTER=1
- else
- MASTER=0
- fi
-}
-
-start_all() {
- check_config
- get_master_node
- for i in $($DAEMON_UTIL list-start-daemons); do \
- GANETI_START_OPTS="${GANETI_OPTS}"
- case "${i}" in
- ganeti-masterd)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_MASTERD_OPTS}"
- ;;
- ganeti-rapid)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_RAPI_OPTS}"
- ;;
- ganeti-noded)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_NODED_OPTS}"
- ;;
- ganeti-confd)
- GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_CONFD_OPTS}"
- ;;
- esac
- # Don't start if not master
- if [ $MASTER = 0 -a $i = "ganeti-masterd" ] ; then
- continue
- elif [ $MASTER = 0 -a $i = "ganeti-rapi" ] ; then
- continue
- else
- maybe_do "${1}" start_action ${i} ${GANETI_OPTS}
- fi
- done
-}
-
-stop_all() {
- get_master_node
- for i in $($DAEMON_UTIL list-stop-daemons) ; do \
- if [ $MASTER = 0 -a $i = "ganeti-masterd" ] ; then
- continue
- elif [ $MASTER = 0 -a $i = "ganeti-rapi" ] ; then
- continue
- else
- maybe_do "${1}" stop_action ${i} ${GANETI_OPTS}
- fi
- done
-}
-
-start() {
- start_all
-}
-
-stop() {
- stop_all
-}
diff --git a/app-emulation/ganeti/files/ganeti-2.6-add-pgrep.patch b/app-emulation/ganeti/files/ganeti-2.6-add-pgrep.patch
deleted file mode 100644
index c69128229a66..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.6-add-pgrep.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 49767a66e27a1cb61abb8f812b2e61eba03a9594 Mon Sep 17 00:00:00 2001
-From: Lance Albertson <lance@osuosl.org>
-Date: Wed, 25 Jul 2012 16:21:21 -0700
-Subject: [PATCH 2/2] Check if process is already running and skip if so
-
-Gentoo uses a modified version of start-stop-daemon which returns an error if it
-sees another process running with the same name. This happens during cluster
-initialization since ganeti-noded gets fired off first.
----
- daemons/daemon-util.in | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index c19daa7..7be9d8b 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -222,11 +222,13 @@ start() {
- @PKGLIBDIR@/ensure-dirs
-
- if type -p start-stop-daemon >/dev/null; then
-- start-stop-daemon --start --quiet \
-- --pidfile $pidfile \
-- --exec $daemonexec \
-- --user $usergroup \
-- -- $args "$@"
-+ if ! ret=$(/usr/bin/pgrep $name) ; then
-+ start-stop-daemon --start --quiet \
-+ --pidfile $pidfile \
-+ --exec $daemonexec \
-+ --user $usergroup \
-+ -- $args "$@"
-+ fi
- else
- # TODO: Find a way to start daemon with a group, until then the group must
- # be removed
---
-1.7.9.5
-
diff --git a/app-emulation/ganeti/files/ganeti-2.6-fix-args.patch b/app-emulation/ganeti/files/ganeti-2.6-fix-args.patch
deleted file mode 100644
index 6fb5bd0df62f..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.6-fix-args.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0491397d7648fd70ad0a6cef9e8626b9c2a968e9 Mon Sep 17 00:00:00 2001
-From: Lance Albertson <ramereth@gmail.com>
-Date: Mon, 8 Aug 2011 23:34:33 -0700
-Subject: [PATCH 1/2] Remove/fix deprecated start-stop-daemon functions
-
-daemon-util uses the deprecated functions --startas, --chuid and, most
-importantly, --oknodo. The last one causes start-stop-daemon to exit with a
-non-zero status, which makes openrc think it crashed (when in reality it just
-shut down properly) [1].
-
-[1] https://bugs.gentoo.org/show_bug.cgi?id=377905
----
- daemons/daemon-util.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index b754e7f..c19daa7 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -222,10 +222,10 @@ start() {
- @PKGLIBDIR@/ensure-dirs
-
- if type -p start-stop-daemon >/dev/null; then
-- start-stop-daemon --start --quiet --oknodo \
-+ start-stop-daemon --start --quiet \
- --pidfile $pidfile \
-- --startas $daemonexec \
-- --chuid $usergroup \
-+ --exec $daemonexec \
-+ --user $usergroup \
- -- $args "$@"
- else
- # TODO: Find a way to start daemon with a group, until then the group must
-@@ -248,7 +248,7 @@ stop() {
- local pidfile=$(_daemon_pidfile $name)
-
- if type -p start-stop-daemon >/dev/null; then
-- start-stop-daemon --stop --quiet --oknodo --retry 30 \
-+ start-stop-daemon --stop --quiet --retry 30 \
- --pidfile $pidfile
- else
- _ignore_error killproc -p $pidfile $name
---
-1.7.9.5
-
diff --git a/app-emulation/ganeti/files/ganeti-2.9-regex-builtin.patch b/app-emulation/ganeti/files/ganeti-2.9-regex-builtin.patch
deleted file mode 100644
index f9aba9d4e2eb..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.9-regex-builtin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac.orig 2013-11-13 01:56:03.819694900 +0000
-+++ configure.ac 2013-11-13 01:56:34.350116602 +0000
-@@ -493,8 +493,8 @@
- has_confd=False
- if test "$enable_confd" != no; then
- CONFD_PKG=
-- AC_GHC_PKG_CHECK([regex-pcre], [HS_REGEX_PCRE=],
-- [CONFD_PKG="$CONFD_PKG regex-pcre"])
-+ AC_GHC_PKG_CHECK([regex-pcre-builtin], [HS_REGEX_PCRE=],
-+ [CONFD_PKG="$CONFD_PKG regex-pcre-builtin"])
- AC_GHC_PKG_CHECK([Crypto], [], [CONFD_PKG="$CONFD_PKG Crypto"])
- AC_GHC_PKG_CHECK([text], [], [CONFD_PKG="$CONFD_PKG text"])
- AC_GHC_PKG_CHECK([hinotify], [], [CONFD_PKG="$CONFD_PKG hinotify"])
-@@ -578,7 +578,7 @@
- AC_GHC_PKG_CHECK([vector], [], [HS_NODEV=1])
- AC_GHC_PKG_CHECK([process], [], [HS_NODEV=1])
- AC_GHC_PKG_CHECK([snap-server], [], [HS_NODEV=1])
--AC_GHC_PKG_CHECK([regex-pcre], [], [HS_NODEV=1])
-+AC_GHC_PKG_CHECK([regex-pcre-builtin], [], [HS_NODEV=1])
- AC_GHC_PKG_CHECK([Crypto], [], [HS_NODEV=1])
- AC_GHC_PKG_CHECK([text], [], [HS_NODEV=1])
- AC_GHC_PKG_CHECK([hinotify], [], [HS_NODEV=1])
diff --git a/app-emulation/ganeti/files/ganeti-fix-start-stop.patch b/app-emulation/ganeti/files/ganeti-fix-start-stop.patch
deleted file mode 100644
index e53161a00b22..000000000000
--- a/app-emulation/ganeti/files/ganeti-fix-start-stop.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9f8f304c983635e0ead6adadd1c4a62be6e92e01 Mon Sep 17 00:00:00 2001
-From: Lance Albertson <ramereth@gmail.com>
-Date: Mon, 8 Aug 2011 23:34:33 -0700
-Subject: [PATCH] Remove/fix deprecated start-stop-daemon functions
-
-daemon-util uses the deprecated functions --startas, --chuid and, most
-importantly, --oknodo. The last one causes start-stop-daemon to exit with a
-non-zero status, which makes openrc think it crashed (when in reality it just
-shut down properly) [1].
-
-[1] https://bugs.gentoo.org/show_bug.cgi?id=377905
-
-Signed-off-by: Lance Albertson <ramereth@gmail.com>
----
- daemons/daemon-util.in | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index 819fd6b..00fe1b6 100644
---- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -172,10 +172,10 @@ start() {
-
- @PKGLIBDIR@/ensure-dirs
-
-- start-stop-daemon --start --quiet --oknodo \
-+ start-stop-daemon --start --quiet \
- --pidfile $(_daemon_pidfile $name) \
-- --startas $(_daemon_executable $name) \
-- --chuid $(_daemon_usergroup $plain_name) \
-+ --exec $(_daemon_executable $name) \
-+ --user $(_daemon_usergroup $plain_name) \
- -- $args "$@"
- }
-
-@@ -188,7 +188,7 @@ stop() {
-
- local name="$1"; shift
-
-- start-stop-daemon --stop --quiet --oknodo --retry 30 \
-+ start-stop-daemon --stop --quiet --retry 30 \
- --pidfile $(_daemon_pidfile $name)
- }
-
---
-1.7.4.1
-
diff --git a/app-emulation/ganeti/files/ganeti.confd b/app-emulation/ganeti/files/ganeti.confd
deleted file mode 100644
index 3b71d7ee44a8..000000000000
--- a/app-emulation/ganeti/files/ganeti.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-# /etc/conf.d/ganeti: config file for /etc/init.d/ganeti
-
-# Extra options to pass to all of the ganeti daemons
-# GANETI_OPTS="-d"
-
-# Options to pass to ganeti-masterd
-# GANETI_MASTERD_OPTS=""
-
-# Options to pass to ganeti-rapi
-# GANETI_RAPI_OPTS=""
-
-# Options to pass to ganeti-noded
-# GANETI_NODED_OPTS=""
-
-# Options to pass to ganeti-confd
-# GANETI_CONFD_OPTS=""
diff --git a/app-emulation/ganeti/files/ganeti.initd b/app-emulation/ganeti/files/ganeti.initd
deleted file mode 100644
index 8d31f1698490..000000000000
--- a/app-emulation/ganeti/files/ganeti.initd
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount xend drbd
- before ganeti-kvm-poweroff
- after bootmisc nfsmount
-}
-
-checkconfig() {
- for fname in /var/lib/ganeti/ssconf_node_pass /var/lib/ganeti/server.pem
- do
- if [[ ! -f "$fname" ]]
- then
- eerror "Config file $fname not found, will not run."
- return 1
- fi
- done
-
- return 0
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting ganeti-master"
- /usr/sbin/ganeti-master start
- ret=$?
- eend ${ret}
- [[ "${ret}" != 0 ]] && return 1
-
- ebegin "Starting ganeti-noded"
- start-stop-daemon --start --quiet --exec /usr/sbin/ganeti-noded
- ret=$?
- eend ${ret}
- [[ "${ret}" != 0 ]] && return 1
-
- return 0
-}
-
-stop() {
- ebegin "Stopping ganeti-noded"
- start-stop-daemon --stop --quiet --name ganeti-noded
- ret=$?
- eend ${ret}
- [[ "${ret}" != 0 ]] && return 1
-
- ebegin "Stopping ganeti-master"
- /usr/sbin/ganeti-master start
- ret=$?
- eend ${ret}
- [[ "${ret}" != 0 ]] && return 1
-
- return 0
-}
diff --git a/app-emulation/ganeti/files/ganeti2.initd b/app-emulation/ganeti/files/ganeti2.initd
deleted file mode 100644
index 74a748a73e38..000000000000
--- a/app-emulation/ganeti/files/ganeti2.initd
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need localmount drbd
- after bootmisc
-}
-
-checkconfig() {
- for fname in /var/lib/ganeti/server.pem
- do
- if [[ ! -f "$fname" ]]
- then
- eerror "Config file $fname not found, will not run."
- return 1
- fi
- done
-
- return 0
-}
-
-start_action() {
- # called as start_action daemon pidfile
- local daemon="${1}"; shift
- local pidfile="${1}"; shift
- ebegin "Starting ${daemon}"
- start-stop-daemon --start --quiet --exec "${daemon}" --pidfile "${pidfile}" \
- -- "${@}"
- eend ${?}
-}
-
-stop_action() {
- # called as stop_action daemon pidfile
- ebegin "Stopping ${1}"
- start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile "${2}"
- eend ${?}
-}
-
-
-start() {
- checkconfig || return 1
- start_action /usr/sbin/ganeti-noded /var/run/ganeti/ganeti-noded.pid
- start_action /usr/sbin/ganeti-masterd /var/run/ganeti/ganeti-masterd.pid
- start_action /usr/sbin/ganeti-rapi /var/run/ganeti/ganeti-rapi.pid
- return 0
-}
-
-stop() {
- stop_action /usr/sbin/ganeti-rapi /var/run/ganeti/ganeti-rapi.pid
- stop_action /usr/sbin/ganeti-masterd /var/run/ganeti/ganeti-masterd.pid
- stop_action /usr/sbin/ganeti-noded /var/run/ganeti/ganeti-noded.pid
- return 0
-}
diff --git a/app-emulation/ganeti/ganeti-2.10.5-r4.ebuild b/app-emulation/ganeti/ganeti-2.10.5-r4.ebuild
deleted file mode 100644
index eea792e4c167..000000000000
--- a/app-emulation/ganeti/ganeti-2.10.5-r4.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-use test && PYTHON_REQ_USE="ipv6"
-
-inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
- KEYWORDS=""
- # you will need to pull in the haskell overlay for pandoc
- GIT_DEPEND="app-text/pandoc
- dev-python/docutils
- dev-python/sphinx
- media-libs/gd[fontconfig,jpeg,png,truetype]
- media-gfx/graphviz
- media-fonts/urw-fonts"
-else
- SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="https://code.google.com/p/ganeti/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test"
-REQUIRED_USE="|| ( kvm xen lxc )"
-
-HASKELL_DEPS=">=dev-lang/ghc-6.12:0=
- <dev-lang/ghc-7.8
- dev-haskell/json:0=
- dev-haskell/curl:0=
- dev-haskell/network:0=
- dev-haskell/parallel:3=
- dev-haskell/hslogger:0=
- dev-haskell/utf8-string:0=
- dev-haskell/attoparsec:0=
- dev-haskell/crypto:0="
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
- kvm? ( app-emulation/qemu )
- lxc? ( app-emulation/lxc )
- drbd? ( <sys-cluster/drbd-8.5 )
- rbd? ( sys-cluster/ceph )
- ipv6? ( net-misc/ndisc6 )
- haskell-daemons? (
- ${HASKELL_DEPS}
- dev-haskell/text:0=
- dev-haskell/hinotify:0=
- dev-haskell/regex-pcre-builtin:0=
- dev-haskell/vector:0=
- )
- dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- net-analyzer/arping
- net-analyzer/fping
- net-misc/bridge-utils
- net-misc/curl[ssl]
- net-misc/openssh
- net-misc/socat
- sys-apps/iproute2
- sys-fs/lvm2
- >=sys-apps/baselayout-2.0
- ${PYTHON_DEPS}
- ${GIT_DEPEND}"
-RDEPEND="${DEPEND}
- !app-emulation/ganeti-htools"
-DEPEND+="${HASKELL_DEPS}
- sys-devel/m4
- test? (
- dev-python/mock
- dev-python/pyyaml
- dev-haskell/test-framework:0=
- dev-haskell/test-framework-hunit:0=
- dev-haskell/test-framework-quickcheck2:0=
- dev-haskell/temporary:0=
- sys-apps/fakeroot
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.6-fix-args.patch"
- "${FILESDIR}/${PN}-2.6-add-pgrep.patch"
- "${FILESDIR}/${PN}-2.7-fix-tests.patch"
- "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
- "${FILESDIR}/${PN}-2.9-regex-builtin.patch"
- "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
- "${FILESDIR}/${PN}-2.10-rundir.patch"
- "${FILESDIR}/${PN}-lockdir.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup () {
- confutils_use_depend_all haskell-daemons htools
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- [[ ${PV} == "9999" ]] && ./autogen.sh
- rm autotools/missing
- eautoreconf
-}
-
-src_configure () {
- econf --localstatedir=/var \
- --sharedstatedir=/var \
- --disable-symlinks \
- --docdir=/usr/share/doc/${P} \
- --with-ssh-initscript=/etc/init.d/sshd \
- --with-export-dir=/var/lib/ganeti-storage/export \
- --with-os-search-path=/usr/share/${PN}/os \
- $(use_enable syslog) \
- $(usex kvm '--with-kvm-path=' '' '/usr/bin/qemu-kvm' '') \
- $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
-}
-
-src_install () {
- emake V=1 DESTDIR="${D}" install || die "emake install failed"
-
- newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
- newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
- use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
- use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
- newbashcomp doc/examples/bash_completion ganeti
- dodoc INSTALL UPGRADE NEWS README doc/*.rst
- dohtml -r doc/html/*
- rm -rf "${D}"/{usr/share/doc/${PN},run}
-
- docinto examples
- dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
- docinto examples/hooks
- dodoc doc/examples/hooks/{ipsec,ethers}
-
- insinto /etc/cron.d
- newins doc/examples/ganeti.cron ${PN}
-
- insinto /etc/logrotate.d
- newins doc/examples/ganeti.logrotate ${PN}
-
- python_fix_shebang "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-
- keepdir /var/{lib,log}/${PN}/
- keepdir /usr/share/${PN}/${SERIES}/os/
- keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
- dosym ${SERIES} "/usr/share/${PN}/default"
- dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
- python_fix_shebang "${ED}"
-}
-
-src_test () {
- emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.12.1-r3.ebuild b/app-emulation/ganeti/ganeti-2.12.1-r3.ebuild
deleted file mode 100644
index 564e17cdd8db..000000000000
--- a/app-emulation/ganeti/ganeti-2.12.1-r3.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-use test && PYTHON_REQ_USE="ipv6"
-
-inherit eutils user confutils autotools bash-completion-r1 python-single-r1 versionator pax-utils
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
- KEYWORDS=""
- # you will need to pull in the haskell overlay for pandoc
- GIT_DEPEND="app-text/pandoc
- dev-python/docutils
- dev-python/sphinx
- media-libs/gd[fontconfig,jpeg,png,truetype]
- media-gfx/graphviz
- media-fonts/urw-fonts"
-else
- SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="https://code.google.com/p/ganeti/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
-REQUIRED_USE="|| ( kvm xen lxc )"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-# the haskell less-than atoms list are resolver hints, they aren't actual
-# direct dependencies, just hints to help the resolver fufill the dependency
-# on an older transformer.
-# these need to stay until 2.14.0
-DEPEND="
- dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- net-analyzer/arping
- net-analyzer/fping
- net-misc/bridge-utils
- net-misc/curl[ssl]
- net-misc/openssh
- net-misc/socat
- sys-apps/iproute2
- sys-fs/lvm2
- >=sys-apps/baselayout-2.0
- >=dev-lang/ghc-7.6.0:0=
- >=dev-haskell/json-0.9:0=
- <dev-haskell/monad-control-1.0.0.0:0=
- <dev-haskell/transformers-0.4.0:0=
- dev-haskell/curl:0=
- dev-haskell/network:0=
- dev-haskell/parallel:3=
- >=dev-haskell/hslogger-1.2.6:0=
- dev-haskell/snap-server:0=
- dev-haskell/utf8-string:0=
- dev-haskell/attoparsec:0=
- dev-haskell/crypto:0=
- dev-haskell/vector:0=
- dev-haskell/hinotify:0=
- dev-haskell/regex-pcre-builtin:0=
- dev-haskell/zlib:0=
- >=dev-haskell/lifted-base-0.2.3.3:0=
- <dev-haskell/lens-3.10:0=
- dev-haskell/base64-bytestring:0=
- <dev-haskell/mtl-2.2
- <dev-haskell/contravariant-0.6
- <dev-haskell/profunctors-4.3
- <dev-haskell/distributive-0.4.4
- <dev-haskell/comonad-4.2.2
- <dev-haskell/transformers-compat-0.3
- <dev-haskell/transformers-base-0.4.4
- <dev-haskell/semigroupoids-4.0
- <dev-haskell/semigroupoid-extras-4.0
- <dev-haskell/groupoids-4.0
- xen? ( >=app-emulation/xen-3.0 )
- kvm? ( app-emulation/qemu )
- lxc? ( app-emulation/lxc )
- drbd? ( <sys-cluster/drbd-8.5 )
- rbd? ( sys-cluster/ceph )
- ipv6? ( net-misc/ndisc6 )
- haskell-daemons? ( dev-haskell/text:0= )
- ${PYTHON_DEPS}
- ${GIT_DEPEND}"
-RDEPEND="${DEPEND}
- !app-emulation/ganeti-htools"
-DEPEND+="sys-devel/m4
- test? (
- dev-python/mock
- dev-python/pyyaml
- dev-haskell/haddock:0=
- dev-haskell/test-framework:0=
- dev-haskell/test-framework-hunit:0=
- dev-haskell/test-framework-quickcheck2:0=
- dev-haskell/temporary:0=
- sys-apps/fakeroot
- net-misc/socat
- dev-util/shelltestrunner
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
- "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
- "${FILESDIR}/${PN}-2.12-daemon-util.patch"
- "${FILESDIR}/${PN}-2.7-fix-tests.patch"
- "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
- "${FILESDIR}/${PN}-2.11-regex-builtin.patch"
- "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
- "${FILESDIR}/${PN}-2.10-rundir.patch"
- "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
- "${FILESDIR}/${PN}-2.11-tests.patch"
- "${FILESDIR}/${PN}-lockdir.patch"
- "${FILESDIR}/${PN}-2.11-useradd.patch"
- "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
- "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
- "${FILESDIR}/${PN}-2.12-tests.patch"
- "${FILESDIR}/${PN}-2.12-cfgupgrade-state.patch"
-)
-
-REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup () {
- local user
- confutils_use_depend_all haskell-daemons htools
- python-single-r1_pkg_setup
-
- if use multiple-users; then
- for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
- enewgroup ${user}
- enewuser ${user} -1 -1 -1 ${user}
- done
- fi
-}
-
-src_prepare() {
- local testfile
- epatch "${PATCHES[@]}"
-
- # not sure why these tests are failing
- # should remove this on next version bump if possible
- for testfile in test/py/import-export_unittest.bash; do
- printf '#!/bin/bash\ntrue\n' > "${testfile}"
- done
-
- [[ ${PV} == "9999" ]] && ./autogen.sh
- rm autotools/missing
- eautoreconf
-}
-
-src_configure () {
- # this is kind of a hack to work around the removal of the qemu-kvm wrapper
- local kvm_arch
-
- if use amd64; then
- kvm_arch=x86_64
- elif use x86; then
- kvm_arch=i386
- elif use kvm; then
- die "Could not determine qemu system to use for kvm"
- fi
-
- econf --localstatedir=/var \
- --sharedstatedir=/var \
- --disable-symlinks \
- --docdir=/usr/share/doc/${P} \
- --with-ssh-initscript=/etc/init.d/sshd \
- --with-export-dir=/var/lib/ganeti-storage/export \
- --with-os-search-path=/usr/share/${PN}/os \
- $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
- $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
- $(use_enable syslog) \
- $(use_enable monitoring) \
- $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
- $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
-}
-
-src_install () {
- emake V=1 DESTDIR="${D}" install || die "emake install failed"
-
- newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
- newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
- if use kvm; then
- newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
- newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
- fi
-
- # ganeti installs it's own docs in a generic location
- rm -rf "${D}"/{usr/share/doc/${PN},run}
-
- newbashcomp doc/examples/bash_completion ganeti
-
- dodoc INSTALL UPGRADE NEWS README doc/*.rst
- dohtml -r doc/html/* doc/css/*.css
-
- docinto examples
- dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
- docinto examples/hooks
- dodoc doc/examples/hooks/{ipsec,ethers}
-
- insinto /etc/cron.d
- newins doc/examples/ganeti.cron ${PN}
-
- insinto /etc/logrotate.d
- newins doc/examples/ganeti.logrotate ${PN}
-
- keepdir /var/{lib,log}/${PN}/
- keepdir /usr/share/${PN}/${SERIES}/os/
- keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
- dosym ${SERIES} "/usr/share/${PN}/default"
- dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
- python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
- if use multiple-users; then
- elog "You have enable multiple user support, the users for this must"
- elog "be created. You can use the provided tool for this, which is"
- elog "located at:"
- elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
- fi
-}
-
-src_test () {
- PATH="${S}/scripts:${S}/src:${PATH}" \
- TMPDIR="/tmp" \
- emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.15.1-r1.ebuild b/app-emulation/ganeti/ganeti-2.15.1-r1.ebuild
deleted file mode 100644
index d3adc439cbaf..000000000000
--- a/app-emulation/ganeti/ganeti-2.15.1-r1.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-if [[ ${PV} =~ [9]{4,} ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
- KEYWORDS=""
- GIT_DEPEND="dev-python/docutils
- dev-python/sphinx[${PYTHON_USEDEP}]
- media-gfx/graphviz
- media-fonts/urw-fonts"
-else
- SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
-REQUIRED_USE="|| ( kvm xen lxc ) test? ( ipv6 ) ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DOC_DEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/docutils
- media-fonts/urw-fonts
- media-gfx/graphviz"
-
-DEPEND="
- dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- net-analyzer/arping
- net-analyzer/fping
- net-misc/bridge-utils
- net-misc/curl[ssl]
- net-misc/openssh
- net-misc/socat
- sys-apps/iproute2
- sys-fs/lvm2
- >=sys-apps/baselayout-2.0
- dev-lang/ghc
- dev-haskell/cabal:0=
- dev-haskell/cabal-install:0=
- >=dev-haskell/mtl-2.1.1:0=
- >=dev-haskell/old-time-1.1.0.0:0=
- >=dev-haskell/random-1.0.1.1:0=
- haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
- >=dev-haskell/transformers-0.3.0.0:0=
-
- >=dev-haskell/attoparsec-0.10.1.1:0=
- <dev-haskell/attoparsec-0.13:0
- >=dev-haskell/base64-bytestring-1.0.0.1:0=
- <dev-haskell/base64-bytestring-1.1:0=
- >=dev-haskell/crypto-4.2.4:0=
- <dev-haskell/crypto-4.3:0=
- >=dev-haskell/curl-1.3.7:0=
- <dev-haskell/curl-1.4:0=
- >=dev-haskell/hinotify-0.3.2:0=
- <dev-haskell/hinotify-0.4:0=
- >=dev-haskell/hslogger-1.1.4:0=
- <dev-haskell/hslogger-1.3:0=
- >=dev-haskell/json-0.5:0=
- <dev-haskell/json-0.9:0=
- >=dev-haskell/lens-3.10:0=
- <dev-haskell/lens-4.8:0=
- >=dev-haskell/lifted-base-0.2.0.3:0=
- <dev-haskell/lifted-base-0.3:0=
- >=dev-haskell/monad-control-0.3.1.3:0=
- <dev-haskell/monad-control-1.1:0=
- >=dev-haskell/network-2.3.0.13:0=
- <dev-haskell/network-2.7:0=
- >=dev-haskell/parallel-3.2.0.2:3=
- <dev-haskell/parallel-3.3:3=
- >=dev-haskell/temporary-1.1.2.3:0=
- <dev-haskell/temporary-1.3:0=
- >=dev-haskell/regex-pcre-0.94.2:0=
- <dev-haskell/regex-pcre-0.95:0=
- >=dev-haskell/transformers-base-0.4.1:0=
- <dev-haskell/transformers-base-0.5:0=
- >=dev-haskell/utf8-string-0.3.7:0=
- <dev-haskell/utf8-string-0.4:0=
- >=dev-haskell/zlib-0.5.3.3:0=
- <dev-haskell/zlib-0.6:0=
-
- >=dev-haskell/psqueue-1.1:0=
- <dev-haskell/psqueue-1.2:0=
- >=dev-haskell/snap-core-0.8.1:0=
- <dev-haskell/snap-core-0.10:0=
- >=dev-haskell/snap-server-0.8.1:0=
- <dev-haskell/snap-server-0.10:0=
- >=dev-haskell/case-insensitive-0.4.0.1
-
- dev-haskell/vector:0=
- <dev-haskell/semigroupoids-4.1:0=
- <dev-haskell/contravariant-0.6
- <dev-haskell/transformers-compat-0.4[three]
- xen? ( >=app-emulation/xen-3.0 )
- kvm? (
- dev-python/psutil
- app-emulation/qemu
- )
- lxc? ( app-emulation/lxc )
- drbd? (
- || (
- <sys-cluster/drbd-8.5
- sys-cluster/drbd-utils
- )
- )
- rbd? ( sys-cluster/ceph )
- ipv6? ( net-misc/ndisc6 )
- ${PYTHON_DEPS}
- ${GIT_DEPEND}"
-RDEPEND="${DEPEND}
- !app-emulation/ganeti-htools"
-DEPEND+="sys-devel/m4
- app-text/pandoc
- >=dev-haskell/test-framework-0.6:0=
- <dev-haskell/test-framework-0.9:0=
- >=dev-haskell/test-framework-hunit-0.2.7:0=
- <dev-haskell/test-framework-hunit-0.4:0=
- >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
- <dev-haskell/test-framework-quickcheck2-0.4:0=
- test? (
- dev-python/mock
- dev-python/pyyaml
- dev-haskell/haddock:0=
- >=dev-haskell/hunit-1.2.4.2:0=
- <dev-haskell/hunit-1.3:0=
- >=dev-haskell/quickcheck-2.4.2:2=
- <dev-haskell/quickcheck-2.8:2=
- sys-apps/fakeroot
- net-misc/socat
- dev-util/shelltestrunner
- ${DOC_DEPEND}
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
- "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
- "${FILESDIR}/${PN}-2.15-daemon-util.patch"
- "${FILESDIR}/${PN}-2.7-fix-tests.patch"
- "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
- "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
- "${FILESDIR}/${PN}-2.10-rundir.patch"
- "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
- "${FILESDIR}/${PN}-2.11-tests.patch"
- "${FILESDIR}/${PN}-lockdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
- "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
- "${FILESDIR}/${PN}-2.13-process_unittest.patch"
- "${FILESDIR}/${PN}-2.15-python-mock.patch"
-)
-
-REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
- usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
- usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
- local user
- python-single-r1_pkg_setup
-
- if use multiple-users; then
- for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
- enewgroup ${user}
- enewuser ${user} -1 -1 -1 ${user}
- done
- fi
-}
-
-src_prepare() {
- local testfile
- epatch "${PATCHES[@]}"
-
- # not sure why these tests are failing
- # should remove this on next version bump if possible
- for testfile in test/py/import-export_unittest.bash; do
- printf '#!/bin/bash\ntrue\n' > "${testfile}"
- done
-
- # take the sledgehammer approach to bug #526270
- grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
- [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
- rm autotools/missing
- eautoreconf
-}
-
-src_configure () {
- # this is kind of a hack to work around the removal of the qemu-kvm wrapper
- local kvm_arch
-
- if use amd64; then
- kvm_arch=x86_64
- elif use x86; then
- kvm_arch=i386
- elif use kvm; then
- die "Could not determine qemu system to use for kvm"
- fi
-
- econf --localstatedir=/var \
- --sharedstatedir=/var \
- --disable-symlinks \
- --docdir=/usr/share/doc/${P} \
- --with-ssh-initscript=/etc/init.d/sshd \
- --with-export-dir=/var/lib/ganeti-storage/export \
- --with-os-search-path=/usr/share/${PN}/os \
- $(use_enable test haskell-tests) \
- $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
- $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
- $(use_enable syslog) \
- $(use_enable monitoring) \
- $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
- $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
-}
-
-src_install () {
- emake V=1 DESTDIR="${D}" install || die "emake install failed"
-
- newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
- newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
- if use kvm; then
- newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
- newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
- fi
-
- # ganeti installs it's own docs in a generic location
- rm -rf "${D}"/{usr/share/doc/${PN},run}
-
- sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
- newbashcomp doc/examples/bash_completion gnt-instance
- bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
- h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
- gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
- dodoc INSTALL UPGRADE NEWS README doc/*.rst
- dohtml -r doc/html/* doc/css/*.css
-
- docinto examples
- dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
- docinto examples/hooks
- dodoc doc/examples/hooks/{ipsec,ethers}
-
- insinto /etc/cron.d
- newins doc/examples/ganeti.cron ${PN}
-
- insinto /etc/logrotate.d
- newins doc/examples/ganeti.logrotate ${PN}
-
- # need to dodir rather than keepdir here (bug #552482)
- dodir /var/lib/${PN}
-
- keepdir /var/log/${PN}/
- keepdir /usr/share/${PN}/${SERIES}/os/
- keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
- dosym ${SERIES} "/usr/share/${PN}/default"
- dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
- python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
- if use multiple-users; then
- elog "You have enable multiple user support, the users for this must"
- elog "be created. You can use the provided tool for this, which is"
- elog "located at:"
- elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
- fi
-}
-
-src_test () {
- PATH="${S}/scripts:${S}/src:${PATH}" \
- TMPDIR="/tmp" \
- GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.15.1.ebuild b/app-emulation/ganeti/ganeti-2.15.1.ebuild
deleted file mode 100644
index b94908eec804..000000000000
--- a/app-emulation/ganeti/ganeti-2.15.1.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-use test && PYTHON_REQ_USE="ipv6"
-
-inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-if [[ ${PV} =~ [9]{4,} ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
- KEYWORDS=""
- GIT_DEPEND="dev-python/docutils
- dev-python/sphinx[${PYTHON_USEDEP}]
- media-gfx/graphviz
- media-fonts/urw-fonts"
-else
- SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
-REQUIRED_USE="|| ( kvm xen lxc ) ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DOC_DEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/docutils
- media-fonts/urw-fonts
- media-gfx/graphviz"
-
-DEPEND="
- dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- net-analyzer/arping
- net-analyzer/fping
- net-misc/bridge-utils
- net-misc/curl[ssl]
- net-misc/openssh
- net-misc/socat
- sys-apps/iproute2
- sys-fs/lvm2
- >=sys-apps/baselayout-2.0
- dev-lang/ghc
- dev-haskell/cabal:0=
- dev-haskell/cabal-install:0=
- >=dev-haskell/mtl-2.1.1:0=
- >=dev-haskell/old-time-1.1.0.0:0=
- >=dev-haskell/random-1.0.1.1:0=
- haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
- >=dev-haskell/transformers-0.3.0.0:0=
-
- >=dev-haskell/attoparsec-0.10.1.1:0=
- <dev-haskell/attoparsec-0.13:0
- >=dev-haskell/base64-bytestring-1.0.0.1:0=
- <dev-haskell/base64-bytestring-1.1:0=
- >=dev-haskell/crypto-4.2.4:0=
- <dev-haskell/crypto-4.3:0=
- >=dev-haskell/curl-1.3.7:0=
- <dev-haskell/curl-1.4:0=
- >=dev-haskell/hinotify-0.3.2:0=
- <dev-haskell/hinotify-0.4:0=
- >=dev-haskell/hslogger-1.1.4:0=
- <dev-haskell/hslogger-1.3:0=
- >=dev-haskell/json-0.5:0=
- <dev-haskell/json-0.9:0=
- >=dev-haskell/lens-3.10:0=
- <dev-haskell/lens-4.8:0=
- >=dev-haskell/lifted-base-0.2.0.3:0=
- <dev-haskell/lifted-base-0.3:0=
- >=dev-haskell/monad-control-0.3.1.3:0=
- <dev-haskell/monad-control-1.1:0=
- >=dev-haskell/network-2.3.0.13:0=
- <dev-haskell/network-2.7:0=
- >=dev-haskell/parallel-3.2.0.2:3=
- <dev-haskell/parallel-3.3:3=
- >=dev-haskell/temporary-1.1.2.3:0=
- <dev-haskell/temporary-1.3:0=
- >=dev-haskell/regex-pcre-0.94.2:0=
- <dev-haskell/regex-pcre-0.95:0=
- >=dev-haskell/transformers-base-0.4.1:0=
- <dev-haskell/transformers-base-0.5:0=
- >=dev-haskell/utf8-string-0.3.7:0=
- <dev-haskell/utf8-string-0.4:0=
- >=dev-haskell/zlib-0.5.3.3:0=
- <dev-haskell/zlib-0.6:0=
-
- >=dev-haskell/psqueue-1.1:0=
- <dev-haskell/psqueue-1.2:0=
- >=dev-haskell/snap-core-0.8.1:0=
- <dev-haskell/snap-core-0.10:0=
- >=dev-haskell/snap-server-0.8.1:0=
- <dev-haskell/snap-server-0.10:0=
- >=dev-haskell/case-insensitive-0.4.0.1
-
- dev-haskell/vector:0=
- <dev-haskell/semigroupoids-4.1:0=
- <dev-haskell/contravariant-0.6
- <dev-haskell/transformers-compat-0.4[three]
- xen? ( >=app-emulation/xen-3.0 )
- kvm? (
- dev-python/psutil
- app-emulation/qemu
- )
- lxc? ( app-emulation/lxc )
- drbd? (
- || (
- <sys-cluster/drbd-8.5
- sys-cluster/drbd-utils
- )
- )
- rbd? ( sys-cluster/ceph )
- ipv6? ( net-misc/ndisc6 )
- ${PYTHON_DEPS}
- ${GIT_DEPEND}"
-RDEPEND="${DEPEND}
- !app-emulation/ganeti-htools"
-DEPEND+="sys-devel/m4
- app-text/pandoc
- >=dev-haskell/test-framework-0.6:0=
- <dev-haskell/test-framework-0.9:0=
- >=dev-haskell/test-framework-hunit-0.2.7:0=
- <dev-haskell/test-framework-hunit-0.4:0=
- >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
- <dev-haskell/test-framework-quickcheck2-0.4:0=
- test? (
- dev-python/mock
- dev-python/pyyaml
- dev-haskell/haddock:0=
- >=dev-haskell/hunit-1.2.4.2:0=
- <dev-haskell/hunit-1.3:0=
- >=dev-haskell/quickcheck-2.4.2:2=
- <dev-haskell/quickcheck-2.8:2=
- sys-apps/fakeroot
- net-misc/socat
- dev-util/shelltestrunner
- ${DOC_DEPEND}
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
- "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
- "${FILESDIR}/${PN}-2.15-daemon-util.patch"
- "${FILESDIR}/${PN}-2.7-fix-tests.patch"
- "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
- "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
- "${FILESDIR}/${PN}-2.10-rundir.patch"
- "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
- "${FILESDIR}/${PN}-2.11-tests.patch"
- "${FILESDIR}/${PN}-lockdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
- "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
- "${FILESDIR}/${PN}-2.13-process_unittest.patch"
- "${FILESDIR}/${PN}-2.15-python-mock.patch"
-)
-
-REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
- usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
- usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
- local user
- python-single-r1_pkg_setup
-
- if use multiple-users; then
- for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
- enewgroup ${user}
- enewuser ${user} -1 -1 -1 ${user}
- done
- fi
-}
-
-src_prepare() {
- local testfile
- epatch "${PATCHES[@]}"
-
- # not sure why these tests are failing
- # should remove this on next version bump if possible
- for testfile in test/py/import-export_unittest.bash; do
- printf '#!/bin/bash\ntrue\n' > "${testfile}"
- done
-
- # take the sledgehammer approach to bug #526270
- grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
- [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
- rm autotools/missing
- eautoreconf
-}
-
-src_configure () {
- # this is kind of a hack to work around the removal of the qemu-kvm wrapper
- local kvm_arch
-
- if use amd64; then
- kvm_arch=x86_64
- elif use x86; then
- kvm_arch=i386
- elif use kvm; then
- die "Could not determine qemu system to use for kvm"
- fi
-
- econf --localstatedir=/var \
- --sharedstatedir=/var \
- --disable-symlinks \
- --docdir=/usr/share/doc/${P} \
- --with-ssh-initscript=/etc/init.d/sshd \
- --with-export-dir=/var/lib/ganeti-storage/export \
- --with-os-search-path=/usr/share/${PN}/os \
- $(use_enable test haskell-tests) \
- $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
- $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
- $(use_enable syslog) \
- $(use_enable monitoring) \
- $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
- $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
-}
-
-src_install () {
- emake V=1 DESTDIR="${D}" install || die "emake install failed"
-
- newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
- newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
- if use kvm; then
- newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
- newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
- fi
-
- # ganeti installs it's own docs in a generic location
- rm -rf "${D}"/{usr/share/doc/${PN},run}
-
- sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
- newbashcomp doc/examples/bash_completion gnt-instance
- bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
- h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
- gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
- dodoc INSTALL UPGRADE NEWS README doc/*.rst
- dohtml -r doc/html/* doc/css/*.css
-
- docinto examples
- dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
- docinto examples/hooks
- dodoc doc/examples/hooks/{ipsec,ethers}
-
- insinto /etc/cron.d
- newins doc/examples/ganeti.cron ${PN}
-
- insinto /etc/logrotate.d
- newins doc/examples/ganeti.logrotate ${PN}
-
- # need to dodir rather than keepdir here (bug #552482)
- dodir /var/lib/${PN}
-
- keepdir /var/log/${PN}/
- keepdir /usr/share/${PN}/${SERIES}/os/
- keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
- dosym ${SERIES} "/usr/share/${PN}/default"
- dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
- python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
- if use multiple-users; then
- elog "You have enable multiple user support, the users for this must"
- elog "be created. You can use the provided tool for this, which is"
- elog "located at:"
- elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
- fi
-}
-
-src_test () {
- PATH="${S}/scripts:${S}/src:${PATH}" \
- TMPDIR="/tmp" \
- GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild
deleted file mode 100644
index e1eb4ba86c57..000000000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r2.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-if [[ ${PV} =~ [9]{4,} ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
- KEYWORDS=""
- GIT_DEPEND="dev-python/docutils
- dev-python/sphinx[${PYTHON_USEDEP}]
- media-gfx/graphviz
- media-fonts/urw-fonts"
-else
- SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
-REQUIRED_USE="|| ( kvm xen lxc ) test? ( ipv6 ) ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
- dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- net-analyzer/arping
- net-analyzer/fping
- net-misc/bridge-utils
- net-misc/curl[ssl]
- net-misc/openssh
- net-misc/socat
- sys-apps/iproute2
- sys-fs/lvm2
- >=sys-apps/baselayout-2.0
- dev-lang/ghc
- dev-haskell/cabal:0=
- dev-haskell/cabal-install:0=
- >=dev-haskell/mtl-2.1.1:0=
- >=dev-haskell/old-time-1.1.0.0:0=
- >=dev-haskell/random-1.0.1.1:0=
- haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
- >=dev-haskell/transformers-0.3.0.0:0=
-
- >=dev-haskell/attoparsec-0.10.1.1:0=
- <dev-haskell/attoparsec-0.13:0
- >=dev-haskell/base64-bytestring-1.0.0.1:0=
- <dev-haskell/base64-bytestring-1.1:0=
- >=dev-haskell/crypto-4.2.4:0=
- <dev-haskell/crypto-4.3:0=
- >=dev-haskell/curl-1.3.7:0=
- <dev-haskell/curl-1.4:0=
- >=dev-haskell/hinotify-0.3.2:0=
- <dev-haskell/hinotify-0.4:0=
- >=dev-haskell/hslogger-1.1.4:0=
- <dev-haskell/hslogger-1.3:0=
- >=dev-haskell/json-0.5:0=
- <dev-haskell/json-0.9:0=
- >=dev-haskell/lens-3.10:0=
- <dev-haskell/lens-4.8:0=
- >=dev-haskell/lifted-base-0.2.0.3:0=
- <dev-haskell/lifted-base-0.3:0=
- >=dev-haskell/monad-control-0.3.1.3:0=
- <dev-haskell/monad-control-1.1:0=
- >=dev-haskell/network-2.3.0.13:0=
- <dev-haskell/network-2.7:0=
- >=dev-haskell/parallel-3.2.0.2:3=
- <dev-haskell/parallel-3.3:3=
- >=dev-haskell/temporary-1.1.2.3:0=
- <dev-haskell/temporary-1.3:0=
- >=dev-haskell/regex-pcre-0.94.2:0=
- <dev-haskell/regex-pcre-0.95:0=
- >=dev-haskell/transformers-base-0.4.1:0=
- <dev-haskell/transformers-base-0.5:0=
- >=dev-haskell/utf8-string-0.3.7:0=
- <dev-haskell/utf8-string-0.4:0=
- >=dev-haskell/zlib-0.5.3.3:0=
- <dev-haskell/zlib-0.6:0=
-
- >=dev-haskell/psqueue-1.1:0=
- <dev-haskell/psqueue-1.2:0=
- >=dev-haskell/snap-core-0.8.1:0=
- <dev-haskell/snap-core-0.10:0=
- >=dev-haskell/snap-server-0.8.1:0=
- <dev-haskell/snap-server-0.10:0=
- >=dev-haskell/case-insensitive-0.4.0.1
-
- dev-haskell/vector:0=
- <dev-haskell/semigroupoids-4.1:0=
- <dev-haskell/contravariant-0.6
- <dev-haskell/transformers-compat-0.4[three]
- xen? ( >=app-emulation/xen-3.0 )
- kvm? (
- dev-python/psutil
- app-emulation/qemu
- )
- lxc? ( app-emulation/lxc )
- drbd? (
- || (
- <sys-cluster/drbd-8.5
- sys-cluster/drbd-utils
- )
- )
- rbd? ( sys-cluster/ceph )
- ipv6? ( net-misc/ndisc6 )
- ${PYTHON_DEPS}
- ${GIT_DEPEND}"
-RDEPEND="${DEPEND}
- !app-emulation/ganeti-htools"
-DEPEND+="sys-devel/m4
- app-text/pandoc
- dev-python/sphinx[${PYTHON_USEDEP}]
- media-fonts/urw-fonts
- media-gfx/graphviz
- >=dev-haskell/test-framework-0.6:0=
- <dev-haskell/test-framework-0.9:0=
- >=dev-haskell/test-framework-hunit-0.2.7:0=
- <dev-haskell/test-framework-hunit-0.4:0=
- >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
- <dev-haskell/test-framework-quickcheck2-0.4:0=
- test? (
- dev-python/mock
- dev-python/pyyaml
- dev-haskell/haddock:0=
- >=dev-haskell/hunit-1.2.4.2:0=
- <dev-haskell/hunit-1.3:0=
- >=dev-haskell/quickcheck-2.4.2:2=
- <dev-haskell/quickcheck-2.8:2=
- sys-apps/fakeroot
- net-misc/socat
- dev-util/shelltestrunner
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
- "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
- "${FILESDIR}/${PN}-2.15-daemon-util.patch"
- "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
- "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
- "${FILESDIR}/${PN}-2.10-rundir.patch"
- "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
- "${FILESDIR}/${PN}-2.11-tests.patch"
- "${FILESDIR}/${PN}-lockdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
- "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
- "${FILESDIR}/${PN}-2.13-process_unittest.patch"
- "${FILESDIR}/${PN}-2.15-python-mock.patch"
- "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
- "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
- "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
-)
-
-REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
- usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
- usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
- local user
- python-single-r1_pkg_setup
-
- if use multiple-users; then
- for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
- enewgroup ${user}
- enewuser ${user} -1 -1 -1 ${user}
- done
- fi
-}
-
-src_prepare() {
- local testfile
- epatch "${PATCHES[@]}"
-
- # not sure why these tests are failing
- # should remove this on next version bump if possible
- for testfile in test/py/import-export_unittest.bash; do
- printf '#!/bin/bash\ntrue\n' > "${testfile}"
- done
-
- # take the sledgehammer approach to bug #526270
- grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
- epatch_user
-
- [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
- rm autotools/missing
- eautoreconf
-}
-
-src_configure () {
- # this is kind of a hack to work around the removal of the qemu-kvm wrapper
- local kvm_arch
-
- if use amd64; then
- kvm_arch=x86_64
- elif use x86; then
- kvm_arch=i386
- elif use kvm; then
- die "Could not determine qemu system to use for kvm"
- fi
-
- econf --localstatedir=/var \
- --sharedstatedir=/var \
- --disable-symlinks \
- --docdir=/usr/share/doc/${P} \
- --with-ssh-initscript=/etc/init.d/sshd \
- --with-export-dir=/var/lib/ganeti-storage/export \
- --with-os-search-path=/usr/share/${PN}/os \
- $(use_enable test haskell-tests) \
- $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
- $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
- $(use_enable syslog) \
- $(use_enable monitoring) \
- $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
- $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
-}
-
-src_install () {
- emake V=1 DESTDIR="${D}" install || die "emake install failed"
-
- newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
- newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
- if use kvm; then
- newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
- newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
- fi
-
- # ganeti installs it's own docs in a generic location
- rm -rf "${D}"/{usr/share/doc/${PN},run}
-
- sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
- newbashcomp doc/examples/bash_completion gnt-instance
- bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
- h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
- gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
- dodoc INSTALL UPGRADE NEWS README doc/*.rst
- dohtml -r doc/html/* doc/css/*.css
-
- docinto examples
- dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
- docinto examples/hooks
- dodoc doc/examples/hooks/{ipsec,ethers}
-
- insinto /etc/cron.d
- newins doc/examples/ganeti.cron ${PN}
-
- insinto /etc/logrotate.d
- newins doc/examples/ganeti.logrotate ${PN}
-
- # need to dodir rather than keepdir here (bug #552482)
- dodir /var/lib/${PN}
-
- keepdir /var/log/${PN}/
- keepdir /usr/share/${PN}/${SERIES}/os/
- keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
- dosym ${SERIES} "/usr/share/${PN}/default"
- dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
- python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
- if use multiple-users; then
- elog "You have enable multiple user support, the users for this must"
- elog "be created. You can use the provided tool for this, which is"
- elog "located at:"
- elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
- fi
-}
-
-src_test () {
- PATH="${S}/scripts:${S}/src:${PATH}" \
- TMPDIR="/tmp" \
- GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.15.2.ebuild b/app-emulation/ganeti/ganeti-2.15.2.ebuild
deleted file mode 100644
index b9c86e4edee7..000000000000
--- a/app-emulation/ganeti/ganeti-2.15.2.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-if [[ ${PV} =~ [9]{4,} ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
- KEYWORDS=""
- GIT_DEPEND="dev-python/docutils
- dev-python/sphinx[${PYTHON_USEDEP}]
- media-gfx/graphviz
- media-fonts/urw-fonts"
-else
- SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
-REQUIRED_USE="|| ( kvm xen lxc ) test? ( ipv6 ) ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DOC_DEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/docutils
- media-fonts/urw-fonts
- media-gfx/graphviz"
-
-DEPEND="
- dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- net-analyzer/arping
- net-analyzer/fping
- net-misc/bridge-utils
- net-misc/curl[ssl]
- net-misc/openssh
- net-misc/socat
- sys-apps/iproute2
- sys-fs/lvm2
- >=sys-apps/baselayout-2.0
- dev-lang/ghc
- dev-haskell/cabal:0=
- dev-haskell/cabal-install:0=
- >=dev-haskell/mtl-2.1.1:0=
- >=dev-haskell/old-time-1.1.0.0:0=
- >=dev-haskell/random-1.0.1.1:0=
- haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
- >=dev-haskell/transformers-0.3.0.0:0=
-
- >=dev-haskell/attoparsec-0.10.1.1:0=
- <dev-haskell/attoparsec-0.13:0
- >=dev-haskell/base64-bytestring-1.0.0.1:0=
- <dev-haskell/base64-bytestring-1.1:0=
- >=dev-haskell/crypto-4.2.4:0=
- <dev-haskell/crypto-4.3:0=
- >=dev-haskell/curl-1.3.7:0=
- <dev-haskell/curl-1.4:0=
- >=dev-haskell/hinotify-0.3.2:0=
- <dev-haskell/hinotify-0.4:0=
- >=dev-haskell/hslogger-1.1.4:0=
- <dev-haskell/hslogger-1.3:0=
- >=dev-haskell/json-0.5:0=
- <dev-haskell/json-0.9:0=
- >=dev-haskell/lens-3.10:0=
- <dev-haskell/lens-4.8:0=
- >=dev-haskell/lifted-base-0.2.0.3:0=
- <dev-haskell/lifted-base-0.3:0=
- >=dev-haskell/monad-control-0.3.1.3:0=
- <dev-haskell/monad-control-1.1:0=
- >=dev-haskell/network-2.3.0.13:0=
- <dev-haskell/network-2.7:0=
- >=dev-haskell/parallel-3.2.0.2:3=
- <dev-haskell/parallel-3.3:3=
- >=dev-haskell/temporary-1.1.2.3:0=
- <dev-haskell/temporary-1.3:0=
- >=dev-haskell/regex-pcre-0.94.2:0=
- <dev-haskell/regex-pcre-0.95:0=
- >=dev-haskell/transformers-base-0.4.1:0=
- <dev-haskell/transformers-base-0.5:0=
- >=dev-haskell/utf8-string-0.3.7:0=
- <dev-haskell/utf8-string-0.4:0=
- >=dev-haskell/zlib-0.5.3.3:0=
- <dev-haskell/zlib-0.6:0=
-
- >=dev-haskell/psqueue-1.1:0=
- <dev-haskell/psqueue-1.2:0=
- >=dev-haskell/snap-core-0.8.1:0=
- <dev-haskell/snap-core-0.10:0=
- >=dev-haskell/snap-server-0.8.1:0=
- <dev-haskell/snap-server-0.10:0=
- >=dev-haskell/case-insensitive-0.4.0.1
-
- dev-haskell/vector:0=
- <dev-haskell/semigroupoids-4.1:0=
- <dev-haskell/contravariant-0.6
- <dev-haskell/transformers-compat-0.4[three]
- xen? ( >=app-emulation/xen-3.0 )
- kvm? (
- dev-python/psutil
- app-emulation/qemu
- )
- lxc? ( app-emulation/lxc )
- drbd? (
- || (
- <sys-cluster/drbd-8.5
- sys-cluster/drbd-utils
- )
- )
- rbd? ( sys-cluster/ceph )
- ipv6? ( net-misc/ndisc6 )
- ${PYTHON_DEPS}
- ${GIT_DEPEND}"
-RDEPEND="${DEPEND}
- !app-emulation/ganeti-htools"
-DEPEND+="sys-devel/m4
- app-text/pandoc
- >=dev-haskell/test-framework-0.6:0=
- <dev-haskell/test-framework-0.9:0=
- >=dev-haskell/test-framework-hunit-0.2.7:0=
- <dev-haskell/test-framework-hunit-0.4:0=
- >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
- <dev-haskell/test-framework-quickcheck2-0.4:0=
- test? (
- dev-python/mock
- dev-python/pyyaml
- dev-haskell/haddock:0=
- >=dev-haskell/hunit-1.2.4.2:0=
- <dev-haskell/hunit-1.3:0=
- >=dev-haskell/quickcheck-2.4.2:2=
- <dev-haskell/quickcheck-2.8:2=
- sys-apps/fakeroot
- net-misc/socat
- dev-util/shelltestrunner
- ${DOC_DEPEND}
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
- "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
- "${FILESDIR}/${PN}-2.15-daemon-util.patch"
- "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
- "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
- "${FILESDIR}/${PN}-2.10-rundir.patch"
- "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
- "${FILESDIR}/${PN}-2.11-tests.patch"
- "${FILESDIR}/${PN}-lockdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
- "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
- "${FILESDIR}/${PN}-2.13-process_unittest.patch"
- "${FILESDIR}/${PN}-2.15-python-mock.patch"
- "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
-)
-
-REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
- usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
- usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
- local user
- python-single-r1_pkg_setup
-
- if use multiple-users; then
- for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
- enewgroup ${user}
- enewuser ${user} -1 -1 -1 ${user}
- done
- fi
-}
-
-src_prepare() {
- local testfile
- epatch "${PATCHES[@]}"
-
- # not sure why these tests are failing
- # should remove this on next version bump if possible
- for testfile in test/py/import-export_unittest.bash; do
- printf '#!/bin/bash\ntrue\n' > "${testfile}"
- done
-
- # take the sledgehammer approach to bug #526270
- grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
- [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
- rm autotools/missing
- eautoreconf
-}
-
-src_configure () {
- # this is kind of a hack to work around the removal of the qemu-kvm wrapper
- local kvm_arch
-
- if use amd64; then
- kvm_arch=x86_64
- elif use x86; then
- kvm_arch=i386
- elif use kvm; then
- die "Could not determine qemu system to use for kvm"
- fi
-
- econf --localstatedir=/var \
- --sharedstatedir=/var \
- --disable-symlinks \
- --docdir=/usr/share/doc/${P} \
- --with-ssh-initscript=/etc/init.d/sshd \
- --with-export-dir=/var/lib/ganeti-storage/export \
- --with-os-search-path=/usr/share/${PN}/os \
- $(use_enable test haskell-tests) \
- $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
- $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
- $(use_enable syslog) \
- $(use_enable monitoring) \
- $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
- $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
-}
-
-src_install () {
- emake V=1 DESTDIR="${D}" install || die "emake install failed"
-
- newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
- newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
- if use kvm; then
- newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
- newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
- fi
-
- # ganeti installs it's own docs in a generic location
- rm -rf "${D}"/{usr/share/doc/${PN},run}
-
- sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
- newbashcomp doc/examples/bash_completion gnt-instance
- bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
- h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
- gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
- dodoc INSTALL UPGRADE NEWS README doc/*.rst
- dohtml -r doc/html/* doc/css/*.css
-
- docinto examples
- dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
- docinto examples/hooks
- dodoc doc/examples/hooks/{ipsec,ethers}
-
- insinto /etc/cron.d
- newins doc/examples/ganeti.cron ${PN}
-
- insinto /etc/logrotate.d
- newins doc/examples/ganeti.logrotate ${PN}
-
- # need to dodir rather than keepdir here (bug #552482)
- dodir /var/lib/${PN}
-
- keepdir /var/log/${PN}/
- keepdir /usr/share/${PN}/${SERIES}/os/
- keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
- dosym ${SERIES} "/usr/share/${PN}/default"
- dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
- python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
- if use multiple-users; then
- elog "You have enable multiple user support, the users for this must"
- elog "be created. You can use the provided tool for this, which is"
- elog "located at:"
- elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
- fi
-}
-
-src_test () {
- PATH="${S}/scripts:${S}/src:${PATH}" \
- TMPDIR="/tmp" \
- GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild b/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild
deleted file mode 100644
index 5f24604591ba..000000000000
--- a/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils confutils bash-completion-r1
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="https://code.google.com/p/ganeti/"
-SRC_URI="https://ganeti.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kvm xen drbd +filestorage syslog ipv6"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
- kvm? ( app-emulation/qemu )
- drbd? ( >=sys-cluster/drbd-8.3 )
- ipv6? ( net-misc/ndisc6 )
- dev-libs/openssl
- dev-python/paramiko
- dev-python/pyopenssl
- dev-python/pyparsing
- dev-python/pycurl
- dev-python/pyinotify
- dev-python/simplejson
- net-analyzer/arping
- net-misc/bridge-utils
- net-misc/curl[ssl]
- net-misc/openssh
- net-misc/socat
- sys-apps/iproute2
- sys-fs/lvm2
- >=sys-apps/baselayout-2.0"
-RDEPEND="${DEPEND}
- !<app-emulation/ganeti-htools-0.3"
-
-pkg_setup () {
- confutils_require_any kvm xen
-}
-
-src_prepare () {
- epatch "${FILESDIR}/${PN}-fix-start-stop.patch"
-}
-
-src_configure () {
- local myconf
- if use filestorage ; then
- myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
- else
- myconf="--with-file-storage-dir=no"
- fi
- if use kvm && [ -f /usr/bin/qemu-kvm ] ; then
- myconf="--with-kvm-path=/usr/bin/qemu-kvm"
- fi
- econf --localstatedir=/var \
- --docdir=/usr/share/doc/${P} \
- --with-ssh-initscript=/etc/init.d/sshd \
- --with-export-dir=/var/lib/ganeti-storage/export \
- --with-os-search-path=/usr/share/ganeti/os \
- $(use_enable syslog) \
- ${myconf}
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die "emake install failed"
- newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
- newconfd "${FILESDIR}"/ganeti.confd ganeti
- use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
- use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
- newbashcomp doc/examples/bash_completion ganeti
- dodoc INSTALL UPGRADE NEWS README doc/*.rst
- rm -rf "${D}"/usr/share/doc/ganeti
- docinto examples
- #dodoc doc/examples/{basic-oob,ganeti.cron,gnt-config-backup}
- dodoc doc/examples/{ganeti.cron,gnt-config-backup}
- docinto examples/hooks
- dodoc doc/examples/hooks/{ipsec,ethers}
-
- keepdir /var/{lib,log,run}/ganeti/
- keepdir /usr/share/ganeti/os/
- keepdir /var/lib/ganeti-storage/{export,file}/
-}
diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index e49a71c7d4d4..6fbe4e936c52 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -25,7 +25,6 @@
</longdescription>
<use>
<flag name="drbd">Enable DRBD support</flag>
- <flag name="filestorage">Enable File Storage</flag>
<flag name="haskell-daemons">Build haskell daemons instead of python</flag>
<flag name="htools">Enable htools support</flag>
<flag name="kvm">Enable KVM support</flag>