tidy, use virtual/eject in older version too

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

2 files changed, 15 insertions, 21 deletions

diff --git a/app-backup/cdbkup/cdbkup-1.0-r1.ebuild b/app-backup/cdbkup/cdbkup-1.0-r1.ebuild
index 1fb5ceca7aff..1bcdb09f3633 100644
--- a/app-backup/cdbkup/cdbkup-1.0-r1.ebuild
+++ b/app-backup/cdbkup/cdbkup-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/cdbkup/cdbkup-1.0-r1.ebuild,v 1.3 2008/10/04 15:44:18 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/cdbkup/cdbkup-1.0-r1.ebuild,v 1.4 2011/03/31 15:23:09 ssuominen Exp $
 
 inherit eutils
 
@@ -19,18 +19,16 @@ RDEPEND="${DEPEND}
 	!app-misc/cdcat"
 
 src_unpack() {
-	unpack ${A} ; cd "${S}"
-
-	sed -i \
-		-e "s:doc/cdbkup:doc/${P}:" Makefile.in \
-			|| die "sed Makefile.in failed"
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s:doc/cdbkup:doc/${P}:" Makefile.in || die
 }
 
 src_compile() {
-	econf --with-snardir=/etc/cdbkup --with-dumpgrp=users || die "econf failed"
+	econf --with-snardir=/etc/cdbkup --with-dumpgrp=users
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc COMPLIANCE ChangeLog README TODO
 }
diff --git a/app-backup/cdbkup/cdbkup-1.0.ebuild b/app-backup/cdbkup/cdbkup-1.0.ebuild
index 1aba53c5bb73..2351e74de52c 100644
--- a/app-backup/cdbkup/cdbkup-1.0.ebuild
+++ b/app-backup/cdbkup/cdbkup-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/cdbkup/cdbkup-1.0.ebuild,v 1.4 2009/09/23 15:12:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/cdbkup/cdbkup-1.0.ebuild,v 1.5 2011/03/31 15:23:09 ssuominen Exp $
 
 inherit eutils
 
@@ -14,27 +14,23 @@ KEYWORDS="x86 ppc"
 IUSE=""
 
 RDEPEND="virtual/cdrtools
-	>=sys-apps/eject-2.0.10
+	virtual/eject
 	!app-misc/cdcat"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 src_unpack() {
-	unpack ${A} ; cd "${S}"
-
-	sed -i \
-		-e "s:doc/cdbkup:doc/${P}:" Makefile.in \
-			|| die "sed Makefile.in failed"
-
-	#apply the patch
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s:doc/cdbkup:doc/${P}:" Makefile.in || die
 	epatch "${S}"/linuxtar_13.patch
 }
 
 src_compile() {
-	econf --with-snardir=/etc/cdbkup --with-dumpgrp=users || die "econf failed"
+	econf --with-snardir=/etc/cdbkup --with-dumpgrp=users
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc COMPLIANCE ChangeLog README TODO
 }