Changed econf||die to econf

3 files changed, 23 insertions, 36 deletions

diff --git a/app-admin/powertweak/powertweak-0.1.17-r2.ebuild b/app-admin/powertweak/powertweak-0.1.17-r2.ebuild
index 50f2bc6bd868..81bac51d7831 100644
--- a/app-admin/powertweak/powertweak-0.1.17-r2.ebuild
+++ b/app-admin/powertweak/powertweak-0.1.17-r2.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/powertweak/powertweak-0.1.17-r2.ebuild,v 1.6 2002/10/18 13:31:45 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.1.17-r2.ebuild,v 1.7 2002/11/30 01:38:27 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Powertweak"
 SRC_URI="http://powertweak.sourceforge.net/files/${P}.tar.bz2"
 HOMEPAGE="http://powertweak.sourceforge.net"
-IUSE=""
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -16,31 +14,28 @@ DEPEND="=x11-libs/gtk+-1.2*
 	>=dev-libs/libxml-1.8.10"
 
 src_unpack() {
-
 	CFLAGS="${CPPFLAGS} -Wno-error"
 	CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
 	unpack ${A}
 	cd ${S}
 	for FILE in `find . -iname "Makefile*"`;do
+		cp ${FILE} ${FILE}.hacked
 		sed -e "s:\(^CFLAGS =.*\):\1 ${CFLAGS}:" \
 			-e "s:\(^CPPFLAGS =.*\):\1 ${CPPFLAGS}:" \
-			${FILE} > ${FILE}.hacked || die "Hack failed"
-		mv ${FILE}.hacked ${FILE}
+			${FILE}.hacked > ${FILE} || die "Hack failed"
 	done
-}	
+}
 
 src_compile() {
-
 	CFLAGS="${CPPFLAGS} -Wno-error"
 	CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
 	cp /usr/share/libtool/ltmain.sh .
-	econf || die "Configure failed"
+	econf
 	emake || die "Make failed"
 }
 
 src_install() {
-
-	make install prefix=${D}/usr || die "Install failed"
+	einstall
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
 	docinto Documentation
 	dodoc Documentation/* 
diff --git a/app-admin/powertweak/powertweak-0.99.4.ebuild b/app-admin/powertweak/powertweak-0.99.4.ebuild
index 4ae6c9d21d61..9007c40f665e 100644
--- a/app-admin/powertweak/powertweak-0.99.4.ebuild
+++ b/app-admin/powertweak/powertweak-0.99.4.ebuild
@@ -1,17 +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-admin/powertweak/powertweak-0.99.4.ebuild,v 1.4 2002/10/05 05:39:05 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.99.4.ebuild,v 1.5 2002/11/30 01:40:58 vapier Exp $
 
-IUSE="gtk"
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Powertweak"
+DESCRIPTION="tune your kernel and hardware settings for optimal performance"
 SRC_URI="mirror://sourceforge/powertweak/${P}.tar.bz2"
-HOMEPAGE="http://powertweak.sourceforge.net"
+HOMEPAGE="http://powertweak.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc"
+IUSE="gtk"
 
 DEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 	>=dev-libs/libxml-1.8.10
@@ -21,6 +19,8 @@ DEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 RDEPEND=">=sys-apps/pciutils-2.1.0
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
+S=${WORKDIR}/${PN}
+
 inherit libtool
 
 src_unpack() {
@@ -29,10 +29,10 @@ src_unpack() {
 	cd ${S} ; patch -l -p1 < ${FILESDIR}/${P}-gentoo.diff
 
 	for FILE in `find . -iname "Makefile*"`;do
+		cp ${FILE} ${FILE}.hacked
 		sed -e "s:\(^CFLAGS =.*\):\1 ${CFLAGS}:" \
 			-e "s:\(^CPPFLAGS =.*\):\1 ${CPPFLAGS}:" \
-			${FILE} > ${FILE}.hacked || die "Hack failed"
-		mv ${FILE}.hacked ${FILE}
+			${FILE}.hacked > ${FILE} || die "Hack failed"
 	done
 }
 
@@ -44,7 +44,7 @@ src_compile() {
 	CFLAGS="${CPPFLAGS} -Wno-error"
 	CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
 
-	econf ${myconf} || die
+	econf ${myconf}
 	emake || die
 }
 
@@ -55,7 +55,7 @@ src_install() {
 	dodoc Documentation/* Documentation/Hackers/*
 
 	use gtk || rm ${D}/usr/bin/gpowertweak
-	
+
 	exeinto /etc/init.d ; newexe ${FILESDIR}/powertweakd.rc6 powertweakd
 }
 
diff --git a/app-admin/powertweak/powertweak-0.99.5_pre20021029.ebuild b/app-admin/powertweak/powertweak-0.99.5_pre20021029.ebuild
index 5c400b1129e2..f4260fa2743e 100644
--- a/app-admin/powertweak/powertweak-0.99.5_pre20021029.ebuild
+++ b/app-admin/powertweak/powertweak-0.99.5_pre20021029.ebuild
@@ -1,17 +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-admin/powertweak/powertweak-0.99.5_pre20021029.ebuild,v 1.2 2002/11/01 21:55:45 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.99.5_pre20021029.ebuild,v 1.3 2002/11/30 01:43:23 vapier Exp $
 
-IUSE="gtk"
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Powertweak"
+DESCRIPTION="tune your kernel and hardware settings for optimal performance"
 SRC_URI="mirror://sourceforge/powertweak/${PN}-0.99.4.tar.bz2"
-HOMEPAGE="http://powertweak.sourceforge.net"
+HOMEPAGE="http://powertweak.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc -sparc -sparc64 -alpha"
+IUSE="gtk"
 
 DEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 	>=dev-libs/libxml2-2.3.0
@@ -21,8 +19,9 @@ DEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 RDEPEND=">=sys-apps/pciutils-2.1.0
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
-src_unpack() {
+S=${WORKDIR}/${PN}
 
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	bzcat ${FILESDIR}/${P}.diff.bz2 | patch -p1 || die "patch failed"
@@ -30,23 +29,17 @@ src_unpack() {
 	cp configure.in configure.in.orig
 	sed -e "s:CFLAGS=\"\":CFLAGS=\"${CFLAGS}\":" \
 		< configure.in.orig > configure.in
-
 }
 
 src_compile() {
-
 	./autogen.sh
 
 	use gtk || myconf="--disable-gtktest" 
-
-	econf ${myconf} || die
-
+	econf ${myconf}
 	emake || die
-
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
@@ -57,5 +50,4 @@ src_install() {
 	use gtk || rm ${D}/usr/bin/gpowertweak
 	
 	exeinto /etc/init.d ; newexe ${FILESDIR}/powertweakd.rc6 powertweakd
-
 }