epatch and sed updates, changelog fixes

29 files changed, 78 insertions, 95 deletions

diff --git a/app-arch/arc/Manifest b/app-arch/arc/Manifest
index 91e1d3c7c261..29f27fa31404 100644
--- a/app-arch/arc/Manifest
+++ b/app-arch/arc/Manifest
@@ -1,4 +1,4 @@
-MD5 3ab486708806f0fb26ffe0cb2bda8227 arc-521e.ebuild 956
 MD5 f3ae4c7370959ea4260d00d3d4abe4ed ChangeLog 471
+MD5 cb2841c63d7def1fc18773066f3b19a0 arc-521e.ebuild 838
 MD5 11bcb6a067f0bdd2e47b77a6a444b376 files/arc-521e-timeh.patch 516
 MD5 d48e9dc9fe0543d956c346d99ce42dd3 files/digest-arc-521e 62
diff --git a/app-arch/arc/arc-521e.ebuild b/app-arch/arc/arc-521e.ebuild
index f812839035c8..abe2b7055885 100644
--- a/app-arch/arc/arc-521e.ebuild
+++ b/app-arch/arc/arc-521e.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-arch/arc/arc-521e.ebuild,v 1.6 2003/02/13 05:52:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arc/arc-521e.ebuild,v 1.7 2003/09/26 21:07:35 aliz Exp $
 
 DESCRIPTION="Create & extract files from DOS .ARC files."
 MY_P="${PN}${PV}.pl8"
@@ -17,16 +17,13 @@ S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
-	patch -p1 < ${FILESDIR}/${P}-timeh.patch
-	cat marc.c | sed -e 's/char \*arctemp2, \*mktemp();/char *arctemp2;/' \
-	-e 's/mktemp/mkstemp/g' > marc.c.new
-	mv marc.c.new  marc.c
-	cat arc.c | sed -e 's/\*arctemp2, \*mktemp();/*arctemp2;/g' \
-	-e 's/mktemp/mkstemp/g' > arc.c.new
-	mv arc.c.new arc.c
-
-	cp Makefile Makefile.orig
-	sed "s:\$(OPT):${CFLAGS}:" Makefile.orig >Makefile
+	epatch ${FILESDIR}/${P}-timeh.patch
+	sed -i -e 's/char \*arctemp2, \*mktemp();/char *arctemp2;/' \
+		-e 's/mktemp/mkstemp/g' marc.c
+	sed -i -e 's/\*arctemp2, \*mktemp();/*arctemp2;/g' \
+		-e 's/mktemp/mkstemp/g' arc.c
+
+	sed -i "s:\$(OPT):${CFLAGS}:" Makefile
 }
 
 src_compile() {
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index 13651b77221c..f7e6d928d51a 100644
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@@ -1,8 +1,8 @@
 MD5 0305d3bdb25fe7df38b305bb8b4603bc ChangeLog 3007
-MD5 2f5636ff24a219c806ba47f28dd940d1 dump-0.4.31.ebuild 1384
-MD5 20d459e626bc6821a2976439f25dc726 dump-0.4.32.ebuild 1337
-MD5 14055113dc25a094745ee9b85712fe89 dump-0.4.33.ebuild 1338
-MD5 556f9b39653c48a471563d368a011e44 dump-0.4.34.ebuild 1341
+MD5 ebef44af1d39a73ec1e68b0fdaca9d7c dump-0.4.31.ebuild 1351
+MD5 9af7e1f293f82c8de2647dbfa491cf20 dump-0.4.32.ebuild 1304
+MD5 1100ab90dbac32cd1c8b974090d82048 dump-0.4.33.ebuild 1305
+MD5 254d40c107037ada53ff736e22f7c65f dump-0.4.34.ebuild 1310
 MD5 ba8e2c7903d8552371eb52340b4712ac files/digest-dump-0.4.31 63
 MD5 b6a88612994bfc521011a280e5a33756 files/digest-dump-0.4.32 63
 MD5 40f91cf10ab0e88e157a5ddcacd62500 files/digest-dump-0.4.33 63
diff --git a/app-arch/dump/dump-0.4.31.ebuild b/app-arch/dump/dump-0.4.31.ebuild
index d85706fde3e1..c493ab6b7a33 100644
--- a/app-arch/dump/dump-0.4.31.ebuild
+++ b/app-arch/dump/dump-0.4.31.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-arch/dump/dump-0.4.31.ebuild,v 1.14 2003/09/15 17:49:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.31.ebuild,v 1.15 2003/09/26 21:07:35 aliz Exp $
 
 MY_P=${P/4./4b}
 S=${WORKDIR}/${MY_P}
@@ -26,9 +26,8 @@ src_unpack() {
 	if [ `use readline` ] ; then
 		for i in configure configure.in
 		do
-			cp ${i} ${i}.orig
-			sed "s:-ltermcap:-lncurses:g" \
-				${i}.orig > ${i}
+			sed -i "s:-ltermcap:-lncurses:g" \
+				${i}
 		done
 	fi
 }
diff --git a/app-arch/dump/dump-0.4.32.ebuild b/app-arch/dump/dump-0.4.32.ebuild
index dd31581820ea..ff6fc6916007 100644
--- a/app-arch/dump/dump-0.4.32.ebuild
+++ b/app-arch/dump/dump-0.4.32.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-arch/dump/dump-0.4.32.ebuild,v 1.5 2003/09/15 17:49:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.32.ebuild,v 1.6 2003/09/26 21:07:35 aliz Exp $
 
 MY_P=${P/4./4b}
 S=${WORKDIR}/${MY_P}
@@ -26,9 +26,8 @@ src_unpack() {
 	if [ `use readline` ] ; then
 		for i in configure configure.in
 		do
-			cp ${i} ${i}.orig
-			sed "s:-ltermcap:-lncurses:g" \
-				${i}.orig > ${i}
+			sed -i "s:-ltermcap:-lncurses:g" \
+				${i}
 		done
 	fi
 }
diff --git a/app-arch/dump/dump-0.4.33.ebuild b/app-arch/dump/dump-0.4.33.ebuild
index ee56fea356cc..744291187d83 100644
--- a/app-arch/dump/dump-0.4.33.ebuild
+++ b/app-arch/dump/dump-0.4.33.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-arch/dump/dump-0.4.33.ebuild,v 1.3 2003/09/15 17:49:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.33.ebuild,v 1.4 2003/09/26 21:07:35 aliz Exp $
 
 MY_P=${P/4./4b}
 S=${WORKDIR}/${MY_P}
@@ -26,9 +26,8 @@ src_unpack() {
 	if [ `use readline` ] ; then
 		for i in configure configure.in
 		do
-			cp ${i} ${i}.orig
-			sed "s:-ltermcap:-lncurses:g" \
-				${i}.orig > ${i}
+			sed -i "s:-ltermcap:-lncurses:g" \
+				${i}
 		done
 	fi
 }
diff --git a/app-arch/dump/dump-0.4.34.ebuild b/app-arch/dump/dump-0.4.34.ebuild
index c18b764f4e27..ff15abda9e1c 100644
--- a/app-arch/dump/dump-0.4.34.ebuild
+++ b/app-arch/dump/dump-0.4.34.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-arch/dump/dump-0.4.34.ebuild,v 1.4 2003/09/19 00:11:43 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.34.ebuild,v 1.5 2003/09/26 21:07:35 aliz Exp $
 
 MY_P=${P/4./4b}
 S=${WORKDIR}/${MY_P}
@@ -26,9 +26,8 @@ src_unpack() {
 	if [ `use readline` ] ; then
 		for i in configure configure.in
 		do
-			cp ${i} ${i}.orig
-			sed "s:-ltermcap:-lncurses:g" \
-				${i}.orig > ${i}
+			sed -i "s:-ltermcap:-lncurses:g" \
+				${i}
 		done
 	fi
 }
diff --git a/app-arch/lha/ChangeLog b/app-arch/lha/ChangeLog
index b463c1bb33e8..9e1cd70a583f 100644
--- a/app-arch/lha/ChangeLog
+++ b/app-arch/lha/ChangeLog
@@ -1,8 +1,8 @@
 # ChangeLog for app-arch/lha
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/ChangeLog,v 1.7 2003/07/15 18:43:39 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/ChangeLog,v 1.8 2003/09/26 21:07:35 aliz Exp $
 
-*lha-114i (15 Jul 2003)
+*lha-114i-r1 (15 Jul 2003)
 
   15 Jul 2003; Arcady Genkin <agenkin@gentoo.org> :
   Update to handle multy-byte characters in the file names by
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index d28abe8ead95..15200391ed53 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,5 +1,5 @@
-MD5 051d264e54d4457fbe258554bea65ea1 ChangeLog 941
-MD5 5f097d2d4032323eca3fbd8deb4ccda4 lha-114i.ebuild 841
+MD5 7449640be1b646e90cdeee68871e325b ChangeLog 941
+MD5 a7181e4afd7dccfc48cadef063c0ec11 lha-114i.ebuild 793
 MD5 73ad63c0751e1f73130b35bb06db2fe6 lha-114i-r1.ebuild 971
 MD5 0ca54fececc10dcda9d3e9f649102c78 files/digest-lha-114i 59
 MD5 8d44f00f248f7ae367372b6f8edbfb06 files/digest-lha-114i-r1 78
diff --git a/app-arch/lha/lha-114i.ebuild b/app-arch/lha/lha-114i.ebuild
index 6b4b51d7baa4..c769b085a175 100644
--- a/app-arch/lha/lha-114i.ebuild
+++ b/app-arch/lha/lha-114i.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-arch/lha/lha-114i.ebuild,v 1.9 2003/02/10 07:12:50 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/lha-114i.ebuild,v 1.10 2003/09/26 21:07:35 aliz Exp $
 
 DESCRIPTION="Utility for creating and opening lzh archives."
 HOMEPAGE="http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm"
@@ -14,8 +14,7 @@ DEPEND="virtual/glibc"
 
 src_unpack () {
 	unpack ${A} ; cd ${S}
-	sed -e "/^OPTIMIZE/ s:-O2:${CFLAGS}:" < Makefile > Makefile.hacked
-	mv Makefile.hacked Makefile
+	sed -i -e "/^OPTIMIZE/ s:-O2:${CFLAGS}:" Makefile
 }
 
 src_compile() {
diff --git a/app-arch/mt-st/Manifest b/app-arch/mt-st/Manifest
index d37e789e6285..a3b29b4c81ac 100644
--- a/app-arch/mt-st/Manifest
+++ b/app-arch/mt-st/Manifest
@@ -1,7 +1,7 @@
-MD5 b3090e2b889c3dd9d2c270a06ae2469c mt-st-0.7.ebuild 725
-MD5 40e6864af0efa756bbe610442f0e4f2d mt-st-0.6.ebuild 709
-MD5 be69df54ef3a7d28f9af85a8bf4a767f mt-st-0.7-r1.ebuild 781
 MD5 0c5ae2ea8242dd570d93e88697955a75 ChangeLog 826
+MD5 6318b5ca4b00b8f21fb4db7f9d16ea96 mt-st-0.6.ebuild 668
+MD5 03be089a45af128c6325a466752122dd mt-st-0.7.ebuild 683
+MD5 00bd253d55c7380a6a535f12adb8f768 mt-st-0.7-r1.ebuild 739
 MD5 6a81aa6195840ec61f8fdfc81f476f03 files/digest-mt-st-0.6 60
 MD5 97eb21a50a993a5e783cb7964d288978 files/digest-mt-st-0.7 60
 MD5 97eb21a50a993a5e783cb7964d288978 files/digest-mt-st-0.7-r1 60
diff --git a/app-arch/mt-st/mt-st-0.6.ebuild b/app-arch/mt-st/mt-st-0.6.ebuild
index 9396a30959b5..353ce33da335 100644
--- a/app-arch/mt-st/mt-st-0.6.ebuild
+++ b/app-arch/mt-st/mt-st-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-arch/mt-st/mt-st-0.6.ebuild,v 1.9 2003/02/13 05:55:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/mt-st/mt-st-0.6.ebuild,v 1.10 2003/09/26 21:07:35 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Enhanced mt command for Linux, supporting Linux 2.4 ioctls"
@@ -16,8 +16,7 @@ DEPEND="virtual/glibc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:g" Makefile.orig > Makefile
+	sed -i -e "s:-O2:${CFLAGS}:g" Makefile
 }
 
 src_compile() {
diff --git a/app-arch/mt-st/mt-st-0.7-r1.ebuild b/app-arch/mt-st/mt-st-0.7-r1.ebuild
index 414d44e46428..a5c70049ea85 100644
--- a/app-arch/mt-st/mt-st-0.7-r1.ebuild
+++ b/app-arch/mt-st/mt-st-0.7-r1.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-arch/mt-st/mt-st-0.7-r1.ebuild,v 1.2 2003/07/18 19:14:23 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/mt-st/mt-st-0.7-r1.ebuild,v 1.3 2003/09/26 21:07:35 aliz Exp $
 
 DESCRIPTION="Enhanced mt command for Linux, supporting Linux 2.4 ioctls"
 HOMEPAGE="http://www.gnu.org/software/tar/"
@@ -15,8 +15,7 @@ DEPEND="virtual/glibc"
 src_unpack() {
 	unpack ${A} || die
 	cd ${S} || die
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:g" Makefile.orig > Makefile
+	sed -i -e "s:-O2:${CFLAGS}:g" Makefile
 }
 
 src_compile() {
diff --git a/app-arch/mt-st/mt-st-0.7.ebuild b/app-arch/mt-st/mt-st-0.7.ebuild
index 15883f5b6d5a..1b62b3c0dad0 100644
--- a/app-arch/mt-st/mt-st-0.7.ebuild
+++ b/app-arch/mt-st/mt-st-0.7.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-arch/mt-st/mt-st-0.7.ebuild,v 1.13 2003/03/25 14:06:06 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/mt-st/mt-st-0.7.ebuild,v 1.14 2003/09/26 21:07:35 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Enhanced mt command for Linux, supporting Linux 2.4 ioctls"
@@ -16,8 +16,7 @@ DEPEND="virtual/glibc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:g" Makefile.orig > Makefile
+	sed -i -e "s:-O2:${CFLAGS}:g" Makefile
 }
 
 src_compile() {
diff --git a/app-arch/par/ChangeLog b/app-arch/par/ChangeLog
index cb748e93551d..41ad5a38394d 100644
--- a/app-arch/par/ChangeLog
+++ b/app-arch/par/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for app-arch/par
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/par/ChangeLog,v 1.9 2003/09/25 01:31:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/par/ChangeLog,v 1.10 2003/09/26 21:07:35 aliz Exp $
+
+*par-2.0.3 (25 Sep 2003)
 
   24 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> :
   version bump for par2 support, bug #25087
diff --git a/app-arch/par/Manifest b/app-arch/par/Manifest
index 2057dd22e2e1..017f0eea7977 100644
--- a/app-arch/par/Manifest
+++ b/app-arch/par/Manifest
@@ -1,5 +1,5 @@
+MD5 eff2a546e1dd385327723653c40a1f97 ChangeLog 814
+MD5 186e3d3c2f9ee0e1fcd4e9168a5d96cc par-1.1.ebuild 721
+MD5 9a2fac4a9c17b1d0e3c7e86b857c1009 par-2.0.3.ebuild 1145
 MD5 9373343eb9ba09a04f7a15781438de31 files/digest-par-1.1 59
 MD5 1aa64b174e55455b11c0e6492107ba10 files/digest-par-2.0.3 67
-MD5 9a2fac4a9c17b1d0e3c7e86b857c1009 par-2.0.3.ebuild 1145
-MD5 186e3d3c2f9ee0e1fcd4e9168a5d96cc par-1.1.ebuild 721
-MD5 23641b33f2879d93603b24bfc4805a0b ChangeLog 790
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index bf3303e9a777..cf1a50a62a13 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,11 +1,11 @@
-MD5 e48d4063f2707f815e2a1fbd5e299047 rpm-4.2_pre069.ebuild 2154
 MD5 71a833d007459edfe51f333aba260459 ChangeLog 4043
-MD5 e0ab9400b53a15d80357cce880bc121f rpm-4.0.4-r5.ebuild 1637
+MD5 e48d4063f2707f815e2a1fbd5e299047 rpm-4.2_pre069.ebuild 2154
+MD5 ccf876961124bf9d542de5d9e7ae5748 rpm-4.0.4-r5.ebuild 1592
+MD5 576f625499d593cd3424798fe480090e files/digest-rpm-4.2_pre069 65
 MD5 90a229eb084e54a880c72d83dffa31cb files/rpm-3.0.6-popt-popt.c-gentoo.diff 206
+MD5 90a229eb084e54a880c72d83dffa31cb files/rpm-4.0.4-popt-popt.c-gentoo.diff 206
+MD5 6b639232d435829fd97b09e10f58de81 files/rpm-4.0.4-system-popt.diff 18639
+MD5 fe39156514725cf08be38b39fe3f6f3c files/rpm-4.1-system-popt.diff 21458
 MD5 e7ef0e369ef68d513461dd831eb1ef4f files/digest-rpm-4.0.4-r5 62
 MD5 806f307798e39d580d5286d99c44b965 files/rpm-4.0.4-glibc2.3.diff 495
-MD5 fe39156514725cf08be38b39fe3f6f3c files/rpm-4.1-system-popt.diff 21458
-MD5 576f625499d593cd3424798fe480090e files/digest-rpm-4.2_pre069 65
-MD5 90a229eb084e54a880c72d83dffa31cb files/rpm-4.0.4-popt-popt.c-gentoo.diff 206
 MD5 3d46eae2efd769e423b004de176d9812 files/rpm-4.2-system-popt.diff 14435
-MD5 6b639232d435829fd97b09e10f58de81 files/rpm-4.0.4-system-popt.diff 18639
diff --git a/app-arch/rpm/rpm-4.0.4-r5.ebuild b/app-arch/rpm/rpm-4.0.4-r5.ebuild
index 6194e1bf3efe..e01ca2277794 100644
--- a/app-arch/rpm/rpm-4.0.4-r5.ebuild
+++ b/app-arch/rpm/rpm-4.0.4-r5.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-arch/rpm/rpm-4.0.4-r5.ebuild,v 1.5 2003/08/05 14:49:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r5.ebuild,v 1.6 2003/09/26 21:07:35 aliz Exp $
 
 inherit flag-o-matic eutils
 
@@ -32,8 +32,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-glibc2.3.diff
 	rm -rf ${S}/popt
 	# Suppress pointer warnings
-	cp configure configure.orig
-	sed -e "s:-Wpointer-arith::" configure.orig > configure
+	sed -i -e "s:-Wpointer-arith::" configure
 }
 
 src_compile() {
diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
index 8f7f9d8c3f29..1443cd4fda58 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -1,5 +1,5 @@
 MD5 ef6a76561948131708df280bd4c1acea ChangeLog 1467
-MD5 2400a77cb17133ebff85cf798b75fadb unace-1.2b.ebuild 768
+MD5 8fe44194515201c490978f298707bc79 unace-1.2b.ebuild 718
 MD5 88e9b3034e9071fed5434b71afada4a0 unace-2.0.4.ebuild 502
 MD5 739e05bda3e8e400ff8a01aa4461e9f8 unace-2.2.ebuild 500
 MD5 34628d3f6507592703856c82761becf0 files/digest-unace-1.2b 61
diff --git a/app-arch/unace/unace-1.2b.ebuild b/app-arch/unace/unace-1.2b.ebuild
index 074765a00afd..4e326ba5cb58 100644
--- a/app-arch/unace/unace-1.2b.ebuild
+++ b/app-arch/unace/unace-1.2b.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-arch/unace/unace-1.2b.ebuild,v 1.5 2003/07/08 21:50:26 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/unace-1.2b.ebuild,v 1.6 2003/09/26 21:07:35 aliz Exp $
 
 S="${WORKDIR}/${PN}"
 DESCRIPTION="ACE unarchiver"
@@ -20,10 +20,9 @@ src_unpack() {
 }
 
 src_compile() {
-	sed -e "s/^CFLAGS = -O.*/CFLAGS = -Wall ${CFLAGS}/g" \
+	sed -i -e "s/^CFLAGS = -O.*/CFLAGS = -Wall ${CFLAGS}/g" \
 		-e "s/-DCASEINSENSE//g" \
-		< makefile > makefile.new
-	mv -f makefile.new makefile
+		makefile
 
 	emake dep
 	emake
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index ab3746be7135..a9bf210bf851 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -1,10 +1,10 @@
 MD5 d383e26a101d5c5bfeb88a6d92c56ab0 ChangeLog 2138
-MD5 dd88af2f9aadec9fb66b4ffafa6ad241 unzip-5.42-r1.ebuild 857
-MD5 81fd107737f050a7ac8a4fa93b543d64 unzip-5.50-r1.ebuild 966
+MD5 0eb83ff251f2bdf9e901513e0a4549b0 unzip-5.42-r1.ebuild 800
+MD5 16957b9aea4947567315dea1d1b2a302 unzip-5.50-r1.ebuild 909
+MD5 c6b4e0a41584b9fb3024b414968f1868 unzip-5.50.ebuild 765
 MD5 ad92ee874d3f6aed5afba82fed6117d8 unzip-5.50-r2.ebuild 1034
-MD5 116e72c2657082aa6cc1e5a90a3af017 unzip-5.50.ebuild 823
 MD5 9c30fe4c3d3fc6352c597ad8eb1ca6b9 files/digest-unzip-5.42-r1 61
 MD5 583a5d8bbc70fb1d858c5e40d686e8ce files/digest-unzip-5.50 61
 MD5 583a5d8bbc70fb1d858c5e40d686e8ce files/digest-unzip-5.50-r1 61
-MD5 583a5d8bbc70fb1d858c5e40d686e8ce files/digest-unzip-5.50-r2 61
 MD5 3b01796cbe10d9492bd8c0825bc83544 files/unzip-5.50-dotdot.patch 3236
+MD5 583a5d8bbc70fb1d858c5e40d686e8ce files/digest-unzip-5.50-r2 61
diff --git a/app-arch/unzip/unzip-5.42-r1.ebuild b/app-arch/unzip/unzip-5.42-r1.ebuild
index dae42cd72e1b..d1dead73ea61 100644
--- a/app-arch/unzip/unzip-5.42-r1.ebuild
+++ b/app-arch/unzip/unzip-5.42-r1.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-arch/unzip/unzip-5.42-r1.ebuild,v 1.16 2003/08/05 14:55:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.42-r1.ebuild,v 1.17 2003/09/26 21:07:35 aliz Exp $
 
 DESCRIPTION="Unzipper for pkzip-compressed files"
 HOMEPAGE="ftp://ftp.info-zip.org/pub/infozip/UnZip.html"
@@ -13,8 +13,7 @@ KEYWORDS="x86 ppc sparc alpha"
 DEPEND="virtual/glibc"
 
 src_compile() {
-	cp unix/Makefile unix/Makefile.orig
-	sed -e "s:-O3:${CFLAGS}:" unix/Makefile.orig > unix/Makefile
+	sed -i -e "s:-O3:${CFLAGS}:" unix/Makefile
 
 	use x86 \
 		&& TARGET=linux \
diff --git a/app-arch/unzip/unzip-5.50-r1.ebuild b/app-arch/unzip/unzip-5.50-r1.ebuild
index 40599d12401b..57bcdcfc3504 100644
--- a/app-arch/unzip/unzip-5.50-r1.ebuild
+++ b/app-arch/unzip/unzip-5.50-r1.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-arch/unzip/unzip-5.50-r1.ebuild,v 1.10 2003/08/05 14:55:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.50-r1.ebuild,v 1.11 2003/09/26 21:07:35 aliz Exp $
 
 DESCRIPTION="Unzipper for pkzip-compressed files"
 HOMEPAGE="ftp://ftp.info-zip.org/pub/infozip/UnZip.html"
@@ -13,10 +13,9 @@ KEYWORDS="x86 ppc alpha hppa mips arm"
 DEPEND="virtual/glibc"
 
 src_compile() {
-	cp unix/Makefile unix/Makefile.orig
-	sed -e "s:-O3:${CFLAGS}:" \
+	sed -i -e "s:-O3:${CFLAGS}:" \
 		-e "s:CC=gcc LD=gcc:CC=${CC:-gcc} LD=${CC:-gcc}:" \
-		-e "s:-O :${CFLAGS} :" unix/Makefile.orig > unix/Makefile
+		-e "s:-O :${CFLAGS} :" unix/Makefile
 
 	use x86 \
 		&& TARGET=linux \
diff --git a/app-arch/unzip/unzip-5.50.ebuild b/app-arch/unzip/unzip-5.50.ebuild
index d109bfe77bef..65596eff8e30 100644
--- a/app-arch/unzip/unzip-5.50.ebuild
+++ b/app-arch/unzip/unzip-5.50.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-arch/unzip/unzip-5.50.ebuild,v 1.7 2003/08/05 14:55:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.50.ebuild,v 1.8 2003/09/26 21:07:35 aliz Exp $
 
 DESCRIPTION="Unzipper for pkzip-compressed files"
 HOMEPAGE="ftp://ftp.info-zip.org/pub/infozip/UnZip.html"
@@ -13,9 +13,7 @@ KEYWORDS="x86 ppc alpha"
 DEPEND="virtual/glibc"
 
 src_compile() {
-
-	cp unix/Makefile unix/Makefile.orig
-	sed -e "s:-O3:${CFLAGS}:" unix/Makefile.orig > unix/Makefile
+	sed -i -e "s:-O3:${CFLAGS}:" unix/Makefile
 
 	use x86 \
 		&& TARGET=linux \
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index b9fd379fae43..e64f177a4308 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1,5 +1,5 @@
 MD5 765039a33386b19e14f3add021760fd8 ChangeLog 1387
-MD5 89c3961bccad2e48daa2b3f16bd7308e zip-2.3-r1.ebuild 785
-MD5 60638a0c42aeb8f452718b0f9b53d453 zip-2.3-r2.ebuild 992
+MD5 3460e0d33c11c93ea18629120d8cb71b zip-2.3-r1.ebuild 743
+MD5 f55bfcfd093de45e14c8a267925e56aa zip-2.3-r2.ebuild 948
 MD5 446598b124c5aa6073e4a431a166cc2d files/digest-zip-2.3-r1 57
 MD5 0fae982a1638aacea39c862dd7ebbea6 files/digest-zip-2.3-r2 113
diff --git a/app-arch/zip/zip-2.3-r1.ebuild b/app-arch/zip/zip-2.3-r1.ebuild
index 94aec69eb685..1f4d4f69854f 100644
--- a/app-arch/zip/zip-2.3-r1.ebuild
+++ b/app-arch/zip/zip-2.3-r1.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-arch/zip/zip-2.3-r1.ebuild,v 1.20 2003/07/18 19:14:23 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.3-r1.ebuild,v 1.21 2003/09/26 21:07:35 aliz Exp $
 
 DESCRIPTION="Info ZIP"
 SRC_URI="http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/${PN}23.tar.gz"
@@ -13,8 +13,7 @@ LICENSE="Info-ZIP"
 src_unpack() {
 	unpack ${A}
 	cd ${S}/unix
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile
 }
 
 src_compile() {
diff --git a/app-arch/zip/zip-2.3-r2.ebuild b/app-arch/zip/zip-2.3-r2.ebuild
index 279d0e926b1c..2c86209be5a2 100644
--- a/app-arch/zip/zip-2.3-r2.ebuild
+++ b/app-arch/zip/zip-2.3-r2.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-arch/zip/zip-2.3-r2.ebuild,v 1.5 2003/09/05 22:49:03 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.3-r2.ebuild,v 1.6 2003/09/26 21:07:35 aliz Exp $
 
 IUSE="crypt"
 
@@ -22,8 +22,7 @@ src_unpack() {
 		mv -f crypt.c ${S}
 	fi
 	cd ${S}/unix
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile
 }
 
 src_compile() {
diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest
index 50905985aad1..15c0c29eaf3d 100644
--- a/app-arch/zoo/Manifest
+++ b/app-arch/zoo/Manifest
@@ -1,4 +1,4 @@
 MD5 134650e36d2699ddae841d0f97863034 ChangeLog 600
-MD5 d8bb93bae665e876d9011ad9e0dbb1f9 zoo-2.10.ebuild 586
+MD5 779001c833a70bccad3e474b6e53990a zoo-2.10.ebuild 577
 MD5 5a83375f305f43e7455cf85cfe1975e4 files/digest-zoo-2.10 63
 MD5 35300a4e8735062c357aa1ac029bcfb3 files/zoo-2.10pl1.patch 23718
diff --git a/app-arch/zoo/zoo-2.10.ebuild b/app-arch/zoo/zoo-2.10.ebuild
index 541c5152cf08..e068789f3059 100644
--- a/app-arch/zoo/zoo-2.10.ebuild
+++ b/app-arch/zoo/zoo-2.10.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-arch/zoo/zoo-2.10.ebuild,v 1.10 2003/09/05 22:49:03 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zoo/zoo-2.10.ebuild,v 1.11 2003/09/26 21:07:35 aliz Exp $
 
 DESCRIPTION="Manipulate archives of files in compressed form."
 SRC_URI="ftp://ftp.kiarchive.ru/pub/unix/arcers/${P}pl1.tar.gz"
@@ -13,7 +13,7 @@ S=${WORKDIR}
 
 src_unpack() {
 	unpack ${P}pl1.tar.gz
-	patch -p1 < ${FILESDIR}/${P}pl1.patch
+	epatch ${FILESDIR}/${P}pl1.patch
 }
 
 src_compile() {