QA: Cleanup, fixed dependencies (bug 239996)

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 26 insertions, 74 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 3bd91fdd87da..2872143c2f5f 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/ganeti
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.7 2008/07/05 07:47:22 killerfox Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.8 2009/01/03 18:06:11 angelos Exp $
+
+  03 Jan 2009; Christoph Mende <angelos@gentoo.org> -ganeti-1.2.0.ebuild,
+  ganeti-1.2.1.ebuild:
+  QA: Cleanup, fixed dependencies (bug 239996)
 
   05 Jul 2008; René Nussbaumer <killerfox@gentoo.org> metadata.xml:
   Removing me as a maintainer
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 9b9ed3b7f442..b022e2c32ab8 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -1,7 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ganeti.initd 1117 RMD160 763bc5795ac721d1616c435e1e087c3f5279c338 SHA1 ffeca91d3f4f26e775ea9de4c6b406e712aa317e SHA256 ae65bfb27f6cd6e261af0e130f5906185b9f9d6413c8319e989609a35d37172d
-DIST ganeti-1.2.0.tar.gz 600050 RMD160 5e65d8dc01fcb0e16175005fc7120e7e42b10ba2 SHA1 f9e0acff776a35a11da38b1a9337f87602f93ea2 SHA256 4085f3036f02d1d0b34630f6bec9b7fc513110a360590d6c5c8aba27b9333692
 DIST ganeti-1.2.1.tar.gz 614274 RMD160 184b59dfdf51ec7eac746746ca6953749b963cb1 SHA1 c82140a68762464c0ec67bdb2773bddf66211491 SHA256 b0c414fa0dacbd55315711cbf38670f5693f84cf7fc02d5b3a9465cc2146c571
-EBUILD ganeti-1.2.0.ebuild 1165 RMD160 e5bd17f13bbdd47d29be2e7311dec55344eba893 SHA1 6cc3baac9fe8901292d54416176743b3e7ee713b SHA256 cd614f4b0d7a20115279486d8ec5e899723a7511078f27021e1ae74f29330b85
-EBUILD ganeti-1.2.1.ebuild 1165 RMD160 e8576c120d28e009bc34be19e37f7a7815b018b7 SHA1 183c78f8fae170e689fdeee7010edc8f863f41b9 SHA256 c7166ff511297764552d166a613c8aa2c2e9ea98e4494e38d088ea2521a6f3f3
-MISC ChangeLog 1182 RMD160 036d48df9fc2f86c21998ef483a1326efe712fd9 SHA1 9acf0cc2834f1f7848313a3621a6e2fca62bbf70 SHA256 3ee6c406657464f4441467a342f7dcb7e04fd7f1df895e8bf1fba668278d3a33
+EBUILD ganeti-1.2.1.ebuild 1183 RMD160 c56555692f488039ddaa7d046711d28022d34e3c SHA1 4064edf3e307133a0efb21592df9d2bc71490b19 SHA256 946f5af6c06df1596b70b9ff0f51e223f1aef59f7fac8cd975524f7e2851aedf
+MISC ChangeLog 1325 RMD160 b7ae49c2c3f5640c7dc5b7ab8045e6a3693392d9 SHA1 dfffb947843654f6fd9764a4b49c0f351a8540c3 SHA256 9de5818dc27df992b989585f16488289fe486dafce07d6ef51bef88e794b687e
 MISC metadata.xml 298 RMD160 a6cce5471a7c6fb1e419d8ffb0e2f0081cac6331 SHA1 e7b7e50d804fd6e98856be4e98002c6d43f4e091 SHA256 3f6bc7f7cb2dad32649562d0997cdd35a65ae4430b9a98b52a4c12fca2a10246
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklfqRkACgkQKhnDs22gwa+ZMACeNQUIMvtxh3GGDcOnU7wNcKfY
+DbIAoOBvdUUgNugz+XHe+COH9hTt6Xb4
+=WVg9
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/ganeti-1.2.0.ebuild b/app-emulation/ganeti/ganeti-1.2.0.ebuild
deleted file mode 100644
index 03a1b21cc207..000000000000
--- a/app-emulation/ganeti/ganeti-1.2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-1.2.0.ebuild,v 1.1 2007/12/19 22:06:01 hansmi Exp $
-
-NEED_PYTHON=2.4
-
-inherit python autotools eutils
-
-MY_P=${P/_beta/b}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Ganeti is a virtual server management software tool built upon Xen"
-HOMEPAGE="http://code.google.com/p/ganeti/"
-SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	>=app-emulation/xen-3.0
-	dev-libs/openssl
-	dev-python/pyopenssl
-	dev-python/pyparsing
-	dev-python/simplejson
-	dev-python/twisted
-	net-analyzer/arping
-	net-misc/bridge-utils
-	net-misc/openssh
-	sys-apps/iproute2
-	sys-cluster/drbd
-	sys-fs/lvm2
-	sys-fs/mdadm
-"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --localstatedir=/var --with-ssh-initscript=/etc/init.d/sshd || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	newinitd "${FILESDIR}/ganeti.initd" ganeti
-
-	keepdir /var/{lib,log,run}/ganeti/
-	keepdir /srv/ganeti/{os,export}/
-}
diff --git a/app-emulation/ganeti/ganeti-1.2.1.ebuild b/app-emulation/ganeti/ganeti-1.2.1.ebuild
index dbb1a9a288e6..a0da610246c6 100644
--- a/app-emulation/ganeti/ganeti-1.2.1.ebuild
+++ b/app-emulation/ganeti/ganeti-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-1.2.1.ebuild,v 1.1 2008/01/31 21:01:04 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-1.2.1.ebuild,v 1.2 2009/01/03 18:06:11 angelos Exp $
 
 NEED_PYTHON=2.4
 
@@ -18,9 +18,7 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND="
-	>=app-emulation/xen-3.0
+RDEPEND=">=app-emulation/xen-3.0
 	dev-libs/openssl
 	dev-python/pyopenssl
 	dev-python/pyparsing
@@ -32,23 +30,22 @@ RDEPEND="
 	sys-apps/iproute2
 	sys-cluster/drbd
 	sys-fs/lvm2
-	sys-fs/mdadm
-"
+	sys-fs/mdadm"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	eautoreconf
 }
 
 src_compile() {
-	econf --localstatedir=/var --with-ssh-initscript=/etc/init.d/sshd || die
-	emake || die
+	econf --localstatedir=/var --with-ssh-initscript=/etc/init.d/sshd
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	newinitd "${FILESDIR}/ganeti.initd" ganeti