Changed econf||die to econf

2 files changed, 7 insertions, 19 deletions

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
 }