Changed einstall||die to einstall

6 files changed, 26 insertions, 37 deletions

diff --git a/app-office/abiword/abiword-1.0.2-r1.ebuild b/app-office/abiword/abiword-1.0.2-r1.ebuild
index d7e6d28c54a6..d10cf0ba98ae 100644
--- a/app-office/abiword/abiword-1.0.2-r1.ebuild
+++ b/app-office/abiword/abiword-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.2-r1.ebuild,v 1.7 2002/10/24 23:23:44 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.2-r1.ebuild,v 1.8 2002/11/30 21:55:32 vapier Exp $
 
 IUSE="perl nls gnome build spell jpeg xml2"
 
@@ -108,7 +108,7 @@ src_compile() {
 	
 	econf \
 		--enable-extra-optimization \
-		${myconf} || die
+		${myconf}
 
 	# Doesn't work with -j 4 (hallski)
 	make UNIX_CAN_BUILD_STATIC=0 \
@@ -119,7 +119,7 @@ src_install() {
 
 	dodir /usr/{bin,lib}
 
-	einstall PERLDEST=${D} || die
+	einstall PERLDEST=${D}
 	
 	dosed "s:${D}::g" /usr/bin/AbiWord
 	
diff --git a/app-office/abiword/abiword-1.0.3.ebuild b/app-office/abiword/abiword-1.0.3.ebuild
index 9b48d83ace9a..07814ccb5a3e 100644
--- a/app-office/abiword/abiword-1.0.3.ebuild
+++ b/app-office/abiword/abiword-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.3.ebuild,v 1.3 2002/10/24 23:23:44 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.3.ebuild,v 1.4 2002/11/30 21:56:15 vapier Exp $
 
 IUSE="perl nls gnome build spell jpeg xml2"
 
@@ -103,9 +103,7 @@ src_compile() {
 
 	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
 	
-	econf \
-		${myconf} || die
-
+	econf ${myconf}
 #		--enable-extra-optimization \
 
 	# Doesn't work with -j 4 (hallski)
@@ -117,7 +115,7 @@ src_install() {
 
 	dodir /usr/{bin,lib}
 
-	einstall PERLDEST=${D} || die
+	einstall PERLDEST=${D}
 	
 	dosed "s:${D}::g" /usr/bin/AbiWord
 	
diff --git a/app-office/abiword/abiword-1.0.4_pre1-r1.ebuild b/app-office/abiword/abiword-1.0.4_pre1-r1.ebuild
index 55093f55441f..4d55dc9c51fb 100644
--- a/app-office/abiword/abiword-1.0.4_pre1-r1.ebuild
+++ b/app-office/abiword/abiword-1.0.4_pre1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.4_pre1-r1.ebuild,v 1.1 2002/11/19 02:07:41 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.4_pre1-r1.ebuild,v 1.2 2002/11/30 21:57:50 vapier Exp $
 
 IUSE="perl nls gnome build spell jpeg xml2"
 
@@ -56,8 +56,7 @@ src_compile() {
 
 	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
 	
-	econf \
-		${myconf} || die
+	econf ${myconf}
 
 	make || die
 }
@@ -66,7 +65,7 @@ src_install() {
 
 	dodir /usr/{bin,lib}
 
-	einstall PERLDEST=${D} || die
+	einstall PERLDEST=${D}
 	
 	dosed "s:${D}::g" /usr/bin/AbiWord
 	
diff --git a/app-office/abiword/abiword-1.0.4_pre1.ebuild b/app-office/abiword/abiword-1.0.4_pre1.ebuild
index b48f8e781a53..3b8df92c1db0 100644
--- a/app-office/abiword/abiword-1.0.4_pre1.ebuild
+++ b/app-office/abiword/abiword-1.0.4_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.4_pre1.ebuild,v 1.4 2002/11/17 22:47:19 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.4_pre1.ebuild,v 1.5 2002/11/30 21:57:24 vapier Exp $
 
 #inherit debug
 
@@ -99,8 +99,7 @@ src_compile() {
 
 	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
 	
-	econf \
-		${myconf} || die
+	econf ${myconf}
 	#   --enable-debug \
 
 	make || die
@@ -110,7 +109,7 @@ src_install() {
 
 	dodir /usr/{bin,lib}
 
-	einstall PERLDEST=${D} || die
+	einstall PERLDEST=${D}
 	
 	dosed "s:${D}::g" /usr/bin/AbiWord
 	
diff --git a/app-office/gnucash/gnucash-1.6.6-r1.ebuild b/app-office/gnucash/gnucash-1.6.6-r1.ebuild
index 50d5a36b6db3..8eba6f835e64 100644
--- a/app-office/gnucash/gnucash-1.6.6-r1.ebuild
+++ b/app-office/gnucash/gnucash-1.6.6-r1.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.6.6-r1.ebuild,v 1.3 2002/10/05 05:39:09 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.6.6-r1.ebuild,v 1.4 2002/11/30 22:00:32 vapier Exp $
 
-IUSE="nls postgres"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="A personal finance manager"
 SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnucash.org/"
+
 KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
+IUSE="nls postgres"
 
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	 >=dev-libs/libxml-1.8.3
@@ -53,14 +52,12 @@ src_compile() {
 	
 	econf --enable-profile \
 		--enable-rpc \
-		$myconf || die "Configuration failed"
-
+		${myconf}
 
 	make || die "Compilation failed" # Doesn't work with make -j 4 (hallski)
 }
 
-src_install () {
-    einstall || die "Installation failed"
-
-    dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING NEWS README* TODO
+src_install() {
+	einstall
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING NEWS README* TODO
 }
diff --git a/app-office/gnucash/gnucash-1.6.7.ebuild b/app-office/gnucash/gnucash-1.6.7.ebuild
index 202370b85af2..69a4de867aef 100644
--- a/app-office/gnucash/gnucash-1.6.7.ebuild
+++ b/app-office/gnucash/gnucash-1.6.7.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.6.7.ebuild,v 1.3 2002/10/05 05:39:09 drobbins Exp $
-
-IUSE="nls postgres"
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.6.7.ebuild,v 1.4 2002/11/30 22:01:32 vapier Exp $
 
 inherit flag-o-matic
 
-
-S=${WORKDIR}/${P}
 DESCRIPTION="A personal finance manager"
 SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnucash.org/"
+
 KEYWORDS="x86 ppc"
 SLOT="0"
 LICENSE="GPL-2"
+IUSE="nls postgres"
 
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	 >=dev-libs/libxml-1.8.3
@@ -34,7 +32,6 @@ DEPEND="${RDEPEND}
 	gnome-base/libghttp
 	nls? ( sys-devel/gettext )"
 
-
 # won't configure with this
 filter-flags -fomit-frame-pointer
 
@@ -56,13 +53,12 @@ src_compile() {
 
 	econf --enable-profile \
 		--enable-rpc \
-		$myconf || die "Configuration failed"
+		${myconf}
 
 	make || die # Doesn't work with make -j 4 (hallski)
 }
 
-src_install () {
-    einstall || die "Installation failed"
-
-    dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING NEWS README* TODO
+src_install() {
+	einstall
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING NEWS README* TODO
 }