Add kvm path fix to 2.4.x series ebuild, mark 2.4.5 stable

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

4 files changed, 106 insertions, 9 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index a923d342df76..7f481bc7a9bb 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,12 @@
 # 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.59 2012/05/12 08:10:23 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.60 2012/05/13 05:54:58 ramereth Exp $
+
+*ganeti-2.4.5-r1 (13 May 2012)
+
+  13 May 2012; Lance Albertson <ramereth@gentoo.org> ganeti-2.4.5.ebuild,
+  +ganeti-2.4.5-r1.ebuild:
+  Add kvm path fix to 2.4.x series ebuild, mark 2.4.5 stable
 
 *ganeti-2.5.1 (12 May 2012)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 72c98ad7102c..0915780f842a 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -21,14 +21,15 @@ EBUILD ganeti-2.0.6.ebuild 1758 RMD160 8afbfe02a47395149f85c6daa72474b401a7148e
 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.5.ebuild 2447 RMD160 9f937f70c877bc979eb9683319fc5b9aab5c3690 SHA1 3f34e3b2f5e6184775d4ef479091bc206a064c42 SHA256 7729dde7c94b2bdbeecc6ebeb14e5546410635ff388c4b93cced10fd7e061669
+EBUILD ganeti-2.4.5-r1.ebuild 2546 RMD160 73d7682a17623d7df05713d1792c4a94294aab7a SHA1 d6e5374c502abc59e15cc45e6c858b0b353313ad SHA256 648095a73f9aa38264dc67da79f8ec980d0476b56869b97b9402be6f46ccb431
+EBUILD ganeti-2.4.5.ebuild 2445 RMD160 08e05ef857e29bf24ac132f526ca1ee3e817efa6 SHA1 a2da46797e210b1e4500fd23a41e9b2c836d89fd SHA256 956751207977726f6468e0da6b771e44c3fed96988e8dd5189eb530c7dd27056
 EBUILD ganeti-2.5.1.ebuild 3381 RMD160 0492d5952df0bf9ff411189d043cde4ae6ff1411 SHA1 719fa581953bb879f2453ff7ead3563cad63bc7c SHA256 906538ef5dabe6526ad64d43b087fc5569c171eea3ef746e67f6fd575cec29b0
-MISC ChangeLog 11480 RMD160 8b8c67b7375fa9ff30da37405d37a9c91c68953c SHA1 9b3cf0df8567d2fbb6de03a92c66cf21f3b97811 SHA256 c5f619c904394c77cadaaa45a286d3ff7afc430621c282456779ffc0b2ddabd1
+MISC ChangeLog 11675 RMD160 31a410580d62bbe541befd958b5e1bc7c1589797 SHA1 bf8a2457e1728431048dcda804833797fd3f6c36 SHA256 6ac850486887194721dc3a2ece82e627b714deba327a5dce4cb19fb850ef314b
 MISC metadata.xml 1417 RMD160 901905a7bd7b2bcbecdecf2380565e714ba6b8e4 SHA1 186ebe41b1124eb972c7412f9a7470422c6a281c SHA256 4c9d7eac035b80579071e8d3d283df32f011729e8058345b7d3c497671d59bf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFPrhr2QW+hXSf0t0IRAoJhAKCVBQcDbXbx0NA9puYXS3G6tSfOPQCgvf4X
-/z/sdr4Cp2X+QDxAjRHozzw=
-=URtT
+iD8DBQFPr0y4QW+hXSf0t0IRAnrXAJ4xxrZVOMYfKfa97/ijeBDMJGB29QCfTrNu
+Buj6QPqLLQW7FmSId42dCR4=
+=me0b
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild b/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild
new file mode 100644
index 000000000000..09810fd11909
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild
@@ -0,0 +1,90 @@
+# 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.5-r1.ebuild,v 1.1 2012/05/13 05:54:58 ramereth Exp $
+
+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="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
+	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/ganeti-2.4.5.ebuild b/app-emulation/ganeti/ganeti-2.4.5.ebuild
index 01a4aa18f03f..fdef495eceaf 100644
--- a/app-emulation/ganeti/ganeti-2.4.5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.4.5.ebuild
@@ -1,6 +1,6 @@
-# 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/ganeti-2.4.5.ebuild,v 1.1 2011/10/27 16:57:55 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.5.ebuild,v 1.2 2012/05/13 05:54:58 ramereth Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@ SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kvm xen drbd +filestorage syslog ipv6"
 
 S="${WORKDIR}/${MY_P}"