Version bump, cleanup, lots-o-bugfixes

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

8 files changed, 74 insertions, 334 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 195426332ee8..a923d342df76 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.58 2012/04/05 14:55:17 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.59 2012/05/12 08:10:23 ramereth Exp $
+
+*ganeti-2.5.1 (12 May 2012)
+
+  12 May 2012; Lance Albertson <ramereth@gentoo.org> files/ganeti-2.1.initd,
+  -ganeti-2.4.3.ebuild, -ganeti-2.4.4.ebuild, -ganeti-2.5.0_rc5.ebuild,
+  -ganeti-2.5.0_rc6.ebuild, +ganeti-2.5.1.ebuild, files/ganeti.confd:
+  Version bump, cleanup, lots-o-bugfixes
+
+  Fixed #371759, #372581 with an updated init script which is hopefully
+  smarter.
+  Fixed #415321 by checking for new path for kvm binary. Fixed #398279 by
+  adding
+  logger to the need depend in the init script. Added support for giving
+  args to noded and confd.
 
 *ganeti-2.5.0_rc6 (05 Apr 2012)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 003f1737fcb2..72c98ad7102c 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -2,11 +2,11 @@
 Hash: SHA1
 
 AUX ganeti-2.0.3-gentoo-brctl-path.patch 741 RMD160 2e97a68618467ba700fa97d3fc250e6734570c35 SHA1 90d414b327fa4a61850a8f11fab6ef9bd8cf437b SHA256 8362692d1af5b264a9681d63137bd010be29047419718b8daaa320dfb0979965
-AUX ganeti-2.1.initd 1748 RMD160 83e3a40e944c4572d1d4e43cb68a5eeaecdb860b SHA1 a86e81d427d525cdc58258bec8221447558c4019 SHA256 9114a9eebb0f1af369e25739f4ee042bb7b083c70098d1eb404681ed2b02ba70
+AUX ganeti-2.1.initd 2715 RMD160 0c41848a5076c9ae4071baae6450f354db00edf4 SHA1 5376d01fde3df94db43fb3346a15a2b413fd6536 SHA256 b56dfab540977f17f2e80e30ba49d3b0848cb58f031a5c7b388c967870ea2d29
 AUX ganeti-fix-start-stop.patch 1440 RMD160 50db2c5a3436267640573a30c339f5103f74fc2e SHA1 a89fc90c24e1a589e106ef48df530deaf57d0182 SHA256 5b2beddaa862cec4b7ea7a08c8d04fb3a42db1df0d632f5d158e9ecbf4b47af3
 AUX ganeti-kvm-poweroff.confd 186 RMD160 87242c3c785e012b2ec7534836dabd8017a25893 SHA1 955bdc02481591c06d8e00f1b6e04c55830e1150 SHA256 d811f1825351b03653aed4b6827b2b0c9dd1dc3340c980862c0758b3bf5ad21e
 AUX ganeti-kvm-poweroff.initd 1621 RMD160 2d8d59ac9bf25ff6efa74a3277f4d295c05d4282 SHA1 7e3cbfb9f6ed988393522af6569a96c66cb4feb0 SHA256 bb7b6ab5ac2899969bab52d9c5e1c5d9fd9629d247563ff74e8b9f64a4478e28
-AUX ganeti.confd 248 RMD160 18662964365f102e77f593429bb0772d94c65267 SHA1 337999b3fbeb64518f3d39c41634e3f414aedb25 SHA256 7efc3a5052ad5c2085605a8c0bf9e9bb9cf20c0623263b7abcd0b7a0cb9a895b
+AUX ganeti.confd 364 RMD160 884f84ade7f1afaa1449e16d88b5d6b221f6a0d9 SHA1 5f0a5ce5f4a90bc2c2a4e568c0cfecedf0366312 SHA256 6aecb2dc014fe1b66b873f6198a08a3c88968dce6124bff8d39f241fbb7b4cc4
 AUX ganeti.initd 1159 RMD160 3d3f56cbef2852625abdfc7f47d711b844c42780 SHA1 c74485c40329cdd129eeebfdb38f47973dd4b3a5 SHA256 86f30236349528647e7b78d2e72963e9cda5f6998ebb314e44387bef5eab1f66
 AUX ganeti2.initd 1503 RMD160 4af84c353f6638af31a94a5274e922237ae2fd00 SHA1 a46268352d11fb6450362c9a0d72655ded6b5b6f SHA256 6fd666648ac543ffcc3700821a36eba9a027eb04278e53f60e07ce8989de3fb8
 DIST ganeti-1.2.9.tar.gz 847644 RMD160 fcb803e6db851e020439a5c512d656bdd1712323 SHA1 2332038124c411085ffbdaf9539ac6a5cdccf443 SHA256 1de2432281f127a2b19106ba04fd1f630c7868113f0665063ff10a147676b92b
@@ -14,27 +14,21 @@ DIST ganeti-2.0.6.tar.gz 684502 RMD160 3d521b48fad01d13c287457b421b3a60b926fe5c
 DIST ganeti-2.1.8.tar.gz 1400262 RMD160 10eecb4c4757c77afcb834743e0a424bf13ac827 SHA1 f251fa6e818b67e66c4f22dcefb3d7e4e264155d SHA256 80fc2add2937bb7503a003d71b910ccac29e691c35e2febc5e05908a551908ad
 DIST ganeti-2.2.2.tar.gz 1588569 RMD160 98d615742b639b50a95755715e4b94cf6d01b2ba SHA1 3d08d1c1058640ba76420ee928ac150bc52b89ab SHA256 99e9aa7de0397fa8bb19f216851dbfdb181c539b8ca25a7bc557899d96c6628e
 DIST ganeti-2.3.1.tar.gz 1679030 RMD160 a9552c55876feaf690a1c021c9d5ff3aa7a0987c SHA1 109486c6c89f250204ca9a87c30634d9a74d5da0 SHA256 3d644eea35f1caed9e38246f21fa79f4d4d783f396078b5872b14934a47c2d8e
-DIST ganeti-2.4.3.tar.gz 1826541 RMD160 3b696e2af48adc7ccbbbe6e0dd9c63ccd8525302 SHA1 72cd24f299a8e444369fe235e57209709f6880e8 SHA256 44742bb2ef87895730e6a869a83d4a3b6a62df3a437eb0acd594fd21df78421d
-DIST ganeti-2.4.4.tar.gz 1827741 RMD160 f7502ed1a0e00951c0d05ae8d096c317ff835f0f SHA1 d78317484ef6a7d88c440986da2a6be1a3244d5e SHA256 c293a815ac4d69ecdd5ed49cb8f2b701bb6e2842d4b6bd284d4ff0a8619ddf7f
 DIST ganeti-2.4.5.tar.gz 1828118 RMD160 d152a525499ed1ea8c3a69d6e32cf52b1d26cc46 SHA1 f35b79be9ab83bf72b198c1a82d7769ba49d6107 SHA256 9141379f3802238fb209309ec12f7090d872b77d7a473c91fe766d1fcec97c89
-DIST ganeti-2.5.0~rc5.tar.gz 2287511 RMD160 612ae14fe89cc0a9beb176631fdc3b507571cacc SHA1 88868990ea0e57e4fa399291e8727c92cdc4c744 SHA256 83948a33fcb3e7e7cc4acff40fedb6a50b8dd8e594333b28cd41c9f65a97990b
-DIST ganeti-2.5.0~rc6.tar.gz 2288242 RMD160 291e562615a37d819cfe118ade422fda8205c837 SHA1 1153b593826d9f2d8b7ac8cda37e53a0632626ad SHA256 b25949bdf398a4cbf96cfa1d42ee6993fdd823644afa7548a45f40bf7fdb86f1
+DIST ganeti-2.5.1.tar.gz 2292928 RMD160 550a75d778ed0ceec6429a120e38f6398c1cd15a SHA1 f02f20f489fe94cbed3c5ae637297821f6b77d21 SHA256 c80ce69e5cee61cff058dbde43a1fa32f020b95aa804fd614682931a6791ec9e
 EBUILD ganeti-1.2.9.ebuild 1186 RMD160 80d028e0d6b9b3edb04fa742d612bbd46085f699 SHA1 5ffaf48d6ff975341fd03f3f277cac007c158edb SHA256 4881e505e39e2db011aca0f6ab1f1c49c0eabd9fe35ef389c42b7cbbcddb12c1
 EBUILD ganeti-2.0.6.ebuild 1758 RMD160 8afbfe02a47395149f85c6daa72474b401a7148e SHA1 85154e14b677ec68a162d6089834d70e7f6adbeb SHA256 3ad06822eab40cfdb00c94765b223f4e4a56d28dadb633a81f653024d97fcaac
 EBUILD ganeti-2.1.8.ebuild 2028 RMD160 cf481947823ae7d4346ad6743f0cb342dc909261 SHA1 1b0202a8f686e88c81fa9055dbdbb46994cffb23 SHA256 385cc64b07a46852806869f1228ce76bad3743b75036c183a47847c4460111de
 EBUILD ganeti-2.2.2.ebuild 2115 RMD160 7909f9d8a09ce14491723836249d3bb3426db2f0 SHA1 b598fa2777d9723309d89cab23ace79466f33553 SHA256 2dc4f5ee30b8e3627771d0ab03f96cf7ba67ed3613373d34f798695255b7df0d
 EBUILD ganeti-2.3.1.ebuild 2147 RMD160 9caf74fa39b234556c621fd3c1383d512475a55c SHA1 243dae1cee5135794635bd0599f0dbcb3dc22872 SHA256 55ece094a5fd5bd64da7873bc4b36992e54f8ff72cd5c94afc800f6c5eb364a4
-EBUILD ganeti-2.4.3.ebuild 2498 RMD160 d973ea591c3e72dc3e4d15be2a1e7b26894a3682 SHA1 45b0dbdea15dc8b32fe3a6c4a1d576853661f789 SHA256 7c52a38eff91b8c571f33e9890004d7def0b194e9772f7fbd8dd61e8ab392445
-EBUILD ganeti-2.4.4.ebuild 2498 RMD160 0775d64edda20bb635a354e8d26ce3b2137ad0fe SHA1 33789fff8bce33bb88d0df25df330310ccfb29f7 SHA256 3f0b642f6426d77edfb7916828ef57812da42bffccbc66ee694a2b2639820b55
 EBUILD ganeti-2.4.5.ebuild 2447 RMD160 9f937f70c877bc979eb9683319fc5b9aab5c3690 SHA1 3f34e3b2f5e6184775d4ef479091bc206a064c42 SHA256 7729dde7c94b2bdbeecc6ebeb14e5546410635ff388c4b93cced10fd7e061669
-EBUILD ganeti-2.5.0_rc5.ebuild 3317 RMD160 79d6ef26e02dd0994344af516462008a33a012e0 SHA1 9aa614639ed695943fffca49619231a333f68fa0 SHA256 b76b3529a9e6f7a9f973eee30b7ee5430beae0fc002aa8703bb98f0a22ccdecb
-EBUILD ganeti-2.5.0_rc6.ebuild 3314 RMD160 0cdc4ac3a2f5840686c33a55429851a1effdd26e SHA1 2c4026a8520112a2fea984cae2eaf57e8f6d6c49 SHA256 d54bc900a95b4687c89be4f59bbb4efa3ca7078aaccaed509b6f7a9089d66e29
-MISC ChangeLog 10920 RMD160 94942db5bea1ecd86e3b014d6b8ab491ecbeb2e5 SHA1 0265f2b6d0f0ae5d037fa55e203a6825c17e2e67 SHA256 0008270e0ec3cded58bda16f4aeb7dae84e42609acb3e38584eacba304aa76bd
+EBUILD ganeti-2.5.1.ebuild 3381 RMD160 0492d5952df0bf9ff411189d043cde4ae6ff1411 SHA1 719fa581953bb879f2453ff7ead3563cad63bc7c SHA256 906538ef5dabe6526ad64d43b087fc5569c171eea3ef746e67f6fd575cec29b0
+MISC ChangeLog 11480 RMD160 8b8c67b7375fa9ff30da37405d37a9c91c68953c SHA1 9b3cf0df8567d2fbb6de03a92c66cf21f3b97811 SHA256 c5f619c904394c77cadaaa45a286d3ff7afc430621c282456779ffc0b2ddabd1
 MISC metadata.xml 1417 RMD160 901905a7bd7b2bcbecdecf2380565e714ba6b8e4 SHA1 186ebe41b1124eb972c7412f9a7470422c6a281c SHA256 4c9d7eac035b80579071e8d3d283df32f011729e8058345b7d3c497671d59bf4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEARECAAYFAk99skMACgkQsAvGakAaFgA9JACfWlpbzCC4UjBEVN5kS5bs1U/q
-iNMAl3oUAwRyxmKLiyqVShftP1/bXcA=
-=l75c
+iD8DBQFPrhr2QW+hXSf0t0IRAoJhAKCVBQcDbXbx0NA9puYXS3G6tSfOPQCgvf4X
+/z/sdr4Cp2X+QDxAjRHozzw=
+=URtT
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.1.initd b/app-emulation/ganeti/files/ganeti-2.1.initd
index 8b84e2f9a6dc..ed890d81c71c 100644
--- a/app-emulation/ganeti/files/ganeti-2.1.initd
+++ b/app-emulation/ganeti/files/ganeti-2.1.initd
@@ -1,10 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti-2.1.initd,v 1.4 2011/08/09 06:57:04 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti-2.1.initd,v 1.5 2012/05/12 08:10:23 ramereth Exp $
 
 depend() {
-    need localmount
+    need localmount logger
     after bootmisc
 }
 
@@ -50,24 +50,56 @@ maybe_do() {
     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_OPTS} ${GANETI_MASTERD_OPTS}"
+                GANETI_OPTS="${GANETI_START_OPTS} ${GANETI_MASTERD_OPTS}"
                 ;;
             ganeti-rapid)
-                GANETI_OPTS="${GANETI_OPTS} ${GANETI_RAPI_OPTS}"
+                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
-        maybe_do "${1}" start_action ${i} ${GANETI_OPTS}
+        # 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 \
-        maybe_do "${1}" stop_action ${i}
+        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
 }
 
diff --git a/app-emulation/ganeti/files/ganeti.confd b/app-emulation/ganeti/files/ganeti.confd
index b79a27815c12..3b71d7ee44a8 100644
--- a/app-emulation/ganeti/files/ganeti.confd
+++ b/app-emulation/ganeti/files/ganeti.confd
@@ -8,3 +8,9 @@
 
 # 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/ganeti-2.4.3.ebuild b/app-emulation/ganeti/ganeti-2.4.3.ebuild
deleted file mode 100644
index 8f0a1af72dca..000000000000
--- a/app-emulation/ganeti/ganeti-2.4.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.3.ebuild,v 1.4 2012/03/09 04:48:43 ramereth Exp $
-
-EAPI=2
-
-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="http://code.google.com/p/ganeti/"
-SRC_URI="http://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-kvm )
-	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
-	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}/
-}
-
-pkg_postinst () {
-	bash-completion_pkg_postinst
-}
diff --git a/app-emulation/ganeti/ganeti-2.4.4.ebuild b/app-emulation/ganeti/ganeti-2.4.4.ebuild
deleted file mode 100644
index 6852f9a31608..000000000000
--- a/app-emulation/ganeti/ganeti-2.4.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.4.ebuild,v 1.2 2012/03/09 04:48:43 ramereth Exp $
-
-EAPI=2
-
-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="http://code.google.com/p/ganeti/"
-SRC_URI="http://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-kvm )
-	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
-	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}/
-}
-
-pkg_postinst () {
-	bash-completion_pkg_postinst
-}
diff --git a/app-emulation/ganeti/ganeti-2.5.0_rc6.ebuild b/app-emulation/ganeti/ganeti-2.5.0_rc6.ebuild
deleted file mode 100644
index cd4b035e6f11..000000000000
--- a/app-emulation/ganeti/ganeti-2.5.0_rc6.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.5.0_rc6.ebuild,v 1.1 2012/04/05 14:55:17 sping Exp $
-
-EAPI="4"
-
-inherit eutils confutils bash-completion-r1
-
-MY_PV="${PV/_rc/~rc}"
-#MY_PV="${PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-
-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://ganeti.googlecode.com/files/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu-kvm )
-	lxc? ( app-emulation/lxc )
-	drbd? ( >=sys-cluster/drbd-8.3 )
-	ipv6? ( net-misc/ndisc6 )
-	htools? (
-		>=dev-lang/ghc-6.10
-		dev-haskell/json
-		dev-haskell/curl
-		dev-haskell/network
-		dev-haskell/parallel )
-	dev-libs/openssl
-	dev-python/paramiko
-	dev-python/pyopenssl
-	>=dev-python/pyparsing-1.4.6
-	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
-	${GIT_DEPEND}"
-RDEPEND="${DEPEND}
-	!app-emulation/ganeti-htools"
-
-pkg_setup () {
-	confutils_require_any kvm xen lxc
-}
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		./autogen.sh
-	fi
-	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 sharedstorage ; then
-		myconf="--with-shared-file-storage-dir=/var/lib/ganeti-storage/shared"
-	else
-		myconf="--with-shared-file-storage-dir=no"
-	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) \
-		$(use_enable htools) \
-		$(use_enable htools htools-rapi) \
-		${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,shared}/
-}
-
-pkg_postinst () {
-	bash-completion_pkg_postinst
-}
diff --git a/app-emulation/ganeti/ganeti-2.5.0_rc5.ebuild b/app-emulation/ganeti/ganeti-2.5.1.ebuild
index 6a83b4eac3f4..f2f4f4119d53 100644
--- a/app-emulation/ganeti/ganeti-2.5.0_rc5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.5.0_rc5.ebuild,v 1.1 2012/03/09 04:48:43 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.5.1.ebuild,v 1.1 2012/05/12 08:10:23 ramereth Exp $
 
 EAPI="4"
 
@@ -61,6 +61,7 @@ DEPEND="xen? ( >=app-emulation/xen-3.0 )
 	sys-apps/iproute2
 	sys-fs/lvm2
 	>=sys-apps/baselayout-2.0
+	>=dev-lang/python-2.6
 	${GIT_DEPEND}"
 RDEPEND="${DEPEND}
 	!app-emulation/ganeti-htools"
@@ -88,6 +89,9 @@ src_configure () {
 	else
 		myconf="--with-shared-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 \
@@ -118,7 +122,3 @@ src_install () {
 	keepdir /usr/share/ganeti/os/
 	keepdir /var/lib/ganeti-storage/{export,file,shared}/
 }
-
-pkg_postinst () {
-	bash-completion_pkg_postinst
-}