QA: Cleanup, fixed dependencies (bug 239996)

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

3 files changed, 14 insertions, 70 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/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