version bump, ebuild & patch cleanup

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

7 files changed, 30 insertions, 132 deletions

diff --git a/app-emulation/ganeti-instance-image/Manifest b/app-emulation/ganeti-instance-image/Manifest
new file mode 100644
index 000000000000..31d7f42c237b
--- /dev/null
+++ b/app-emulation/ganeti-instance-image/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST ganeti-instance-image-0.4.tar.gz 71730 RMD160 f553a3a1df0016b5bf356fce65744ec640b64706 SHA1 810bb7a45b7a17942e5705c475dd1abb528cff69 SHA256 e36a470deb5789ba8a08bb6f044c7e7ed50bd23f50c5cd66c97f0057e69256fc
+EBUILD ganeti-instance-image-0.4.ebuild 1160 RMD160 af34f6c505a359ffff09e0d46c9ba9d33cdb5c5b SHA1 a0f4b8ae540d52bef1225c011c3cad5148a90905 SHA256 725c29a0590a8a34884d1c1c2a97ca50d54787b402b9d9ec21d867130afa1b8e
+MISC ChangeLog 441 RMD160 e35d904081ecba9350b0d3d8d81fe988a184f73c SHA1 ad619d31efa3d8c4ea107bfedcb25b635d2f6558 SHA256 c89da26e80c1467aca4ce674dd42767119341158bd420eb76fc5ca5cfef4c55a
+MISC metadata.xml 301 RMD160 759f51dcb64d85eee294cf160d7eedff66f3c6f6 SHA1 36446536d5452b1771f375c9d6fbf867bb705587 SHA256 a1d5a7bd389d314377303e077893dcae8ed0c8bd5bf4389c384d751704c27b2d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iD8DBQFMDNxLQW+hXSf0t0IRAs1yAJ0UJT3aV29xE/3CgokS/8i9rMmjwwCdEYQx
+EoFQm4s9SuAu4oC0lyiv/RE=
+=/byP
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index c0ce54b618fa..19066fa6c4b1 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,14 @@
 # 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.21 2010/05/07 18:57:43 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.22 2010/06/07 22:26:03 ramereth Exp $
+
+*ganeti-2.1.3 (07 Jun 2010)
+
+  07 Jun 2010; Lance Albertson <ramereth@gentoo.org> -ganeti-2.1.0.ebuild,
+  -files/ganeti-2.1.0_rc1-fix-brctl-path-for-gentoo.patch,
+  -ganeti-2.1.1.ebuild, -files/ganeti-2.1.1-disable-check-man.patch,
+  +ganeti-2.1.3.ebuild:
+  version bump, ebuild & patch cleanup
 
 *ganeti-2.1.2.1 (07 May 2010)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index c9b75918c71a..5212fc279c48 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -2,28 +2,24 @@
 Hash: SHA1
 
 AUX ganeti-2.0.3-gentoo-brctl-path.patch 741 RMD160 2e97a68618467ba700fa97d3fc250e6734570c35 SHA1 90d414b327fa4a61850a8f11fab6ef9bd8cf437b SHA256 8362692d1af5b264a9681d63137bd010be29047419718b8daaa320dfb0979965
-AUX ganeti-2.1.0_rc1-fix-brctl-path-for-gentoo.patch 1041 RMD160 fc6a76737c923e25ac918a390b4b1881313f95b1 SHA1 4edc7135756f64111933bac23879b0cce50cb864 SHA256 ec597d86558bc8f5205afeb55f4fd1f7aa016f2482dd7f31935628ef0ae1e3c0
-AUX ganeti-2.1.1-disable-check-man.patch 547 RMD160 5b760903179418191da3dc9a17f4f1e8c65fde91 SHA1 5199d14b0b498a0ce096b1617a2b21e1bcfba5a7 SHA256 09396f4b321cd3b3b9f9cd15c9d8d3e2a68838bdbcaf071e4f6b71e7b6065b24
 AUX ganeti-2.1.initd 2014 RMD160 44996bf7d50b8ac70df572daafa5f5d04be021a8 SHA1 ceda61da3b3099292f4cd5ab41b5e02f2666dc6b SHA256 37fd18b914846e5fb8d984db7162b230ac3488ec530aaddda7b63bd72cc70117
 AUX ganeti.confd 248 RMD160 18662964365f102e77f593429bb0772d94c65267 SHA1 337999b3fbeb64518f3d39c41634e3f414aedb25 SHA256 7efc3a5052ad5c2085605a8c0bf9e9bb9cf20c0623263b7abcd0b7a0cb9a895b
 AUX ganeti.initd 1117 RMD160 763bc5795ac721d1616c435e1e087c3f5279c338 SHA1 ffeca91d3f4f26e775ea9de4c6b406e712aa317e SHA256 ae65bfb27f6cd6e261af0e130f5906185b9f9d6413c8319e989609a35d37172d
 AUX ganeti2.initd 1503 RMD160 4af84c353f6638af31a94a5274e922237ae2fd00 SHA1 a46268352d11fb6450362c9a0d72655ded6b5b6f SHA256 6fd666648ac543ffcc3700821a36eba9a027eb04278e53f60e07ce8989de3fb8
 DIST ganeti-1.2.9.tar.gz 847644 RMD160 fcb803e6db851e020439a5c512d656bdd1712323 SHA1 2332038124c411085ffbdaf9539ac6a5cdccf443 SHA256 1de2432281f127a2b19106ba04fd1f630c7868113f0665063ff10a147676b92b
 DIST ganeti-2.0.6.tar.gz 684502 RMD160 3d521b48fad01d13c287457b421b3a60b926fe5c SHA1 167086e5285650a424891fcb4b6b3a298f104896 SHA256 f06433c567109ffa319ca23449eec670fb8b7bec7fa906edbf3c0cfc01f60043
-DIST ganeti-2.1.0.tar.gz 1237144 RMD160 340221421e5069bbbac0421d7486281ec5a56085 SHA1 c1be9a6d66c3cd38f716345b4677e823320791ae SHA256 09e433cd71a5c4a94ff80e2e2ea7b6c4e31a0eab9efa7b345d868c2aa761c612
-DIST ganeti-2.1.1.tar.gz 1267726 RMD160 b424545d33ee84bf8af508ee8e3727d8fe51aca7 SHA1 9e851ca239f20d3e56f649962a9d173195ebad78 SHA256 4dd6a26cb2464206fe1dbf40d077ba14f75bcef7515d14b461c7ffe27a0500e6
 DIST ganeti-2.1.2.1.tar.gz 1352834 RMD160 ac07aed49fd049318b702c05360e8768067c1f8f SHA1 69a18ba230deee03c68c8c9d91ae42ae438efbe4 SHA256 8de60d9682f6d4a6f50ba74c360c84de6040a94b596239b53b85cef5110ba422
+DIST ganeti-2.1.3.tar.gz 1383015 RMD160 7ab102a8aa8fdce027194a9d86710a276310b8ce SHA1 1679aa3367bab51037f4ef041911fbf1f0aef617 SHA256 02dcd0cdcb515aee3e7e465f39e60c2ef3b5b3a5a4fe20e68c7a32899123a871
 EBUILD ganeti-1.2.9.ebuild 1184 RMD160 a5a134cb7dec0599845d544f3637cce9c36b9413 SHA1 a1209b771ec6bfd056186fa9d99819ab0d84a471 SHA256 437c0d62c4db77b71f8a97f95f8f4ffecf36624a9cd2988feb9df1ec406a627c
 EBUILD ganeti-2.0.6.ebuild 1762 RMD160 9408c5ce24e0a45be716ee7372a316c0f5a83e92 SHA1 129ffac81161c0e1598ed0cf2819c992b210e392 SHA256 acd454d76f642b5f388b2effb0cead5d0af44d6231a1dfa915feabc4671f334a
-EBUILD ganeti-2.1.0.ebuild 1973 RMD160 ff0e65eeb9a63531bcceb019a5ba6716c660ab8d SHA1 5c7894276b3f7167b18ef91c96c2d7d6d4271329 SHA256 eb46ba16a4f46b64b3d78d279b46280d86e10cfdea4808d91e844506ad9888ce
-EBUILD ganeti-2.1.1.ebuild 2102 RMD160 3021e65e1ac3e7c56f29354f30019e47367482de SHA1 47c383f4daf57a103712f331a65da3282389f571 SHA256 d90bee79b16cf6951ca849581bab2a5e36ab58d25411489da0a52b12e43735f9
 EBUILD ganeti-2.1.2.1.ebuild 2034 RMD160 65848e0925bb4c3cea2016443ac00c37a9c4c8ea SHA1 e5e660a4530f088710628841efd5ce3b886e8f4d SHA256 5ed2cd62c22c627560a28f8a618d39f53c1a1b80af55c937e435ac00a20202f5
-MISC ChangeLog 4264 RMD160 c4e4988c62618c015caed88e6b137da36f5a63fc SHA1 9689dd69ff6c69930faaf0aaab8d9d2cdcab0083 SHA256 819f03f051b742076fb03dc42ca038036f98208b3849729cc7d482ccf4ff6bbb
+EBUILD ganeti-2.1.3.ebuild 2032 RMD160 95137b0649dcdf0be363d4e3077d2f4bf06309cc SHA1 bd7a74edb1f99074d25590cf58fbdf5df68d4572 SHA256 38409818399a817ad5c9c7455165d88424b57574986ab03a2664d6a255a573a4
+MISC ChangeLog 4560 RMD160 747ae63d0fb3d1e3cf8185a94c6400dd86cab44c SHA1 03a321700487fe3962a78f4a8753cb5e0ec9d681 SHA256 2b3fe414ad24f98b7915744615fe30ec371e06785befe39805bb23264a72e50c
 MISC metadata.xml 1241 RMD160 efeb38484aca2c00aed39b5baaa0a6b3be8aa3fd SHA1 572c2325f73be081e85a7b6dd8356e778b92ae8c SHA256 d3c4195c8a273087826535dbf371bd7c7c5f129a8fc5bb247fa52bbc39fd570c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFL5GJtQW+hXSf0t0IRAhkJAJ0S/XpKJ6RNL6NdDRA716k2Rj6Z5ACg5JO3
-IZMYqaodQc0f40Q7j5ex/UI=
-=FAc5
+iD8DBQFMDNs1QW+hXSf0t0IRAjm3AJwJG1dHUgStvgDVCH1ZgZG2X2crswCg0Pet
+fueogVilsZnG06mOzZOWAds=
+=mg9p
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.1.0_rc1-fix-brctl-path-for-gentoo.patch b/app-emulation/ganeti/files/ganeti-2.1.0_rc1-fix-brctl-path-for-gentoo.patch
deleted file mode 100644
index b44ec57116e2..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.1.0_rc1-fix-brctl-path-for-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4c41d9025ddbc5d093d58b81bf9b31d735a4a162 Mon Sep 17 00:00:00 2001
-From: Lance Albertson <lance@osuosl.org>
-Date: Wed, 9 Dec 2009 00:42:53 -0800
-Subject: Fix brctl path for Gentoo
-
----
- lib/hypervisor/hv_kvm.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
-index a153d36..5700034 100644
---- a/lib/hypervisor/hv_kvm.py
-+++ b/lib/hypervisor/hv_kvm.py
-@@ -181,7 +181,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
-     script.write("  /sbin/ifconfig $INTERFACE 0.0.0.0 up\n")
-     if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED:
-       script.write("  # Connect the interface to the bridge\n")
--      script.write("  /usr/sbin/brctl addif $BRIDGE $INTERFACE\n")
-+      script.write("  /sbin/brctl addif $BRIDGE $INTERFACE\n")
-     elif nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_ROUTED:
-       script.write("  # Route traffic targeted at the IP to the interface\n")
-       if nic.nicparams[constants.NIC_LINK]:
--- 
-1.6.2.5
-
diff --git a/app-emulation/ganeti/files/ganeti-2.1.1-disable-check-man.patch b/app-emulation/ganeti/files/ganeti-2.1.1-disable-check-man.patch
deleted file mode 100644
index 5c2868d1a0fd..000000000000
--- a/app-emulation/ganeti/files/ganeti-2.1.1-disable-check-man.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur ganeti-2.1.1/Makefile.in ganeti-2.1.1.new/Makefile.in
---- ganeti-2.1.1/Makefile.in	2010-03-12 03:04:33.000000000 -0800
-+++ ganeti-2.1.1.new/Makefile.in	2010-03-12 11:07:47.000000000 -0800
-@@ -1320,11 +1320,11 @@
- 
- man/%.7: man/%.7.in $(REPLACE_VARS_SED)
- 	sed -f $(REPLACE_VARS_SED) < $< > $@
--	$(CHECK_MAN) $@
-+	#$(CHECK_MAN) $@
- 
- man/%.8: man/%.8.in $(REPLACE_VARS_SED)
- 	sed -f $(REPLACE_VARS_SED) < $< > $@
--	$(CHECK_MAN) $@
-+	#$(CHECK_MAN) $@
- 
- man/%.html: man/%.html.in $(REPLACE_VARS_SED)
- 	sed -f $(REPLACE_VARS_SED) < $< > $@
diff --git a/app-emulation/ganeti/ganeti-2.1.0.ebuild b/app-emulation/ganeti/ganeti-2.1.0.ebuild
deleted file mode 100644
index 9aa8db147b71..000000000000
--- a/app-emulation/ganeti/ganeti-2.1.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.ebuild,v 1.1 2010/03/07 20:56:03 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}/${PN}-2.1.0_rc1-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
-	newconfd "${FILESDIR}"/ganeti.confd 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.1.ebuild b/app-emulation/ganeti/ganeti-2.1.3.ebuild
index 989660e85fc8..cf92fd43b0bc 100644
--- a/app-emulation/ganeti/ganeti-2.1.1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2010/03/12 19:21:58 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.1.3.ebuild,v 1.1 2010/06/07 22:26:03 ramereth Exp $
 
 EAPI=2
 
@@ -35,10 +35,6 @@ DEPEND="xen? ( >=app-emulation/xen-3.0 )
 	sys-fs/lvm2"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-disable-check-man.patch
-}
-
 pkg_setup () {
 	confutils_require_any kvm xen
 }