Changed econf||die to econf

7 files changed, 27 insertions, 59 deletions

diff --git a/app-arch/file-roller/file-roller-1.0.2.ebuild b/app-arch/file-roller/file-roller-1.0.2.ebuild
index cd3aa6d02342..912763073d00 100644
--- a/app-arch/file-roller/file-roller-1.0.2.ebuild
+++ b/app-arch/file-roller/file-roller-1.0.2.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-1.0.2.ebuild,v 1.10 2002/10/05 05:39:05 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-1.0.2.ebuild,v 1.11 2002/11/30 02:13:54 vapier Exp $
 
-IUSE="nls"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="File Roller is an archive manager for the GNOME environment."
 SRC_URI="mirror://sourceforge/${PN/-/}/${P}.tar.gz"
 HOMEPAGE="http://fileroller.sourceforge.net/"
@@ -12,6 +9,7 @@ HOMEPAGE="http://fileroller.sourceforge.net/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
+IUSE="nls"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/gnome-libs-1.4.1.4
@@ -20,7 +18,6 @@ DEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/oaf-0.6.8
 	>=gnome-base/bonobo-1.0.19
 	>=media-libs/gdk-pixbuf-0.16.0"
-
 RDEPEND="${DEPEND}
 	nls? ( dev-util/intltool )"
 	
@@ -28,11 +25,11 @@ src_compile() {
 	local myconf=""
 	use nls || myconf="--disable-nls"
 
-	econf ${myconf} || die
+	econf ${myconf}
 	emake || die
 }
 
 src_install() {
-	einstall || die
+	einstall
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 }
diff --git a/app-arch/gnorpm/gnorpm-0.95.1-r1.ebuild b/app-arch/gnorpm/gnorpm-0.95.1-r1.ebuild
index 05de353e8bfd..3656faff2245 100644
--- a/app-arch/gnorpm/gnorpm-0.95.1-r1.ebuild
+++ b/app-arch/gnorpm/gnorpm-0.95.1-r1.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gnorpm/gnorpm-0.95.1-r1.ebuild,v 1.13 2002/10/05 05:39:05 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gnorpm/gnorpm-0.95.1-r1.ebuild,v 1.14 2002/11/30 02:15:13 vapier Exp $
 
-IUSE="nls"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="A Gnome RPM Frontend"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
@@ -12,21 +9,21 @@ HOMEPAGE="http://www.gnome.org/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
+IUSE="nls"
 
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/db-3.2.3h
 	>=gnome-base/libghttp-1.0.9-r1
 	>=app-arch/rpm-3.0.5"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	econf --disable-rpmfind  || die
+	econf --disable-rpmfind
 	make || die # Doesn't work with make -j 4 (hallski)
 }
 
 src_install() {
-	einstall || die
+	einstall
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 }
diff --git a/app-arch/gnorpm/gnorpm-0.96.ebuild b/app-arch/gnorpm/gnorpm-0.96.ebuild
index d979917cd114..0f0750a6b1d3 100644
--- a/app-arch/gnorpm/gnorpm-0.96.ebuild
+++ b/app-arch/gnorpm/gnorpm-0.96.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gnorpm/gnorpm-0.96.ebuild,v 1.9 2002/10/05 05:39:05 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gnorpm/gnorpm-0.96.ebuild,v 1.10 2002/11/30 02:15:43 vapier Exp $
 
-IUSE="nls"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="A Gnome RPM Frontend"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
@@ -12,21 +9,21 @@ HOMEPAGE="http://www.gnome.org/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
+IUSE="nls"
 
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/db-3.2.3h
 	>=gnome-base/libghttp-1.0.9-r1
 	>=app-arch/rpm-3.0.5"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	econf --disable-rpmfind || die
+	econf --disable-rpmfind
 	make || die # Doesn't work with make -j 4 (hallski)
 }
 
 src_install() {
-	einstall || die
+	einstall
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 }
diff --git a/app-arch/guitar/guitar-0.1.4.ebuild b/app-arch/guitar/guitar-0.1.4.ebuild
index 7738c434bb61..3c5b8a39c747 100644
--- a/app-arch/guitar/guitar-0.1.4.ebuild
+++ b/app-arch/guitar/guitar-0.1.4.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/guitar/guitar-0.1.4.ebuild,v 1.9 2002/10/17 13:20:25 aliz Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/app-arch/guitar/guitar-0.1.4.ebuild,v 1.10 2002/11/30 02:16:22 vapier Exp $
 
 MY_P=guiTAR-${PV}
 S=${WORKDIR}/${MY_P}
-DESCRIPTION="Extraction tool, supports the tar, tar.Z, tar.gz, tar.bz2, lha,
-lzh, rar, arj, zip, and slp formats."
+DESCRIPTION="Extraction tool, supports the tar, tar.Z, tar.gz, tar.bz2, lha, lzh, rar, arj, zip, and slp formats."
 SRC_URI="http://artemis.efes.net/disq/${PN}/${MY_P}.tar.gz"
 HOMEPAGE="http://artemis.efes.net/disq/guitar/"
+
 IUSE="gnome"
 SLOT="0"
 LICENSE="GPL-2"
@@ -24,17 +23,13 @@ DEPEND="x11-libs/gtk+
 	app-arch/unzip"
 
 src_compile() {
-
 	local myconf
-
 	use gnome || myconf="${myconf} --disable-gnome"
-
-	econf ${myconf} || die
+	econf ${myconf}
 	emake || die
 }
 
 src_install() {
-	
 	use gnome && cp ${FILESDIR}/install.gnome ${S}
-	einstall || die
+	einstall
 }
diff --git a/app-arch/lzop/lzop-1.00.ebuild b/app-arch/lzop/lzop-1.00.ebuild
index 1e1b1f1f76c4..9202e685969d 100644
--- a/app-arch/lzop/lzop-1.00.ebuild
+++ b/app-arch/lzop/lzop-1.00.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzop/lzop-1.00.ebuild,v 1.12 2002/10/20 18:36:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzop/lzop-1.00.ebuild,v 1.13 2002/11/30 02:16:49 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Utility for fast (even reat-time) compression/decompression"
 SRC_URI="http://www.oberhumer.com/opensource/lzop/download/${P}.tar.gz"
 HOMEPAGE="http://www.oberhumer.com/opensource/lzop/"
@@ -14,17 +13,12 @@ KEYWORDS="x86 ppc sparc sparc64"
 DEPEND="dev-libs/lzo"
 
 src_compile() {
-	econf --disable-shared || die
+	econf --disable-shared
 	emake || die
 }
 
 src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
+	einstall
 	dodoc AUTHORS ChangeLog COPYING* NEWS README THANKS
 	dodoc doc/lzop.{txt,ps}
 	dohtml doc/*.html
diff --git a/app-arch/rpm/rpm-4.0.4-r3.ebuild b/app-arch/rpm/rpm-4.0.4-r3.ebuild
index 6272280ff746..bd76bcdfe754 100644
--- a/app-arch/rpm/rpm-4.0.4-r3.ebuild
+++ b/app-arch/rpm/rpm-4.0.4-r3.ebuild
@@ -1,29 +1,26 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r3.ebuild,v 1.8 2002/10/17 13:20:25 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r3.ebuild,v 1.9 2002/11/30 02:17:25 vapier Exp $
 
 # note to self: check for java deps
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Red Hat Package Management Utils"
 SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/${P}.tar.gz"
 HOMEPAGE="http://www.rpm.org/"
-IUSE="nls"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
+IUSE="nls"
 
 RDEPEND="=sys-libs/db-3.2*
 	>=sys-libs/zlib-1.1.3
 	>=sys-apps/bzip2-1.0.1
 	>=dev-libs/popt-1.6.3"
-
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_unpack() {
-
 	export WANT_AUTOCONF_2_1=1
 
 	unpack ${A}
@@ -36,17 +33,13 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local myconf
 	use nls || myconf="--disable-nls"
-	use sparc64 && myconf="$myconf --host=${CHOST}"
-
-	econf ${myconf} || die
+	econf ${myconf}
 	make || die
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 	mv ${D}/bin/rpm ${D}/usr/bin
 	rm -rf ${D}/bin
@@ -55,6 +48,5 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
 }
diff --git a/app-arch/rpm/rpm-4.0.4-r4.ebuild b/app-arch/rpm/rpm-4.0.4-r4.ebuild
index 50d38ed75643..8067d97b22fd 100644
--- a/app-arch/rpm/rpm-4.0.4-r4.ebuild
+++ b/app-arch/rpm/rpm-4.0.4-r4.ebuild
@@ -1,23 +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-arch/rpm/rpm-4.0.4-r4.ebuild,v 1.3 2002/10/17 13:20:25 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r4.ebuild,v 1.4 2002/11/30 02:17:59 vapier Exp $
 
 # note to self: check for java deps
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Red Hat Package Management Utils"
 SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/${P}.tar.gz"
 HOMEPAGE="http://www.rpm.org/"
-IUSE="nls"
+
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
+IUSE="nls"
 
 RDEPEND="=sys-libs/db-3.2*
 	>=sys-libs/zlib-1.1.3
 	>=sys-apps/bzip2-1.0.1
 	>=dev-libs/popt-1.6.3"
-
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
@@ -36,9 +34,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 	use nls || myconf="--disable-nls"
-	use sparc64 && myconf="$myconf --host=${CHOST}"
-
-	econf ${myconf} || die
+	econf ${myconf}
 	make || die
 }