epatch and sed updates

7 files changed, 15 insertions, 17 deletions

diff --git a/app-benchmarks/bonnie/Manifest b/app-benchmarks/bonnie/Manifest
index 8c77fd60bd9b..19cbb4093442 100644
--- a/app-benchmarks/bonnie/Manifest
+++ b/app-benchmarks/bonnie/Manifest
@@ -1,5 +1,5 @@
-MD5 f23bd5149955b47a9739ac6279998698 files/bonnie_man.patch 350
+MD5 dea5793b15d57dd0fdcd318270d87e68 ChangeLog 510
+MD5 d58a938a79a116f75a51a6fcaf400800 bonnie-2.0.6.ebuild 767
 MD5 c72a42518e23fdc675ed7b0a4bee0045 files/Makefile.patch 248
+MD5 f23bd5149955b47a9739ac6279998698 files/bonnie_man.patch 350
 MD5 4f5d7854c5b9e58a36722c7b932ba53d files/digest-bonnie-2.0.6 56
-MD5 1bbbd867e913fe7d6c47bc38ce308291 bonnie-2.0.6.ebuild 793
-MD5 dea5793b15d57dd0fdcd318270d87e68 ChangeLog 510
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6.ebuild
index 744e8afdc095..ed1f65d24140 100644
--- a/app-benchmarks/bonnie/bonnie-2.0.6.ebuild
+++ b/app-benchmarks/bonnie/bonnie-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie/bonnie-2.0.6.ebuild,v 1.5 2003/09/07 22:23:31 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie/bonnie-2.0.6.ebuild,v 1.6 2003/09/26 21:14:43 aliz Exp $
 
 DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls."
 HOMEPAGE="http://www.textuality.com/bonnie/"
@@ -17,8 +17,8 @@ S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A} || die
-	patch -p0 < ${FILESDIR}/bonnie_man.patch || die
-	patch -p0 < ${FILESDIR}/Makefile.patch || die
+	epatch ${FILESDIR}/bonnie_man.patch
+	epatch ${FILESDIR}/Makefile.patch
 }
 
 src_compile() {
diff --git a/app-benchmarks/dbench/Manifest b/app-benchmarks/dbench/Manifest
index c59366216650..8fc19c6f7978 100644
--- a/app-benchmarks/dbench/Manifest
+++ b/app-benchmarks/dbench/Manifest
@@ -1,5 +1,5 @@
 MD5 022eea460619cde5f859ebd25fffd57e ChangeLog 655
-MD5 4954d2c088d3ece55056e188ebb58752 dbench-1.3.ebuild 839
-MD5 011f7946b5c0c00ca4526f740aebd354 dbench-2.0.ebuild 897
+MD5 08b3e77a7ff12493c0777c483619d38e dbench-1.3.ebuild 797
+MD5 c656e3739908565d4ce035e7a5f8bbf0 dbench-2.0.ebuild 855
 MD5 78114d4662dba851948ba6ddd384c769 files/digest-dbench-1.3 62
 MD5 a142bb2058c79ef4a6ee2ab38def85e1 files/digest-dbench-2.0 62
diff --git a/app-benchmarks/dbench/dbench-1.3.ebuild b/app-benchmarks/dbench/dbench-1.3.ebuild
index da178fa17313..b88cb4394dfd 100644
--- a/app-benchmarks/dbench/dbench-1.3.ebuild
+++ b/app-benchmarks/dbench/dbench-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/dbench-1.3.ebuild,v 1.8 2003/02/13 05:58:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/dbench-1.3.ebuild,v 1.9 2003/09/26 21:14:43 aliz Exp $
 
 S="${WORKDIR}/${PN}"
 DESCRIPTION="Popular filesystem benchmark"
@@ -16,8 +16,7 @@ DEPEND="sys-apps/sed"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2 -Wall:${CFLAGS}:g" Makefile.orig > Makefile
+	sed -i -e "s:-O2 -Wall:${CFLAGS}:g" Makefile
 }
 
 src_compile() {
diff --git a/app-benchmarks/dbench/dbench-2.0.ebuild b/app-benchmarks/dbench/dbench-2.0.ebuild
index 1023a43437a8..76e492a9552e 100644
--- a/app-benchmarks/dbench/dbench-2.0.ebuild
+++ b/app-benchmarks/dbench/dbench-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/dbench-2.0.ebuild,v 1.6 2003/02/13 05:58:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/dbench-2.0.ebuild,v 1.7 2003/09/26 21:14:43 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Popular filesystem benchmark"
@@ -16,8 +16,7 @@ DEPEND="sys-apps/sed"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2 -Wall:${CFLAGS}:g" Makefile.orig > Makefile
+	sed -i -e "s:-O2 -Wall:${CFLAGS}:g" Makefile
 }
 
 src_compile() {
diff --git a/app-benchmarks/jmeter/Manifest b/app-benchmarks/jmeter/Manifest
index ed5e861ed76d..2cf18700206b 100644
--- a/app-benchmarks/jmeter/Manifest
+++ b/app-benchmarks/jmeter/Manifest
@@ -1,4 +1,4 @@
 MD5 999ec7d13c2ebe1966a4e506cd469577 ChangeLog 1217
-MD5 d93fc43ba7d40888dc7d91e98786b8ae jmeter-1.8.1.ebuild 946
+MD5 9783ce7877438bb61df8402c8976df64 jmeter-1.8.1.ebuild 930
 MD5 95c741b3cec21124a6ed8ebcac8f8aef files/digest-jmeter-1.8.1 206
 MD5 39ba6f903ec77a9818e377eff831a0a3 files/jmeter-1.8.1-gentoo.diff 1221
diff --git a/app-benchmarks/jmeter/jmeter-1.8.1.ebuild b/app-benchmarks/jmeter/jmeter-1.8.1.ebuild
index 9ff0612faf8e..33fac18004d8 100644
--- a/app-benchmarks/jmeter/jmeter-1.8.1.ebuild
+++ b/app-benchmarks/jmeter/jmeter-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-1.8.1.ebuild,v 1.3 2003/04/06 08:54:21 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/jmeter/jmeter-1.8.1.ebuild,v 1.4 2003/09/26 21:14:43 aliz Exp $
 
 S=${WORKDIR}/${PN}-${PV}
 P=jakarta-${PN}-${PV}
@@ -17,7 +17,7 @@ IUSE="doc"
 
 src_compile () {
 	cd ${WORKDIR}/${P}
-	patch -p1 < ${FILESDIR}/${PN}-${PV}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
 }
 
 src_install () {