4 files changed, 16 insertions, 84 deletions
diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 579424382f51..d84a1d6e4808 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.14 2010/01/15 17:50:51 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.15 2010/01/31 01:55:10 ramereth Exp $
+
+*ganeti-2.1.0_rc4 (31 Jan 2010)
+
+  31 Jan 2010; Lance Albertson <ramereth@gentoo.org>
+  -ganeti-2.1.0_rc1.ebuild, -ganeti-2.1.0_rc2.ebuild,
+  +ganeti-2.1.0_rc4.ebuild:
+  Version bump, cleanup
 
 *ganeti-2.1.0_rc3 (15 Jan 2010)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index abb46b8aa915..b353795df433 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -11,23 +11,21 @@ DIST ganeti-1.2.9.tar.gz 847644 RMD160 fcb803e6db851e020439a5c512d656bdd1712323
 DIST ganeti-2.0.3.tar.gz 652998 RMD160 d2df53d6e3a5809259e1eb93e9c5017a45eb186c SHA1 ae9d805a5cbe56fbf8940003debde08a0c872139 SHA256 24dc43bf1771440e8da948b69b720209ec377e3bcc9c3ee41be155e4bbbf432b
 DIST ganeti-2.0.4.tar.gz 662927 RMD160 9b70c32d9439b36f2f6128f437ca01426e288f50 SHA1 7d4b6ffd5195812f729a4ad1e7fbc3fa9c6a249a SHA256 d8498ce50f1a77e3ae1bb3dfe0bf3b4d953b34d3d058b213d50abd516b091c74
 DIST ganeti-2.0.5.tar.gz 668568 RMD160 ae53b420302070522e29d00196f4ce4ae9b7fa50 SHA1 ac7195f500f78337ab5f6003b617ccabb842e2b5 SHA256 9cfdac5754ab6db7bb98b492d3556e51d46b6aa918df6df9050d46d5f10c3573
-DIST ganeti-2.1.0~rc1.tar.gz 1201913 RMD160 3f9f7eaf021b82bc7a16f13d42227544bd0d95cb SHA1 16833412e40e1e719d86b3dcfef0b9ae598590d0 SHA256 82a0440662e84a9ed20781e8881a1421f06ffdf95c9604aa61f8e312ff6d4620
-DIST ganeti-2.1.0~rc2.tar.gz 1225690 RMD160 59223717ec70eeade38db9b8cc5077f8b60b6bee SHA1 7763a52bec950e03f71e51952b090cae746cd4c3 SHA256 9438aa099974ea8bd8f6de24ae6603945693ef718353a388162b979eef5ee557
 DIST ganeti-2.1.0~rc3.tar.gz 1209924 RMD160 f893ca2791e6e93a880eed57ed23963079182382 SHA1 eba6f631a216398b89177599b2362dc21fd063cc SHA256 990f435bd5e44228d08b1257da96a219d494404ab31f56dcb2b74ca7fe3cfd6c
+DIST ganeti-2.1.0~rc4.tar.gz 1210681 RMD160 0f49de1b2afd8b0037b20f28c875bf90f4cd1293 SHA1 e3d0b0fd536ad5f531811750f76d198aa0c5c88a SHA256 720c9a4e9af0de923db9f5be27904bd9688dea04e666d974aee6013b7c23a69b
 EBUILD ganeti-1.2.1.ebuild 1183 RMD160 c56555692f488039ddaa7d046711d28022d34e3c SHA1 4064edf3e307133a0efb21592df9d2bc71490b19 SHA256 946f5af6c06df1596b70b9ff0f51e223f1aef59f7fac8cd975524f7e2851aedf
 EBUILD ganeti-1.2.9.ebuild 1184 RMD160 a5a134cb7dec0599845d544f3637cce9c36b9413 SHA1 a1209b771ec6bfd056186fa9d99819ab0d84a471 SHA256 437c0d62c4db77b71f8a97f95f8f4ffecf36624a9cd2988feb9df1ec406a627c
 EBUILD ganeti-2.0.3.ebuild 1755 RMD160 86a4ebf578d94de19e33402c24391420cdd5668a SHA1 ee8a5fdf36e370de182855b8c3011c5eb8bc5e6b SHA256 7f4c7c2da6f128a15b9430a9e6ba786893df3941bee461c0ded54b6d80e94fc3
 EBUILD ganeti-2.0.4.ebuild 1762 RMD160 d2e28451ff25fc2b19fce9c852559617648ef7d1 SHA1 825e199e1c73fa31f366a2d433169bbdb53106ad SHA256 dd52db7f709f699fe3fa6c6e161823b56ab0bacff6d5a434976ccdb2abef68ed
 EBUILD ganeti-2.0.5.ebuild 1762 RMD160 16540a00486a5715f81055aba5ab6a4c5f8afd1d SHA1 d5371fc235ecfb8b6fdd7c9f0a47e0e3a7b08298 SHA256 1daa44848d5dc3863a611722f4d71ec64e3e3f5da041fc35c71339fead7242c8
-EBUILD ganeti-2.1.0_rc1.ebuild 1922 RMD160 539e66ba830bae088d013b95de7ea9f71ef6e0f6 SHA1 f5d0ade075f176910d7dc38efd8231db3e2ee4a6 SHA256 c2c4d1338672d8d6e73e16c1dfb2ac006cef454fe0f722e7550d5feacca14fed
-EBUILD ganeti-2.1.0_rc2.ebuild 1933 RMD160 4394237b10bcbe4f127490b7f6cef8ce2a4f4705 SHA1 1f79087a449c71521cd3927f6d46cccc4154da17 SHA256 1f80c1880f2f33ceb125b78945e5ad138250bb85c9bb7d4ed29b07339fd7355d
 EBUILD ganeti-2.1.0_rc3.ebuild 1933 RMD160 1582ddab1135e4679fa8d2f41189ed49783c38ae SHA1 f6f72466599c4d60a26f2f143ffb17deb331b30a SHA256 fed2150f6f761749e178671948c0b0d493a445e82c1514a384a1b88261230d4b
-MISC ChangeLog 2718 RMD160 2d68e434ee69afc34278cc426e2db0af839983b3 SHA1 4a202271b3ee4b6c1d713ca125856224aa3a1fbc SHA256 502e9f12a9c6759cc82697fcda84cb28d055f448a78e8d863acd75512e2d37d0
+EBUILD ganeti-2.1.0_rc4.ebuild 1933 RMD160 634c9309e5eaf5cb48b2c8d5edad84428f8a089e SHA1 9726b5f0ad871c539e20c75c49123dbea48d9d79 SHA256 02757cbab0831caeb5f3a90f23d33334694603ee0673fd524dba7e1f25ba31f0
+MISC ChangeLog 2911 RMD160 6f52f146de7ea4259cec407cdb7b13d3607346d0 SHA1 c00ca8fd0049f94c4d368cab221ba2d9a4252d46 SHA256 a26a911157c23c281ff29eab6a56d2b4e2269eb472b9d3ce286d41ab6bb6dec8
 MISC metadata.xml 1187 RMD160 c4f4fd250ec9b7b8fb4738a8d61c09f2af01d3a0 SHA1 921024500dae363c3e73ba565d3300a000f1772c SHA256 e6a405062ca4862abc506bd8fc0138403976c0769dd25ddcb4b737507bda9404
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFLUKsCQW+hXSf0t0IRAqhwAJ9dutnP9de1GI50qMCqHhW0umXUaACfcqc3
-ncgK1imfwmC5KENDKC5XuXU=
-=nxCF
+iD8DBQFLZOLeQW+hXSf0t0IRAnP+AJ9J3O8BpxEBWYPnr0NQhhraIHacKwCeMsD3
++mGVzh68S0/4SJoIa0qMfIQ=
+=JeUS
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/ganeti-2.1.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.1.0_rc1.ebuild
deleted file mode 100644
index 8e654a887cb9..000000000000
--- a/app-emulation/ganeti/ganeti-2.1.0_rc1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.1.0_rc1.ebuild,v 1.1 2009/12/17 00:47:24 ramereth Exp $
-
-EAPI=2
-
-inherit eutils confutils bash-completion
-
-MY_PV="${PV/_rc/~rc}"
-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"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
-	kvm? ( app-emulation/qemu-kvm )
-	drbd? ( >=sys-cluster/drbd-8.0 )
-	dev-libs/openssl
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/pyinotify
-	dev-python/simplejson
-	net-analyzer/arping
-	net-misc/bridge-utils
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	sys-fs/lvm2"
-RDEPEND="${DEPEND}"
-
-src_prepare () {
-	epatch "${FILESDIR}/${P}-fix-brctl-path-for-gentoo.patch"
-}
-
-pkg_setup () {
-	confutils_require_any kvm xen
-}
-
-src_configure () {
-	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 \
-		--with-file-storage-dir=/var/lib/ganeti-storage/file
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
-	dobashcompletion doc/examples/bash_completion ganeti
-	dodoc INSTALL NEWS README doc/*.{rst,png}
-	rm -rf "${D}"/usr/share/doc/ganeti
-	docinto examples
-	dodoc doc/examples/{dumb-allocator,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.1.0_rc2.ebuild b/app-emulation/ganeti/ganeti-2.1.0_rc4.ebuild
index 1c9fe1becc5f..6fcb8871fee1 100644
--- a/app-emulation/ganeti/ganeti-2.1.0_rc2.ebuild
+++ b/app-emulation/ganeti/ganeti-2.1.0_rc4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.1.0_rc2.ebuild,v 1.1 2009/12/17 17:05:20 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.1.0_rc4.ebuild,v 1.1 2010/01/31 01:55:10 ramereth Exp $
 
 EAPI=2