Changed econf||die to econf

12 files changed, 62 insertions, 95 deletions

diff --git a/app-admin/stow/stow-1.3.3.ebuild b/app-admin/stow/stow-1.3.3.ebuild
index 04457a722b3b..21ec0119fc2e 100644
--- a/app-admin/stow/stow-1.3.3.ebuild
+++ b/app-admin/stow/stow-1.3.3.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/stow/stow-1.3.3.ebuild,v 1.9 2002/10/20 18:14:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/stow/stow-1.3.3.ebuild,v 1.10 2002/11/30 01:53:20 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GNU Stow -- manage installation of software in /usr/local"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/stow/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/${PN}/"
@@ -14,7 +13,7 @@ KEYWORDS="x86 ppc sparc sparc64"
 DEPEND="sys-devel/perl"
 
 src_compile() {
-	econf || die "./configure failed"
+	econf
 	emake || die "emake failed"
 }
 
diff --git a/app-admin/sxid/sxid-4.0.2.ebuild b/app-admin/sxid/sxid-4.0.2.ebuild
index 5121d4482f76..d59996744218 100644
--- a/app-admin/sxid/sxid-4.0.2.ebuild
+++ b/app-admin/sxid/sxid-4.0.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sxid/sxid-4.0.2.ebuild,v 1.1 2002/11/08 13:32:48 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sxid/sxid-4.0.2.ebuild,v 1.2 2002/11/30 02:08:00 vapier Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="suid, sgid file and directory checking"
 SRC_URI="ftp://marcus.seva.net/pub/sxid/${P/-/_}.tar.gz"
 HOMEPAGE="http://freshmeat.net/projects/sxid"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
@@ -20,14 +20,15 @@ src_compile() {
 	mv -f Makefile.in.new Makefile.in
 	cd ..
 
-	econf || die "./configure failed"
+	econf
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc README docs/sxid.conf.example docs/sxid.cron.example
+}
 
+pkg_postinst() {
 	einfo "You will need to configure sxid.conf for your system using the manpage and example"
 }
-
diff --git a/app-admin/syslog-ng/syslog-ng-1.4.16.ebuild b/app-admin/syslog-ng/syslog-ng-1.4.16.ebuild
index 5f8e4b949595..39a21dfbcaab 100644
--- a/app-admin/syslog-ng/syslog-ng-1.4.16.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-1.4.16.ebuild
@@ -1,27 +1,24 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.4.16.ebuild,v 1.2 2002/11/04 18:01:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.4.16.ebuild,v 1.3 2002/11/30 01:56:22 vapier Exp $
 
-IUSE="tcpd"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Syslog-ng is a syslog replacement with advanced filtering features"
 SRC_URI="http://www.balabit.hu/downloads/syslog-ng/1.4/${P}.tar.gz"
 HOMEPAGE="http://www.balabit.hu/en/products/syslog-ng/"
 
-DEPEND="=dev-libs/libol-0.2.23
-	sys-devel/flex
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
+IUSE="tcpd"
+
+DEPEND="=dev-libs/libol-0.2.23
+	sys-devel/flex
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 
 src_compile() {
 	local myconf
 	use tcpd && myconf="--enable-tcp-wrapper"
-
-	econf ${myconf} || die
+	econf ${myconf}
 
 	# configure script braindamage?
 #    cd ${S}/src
@@ -34,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die
+	einstall
 	rm -rf ${D}/usr/share/man
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS PORTS README
diff --git a/app-admin/syslog-ng/syslog-ng-1.4.17.ebuild b/app-admin/syslog-ng/syslog-ng-1.4.17.ebuild
index 8b1d201d830f..5b65bee3171c 100644
--- a/app-admin/syslog-ng/syslog-ng-1.4.17.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-1.4.17.ebuild
@@ -1,27 +1,24 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.4.17.ebuild,v 1.1 2002/11/05 19:29:05 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.4.17.ebuild,v 1.2 2002/11/30 01:58:38 vapier Exp $
 
-IUSE="tcpd"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Syslog-ng is a syslog replacement with advanced filtering features"
 SRC_URI="http://www.balabit.hu/downloads/syslog-ng/1.4/${P}.tar.gz"
 HOMEPAGE="http://www.balabit.hu/en/products/syslog-ng/"
 
-DEPEND="=dev-libs/libol-0.2.23
-	sys-devel/flex
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+IUSE="tcpd"
+
+DEPEND="=dev-libs/libol-0.2.23
+	sys-devel/flex
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 
 src_compile() {
 	local myconf
 	use tcpd && myconf="--enable-tcp-wrapper"
-
-	econf ${myconf} || die
+	econf ${myconf}
 
 	# configure script braindamage?
 #    cd ${S}/src
@@ -34,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die
+	einstall
 	rm -rf ${D}/usr/share/man
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS PORTS README
diff --git a/app-admin/syslog-ng/syslog-ng-1.5.21.ebuild b/app-admin/syslog-ng/syslog-ng-1.5.21.ebuild
index e0ccbddc90a4..fe679aa393a0 100644
--- a/app-admin/syslog-ng/syslog-ng-1.5.21.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-1.5.21.ebuild
@@ -1,29 +1,24 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.5.21.ebuild,v 1.5 2002/11/04 18:01:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.5.21.ebuild,v 1.6 2002/11/30 01:55:28 vapier Exp $
 
-IUSE="tcpd"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Syslog-ng is a syslog replacement with advanced filtering features"
 SRC_URI="http://www.balabit.hu/downloads/syslog-ng/1.5/${P}.tar.gz"
 HOMEPAGE="http://www.balabit.hu/en/products/syslog-ng/"
 
-DEPEND=">=dev-libs/libol-0.3.3
-	sys-devel/flex
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+IUSE="tcpd"
 
-src_compile() {
+DEPEND=">=dev-libs/libol-0.3.3
+	sys-devel/flex
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 
+src_compile() {
 	local myconf
-
 	use tcpd && myconf="--enable-tcp-wrapper"
-
-	econf ${myconf} || die
+	econf ${myconf}
 
 	# configure script braindamage?
 #    cd ${S}/src
@@ -36,8 +31,7 @@ src_compile() {
 }
 
 src_install() {
-
-	einstall || die
+	einstall
 	rm -rf ${D}/usr/share/man
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS PORTS README
@@ -58,4 +52,3 @@ pkg_postinst() {
 	einfo "To convert your existing syslog.conf for use with syslog-ng,"
 	einfo "use the syslog2ng script in /usr/share/doc/${PF}."
 }
-
diff --git a/app-admin/syslog-ng/syslog-ng-1.5.22.ebuild b/app-admin/syslog-ng/syslog-ng-1.5.22.ebuild
index acc6aac375c4..a2ea1346b045 100644
--- a/app-admin/syslog-ng/syslog-ng-1.5.22.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-1.5.22.ebuild
@@ -1,29 +1,24 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.5.22.ebuild,v 1.3 2002/11/04 18:01:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.5.22.ebuild,v 1.4 2002/11/30 01:59:30 vapier Exp $
 
-IUSE="tcpd"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Syslog-ng is a syslog replacement with advanced filtering features"
 SRC_URI="http://www.balabit.hu/downloads/syslog-ng/1.5/${P}.tar.gz"
 HOMEPAGE="http://www.balabit.hu/en/products/syslog-ng/"
 
-DEPEND=">=dev-libs/libol-0.3.5
-	sys-devel/flex
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+IUSE="tcpd"
 
-src_compile() {
+DEPEND=">=dev-libs/libol-0.3.5
+	sys-devel/flex
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 
+src_compile() {
 	local myconf
-
 	use tcpd && myconf="--enable-tcp-wrapper"
-
-	econf ${myconf} || die
+	econf ${myconf}
 
 	# configure script braindamage?
 #    cd ${S}/src
@@ -36,8 +31,7 @@ src_compile() {
 }
 
 src_install() {
-
-	einstall || die
+	einstall
 	rm -rf ${D}/usr/share/man
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS PORTS README
@@ -58,4 +52,3 @@ pkg_postinst() {
 	einfo "To convert your existing syslog.conf for use with syslog-ng,"
 	einfo "use the syslog2ng script in /usr/share/doc/${PF}."
 }
-
diff --git a/app-admin/tftp-hpa/tftp-hpa-0.16.ebuild b/app-admin/tftp-hpa/tftp-hpa-0.16.ebuild
index 83c384722e2c..2db324d05504 100644
--- a/app-admin/tftp-hpa/tftp-hpa-0.16.ebuild
+++ b/app-admin/tftp-hpa/tftp-hpa-0.16.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/tftp-hpa/tftp-hpa-0.16.ebuild,v 1.8 2002/10/04 03:46:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tftp-hpa/tftp-hpa-0.16.ebuild,v 1.9 2002/11/30 02:00:06 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="HPA's TFTP Daemon is a port of the OpenBSD TFTP server"
 SRC_URI="ftp://ftp.kernel.org/pub/software/network/tftp/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
@@ -14,12 +13,11 @@ KEYWORDS="x86 sparc sparc64"
 DEPEND="virtual/glibc"
 
 src_compile() {
-	econf || die
+	econf
 	make || die
-
 }
 
-src_install () {
+src_install() {
 	dodir /usr/{bin,sbin} /usr/share/man/man{1,8}
 	make INSTALLROOT=${D} install || die
 	dodoc README
diff --git a/app-admin/tftp-hpa/tftp-hpa-0.29.ebuild b/app-admin/tftp-hpa/tftp-hpa-0.29.ebuild
index a245bfb98597..9d8dcd1f2b80 100644
--- a/app-admin/tftp-hpa/tftp-hpa-0.29.ebuild
+++ b/app-admin/tftp-hpa/tftp-hpa-0.29.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/tftp-hpa/tftp-hpa-0.29.ebuild,v 1.8 2002/10/04 03:46:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tftp-hpa/tftp-hpa-0.29.ebuild,v 1.9 2002/11/30 02:01:02 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="HPA's TFTP Daemon is a port of the OpenBSD TFTP server"
 SRC_URI="ftp://ftp.kernel.org/pub/software/network/tftp/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
@@ -14,11 +13,11 @@ KEYWORDS="x86 ppc sparc sparc64"
 DEPEND="virtual/glibc"
 
 src_compile() {
-	econf || die
+	econf
 	make || die
 }
 
-src_install () {
+src_install() {
 	make INSTALLROOT=${D} install || die
 	dodoc README* CHANGES INSTALL*
 
diff --git a/app-admin/ulogd/ulogd-0.97-r1.ebuild b/app-admin/ulogd/ulogd-0.97-r1.ebuild
index dc393ab19e5a..582e10aaec6b 100644
--- a/app-admin/ulogd/ulogd-0.97-r1.ebuild
+++ b/app-admin/ulogd/ulogd-0.97-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-admin/ulogd/ulogd-0.97-r1.ebuild,v 1.10 2002/11/04 07:49:51 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-0.97-r1.ebuild,v 1.11 2002/11/30 02:02:26 vapier Exp $
 
-IUSE="mysql"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging"
 SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnumonks.org/gnumonks/projects/project_details?p_id=1"
@@ -12,26 +9,25 @@ HOMEPAGE="http://www.gnumonks.org/gnumonks/projects/project_details?p_id=1"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
+IUSE="mysql"
 
 DEPEND="sys-apps/iptables"
 
 src_compile() {
-	local myconf
-
 	cp ulogd.conf ulogd.conf.orig
 	sed -e "s:/usr/local/lib/:/usr/lib/:" ulogd.conf.orig > ulogd.conf
-	
+
+	local myconf
 	use mysql && myconf="--with-mysql"
-	
-	econf ${myconf} || die
+
+	econf ${myconf}
 	make all || die "make failed"
 }
 
 src_install() {
 	# the Makefile seems to be "broken" - 
 	# it relies on the existance of /usr, /etc ..
-	dodir /usr/sbin
-	dodir /etc/init.d
+	dodir /usr/sbin /etc/init.d
 
 	make DESTDIR=${D} install || die "install failed"
 	
diff --git a/app-admin/usbview/usbview-1.0-r1.ebuild b/app-admin/usbview/usbview-1.0-r1.ebuild
index bd545c718714..1a8e13a05d2a 100644
--- a/app-admin/usbview/usbview-1.0-r1.ebuild
+++ b/app-admin/usbview/usbview-1.0-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/usbview/usbview-1.0-r1.ebuild,v 1.10 2002/10/04 03:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-1.0-r1.ebuild,v 1.11 2002/11/30 02:02:43 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Display the topology of devices on the USB bus"
 SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
 HOMEPAGE="http://www.kroah.com/linux-usb/"
@@ -14,13 +13,11 @@ KEYWORDS="x86 ppc sparc sparc64"
 DEPEND="=x11-libs/gtk+-1.2*"
 
 src_compile() {
-
-	econf || die
+	econf
 	make || die
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
 }
diff --git a/app-admin/whowatch/whowatch-1.5.2.ebuild b/app-admin/whowatch/whowatch-1.5.2.ebuild
index 8a151f216ebc..c6c380ece8eb 100644
--- a/app-admin/whowatch/whowatch-1.5.2.ebuild
+++ b/app-admin/whowatch/whowatch-1.5.2.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.5.2.ebuild,v 1.11 2002/10/20 18:14:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.5.2.ebuild,v 1.12 2002/11/30 02:04:34 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="an interactive who-like program that displays information
-about the users currently logged on to the machine, in real time."
+DESCRIPTION="interactive who-like program that displays information about users currently logged on in real time."
 SRC_URI="http://wizard.ae.krakow.pl/~mike/download/${P}.tar.gz"
 HOMEPAGE="http://wizard.ae.krakow.pl/~mike/"
 
@@ -21,11 +19,11 @@ src_unpack() {
 }
 
 src_compile() {
-	econf || die
+	econf
 	make || die
 }
 
-src_install () {
-	einstall || die
+src_install() {
+	einstall
 	dodoc AUTHORS ChangeLog COPYING KEYS NEWS README TODO VERSION
 }
diff --git a/app-admin/xtail/xtail-2.1.ebuild b/app-admin/xtail/xtail-2.1.ebuild
index 9f2d484fb6f0..caca2e01a312 100644
--- a/app-admin/xtail/xtail-2.1.ebuild
+++ b/app-admin/xtail/xtail-2.1.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/xtail/xtail-2.1.ebuild,v 1.8 2002/10/20 18:14:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/xtail/xtail-2.1.ebuild,v 1.9 2002/11/30 02:05:37 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Tail multiple logfiles at once, even if rotated."
 SRC_URI="http://www.unicom.com/sw/xtail/${P}.tar.gz"
 HOMEPAGE="http://www.unicom.com/sw/xtail/"
@@ -14,11 +13,11 @@ KEYWORDS="x86 ppc sparc sparc64"
 DEPEND="virtual/glibc"
 
 src_compile() {
-	econf || die
+	econf
 	emake || die
 }
 
-src_install () {
+src_install() {
 	doman xtail.1
 	dobin xtail
 	dodoc README