Version bump, mark 2.4.1 stable

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

4 files changed, 102 insertions, 8 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 028c7a0b83c8..0edf5245081e 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.47 2011/03/29 22:12:25 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.48 2011/05/12 17:46:25 ramereth Exp $
+
+*ganeti-2.4.2 (12 May 2011)
+
+  12 May 2011; Lance Albertson <ramereth@gentoo.org> ganeti-2.4.1.ebuild,
+  +ganeti-2.4.2.ebuild:
+  Version bump, mark 2.4.1 stable
 
   29 Mar 2011; Lance Albertson <ramereth@gentoo.org> files/ganeti.initd:
   add more constraints to init script
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 67a207ea6574..396e8301f56b 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -14,18 +14,20 @@ DIST ganeti-2.1.8.tar.gz 1400262 RMD160 10eecb4c4757c77afcb834743e0a424bf13ac827
 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.1.tar.gz 1803884 RMD160 c0bd4ee93725867ef075097cf6af0ffbc221e56e SHA1 8a0a6c4204c340f3392cc260e0dc1e65dbed085b SHA256 1f62d350e07ca716c9a198ac35d3617dc59775d68ca615411280f95e5f11f01e
+DIST ganeti-2.4.2.tar.gz 1820742 RMD160 d03d7ba7e02e02750774aa3381ee704a692e695f SHA1 64d6d7bf663c5be5c68310a8618702f52d1075fc SHA256 7eb3aeff26c7a47302d376a8e21d5c23299ba73bb42d69a1c9d0498f4f19a5d6
 EBUILD ganeti-1.2.9.ebuild 1186 RMD160 80d028e0d6b9b3edb04fa742d612bbd46085f699 SHA1 5ffaf48d6ff975341fd03f3f277cac007c158edb SHA256 4881e505e39e2db011aca0f6ab1f1c49c0eabd9fe35ef389c42b7cbbcddb12c1
 EBUILD ganeti-2.0.6.ebuild 1760 RMD160 3ab8f9d91bdbda6c2ff07623e5ff5c5004a8709b SHA1 650fd64b9557aeed53a0d03f6fe6e7db594322f2 SHA256 a8a9d35cb1f13ce4c899d1295c8a4c3889f9a0f16fe2010bec9dd54cd8ecddc8
 EBUILD ganeti-2.1.8.ebuild 2030 RMD160 6e7e83402ea3b99aef8190dc8f9c3ac9db686e41 SHA1 dd06e6380a672a233a461e6eb75c8492ad790e5b SHA256 5f58568fde473271969f142aeb4adb246d4d1afa1407be3c27f157fea1dbf4c9
 EBUILD ganeti-2.2.2.ebuild 2117 RMD160 d910a0320211c45ab37b537c346cfd74dd00706d SHA1 5a08e839aeaea9e6a646bba34981da90c3499099 SHA256 2ac8435fd5fb274142988f1df39dc55d15d51a8a66dba48e06f00b0debe8379b
 EBUILD ganeti-2.3.1.ebuild 2149 RMD160 41599b1d89292bb0ed3ddd5ac82bd1b989b82fcc SHA1 eb91381f25cd65af3fe09426ac34d1fd9391e185 SHA256 c9715d1cbd3f238d8bfa031b83bf292f086cf3cc578e6a39404b0895e47c4ed2
-EBUILD ganeti-2.4.1.ebuild 2404 RMD160 3b469d286c87b8b16f32923d130a999193cc10c9 SHA1 ad807f0973fc5a3b2e5a9a4d6e3d154b962fdd3b SHA256 b4bc7ea2415c8a2439726075c1193e04e4344664b0bc749454db63f2726a95a5
-MISC ChangeLog 8686 RMD160 c6e0f7abf846532a00a9fbfd2fbd37ec5418f0a7 SHA1 938f5523125a57035d7971f994b2706e0d021524 SHA256 30d005fd4fad59c8e321ef8885cccf681c148076eb06c9937fd3dff941b5eb54
+EBUILD ganeti-2.4.1.ebuild 2402 RMD160 c7c7b36a5c17395583df95823fe299e63a7904d5 SHA1 dbbd3f62454fb25595f8f38afe4ff2c1e502d50b SHA256 65bb2e127faba6c66561fc6fca0924a30784730d20cce20286136a797f3533d4
+EBUILD ganeti-2.4.2.ebuild 2404 RMD160 15ba8fef47929ad3f1038966b770fbeed8267fc3 SHA1 a6020d1c327902599ce981d9f9bb5f3b731324cb SHA256 77150e37b744e456104878828ac8bd8cc81127bee113b021ba83e03ec1803f6c
+MISC ChangeLog 8848 RMD160 ab0605e8fa7a8257bf621dae5e8554e00dc63491 SHA1 3b30b39be3978114c9bdfccaa33ef8e806e62b6d SHA256 d13c796498cb98f37ff335033089ec1ad37c426958584f88fa10ddc4b044c45d
 MISC metadata.xml 1241 RMD160 efeb38484aca2c00aed39b5baaa0a6b3be8aa3fd SHA1 572c2325f73be081e85a7b6dd8356e778b92ae8c SHA256 d3c4195c8a273087826535dbf371bd7c7c5f129a8fc5bb247fa52bbc39fd570c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFNkllIQW+hXSf0t0IRApUkAJ9rzVGZTGlQwUHrbnqPZBWWGG5euQCeJLjz
-XEiYP6I9LpRAKmV4JNYArOk=
-=/mfd
+iD8DBQFNzBzpQW+hXSf0t0IRAvc2AKDM/LRW5Z2Q2oYH/8qT/E/mXkCDzwCgo4FN
+QXB5R/9om6B2jCtxEkNQqa8=
+=aIKI
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/ganeti-2.4.1.ebuild b/app-emulation/ganeti/ganeti-2.4.1.ebuild
index ca8f16b55710..94d2d03feaf7 100644
--- a/app-emulation/ganeti/ganeti-2.4.1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.1.ebuild,v 1.1 2011/03/09 18:20:00 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.1.ebuild,v 1.2 2011/05/12 17:46:25 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}"
diff --git a/app-emulation/ganeti/ganeti-2.4.2.ebuild b/app-emulation/ganeti/ganeti-2.4.2.ebuild
new file mode 100644
index 000000000000..bc65ae9c2c4e
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.4.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.2.ebuild,v 1.1 2011/05/12 17:46:25 ramereth Exp $
+
+EAPI=2
+
+inherit eutils confutils bash-completion
+
+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"
+RDEPEND="${DEPEND}
+	!<app-emulation/ganeti-htools-0.3"
+
+pkg_setup () {
+	confutils_require_any kvm xen
+}
+
+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
+	dobashcompletion 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
+}