Changed econf||die to econf

2 files changed, 16 insertions, 33 deletions

diff --git a/app-cdr/cdbkup/cdbkup-1.0.ebuild b/app-cdr/cdbkup/cdbkup-1.0.ebuild
index ab1e286085f8..66cb9770cec9 100644
--- a/app-cdr/cdbkup/cdbkup-1.0.ebuild
+++ b/app-cdr/cdbkup/cdbkup-1.0.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbkup/cdbkup-1.0.ebuild,v 1.3 2002/10/17 12:55:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbkup/cdbkup-1.0.ebuild,v 1.4 2002/11/30 02:26:31 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="cdbkup performs full or incremental backups of local or remote filesystems onto CD-R(W)s."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://cdbkup.sourceforge.net/"
 
-DEPEND="virtual/glibc 
-        >=app-cdr/cdrtools-1.11.28
-        >=sys-apps/eject-2.0.10"
-
-
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
-src_unpack() {
-	unpack ${A}
+DEPEND="virtual/glibc 
+        >=app-cdr/cdrtools-1.11.28
+        >=sys-apps/eject-2.0.10"
 
-	cd ${S}
+src_unpack() {
+	unpack ${A} ; cd ${S}
 
 	cp Makefile.in Makefile.in.orig
 	sed "s:doc/cdbkup:doc/${P}:" Makefile.in.orig > Makefile.in
@@ -29,13 +25,10 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-	myconf="--with-snardir=/etc/cdbkup --with-dumpgrp=users"
-
-	econf ${myconf} || die "configure failed"
+	econf --with-snardir=/etc/cdbkup --with-dumpgrp=users
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc COMPLIANCE  ChangeLog README  TODO 
+	dodoc COMPLIANCE ChangeLog README TODO 
 }
diff --git a/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild b/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild
index d11d88e73254..72c852cf2e7a 100644
--- a/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild
+++ b/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild,v 1.6 2002/10/31 01:22:59 raker Exp $
-
-IUSE="nls esd gnome oss oggvorbis"
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild,v 1.7 2002/11/30 02:27:34 vapier Exp $
 
 # Fix so that updating can only be done by 'cp old.ebuild new.ebuild'
 MY_P="`echo ${P} |sed -e 's:-::' -e 's:_b:B:'`"
-S=${WORKDIR}/gtoaster
+S=${WORKDIR}/${PN}
 
 DESCRIPTION="GTK+ Frontend for cdrecord"
 SRC_URI="http://gnometoaster.rulez.org/archive/${MY_P}.tgz"
@@ -15,11 +13,11 @@ HOMEPAGE="http://gnometoaster.rulez.org/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
+IUSE="nls esd gnome oss oggvorbis"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2 )
 	esd? ( >=media-sound/esound-0.2.22 )"
-
 RDEPEND="=x11-libs/gtk+-1.2*
 	>=app-cdr/cdrtools-1.11
 	app-cdr/cdrdao
@@ -32,15 +30,11 @@ RDEPEND="=x11-libs/gtk+-1.2*
 		>=media-sound/oggtst-0.0 )"
 
 src_unpack() {
-
-	unpack ${A}
-	cd ${S}
+	unpack ${A} ; cd ${S}
 	patch -p1 < ${FILESDIR}/scdtosr.diff || die "patch failed"
-
 }
 
 src_compile() {
-
 	local myconf=""
 	use nls	|| myconf="$myconf --disable-nls"
 
@@ -56,20 +50,16 @@ src_compile() {
 		&& myconf="$myconf --with-oss" \
 		|| myconf="$myconf --without-oss"
 
-	
-	econf ${myconf} || die "configure failed"
-
+	econf ${myconf}
 	emake || die "parallel make failed"
 }
 
 src_install() {
-
-	einstall || die
-
+	einstall
 	dodoc ABOUT-NLS AUTHORS ChangeLog* COPYING INSTALL NEWS README TODO
 
 	# Install icon and .desktop for menu entry
-	if [ "`use gnome`" ] ; then
+	if [ `use gnome` ] ; then
 		insinto /usr/share/pixmaps
 		doins ${S}/icons/gtoaster.png
 		insinto /usr/share/gnome/apps/Applications