Changed econf||die to econf

4 files changed, 16 insertions, 26 deletions

diff --git a/app-misc/colortail/colortail-0.3.0-r3.ebuild b/app-misc/colortail/colortail-0.3.0-r3.ebuild
index d65ffee4db35..72ecf6f2030b 100644
--- a/app-misc/colortail/colortail-0.3.0-r3.ebuild
+++ b/app-misc/colortail/colortail-0.3.0-r3.ebuild
@@ -1,14 +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-misc/colortail/colortail-0.3.0-r3.ebuild,v 1.4 2002/10/20 18:40:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colortail/colortail-0.3.0-r3.ebuild,v 1.5 2002/11/30 19:44:41 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Colortail custom colors your log files and works like tail"
 SRC_URI="http://www.student.hk-r.se/~pt98jan/colortail-0.3.0.tar.gz"
 HOMEPAGE="http://www.student.hk-r.se/~pt98jan/colortail.html"
 
-DEPEND="virtual/glibc"
-
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
@@ -16,13 +13,12 @@ KEYWORDS="x86 ppc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	# 2002-09-08: karltk
 	# This bit of trickery conditionally applies the gcc-3.2 patch
 	# if the desired compiler is not the 2.95.x series. It is assumed
 	# that if it's not 2.95, it is 3.0.x or newer.
-	if [ -z "${CXX}" ] ; then
-		CXX=g++
-	fi
+	[ -z "${CXX}" ] && CXX=g++
 	if [ "`${CXX} -dumpversion | cut -d. -f1,2`" != "2.95" ] ; then
 		# Both 3.1.x and 3.2 work with the patch.
 		patch -p1 < ${FILESDIR}/${PV}/ansi-c++-gcc-3.2.diff || die
@@ -31,19 +27,16 @@ src_unpack() {
 }
 
 src_compile() {
-	if [ -z "${CXX}" ] ; then
-		CXX=g++
-	fi
+	[ -z "${CXX}" ] && CXX=g++
 	if [ "`cat .gentoo-compiler-version`" != "`${CXX} -dumpversion`" ] ; then
 		eerror "You must unpack and compile with the same CXX setting"
 		die
 	fi
-	econf || die
+	econf
 	make || die
 }
  
-src_install()  {
-	
+src_install() {
 	make DESTDIR=${D} install || die
 	dodoc README example-conf/conf*
 	dodir /usr/bin/wrappers
diff --git a/app-misc/devtodo/devtodo-0.1.11-r1.ebuild b/app-misc/devtodo/devtodo-0.1.11-r1.ebuild
index 4566b7da6b28..bb854aa29679 100644
--- a/app-misc/devtodo/devtodo-0.1.11-r1.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.11-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-misc/devtodo/devtodo-0.1.11-r1.ebuild,v 1.6 2002/10/20 18:40:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.11-r1.ebuild,v 1.7 2002/11/30 19:45:23 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A nice command line todo list for developers"
 SRC_URI="http://activelysecure.net/~alec/development/devtodo/0.1.11/${P}.tar.gz"
 HOMEPAGE="http://activelysecure.net/~alec/development/devtodo/"
@@ -21,11 +20,11 @@ src_unpack() {
 }
 
 src_compile() {
-	econf || die
+	econf
 	make || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS COPYING ChangeLog QuickStart README TODO
 }
diff --git a/app-misc/devtodo/devtodo-0.1.14.ebuild b/app-misc/devtodo/devtodo-0.1.14.ebuild
index b05157e45c98..7ddc0658cc08 100644
--- a/app-misc/devtodo/devtodo-0.1.14.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.14.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-misc/devtodo/devtodo-0.1.14.ebuild,v 1.7 2002/11/02 22:30:46 cselkirk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.14.ebuild,v 1.8 2002/11/30 19:46:29 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A nice command line todo list for developers"
 SRC_URI="http://devtodo.sourceforge.net/${PV}/${P}.tar.gz"
 HOMEPAGE="http://devtodo.sourceforge.net/"
@@ -15,13 +14,12 @@ DEPEND=">=sys-libs/ncurses-5.2
 	>=sys-libs/readline-4.1"
 
 src_compile() {
-	econf --sysconfdir=/etc/devtodo || die
+	econf --sysconfdir=/etc/devtodo
 	make || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-
 	dodoc AUTHORS COPYING ChangeLog QuickStart README TODO 
 	dodoc doc/scripts.sh doc/scripts.tcsh doc/todorc.example contrib/tdrec
 }
diff --git a/app-misc/dfm/dfm-0.99.9.ebuild b/app-misc/dfm/dfm-0.99.9.ebuild
index e4aa840edc07..5367cbf279a0 100644
--- a/app-misc/dfm/dfm-0.99.9.ebuild
+++ b/app-misc/dfm/dfm-0.99.9.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-misc/dfm/dfm-0.99.9.ebuild,v 1.5 2002/10/20 18:40:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dfm/dfm-0.99.9.ebuild,v 1.6 2002/11/30 19:48:17 vapier Exp $
 
-S=${WORKDIR}/dfm
 DESCRIPTION="Desktop Manager. Good replacement for gmc or nautilus"
 SRC_URI="http://www.kaisersite.de/dfm/${P}.tar.gz"
 HOMEPAGE="http://www.kaisersite.de/dfm/"
@@ -14,13 +13,14 @@ KEYWORDS="x86 ppc"
 DEPEND="=x11-libs/gtk+-1.2*
 	=media-libs/imlib-1.9*"
 
+S=${WORKDIR}/${PN}
+
 src_compile() {
-	econf || die
+	econf
 	emake || die
 }
 
 src_install() {
-	einstall || die
-
+	einstall
 	dodoc README INSTALL ChangeLog TODO NEWS AUTHORS
 }