Changed econf||die to econf

5 files changed, 31 insertions, 43 deletions

diff --git a/app-admin/gpsui/gpsui-2.2.ebuild b/app-admin/gpsui/gpsui-2.2.ebuild
index 9393ee4080d6..fe7665113db1 100644
--- a/app-admin/gpsui/gpsui-2.2.ebuild
+++ b/app-admin/gpsui/gpsui-2.2.ebuild
@@ -1,17 +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-admin/gpsui/gpsui-2.2.ebuild,v 1.1 2002/11/11 06:31:26 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gpsui/gpsui-2.2.ebuild,v 1.2 2002/11/30 01:30:01 vapier Exp $
 
 DESCRIPTION="GUI program for managing running processes"
 HOMEPAGE="http://gpsui.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="nls"
 
-MY_P="gpsui"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PN}"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	=gnome-base/gnome-libs-1.4*
@@ -19,16 +19,15 @@ DEPEND="=x11-libs/gtk+-1.2*
 
 src_compile() {
 	local myconf=""
+	use nls \
+		&& myconf="--enable-nls" \
+		|| myconf="--disable-nls"
+	econf ${myconf}
 
-	use nls || myconf="--disable-nls"
-	
-	econf $myconf || die "./configure failed"
-	
 	emake || die "Compilation failed"
 }
 
 src_install() {
-	einstall || die "Installation failed"
-
+	einstall
 	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING README
 }
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild
index e412cf391bee..c270f7a9d2c3 100644
--- a/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild
+++ b/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild
@@ -1,33 +1,30 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild,v 1.1 2002/11/06 06:31:21 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild,v 1.2 2002/11/30 01:30:44 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GtkDiskFree is a program which shows free space on your mounted filesystems"
 HOMEPAGE="http://gtkdiskfree.tuxfamily.org/"
 SRC_URI="http://gtkdiskfree.tuxfamily.org/src_tgz/${P}.tar.gz"
-IUSE=""
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 DEPEND="=x11-libs/gtk+-1.2*
-		=dev-libs/glib-1.2*
-		nls? ( sys-devel/gettext ) "
+	=dev-libs/glib-1.2*
+	nls? ( sys-devel/gettext ) "
 
 src_compile() {
 	local myconf
+	use nls \
+		&& myconf="--enable-nls" \
+		|| myconf="--disable-nls"
+	econf ${myconf}
 
-	use nls || myconf="--disable-nls"
-	
-	econf ${myconf} || die "./configure failed"
 	emake all || die "emake failed"
 }
 
 src_install() {
-	einstall DESTDIR=${D} || die "einstall failed"
-
+	einstall DESTDIR=${D}
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }
-
diff --git a/app-admin/jinit/jinit-0.1.9-r1.ebuild b/app-admin/jinit/jinit-0.1.9-r1.ebuild
index 5acd4ad341ba..41d38d5bd5e0 100644
--- a/app-admin/jinit/jinit-0.1.9-r1.ebuild
+++ b/app-admin/jinit/jinit-0.1.9-r1.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-admin/jinit/jinit-0.1.9-r1.ebuild,v 1.10 2002/10/18 13:31:45 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/jinit/jinit-0.1.9-r1.ebuild,v 1.11 2002/11/30 01:28:59 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="An alternative to sysvinit which supports the need(8) concept"
 SRC_URI="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/download/${P}.tar.gz"
 HOMEPAGE="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/
@@ -11,19 +10,16 @@ HOMEPAGE="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
-IUSE=""
 
 DEPEND="virtual/glibc"
 RDEPEND=""
 
 src_compile() {
-
-	econf || die
+	econf
 	make || die
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install || die
 	mv ${D}/usr/sbin ${D}
 	mv ${D}/sbin/init ${D}/sbin/jinit
diff --git a/app-admin/metalog/metalog-0.6-r10.ebuild b/app-admin/metalog/metalog-0.6-r10.ebuild
index 17ceea496e4f..90996f4f808d 100644
--- a/app-admin/metalog/metalog-0.6-r10.ebuild
+++ b/app-admin/metalog/metalog-0.6-r10.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-admin/metalog/metalog-0.6-r10.ebuild,v 1.8 2002/10/20 18:14:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.6-r10.ebuild,v 1.9 2002/11/30 01:31:07 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A highly configurable replacement for syslogd/klogd"
 SRC_URI="mirror://sourceforge/metalog/${P}.tar.gz"
 HOMEPAGE="http://metalog.sourceforge.net/"
-IUSE=""
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -14,7 +12,6 @@ KEYWORDS="x86 ppc sparc sparc64"
 
 DEPEND=">=dev-libs/libpcre-3.4"
 
-
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	# adds a pidfile option.  NiCE aeoo! :)
@@ -30,11 +27,11 @@ src_unpack() {
 }
 
 src_compile() {
-	econf || die
+	econf
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 
 	dodoc AUTHORS COPYING ChangeLog README
diff --git a/app-admin/msyslog/msyslog-1.09a.ebuild b/app-admin/msyslog/msyslog-1.09a.ebuild
index 85eadaffaa68..c09be4b4fc79 100644
--- a/app-admin/msyslog/msyslog-1.09a.ebuild
+++ b/app-admin/msyslog/msyslog-1.09a.ebuild
@@ -1,8 +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-admin/msyslog/msyslog-1.09a.ebuild,v 1.3 2002/10/05 05:39:05 drobbins Exp $
-
-IUSE="postgres mysql"
+# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/msyslog-1.09a.ebuild,v 1.4 2002/11/30 01:32:38 vapier Exp $
 
 #lame upstream conventions...
 #archive:    msyslog-1.09a-src.tar.gz
@@ -13,18 +11,19 @@ DESCRIPTION="Flexible and easy to integrate syslog with modularized input/output
 HOMEPAGE="http://sourceforge.net/projects/msyslog/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86 sparc sparc64"
+IUSE="postgres mysql"
+
 DEPEND="virtual/glibc"
 RDEPEND="${DEPEND}
 	mysql? ( >=dev-db/mysql-3.23 )
 	postgres? ( >=dev-db/postgresql-7 )"
 
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 sparc sparc64"
-
 src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
+	unpack ${A}
+	cd ${S}
 	# fix paths for pidfile, config file, libdir, logdir...
 	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die
 }
@@ -33,7 +32,7 @@ src_compile() {
 	local myconf
 	use mysql || myconf="${myconf} --without-mysql"
 	use postgres || myconf="${myconf} --without-pgsql"
-	econf --with-daemon-name=msyslogd ${myconf} || die
+	econf --with-daemon-name=msyslogd ${myconf}
 	emake || die
 }