Version bump, mark 2.4.2 stable

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

5 files changed, 147 insertions, 9 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 470fdc19701d..f305697409db 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.50 2011/08/10 17:43:07 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.51 2011/08/15 16:06:44 ramereth Exp $
+
+*ganeti-2.5.0_beta1 (15 Aug 2011)
+
+  15 Aug 2011; Lance Albertson <ramereth@gentoo.org> ganeti-2.4.2.ebuild,
+  +ganeti-2.5.0_beta1.ebuild, metadata.xml:
+  Version bump, mark 2.4.2 stable
 
   10 Aug 2011; Lance Albertson <ramereth@gentoo.org> ganeti-2.4.3.ebuild:
   Add missing dependency for baselayout-2.0
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index ac929ef9a05c..728fc18728eb 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -16,19 +16,21 @@ DIST ganeti-2.2.2.tar.gz 1588569 RMD160 98d615742b639b50a95755715e4b94cf6d01b2ba
 DIST ganeti-2.3.1.tar.gz 1679030 RMD160 a9552c55876feaf690a1c021c9d5ff3aa7a0987c SHA1 109486c6c89f250204ca9a87c30634d9a74d5da0 SHA256 3d644eea35f1caed9e38246f21fa79f4d4d783f396078b5872b14934a47c2d8e
 DIST ganeti-2.4.2.tar.gz 1820742 RMD160 d03d7ba7e02e02750774aa3381ee704a692e695f SHA1 64d6d7bf663c5be5c68310a8618702f52d1075fc SHA256 7eb3aeff26c7a47302d376a8e21d5c23299ba73bb42d69a1c9d0498f4f19a5d6
 DIST ganeti-2.4.3.tar.gz 1826541 RMD160 3b696e2af48adc7ccbbbe6e0dd9c63ccd8525302 SHA1 72cd24f299a8e444369fe235e57209709f6880e8 SHA256 44742bb2ef87895730e6a869a83d4a3b6a62df3a437eb0acd594fd21df78421d
+DIST ganeti-2.5.0~beta1.tar.gz 2258834 RMD160 a3a0ab4a09ea435ad384324adee2f4323ef63346 SHA1 976eed1f088b0afe2d2f642c3b2c8fbcdec3762a SHA256 2857802d7e2290e548f7d7c01b938b15e917e7ac532c4a6c0128f36c80201171
 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.2.ebuild 2404 RMD160 15ba8fef47929ad3f1038966b770fbeed8267fc3 SHA1 a6020d1c327902599ce981d9f9bb5f3b731324cb SHA256 77150e37b744e456104878828ac8bd8cc81127bee113b021ba83e03ec1803f6c
+EBUILD ganeti-2.4.2.ebuild 2402 RMD160 211f5f0b71434ef5dff50657680f17ed4e2dd3e3 SHA1 71f5f33a1afe121bc299102b682c68dafe4a0150 SHA256 909186df9b1c250141d996a1397c088b40f834cddf50c66a0c2d11378b61438e
 EBUILD ganeti-2.4.3.ebuild 2499 RMD160 4440b9b3bf13bb9dac4e285a2bad91334e6660c7 SHA1 60e04218e86aab14d84b68bf03954bdddb2dccd9 SHA256 ad2a48549db8704d12c341fa680170ab3259d4fdb1c2fde56d2d8beaecc334dd
-MISC ChangeLog 9287 RMD160 4d3e798c206835a5ecb945e1604c883785e21f15 SHA1 8e71067f307018f11665349181f7828361ab28ec SHA256 5cac5d7262733af101dbbf1ffa889c1952f4bfdd56626d3eb377ec0cea94d891
-MISC metadata.xml 1241 RMD160 efeb38484aca2c00aed39b5baaa0a6b3be8aa3fd SHA1 572c2325f73be081e85a7b6dd8356e778b92ae8c SHA256 d3c4195c8a273087826535dbf371bd7c7c5f129a8fc5bb247fa52bbc39fd570c
+EBUILD ganeti-2.5.0_beta1.ebuild 3336 RMD160 427a395eb1ced07a86a795c35fc9ca0adf5448f9 SHA1 e69ca4b2049a7af003bdd658df7affb5f84dc9ea SHA256 66c8ac23bb026efee7b55b28c82ab694342dec2d15ddcb8532abddfc15aa7118
+MISC ChangeLog 9475 RMD160 200f6436f40dc7b14d662fe280356988c7bb0b7f SHA1 472af8e8f50cc2c4a91b490a4c03052e3948612f SHA256 843319335318e47868e2a9f6c3dc2d36aa9560d38bb14a6bc57e687ff9d38530
+MISC metadata.xml 1417 RMD160 901905a7bd7b2bcbecdecf2380565e714ba6b8e4 SHA1 186ebe41b1124eb972c7412f9a7470422c6a281c SHA256 4c9d7eac035b80579071e8d3d283df32f011729e8058345b7d3c497671d59bf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFOQsMyQW+hXSf0t0IRAlsgAKDrqN8NLw5qqVLrP2UHKkxxU/FVBQCfZJNC
-U0G3x8ifnui9eGC4z+9AbAA=
-=Ejym
+iD8DBQFOSUQcQW+hXSf0t0IRAmtmAJ47Xhvr4r8U51gHcHLxTRSTmyd/egCdGoir
+5BgGYMF/BJtKhkftm76P4fU=
+=RXdz
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/ganeti-2.4.2.ebuild b/app-emulation/ganeti/ganeti-2.4.2.ebuild
index bc65ae9c2c4e..da6444646b42 100644
--- a/app-emulation/ganeti/ganeti-2.4.2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.4.2.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.2.ebuild,v 1.1 2011/05/12 17:46:25 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.2.ebuild,v 1.2 2011/08/15 16:06:44 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.5.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.5.0_beta1.ebuild
new file mode 100644
index 000000000000..4f127e50925b
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.5.0_beta1.ebuild
@@ -0,0 +1,127 @@
+# 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.5.0_beta1.ebuild,v 1.1 2011/08/15 16:06:44 ramereth Exp $
+
+EAPI="4"
+
+inherit eutils confutils bash-completion
+
+#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:1
+			dev-haskell/parallel:2
+			)
+		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
+}
+
+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
+	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,shared}/
+}
+
+pkg_postinst () {
+	bash-completion_pkg_postinst
+}
diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index 563823b64931..532b120ad87d 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -23,8 +23,11 @@
 	<use>
 		<flag name='kvm'>Enable KVM support</flag>
 		<flag name='xen'>Enable Xen support</flag>
+		<flag name='lxc'>Enable Linux Countainers support</flag>
 		<flag name='drbd'>Enable DRBD support</flag>
 		<flag name='filestorage'>Enable File Storage</flag>
+		<flag name='sharedstorage'>Enable Shared Storage support</flag>
+		<flag name='htools'>Enable htools support</flag>
 	</use>
 </pkgmetadata>