epatch and sed updates

52 files changed, 140 insertions, 174 deletions

diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index 58cd5475f7cb..324eec9decb1 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -1,6 +1,6 @@
 MD5 64deec868bc266d063c40fbd613b29d3 ChangeLog 1836
-MD5 1f44443b122802c6b405d8ef8aa37c23 analog-5.24.ebuild 1355
-MD5 14723a1e491bd4372a630ea3552c3f02 analog-5.31.ebuild 1366
+MD5 8489dafb5b2138e30e57ee4de0d795f8 analog-5.24.ebuild 1303
+MD5 5606c2f2c8a26de78a569fd3b0dc154d analog-5.31.ebuild 1314
 MD5 177bd79ef4967f4d9cf9b2844203e67c analog-5.32.ebuild 1355
 MD5 2fb240fa271f7dd72dd56552f60729ab files/analog-5.1-gentoo.diff 888
 MD5 bea5158163ebee10b42f2a008cf660d7 files/analog.cfg 3992
diff --git a/app-admin/analog/analog-5.24.ebuild b/app-admin/analog/analog-5.24.ebuild
index ee67d4d3101f..167cbc0e781e 100644
--- a/app-admin/analog/analog-5.24.ebuild
+++ b/app-admin/analog/analog-5.24.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-admin/analog/analog-5.24.ebuild,v 1.12 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.24.ebuild,v 1.13 2003/09/23 20:20:55 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The most popular logfile analyser in the world"
@@ -20,11 +20,10 @@ DEPEND=">=dev-libs/libpcre-3.4
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
-	mv src/Makefile src/Makefile.orig
-	sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
+	sed -i -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
 		-e 's:^DEFS.*:DEFS = -DHAVE_GD -DHAVE_PCRE:' \
 		-e 's:^LIBS.*:LIBS = -lgd -lpng -ljpeg -lz -lpcre -lm:' \
-		src/Makefile.orig > src/Makefile
+		src/Makefile
 	epatch ${FILESDIR}/${PN}-5.1-gentoo.diff
 }
 
diff --git a/app-admin/analog/analog-5.31.ebuild b/app-admin/analog/analog-5.31.ebuild
index 644a134e02a6..28db9498df58 100644
--- a/app-admin/analog/analog-5.31.ebuild
+++ b/app-admin/analog/analog-5.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-admin/analog/analog-5.31.ebuild,v 1.5 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.31.ebuild,v 1.6 2003/09/23 20:20:55 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The most popular logfile analyser in the world"
@@ -20,11 +20,10 @@ DEPEND=">=dev-libs/libpcre-3.4
 src_unpack() {
 	unpack ${A} || die
 	cd ${S} || die
-	mv src/Makefile src/Makefile.orig
-	sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
+	sed -i -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
 		-e 's:^DEFS.*:DEFS = -DHAVE_GD -DHAVE_PCRE:' \
 		-e 's:^LIBS.*:LIBS = -lgd -lpng -ljpeg -lz -lpcre -lm:' \
-		src/Makefile.orig > src/Makefile
+		src/Makefile
 	epatch ${FILESDIR}/${PN}-5.1-gentoo.diff
 }
 
diff --git a/app-admin/fam-oss/Manifest b/app-admin/fam-oss/Manifest
index 8231b9ca11ae..dbb53a314de1 100644
--- a/app-admin/fam-oss/Manifest
+++ b/app-admin/fam-oss/Manifest
@@ -1,7 +1,7 @@
 MD5 91ef6fd9a30d920e71a33b07f72f1e26 ChangeLog 4005
-MD5 75dfc859cba46a75cae06af2a02f996d fam-oss-2.6.9-r1.ebuild 1297
+MD5 082ef73afb3e0a6bd528d924108a71a6 fam-oss-2.6.9-r1.ebuild 1197
 MD5 10509b222062c634f70b72a00a565556 fam-oss-2.6.9.ebuild 1161
-MD5 c10f9b4a5594a1444d28b4a413b64fef fam-oss-2.6.9-r2.ebuild 1432
+MD5 bd1054a1f534a62471827e966f05de25 fam-oss-2.6.9-r2.ebuild 1383
 MD5 a58d08a23da3e7c16e748d57634fd508 fam-oss-2.6.9-r3.ebuild 1484
 MD5 cf1c77a6bdca8c08a491eb607e64d5c4 fam-oss-2.6.10.ebuild 1450
 MD5 696dc86a11cb002675f603d0a9ec662e fam-oss-2.6.10-r1.ebuild 1391
diff --git a/app-admin/fam-oss/fam-oss-2.6.9-r1.ebuild b/app-admin/fam-oss/fam-oss-2.6.9-r1.ebuild
index 7254700b5c8c..f8a3e6e7af1c 100644
--- a/app-admin/fam-oss/fam-oss-2.6.9-r1.ebuild
+++ b/app-admin/fam-oss/fam-oss-2.6.9-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-admin/fam-oss/fam-oss-2.6.9-r1.ebuild,v 1.14 2003/09/04 05:16:02 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/fam-oss-2.6.9-r1.ebuild,v 1.15 2003/09/23 20:20:55 aliz Exp $
 
 inherit libtool eutils
 
@@ -26,8 +26,7 @@ src_unpack() {
 
 	# should fix the sigqueue overflow problems
 	cd ${S}/fam
-	mv Makefile.am Makefile.am.old
-	sed -e "s:fam_LDADD =:fam_LDADD = -lrt -lpthread:" Makefile.am.old > Makefile.am
+	sed -i -e "s:fam_LDADD =:fam_LDADD = -lrt -lpthread:" Makefile.am
 
 	elibtoolize
 
@@ -40,8 +39,7 @@ src_unpack() {
 }
 
 src_install() {
-	cp fam/fam.conf fam/fam.conf.old
-	sed s:"local_only = false":"local_only = true":g fam/fam.conf.old >fam/fam.conf
+	sed -i s:"local_only = false":"local_only = true":g fam/fam.conf
 
 	make DESTDIR=${D} install || die
 
diff --git a/app-admin/fam-oss/fam-oss-2.6.9-r2.ebuild b/app-admin/fam-oss/fam-oss-2.6.9-r2.ebuild
index 9d1518a773ba..df1caf1c3410 100644
--- a/app-admin/fam-oss/fam-oss-2.6.9-r2.ebuild
+++ b/app-admin/fam-oss/fam-oss-2.6.9-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-admin/fam-oss/fam-oss-2.6.9-r2.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/fam-oss-2.6.9-r2.ebuild,v 1.7 2003/09/23 20:20:55 aliz Exp $
 
 inherit libtool eutils
 
@@ -45,8 +45,7 @@ src_unpack() {
 }
 
 src_install() {
-	cp fam/fam.conf fam/fam.conf.old
-	sed s:"local_only = false":"local_only = true":g fam/fam.conf.old >fam/fam.conf
+	sed -i s:"local_only = false":"local_only = true":g fam/fam.conf
 
 	make DESTDIR=${D} install || die
 
diff --git a/app-admin/genromfs/Manifest b/app-admin/genromfs/Manifest
index dcde36ce38f0..6e3741578fdb 100644
--- a/app-admin/genromfs/Manifest
+++ b/app-admin/genromfs/Manifest
@@ -1,3 +1,3 @@
 MD5 0efeb6c0a780657cfd16d8e883deead0 ChangeLog 429
-MD5 221418b8a198e749873bcafeaae8f7eb genromfs-0.5.1.ebuild 806
+MD5 2be4a4252e1153851a83ed0cd547dad4 genromfs-0.5.1.ebuild 765
 MD5 95d299423cea7583af6bda19176114db files/digest-genromfs-0.5.1 65
diff --git a/app-admin/genromfs/genromfs-0.5.1.ebuild b/app-admin/genromfs/genromfs-0.5.1.ebuild
index 8c52a7440b25..e7a34c594265 100644
--- a/app-admin/genromfs/genromfs-0.5.1.ebuild
+++ b/app-admin/genromfs/genromfs-0.5.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-admin/genromfs/genromfs-0.5.1.ebuild,v 1.9 2003/02/13 05:18:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/genromfs/genromfs-0.5.1.ebuild,v 1.10 2003/09/23 20:20:55 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Create space-efficient, small, read-only romfs filesystems"
@@ -16,8 +16,7 @@ DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}; cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s%^\(CFLAGS = \)-O2%\1${CFLAGS}%" Makefile.orig > Makefile
+	sed -i -e "s%^\(CFLAGS = \)-O2%\1${CFLAGS}%" Makefile
 }
 
 src_compile() {
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 26e10aee7891..1814237e0da9 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,11 +1,11 @@
 MD5 9c212495a21d11ca212a7869dddacbeb ChangeLog 2368
-MD5 0d387b08a1bcdabeafc21f76613c446e hddtemp-0.2.ebuild 931
-MD5 f334818ef1de70b301dbc19ba42e9e6e hddtemp-0.3_beta6.ebuild 910
-MD5 a2e0670b148cbfee55e96987c50e6f8e hddtemp-0.3_beta6-r1.ebuild 1189
+MD5 599b5f1890eace2c4bce166123db7cc2 hddtemp-0.2.ebuild 883
+MD5 44d8f5647025aed816a6bf23cd34f012 hddtemp-0.3_beta6-r1.ebuild 1117
+MD5 f8f96db76faddb87875730622af3b165 hddtemp-0.3_beta6.ebuild 867
 MD5 0039fb9ebc01e8efd51f595ea5999f7a hddtemp-0.3_beta8.ebuild 1166
+MD5 3b333171d51fb098667daf964bc6e656 files/hddtemp.db 10291
 MD5 06b275391f52469a2773a41b9ccc48d6 files/digest-hddtemp-0.2 115
 MD5 0441f48755331a54d70ab13db98b4117 files/digest-hddtemp-0.3_beta6 121
-MD5 a4e0540c259f86b5ed2c4af2a7ead160 files/hddtemp-0.2-db_location.patch 593
 MD5 e42a32b0df5005090c105881a4cb02cc files/digest-hddtemp-0.3_beta6-r1 133
 MD5 0a2d5f9cdc1a222625e215b2b4025bb5 files/digest-hddtemp-0.3_beta8 70
-MD5 3b333171d51fb098667daf964bc6e656 files/hddtemp.db 10291
+MD5 a4e0540c259f86b5ed2c4af2a7ead160 files/hddtemp-0.2-db_location.patch 593
diff --git a/app-admin/hddtemp/hddtemp-0.2.ebuild b/app-admin/hddtemp/hddtemp-0.2.ebuild
index 36ff0cfba897..5786458c8681 100644
--- a/app-admin/hddtemp/hddtemp-0.2.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.2.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-admin/hddtemp/hddtemp-0.2.ebuild,v 1.14 2003/05/09 21:43:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.2.ebuild,v 1.15 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="A simple utility to read the temperature of SMART IDE hard drives"
 SRC_URI="http://coredump.free.fr/linux/${P}.tar.gz
@@ -17,13 +17,12 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	# patch hddtemp.c
-	patch -p0 < ${FILESDIR}/hddtemp-0.2-db_location.patch
+	epatch ${FILESDIR}/hddtemp-0.2-db_location.patch
 
 	# patch Makefile
-	mv Makefile Makefile.orig
-	sed -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
+	sed -i -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
 		-e "s:^CC.*:CC=gcc:" \
-		Makefile.orig > Makefile
+		Makefile
 }
 
 src_compile() {
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta6-r1.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta6-r1.ebuild
index 659e5888723a..076694fcbfa7 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta6-r1.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta6-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-admin/hddtemp/hddtemp-0.3_beta6-r1.ebuild,v 1.3 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta6-r1.ebuild,v 1.4 2003/09/23 20:20:55 aliz Exp $
 
 MY_P=${P/_beta/-beta}
 HDDDB_VERSION=20030609
@@ -24,13 +24,11 @@ src_unpack() {
 	gunzip <${DISTDIR}/${HDDDB_FILE}.gz >${WORKDIR}/${HDDDB_FILE}
 	cd ${S}
 	# patch Makefile
-	mv Makefile Makefile.orig
-	sed -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
+	sed -i -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
 		-e "s:^CC.*:CC=gcc:" \
-		Makefile.orig > Makefile
-	mv db.h db.h.orig
-	sed -e "s:/etc/hddtemp.db:${HDDDB_DIR}/${HDDDB_FILE}:" \
-		db.h.orig > db.h
+		Makefile
+	sed -i -e "s:/etc/hddtemp.db:${HDDDB_DIR}/${HDDDB_FILE}:" \
+		db.h
 }
 
 src_compile() {
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild
index b0d7475b8f8f..d3c6da94e8a7 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta6.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-admin/hddtemp/hddtemp-0.3_beta6.ebuild,v 1.2 2003/05/09 21:43:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta6.ebuild,v 1.3 2003/09/23 20:20:55 aliz Exp $
 
 MY_P=${P/_beta/-beta}
 DESCRIPTION="A simple utility to read the temperature of SMART IDE hard drives"
@@ -19,10 +19,9 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	# patch Makefile
-	mv Makefile Makefile.orig
-	sed -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
+	sed -i -e "s:^CFLAGS.*:CFLAGS=${CFLAGS} -DARCH_I386:" \
 		-e "s:^CC.*:CC=gcc:" \
-		Makefile.orig > Makefile
+		Makefile
 }
 
 src_compile() {
diff --git a/app-admin/ide-smart/Manifest b/app-admin/ide-smart/Manifest
index c231e33dff65..01fd48da26fe 100644
--- a/app-admin/ide-smart/Manifest
+++ b/app-admin/ide-smart/Manifest
@@ -1,3 +1,3 @@
 MD5 6c8ae135957f8c26179f7c36e59d00aa ChangeLog 511
-MD5 61d4652e57d9a71a171b3997e659d811 ide-smart-1.4.ebuild 765
+MD5 3e7a204f7aa2fc0e380b0cc8a8ed9b2e ide-smart-1.4.ebuild 723
 MD5 73bdc3805a715bf0dd02d8fdef252c49 files/digest-ide-smart-1.4 64
diff --git a/app-admin/ide-smart/ide-smart-1.4.ebuild b/app-admin/ide-smart/ide-smart-1.4.ebuild
index f5e7104b5b12..129b7c79046a 100644
--- a/app-admin/ide-smart/ide-smart-1.4.ebuild
+++ b/app-admin/ide-smart/ide-smart-1.4.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-admin/ide-smart/ide-smart-1.4.ebuild,v 1.15 2003/02/28 22:07:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ide-smart/ide-smart-1.4.ebuild,v 1.16 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="A tool to read SMART information from harddiscs"
 SRC_URI="http://lightside.eresmas.com/${P}.tar.gz"
@@ -14,11 +14,10 @@ DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
-	mv Makefile Makefile.orig
 	rm ide-smart ide-smart.o
-	sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
+	sed -i -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
 		-e "s:^#CC.*:CC = gcc:" \
-		Makefile.orig > Makefile
+		Makefile
 }
 
 src_compile() {
diff --git a/app-admin/killproc/Manifest b/app-admin/killproc/Manifest
index 1c39f310d30e..e554817ff8ce 100644
--- a/app-admin/killproc/Manifest
+++ b/app-admin/killproc/Manifest
@@ -1,3 +1,3 @@
 MD5 f7e3c6a19ccdf8de3e0597cc5fafc902 ChangeLog 1162
-MD5 6c6a1d738d35e596fce8424c89493f12 killproc-1.12-r2.ebuild 856
+MD5 1a2780535ebe2606fe54c418223c530e killproc-1.12-r2.ebuild 798
 MD5 f95f4fbda1f6a2b5816a218c02da6316 files/digest-killproc-1.12-r2 64
diff --git a/app-admin/killproc/killproc-1.12-r2.ebuild b/app-admin/killproc/killproc-1.12-r2.ebuild
index d0dcfbf6f9e0..84e6af333d7f 100644
--- a/app-admin/killproc/killproc-1.12-r2.ebuild
+++ b/app-admin/killproc/killproc-1.12-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-admin/killproc/killproc-1.12-r2.ebuild,v 1.14 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-1.12-r2.ebuild,v 1.15 2003/09/23 20:20:55 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="killproc and assorted tools for boot scripts"
@@ -18,12 +18,10 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	cp Makefile Makefile.orig
-
 	if [ ${ARCH} = "x86" ] ; then
-		sed -e "s:-O2:${CFLAGS}:" -e "s:-m486::" Makefile.orig > Makefile
+		sed -i -e "s:-O2:${CFLAGS}:" -e "s:-m486::" Makefile
 	else
-		sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+		sed -i -e "s:-O2:${CFLAGS}:" Makefile
 	fi
 }
 
diff --git a/app-admin/lcap/Manifest b/app-admin/lcap/Manifest
index 710d9876ca98..3041ef14bbb0 100644
--- a/app-admin/lcap/Manifest
+++ b/app-admin/lcap/Manifest
@@ -1,6 +1,6 @@
 MD5 0c63da71a7ab14a7d4831a42e97553f3 ChangeLog 708
-MD5 2111f3fb3d5dfa19311e4a740cf813b7 lcap-0.0.6-r1.ebuild 949
-MD5 a275974bcb5e888c80827fd80d908fc6 lcap-0.0.6.ebuild 881
+MD5 97d106837e4495aea7f4efc9ec5b2d20 lcap-0.0.6-r1.ebuild 901
+MD5 922d55c80f8fd3a20a74dd1a4e58d8d1 lcap-0.0.6.ebuild 833
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 MD5 b147ed00fa64b3b0be0b78cf2617ce98 files/digest-lcap-0.0.6 66
 MD5 bf12167d46f239f3aa2b87d3686b6a36 files/README.gentoo 185
diff --git a/app-admin/lcap/lcap-0.0.6-r1.ebuild b/app-admin/lcap/lcap-0.0.6-r1.ebuild
index 98029e4c4fc7..e53f310183fb 100644
--- a/app-admin/lcap/lcap-0.0.6-r1.ebuild
+++ b/app-admin/lcap/lcap-0.0.6-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-admin/lcap/lcap-0.0.6-r1.ebuild,v 1.3 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lcap/lcap-0.0.6-r1.ebuild,v 1.4 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="kernel capability remover"
 
@@ -27,8 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PF}.patch
-	use lids || (sed < Makefile > Makefile.tmp -e "s:LIDS =:#\0:" && \
-				mv Makefile.tmp Makefile)
+	use lids || (sed -i -e "s:LIDS =:#\0:" Makefile)
 }
 
 src_compile() {
diff --git a/app-admin/lcap/lcap-0.0.6.ebuild b/app-admin/lcap/lcap-0.0.6.ebuild
index 2535baa12265..6cb5f05c0c69 100644
--- a/app-admin/lcap/lcap-0.0.6.ebuild
+++ b/app-admin/lcap/lcap-0.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-admin/lcap/lcap-0.0.6.ebuild,v 1.4 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lcap/lcap-0.0.6.ebuild,v 1.5 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="kernel capability remover"
 
@@ -26,8 +26,7 @@ RDEPEND="virtual/glibc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	use lids || (sed < Makefile > Makefile.tmp -e "s:LIDS =:#\0:" && \
-				mv Makefile.tmp Makefile)
+	use lids || (sed -i -e "s:LIDS =:#\0:" Makefile)
 }
 
 src_compile() {
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 88fc145dbe23..320fca080820 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,6 +1,6 @@
 MD5 fca2d73679c337cab29715ae11ea2eb7 ChangeLog 2877
-MD5 068279976e16f61f64a46e1a9c7eb6b9 logrotate-3.5.9-r1.ebuild 858
-MD5 ac6d294e245841f7dbd063e0a8c44f39 logrotate-3.6.5.ebuild 1107
+MD5 b90d0d641a7a40105ce6b5774973536e logrotate-3.5.9-r1.ebuild 818
+MD5 cc9f8ce2f385c3d783ee705926889c1e logrotate-3.6.5.ebuild 1068
 MD5 c60ccf72ed78f7d188b03f7a29f3e77b logrotate-3.6.5-r1.ebuild 1556
 MD5 60b5761bada5528ca3e3e9582b56dbfe files/digest-logrotate-3.5.9-r1 71
 MD5 c0d3db322cf626f01a0adea55cdf6b78 files/digest-logrotate-3.6.5 149
diff --git a/app-admin/logrotate/logrotate-3.5.9-r1.ebuild b/app-admin/logrotate/logrotate-3.5.9-r1.ebuild
index 13eac7827cc4..4395687a3678 100644
--- a/app-admin/logrotate/logrotate-3.5.9-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.5.9-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-admin/logrotate/logrotate-3.5.9-r1.ebuild,v 1.13 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.5.9-r1.ebuild,v 1.14 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="Rotates, compresses, and mails system logs"
 HOMEPAGE="http://packages.debian.org/unstable/admin/logrotate.html"
@@ -13,8 +13,7 @@ KEYWORDS="x86 ppc sparc"
 DEPEND=">=dev-libs/popt-1.5"
 
 src_compile() {
-	cp Makefile Makefile.orig
-	sed -e "s:CFLAGS += -g:CFLAGS += -g ${CFLAGS}:" Makefile.orig > Makefile
+	sed -i -e "s:CFLAGS += -g:CFLAGS += -g ${CFLAGS}:" Makefile
 	make || die
 }
 
diff --git a/app-admin/logrotate/logrotate-3.6.5.ebuild b/app-admin/logrotate/logrotate-3.6.5.ebuild
index 30426e669c3c..5a1deedd05f4 100644
--- a/app-admin/logrotate/logrotate-3.6.5.ebuild
+++ b/app-admin/logrotate/logrotate-3.6.5.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-admin/logrotate/logrotate-3.6.5.ebuild,v 1.9 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.6.5.ebuild,v 1.10 2003/09/23 20:20:55 aliz Exp $
 
 inherit eutils
 
@@ -21,8 +21,7 @@ DEPEND=">=sys-apps/portage-2.0.47-r10
 src_compile() {
 	use selinux && epatch ${DISTDIR}/${P}-2003011510.patch.gz
 
-	cp Makefile Makefile.orig
-	sed -e "s:CFLAGS += -g:CFLAGS += -g ${CFLAGS}:" Makefile.orig > Makefile
+	sed -i -e "s:CFLAGS += -g:CFLAGS += -g ${CFLAGS}:" Makefile
 	make || die
 }
 
diff --git a/app-admin/longrun/Manifest b/app-admin/longrun/Manifest
index a780974dbe72..fc4a52cc983a 100644
--- a/app-admin/longrun/Manifest
+++ b/app-admin/longrun/Manifest
@@ -1,6 +1,6 @@
-MD5 04159b8a163c87979fbe52e9fef78f21 files/digest-longrun-0.9-r1 63
-MD5 04159b8a163c87979fbe52e9fef78f21 files/digest-longrun-0.9 63
-MD5 b924563938144473dbfc5be5e8f8f025 files/longrun-0.9-r1-debian-gcc-3.diff 32094
-MD5 9dabaabbf3a2989ab2548763be931354 longrun-0.9-r1.ebuild 760
 MD5 bd86f0d8c577bb743712e5a3ebb02065 ChangeLog 1093
 MD5 5ad891a7b405664245e6cb300e3adfc0 longrun-0.9.ebuild 623
+MD5 02cb366f95470e71bca6f365d014e2a3 longrun-0.9-r1.ebuild 733
+MD5 04159b8a163c87979fbe52e9fef78f21 files/digest-longrun-0.9 63
+MD5 04159b8a163c87979fbe52e9fef78f21 files/digest-longrun-0.9-r1 63
+MD5 b924563938144473dbfc5be5e8f8f025 files/longrun-0.9-r1-debian-gcc-3.diff 32094
diff --git a/app-admin/longrun/longrun-0.9-r1.ebuild b/app-admin/longrun/longrun-0.9-r1.ebuild
index 4dafdfb4a972..26bf594096fa 100644
--- a/app-admin/longrun/longrun-0.9-r1.ebuild
+++ b/app-admin/longrun/longrun-0.9-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-admin/longrun/longrun-0.9-r1.ebuild,v 1.4 2003/09/07 22:19:29 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/longrun/longrun-0.9-r1.ebuild,v 1.5 2003/09/23 20:20:55 aliz Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="A utility to control Transmeta's Crusoe processor"
@@ -16,9 +16,8 @@ DEPEND="virtual/glibc"
 
 # Include fix from debian
 src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}/longrun
-	patch -p1 < ${FILESDIR}/${PF}-debian-gcc-3.diff || die
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${PF}-debian-gcc-3.diff
 }
 
 src_compile() {
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 11dfa451bc01..d8f0e7428fdd 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -1,14 +1,14 @@
 MD5 8fc988be782f791e720899c0748ec7b7 ChangeLog 2311
-MD5 3a344d1f26bf35290c0318d352220a1d metalog-0.6-r10.ebuild 1312
-MD5 cd88d9d166a43c34aa105b4bc884a1fa metalog-0.6-r11.ebuild 1336
-MD5 fc1f0f6ac446890f582b15af13e8a013 metalog-0.7-r1.ebuild 1399
-MD5 672a657106260d70d1307a3fe6c7a943 metalog-0.7.ebuild 1368
+MD5 9c12dddc3cfb6759575547669bb3ef0d metalog-0.6-r10.ebuild 1203
+MD5 9a4aa235ad80e7d51de042e4538677f8 metalog-0.7.ebuild 1278
+MD5 d74c27be835e3499db68902d45e63853 metalog-0.6-r11.ebuild 1235
+MD5 52029e3a1fa041816d574142472a674d metalog-0.7-r1.ebuild 1312
 MD5 2a4834a861e0ed954124316c2a0ad8e9 files/consolelog.sh 191
 MD5 a25ad551b1c77f423d1de78425f1b0ad files/digest-metalog-0.6-r10 63
-MD5 a25ad551b1c77f423d1de78425f1b0ad files/digest-metalog-0.6-r11 63
-MD5 ab769042aa4721d0ac745943e00c70e4 files/digest-metalog-0.7 63
-MD5 ab769042aa4721d0ac745943e00c70e4 files/digest-metalog-0.7-r1 63
 MD5 3e19c05da6bed4a092412095406b0bda files/metalog-0.6-gentoo.patch 3252
 MD5 190c71684001202740eb31821945595c files/metalog.conf 1714
 MD5 83efa326f58d568d66a3506852aa9528 files/metalog.confd 512
 MD5 5dbc35025f97a8cc6b9a9b1d5137c371 files/metalog.rc6 668
+MD5 ab769042aa4721d0ac745943e00c70e4 files/digest-metalog-0.7 63
+MD5 a25ad551b1c77f423d1de78425f1b0ad files/digest-metalog-0.6-r11 63
+MD5 ab769042aa4721d0ac745943e00c70e4 files/digest-metalog-0.7-r1 63
diff --git a/app-admin/metalog/metalog-0.6-r10.ebuild b/app-admin/metalog/metalog-0.6-r10.ebuild
index d5b1170d1833..8d98aa19adf0 100644
--- a/app-admin/metalog/metalog-0.6-r10.ebuild
+++ b/app-admin/metalog/metalog-0.6-r10.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-admin/metalog/metalog-0.6-r10.ebuild,v 1.16 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.6-r10.ebuild,v 1.17 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="A highly configurable replacement for syslogd/klogd"
 SRC_URI="mirror://sourceforge/metalog/${P}.tar.gz"
@@ -15,15 +15,13 @@ DEPEND=">=dev-libs/libpcre-3.4"
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	# adds a pidfile option.  NiCE aeoo! :)
-	patch -p1 < ${FILESDIR}/metalog-0.6-gentoo.patch || die
+	epatch ${FILESDIR}/${P}-gentoo.patch
 	cd ${S}/src
-	mv metalog.h metalog.h.orig
-	sed -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
-		metalog.h.orig > metalog.h
+	sed -i -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
+		metalog.h
 	cd ${S}/man
-	mv metalog.8 metalog.8.orig
-	sed -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
-		metalog.8.orig > metalog.8
+	sed -i -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
+		metalog.8
 }
 
 src_compile() {
diff --git a/app-admin/metalog/metalog-0.6-r11.ebuild b/app-admin/metalog/metalog-0.6-r11.ebuild
index f11f5ad02457..0f708144dedd 100644
--- a/app-admin/metalog/metalog-0.6-r11.ebuild
+++ b/app-admin/metalog/metalog-0.6-r11.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-admin/metalog/metalog-0.6-r11.ebuild,v 1.1 2003/09/17 22:28:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.6-r11.ebuild,v 1.2 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="A highly configurable replacement for syslogd/klogd"
 SRC_URI="mirror://sourceforge/metalog/${P}.tar.gz"
@@ -17,15 +17,13 @@ PROVIDE="virtual/logger"
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	# adds a pidfile option.  NiCE aeoo! :)
-	patch -p1 < ${FILESDIR}/metalog-0.6-gentoo.patch || die
+	epatch ${FILESDIR}/metalog-0.6-gentoo.patch
 	cd ${S}/src
-	mv metalog.h metalog.h.orig
-	sed -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
-		metalog.h.orig > metalog.h
+	sed -i -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
+		metalog.h
 	cd ${S}/man
-	mv metalog.8 metalog.8.orig
-	sed -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
-		metalog.8.orig > metalog.8
+	sed -i -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
+		metalog.8
 }
 
 src_compile() {
diff --git a/app-admin/metalog/metalog-0.7-r1.ebuild b/app-admin/metalog/metalog-0.7-r1.ebuild
index fff975f74651..02cd1fb22e1a 100644
--- a/app-admin/metalog/metalog-0.7-r1.ebuild
+++ b/app-admin/metalog/metalog-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-admin/metalog/metalog-0.7-r1.ebuild,v 1.2 2003/09/18 21:52:38 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.7-r1.ebuild,v 1.3 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="A highly configurable replacement for syslogd/klogd"
 SRC_URI="mirror://sourceforge/metalog/${P}.tar.gz"
@@ -17,13 +17,11 @@ PROVIDE="virtual/logger"
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	cd ${S}/src
-	mv metalog.h metalog.h.orig
-	sed -e "s:/metalog.conf:/metalog/metalog.conf:g" \
-		metalog.h.orig > metalog.h
+	sed -i -e "s:/metalog.conf:/metalog/metalog.conf:g" \
+		metalog.h
 	cd ${S}/man
-	mv metalog.8 metalog.8.orig
-	sed -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
-		metalog.8.orig > metalog.8
+	sed -i -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
+		metalog.8
 }
 
 src_compile() {
diff --git a/app-admin/metalog/metalog-0.7.ebuild b/app-admin/metalog/metalog-0.7.ebuild
index 63aabcebdb44..bb7c2b0817dc 100644
--- a/app-admin/metalog/metalog-0.7.ebuild
+++ b/app-admin/metalog/metalog-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-admin/metalog/metalog-0.7.ebuild,v 1.3 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.7.ebuild,v 1.4 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="A highly configurable replacement for syslogd/klogd"
 SRC_URI="mirror://sourceforge/metalog/${P}.tar.gz"
@@ -15,13 +15,11 @@ DEPEND=">=dev-libs/libpcre-3.4"
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	cd ${S}/src
-	mv metalog.h metalog.h.orig
-	sed -e "s:/metalog.conf:/metalog/metalog.conf:g" \
-		metalog.h.orig > metalog.h
+	sed -i -e "s:/metalog.conf:/metalog/metalog.conf:g" \
+		metalog.h
 	cd ${S}/man
-	mv metalog.8 metalog.8.orig
-	sed -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
-		metalog.8.orig > metalog.8
+	sed -i -e "s:/etc/metalog.conf:/etc/metalog/metalog.conf:g" \
+		metalog.8
 }
 
 src_compile() {
diff --git a/app-admin/msyslog/Manifest b/app-admin/msyslog/Manifest
index 3bf2eeb1ced3..bd71ed170c9c 100644
--- a/app-admin/msyslog/Manifest
+++ b/app-admin/msyslog/Manifest
@@ -1,5 +1,5 @@
 MD5 ef732fe6159bbafe53ee0a6a27cd04f3 ChangeLog 2448
-MD5 cd9dc0046642bb739faa096ce9310736 msyslog-1.09a-r1.ebuild 2114
+MD5 100d6fdc437bf674116a6580a84aeb4d msyslog-1.09a-r1.ebuild 2103
 MD5 abc972b32ebeb711717856368d6eebd8 files/digest-msyslog-1.09a-r1 69
 MD5 2edcd203cb92257f4628ecc2e05520c7 files/msyslog-1.09a-gentoo.diff 4304
 MD5 ca890f415d810ad3a89d6101eeba95ec files/msyslog-confd 304
diff --git a/app-admin/msyslog/msyslog-1.09a-r1.ebuild b/app-admin/msyslog/msyslog-1.09a-r1.ebuild
index e714e2353f65..d8cf8c6a8269 100644
--- a/app-admin/msyslog/msyslog-1.09a-r1.ebuild
+++ b/app-admin/msyslog/msyslog-1.09a-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-admin/msyslog/msyslog-1.09a-r1.ebuild,v 1.2 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/msyslog-1.09a-r1.ebuild,v 1.3 2003/09/23 20:20:55 aliz Exp $
 
 IUSE="postgres mysql"
 
@@ -28,7 +28,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	# fix paths for pidfile, config file, libdir, logdir...
-	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die
+	epatch ${FILESDIR}/${P}-gentoo.diff
 }
 
 src_compile() {
diff --git a/app-admin/newsyslog/Manifest b/app-admin/newsyslog/Manifest
index 08dbfe690047..38f43b5f9bef 100644
--- a/app-admin/newsyslog/Manifest
+++ b/app-admin/newsyslog/Manifest
@@ -1,4 +1,4 @@
 MD5 692a13b5c8b17d3bef9b954f87b18cb8 ChangeLog 448
-MD5 e0e6b9e7174d4de8c685f8128ab7f3fb newsyslog-1.0.103.ebuild 1119
-MD5 fd8d6af0b03e473d583706a656566127 files/digest-newsyslog-1.0.103 61
+MD5 31b7793f25f365732119fbab323b885f newsyslog-1.0.103.ebuild 1099
 MD5 3ead41144e79173c79f70ac7f83d4c39 files/newsyslog-html.patch 589
+MD5 481746f23b0ca7fd8a696c0f7197e611 files/digest-newsyslog-1.0.103 69
diff --git a/app-admin/newsyslog/files/digest-newsyslog-1.0.103 b/app-admin/newsyslog/files/digest-newsyslog-1.0.103
index 4e0a268e01c5..cd3a7d5df351 100644
--- a/app-admin/newsyslog/files/digest-newsyslog-1.0.103
+++ b/app-admin/newsyslog/files/digest-newsyslog-1.0.103
@@ -1 +1 @@
-MD5 b86f1f1228960fed4e6631b1d9739cec newsyslog.tar.gz 142759
+MD5 b86f1f1228960fed4e6631b1d9739cec newsyslog-1.0.103.tar.gz 142759
diff --git a/app-admin/newsyslog/newsyslog-1.0.103.ebuild b/app-admin/newsyslog/newsyslog-1.0.103.ebuild
index 512e8564da2e..4b6bb4950097 100644
--- a/app-admin/newsyslog/newsyslog-1.0.103.ebuild
+++ b/app-admin/newsyslog/newsyslog-1.0.103.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/newsyslog/newsyslog-1.0.103.ebuild,v 1.6 2003/09/17 22:29:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/newsyslog/newsyslog-1.0.103.ebuild,v 1.7 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="An enhanced version of newsyslog originally written by Theodore Ts'o"
 HOMEPAGE="http://www.weird.com/~woods/projects/newsyslog.html"
-SRC_URI="ftp://ftp.weird.com/pub/local/newsyslog.tar.gz"
+SRC_URI="ftp://ftp.weird.com/pub/local/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
@@ -16,7 +16,7 @@ RDEPEND="virtual/cron
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
-	patch -p1 < ${FILESDIR}/newsyslog-html.patch || die
+	epatch ${FILESDIR}/newsyslog-html.patch
 }
 
 src_compile() {
diff --git a/app-admin/osiris/Manifest b/app-admin/osiris/Manifest
index b58de714742f..3cffdb9b6d00 100644
--- a/app-admin/osiris/Manifest
+++ b/app-admin/osiris/Manifest
@@ -1,5 +1,5 @@
 MD5 215e618fc5a443c42801635ccdaaa3e7 ChangeLog 736
-MD5 29b4a2206b04199e4dfe794b02bfdbff osiris-1.5.1b.ebuild 1407
-MD5 bff886327611579955e67fdaf7a0e4dc osiris-1.5.2.ebuild 1407
+MD5 a991cd8b1ff25335ce6aa4c4e9dd2f9f osiris-1.5.1b.ebuild 1296
+MD5 fc593cf46fd958773e247cbedc6fe767 osiris-1.5.2.ebuild 1296
 MD5 c7b045dea619bd3050052a07c64ef24e files/digest-osiris-1.5.1b 65
 MD5 6f6df8ce6e4231c6c1c4ceeca6efafa4 files/digest-osiris-1.5.2 64
diff --git a/app-admin/osiris/osiris-1.5.1b.ebuild b/app-admin/osiris/osiris-1.5.1b.ebuild
index 7ffbe97d8c9d..03fc92293a6a 100644
--- a/app-admin/osiris/osiris-1.5.1b.ebuild
+++ b/app-admin/osiris/osiris-1.5.1b.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-admin/osiris/osiris-1.5.1b.ebuild,v 1.5 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-1.5.1b.ebuild,v 1.6 2003/09/23 20:20:55 aliz Exp $
 
 
 DESCRIPTION="File integrity verification system"
@@ -30,9 +30,8 @@ src_compile() {
 	# The mysql module searches for the mysql.h file in the wrong place
 	# sed line replaces it with the proper path (mysql/mysql.h)
 
-	cp ${S}/src/modules/module_mysql.c ${S}/src/modules/module_mysql.c.old
-	use mysql && sed -e "s:mysql.h:mysql/mysql.h:" \
-				${S}/src/modules/module_mysql.c.old > ${S}/src/modules/module_mysql.c
+	use mysql && sed -i -e "s:mysql.h:mysql/mysql.h:" \
+				${S}/src/modules/module_mysql.c
 
 	./configure \
 		--host=${CHOST} \
diff --git a/app-admin/osiris/osiris-1.5.2.ebuild b/app-admin/osiris/osiris-1.5.2.ebuild
index 27989c4e67e9..4f2e9bf0cc17 100644
--- a/app-admin/osiris/osiris-1.5.2.ebuild
+++ b/app-admin/osiris/osiris-1.5.2.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-admin/osiris/osiris-1.5.2.ebuild,v 1.2 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/osiris/osiris-1.5.2.ebuild,v 1.3 2003/09/23 20:20:55 aliz Exp $
 
 
 DESCRIPTION="File integrity verification system"
@@ -30,9 +30,8 @@ src_compile() {
 	# The mysql module searches for the mysql.h file in the wrong place
 	# sed line replaces it with the proper path (mysql/mysql.h)
 
-	cp ${S}/src/modules/module_mysql.c ${S}/src/modules/module_mysql.c.old
-	use mysql && sed -e "s:mysql.h:mysql/mysql.h:" \
-				${S}/src/modules/module_mysql.c.old > ${S}/src/modules/module_mysql.c
+	use mysql && sed -i -e "s:mysql.h:mysql/mysql.h:" \
+				${S}/src/modules/module_mysql.c
 
 	./configure \
 		--host=${CHOST} \
diff --git a/app-admin/passook/Manifest b/app-admin/passook/Manifest
index 7baa7716b5c4..b1a101e8f041 100644
--- a/app-admin/passook/Manifest
+++ b/app-admin/passook/Manifest
@@ -1,4 +1,4 @@
 MD5 38b59046a7fc4b8aec761b78921532d4 ChangeLog 765
-MD5 920c09e4e18d8e1e54f3c559247feb10 passook-1.0.0.ebuild 710
+MD5 ddceada67265c2e47fc16189a7e68fa7 passook-1.0.0.ebuild 698
 MD5 5db7ef9bcc7e703f3d1c38294506d8c3 files/digest-passook-1.0.0 57
 MD5 dea799398b05ab4dc9782c51ad3b316f files/passook.diff 663
diff --git a/app-admin/passook/passook-1.0.0.ebuild b/app-admin/passook/passook-1.0.0.ebuild
index e1a12eb7636e..c9be12a6db8a 100644
--- a/app-admin/passook/passook-1.0.0.ebuild
+++ b/app-admin/passook/passook-1.0.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-admin/passook/passook-1.0.0.ebuild,v 1.11 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/passook/passook-1.0.0.ebuild,v 1.12 2003/09/23 20:20:55 aliz Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Password generator capable of generating pronounceable and/or secure passwords."
@@ -19,7 +19,7 @@ DEPEND="dev-lang/perl
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p0 < ${FILESDIR}/passook.diff || die
+	epatch ${FILESDIR}/passook.diff
 }
 
 src_install() {
diff --git a/app-admin/petrovich/Manifest b/app-admin/petrovich/Manifest
index cbc9a0dfccaa..dd098999684b 100644
--- a/app-admin/petrovich/Manifest
+++ b/app-admin/petrovich/Manifest
@@ -1,5 +1,5 @@
 MD5 7e7f0c434a22cbec27b8121e1ad2cf64 ChangeLog 915
-MD5 e012304370072d937dccb45ecdfec75c petrovich-1.0.0.ebuild 756
+MD5 b905221cad835b1fcd152924facb1c3c petrovich-1.0.0.ebuild 751
 MD5 4ad2bc1c3193d65ab0ce4fe5c4a7d498 files/digest-petrovich-1.0.0 66
 MD5 01fd0ea51051bba336541cd62abbdde7 files/petrovich-1.0.0-gentoo.diff 1156
 MD5 918c34c936df186b11a213476167df78 files/petrovich.conf 135
diff --git a/app-admin/petrovich/petrovich-1.0.0.ebuild b/app-admin/petrovich/petrovich-1.0.0.ebuild
index 835a124e2127..8a6f172675be 100644
--- a/app-admin/petrovich/petrovich-1.0.0.ebuild
+++ b/app-admin/petrovich/petrovich-1.0.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-admin/petrovich/petrovich-1.0.0.ebuild,v 1.16 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/petrovich/petrovich-1.0.0.ebuild,v 1.17 2003/09/23 20:20:55 aliz Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Filesystem Integrity Checker"
@@ -16,7 +16,7 @@ DEPEND="dev-perl/Digest-MD5"
 src_unpack () {
 	unpack ${A}
 	cd ${WORKDIR}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	epatch ${FILESDIR}/${PF}-gentoo.diff
 }
 
 src_install() {
diff --git a/app-admin/powertweak/Manifest b/app-admin/powertweak/Manifest
index 9d2023161f55..d670fdc2296b 100644
--- a/app-admin/powertweak/Manifest
+++ b/app-admin/powertweak/Manifest
@@ -1,5 +1,5 @@
 MD5 fb94c498a6ea81ebd7eb6ea534232990 ChangeLog 1751
-MD5 dbffee6ac057b5bb63e5038233a62396 powertweak-0.99.4.ebuild 1558
+MD5 95a61c71ba7982f5e3d3912a25ae4aa1 powertweak-0.99.4.ebuild 1512
 MD5 ec8c1bce83a92027ba4e413a6bd684c4 powertweak-0.99.5.ebuild 1035
 MD5 186537e6997431efc00728e2c4a24229 files/digest-powertweak-0.99.4 70
 MD5 1905168a8b57ae19ab4a2dfe41fddbb4 files/powertweak-0.99.4-gentoo.diff 2417
diff --git a/app-admin/powertweak/powertweak-0.99.4.ebuild b/app-admin/powertweak/powertweak-0.99.4.ebuild
index a5606b429715..37f363b20d54 100644
--- a/app-admin/powertweak/powertweak-0.99.4.ebuild
+++ b/app-admin/powertweak/powertweak-0.99.4.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-admin/powertweak/powertweak-0.99.4.ebuild,v 1.7 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.99.4.ebuild,v 1.8 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="tune your kernel and hardware settings for optimal performance"
 SRC_URI="mirror://sourceforge/powertweak/${P}.tar.bz2"
@@ -29,10 +29,9 @@ 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}:" \
+		sed -i -e "s:\(^CFLAGS =.*\):\1 ${CFLAGS}:" \
 			-e "s:\(^CPPFLAGS =.*\):\1 ${CPPFLAGS}:" \
-			${FILE}.hacked > ${FILE} || die "Hack failed"
+			${FILE} || die "Hack failed"
 	done
 }
 
diff --git a/app-admin/qtsvc/Manifest b/app-admin/qtsvc/Manifest
index c268859ef2eb..3158be265fd1 100644
--- a/app-admin/qtsvc/Manifest
+++ b/app-admin/qtsvc/Manifest
@@ -1,4 +1,4 @@
 MD5 4497f46bea467bc8eaccdc19a3151fb7 ChangeLog 753
-MD5 9b40a99cef10c274e3086b05cb204a58 qtsvc-0.1-r1.ebuild 834
+MD5 204bd0997dcf6ba8c89ba83ff887d690 qtsvc-0.1-r1.ebuild 818
 MD5 dddef6718c96525ca39fcd489495d240 files/digest-qtsvc-0.1-r1 61
 MD5 51950d81d264f778df8ec9ab2145f853 files/qtsvc-0.1.diff 2914
diff --git a/app-admin/qtsvc/qtsvc-0.1-r1.ebuild b/app-admin/qtsvc/qtsvc-0.1-r1.ebuild
index cbf81fa8ca98..4929842c32ff 100644
--- a/app-admin/qtsvc/qtsvc-0.1-r1.ebuild
+++ b/app-admin/qtsvc/qtsvc-0.1-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-admin/qtsvc/qtsvc-0.1-r1.ebuild,v 1.16 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/qtsvc/qtsvc-0.1-r1.ebuild,v 1.17 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="A QT frontend for svc"
 SRC_URI="http://www.together.net/~plomp/${P}.tar.gz"
@@ -16,7 +16,7 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
-	patch -p0 < ${FILESDIR}/qtsvc-0.1.diff || die
+	epatch ${FILESDIR}/qtsvc-0.1.diff
 }
 
 src_compile() {
diff --git a/app-admin/sxid/Manifest b/app-admin/sxid/Manifest
index 80ab3227ef2e..2559501e1b03 100644
--- a/app-admin/sxid/Manifest
+++ b/app-admin/sxid/Manifest
@@ -1,3 +1,3 @@
-MD5 d6f1819b2a932dded8bf8054cd14a7ff files/digest-sxid-4.0.2 61
-MD5 7ca02338f201261abf9385b329c878de sxid-4.0.2.ebuild 954
 MD5 2a1e1e97967e92922e98e13ffbfecb10 ChangeLog 549
+MD5 6f252d4ef58b34b77a77e685362bbd42 sxid-4.0.2.ebuild 902
+MD5 d6f1819b2a932dded8bf8054cd14a7ff files/digest-sxid-4.0.2 61
diff --git a/app-admin/sxid/sxid-4.0.2.ebuild b/app-admin/sxid/sxid-4.0.2.ebuild
index 53d29133ecc3..db3649982e27 100644
--- a/app-admin/sxid/sxid-4.0.2.ebuild
+++ b/app-admin/sxid/sxid-4.0.2.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-admin/sxid/sxid-4.0.2.ebuild,v 1.6 2003/06/29 15:24:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sxid/sxid-4.0.2.ebuild,v 1.7 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="suid, sgid file and directory checking"
 SRC_URI="http://www.phunnypharm.org/pub/sxid/${P/-/_}.tar.gz"
@@ -16,8 +16,7 @@ src_compile() {
 	# this is an admin application and really requires root to run correctly
 	# we need to move the binary to the sbin directory
 	cd source
-	sed s/bindir/sbindir/g < Makefile.in > Makefile.in.new
-	mv -f Makefile.in.new Makefile.in
+	sed -i s/bindir/sbindir/g Makefile.in
 	cd ..
 
 	econf
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index afefbdc7aae2..7fb33fd80af9 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1,14 +1,14 @@
 MD5 97f2a4cc5ee973c7597c0584a00abd24 ChangeLog 3321
-MD5 8cd008a1787a436fd203864654680aff sysklogd-1.4.1-r7.ebuild 1200
-MD5 31b4f39133b88255f0b4998790f951a5 sysklogd-1.4.1-r8.ebuild 1321
+MD5 8bacf3b212ce16c730ccec11dfa41d95 sysklogd-1.4.1-r7.ebuild 1157
+MD5 ec33f65ddf32f64755b0bba29d53708d sysklogd-1.4.1-r8.ebuild 1278
 MD5 664d561152badcc03d47dab13e493725 sysklogd-1.4.1-r9.ebuild 1324
-MD5 01d7ea5644c29972a910ab27e3ab4738 files/digest-sysklogd-1.4.1-r7 65
-MD5 01d7ea5644c29972a910ab27e3ab4738 files/digest-sysklogd-1.4.1-r8 65
 MD5 e25d7b583b7e4bd8be503b89e1771e90 files/sysklogd.confd 113
 MD5 59219c3af9de241b92b3fd786c84f483 files/sysklogd.rc6 1007
 MD5 4ebbba13c01a5c6df2d787a01a658b24 files/syslog-cron 709
 MD5 a4ca2a78eecd855928cc313d7c243819 files/syslog.conf 2332
 MD5 39526162728783b83aabc6754a6df208 files/syslogd-listfiles 2759
 MD5 5d4b89ceb689887a6cbb582b875bf3e7 files/syslogd-listfiles.8 2540
-MD5 01d7ea5644c29972a910ab27e3ab4738 files/digest-sysklogd-1.4.1-r9 65
+MD5 01d7ea5644c29972a910ab27e3ab4738 files/digest-sysklogd-1.4.1-r7 65
+MD5 01d7ea5644c29972a910ab27e3ab4738 files/digest-sysklogd-1.4.1-r8 65
 MD5 e1376d40e02cf8026882cd4451267fed files/sysklogd-1.4.1-SO_BSDCOMPAT.patch 2523
+MD5 01d7ea5644c29972a910ab27e3ab4738 files/digest-sysklogd-1.4.1-r9 65
diff --git a/app-admin/sysklogd/sysklogd-1.4.1-r7.ebuild b/app-admin/sysklogd/sysklogd-1.4.1-r7.ebuild
index a99373065b69..c6fc62625c4d 100644
--- a/app-admin/sysklogd/sysklogd-1.4.1-r7.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.4.1-r7.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-admin/sysklogd/sysklogd-1.4.1-r7.ebuild,v 1.1 2003/09/17 22:27:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.4.1-r7.ebuild,v 1.2 2003/09/23 20:20:55 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard log daemons"
@@ -19,8 +19,7 @@ PROVIDE="virtual/logger"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s:-O3:${CFLAGS}:" Makefile.orig > Makefile
+	sed -i -e "s:-O3:${CFLAGS}:" Makefile
 }
 
 src_compile() {
diff --git a/app-admin/sysklogd/sysklogd-1.4.1-r8.ebuild b/app-admin/sysklogd/sysklogd-1.4.1-r8.ebuild
index 6af16c72b508..d8e3e626d3e5 100644
--- a/app-admin/sysklogd/sysklogd-1.4.1-r8.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.4.1-r8.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-admin/sysklogd/sysklogd-1.4.1-r8.ebuild,v 1.1 2003/09/17 22:27:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.4.1-r8.ebuild,v 1.2 2003/09/23 20:20:55 aliz Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Standard log daemons"
@@ -20,8 +20,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s:-O3:${CFLAGS}:" Makefile.orig > Makefile
+	sed -i -e "s:-O3:${CFLAGS}:" Makefile
 
 	# Handle SO_BSDCOMPAT being depricated in 2.5+ kernels.
 	cd ${S}; epatch ${FILESDIR}/${P}-SO_BSDCOMPAT.patch
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 07b9625c25bc..56efb595c850 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,5 +1,5 @@
+MD5 8ea733ff6c67e675da9215e3fd73fe28 ChangeLog 1216
+MD5 a3ede706709d60941c69fa9dffb5e31b sysstat-3.3.6-r1.ebuild 939
+MD5 d3f383ee9d4b68bb41de012121ba8cfa sysstat-4.0.7.ebuild 1023
 MD5 6d8c047307b59fea566a7d61b52c12e5 files/digest-sysstat-3.3.6-r1 64
 MD5 6d9a61061bc468e70100ba366eb4515a files/digest-sysstat-4.0.7 65
-MD5 e79608d9f1649d1f1f847400c293c76d sysstat-3.3.6-r1.ebuild 1033
-MD5 d3f383ee9d4b68bb41de012121ba8cfa sysstat-4.0.7.ebuild 1023
-MD5 8ea733ff6c67e675da9215e3fd73fe28 ChangeLog 1216
diff --git a/app-admin/sysstat/sysstat-3.3.6-r1.ebuild b/app-admin/sysstat/sysstat-3.3.6-r1.ebuild
index 1454a0048467..be10e05fe631 100644
--- a/app-admin/sysstat/sysstat-3.3.6-r1.ebuild
+++ b/app-admin/sysstat/sysstat-3.3.6-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-admin/sysstat/sysstat-3.3.6-r1.ebuild,v 1.12 2003/02/13 05:31:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-3.3.6-r1.ebuild,v 1.13 2003/09/23 20:20:55 aliz Exp $
 
 DESCRIPTION="System performance tools for Linux"
 SRC_URI="http://www.ibiblio.org/pub/Linux/system/status/${P}.tar.gz"
@@ -17,14 +17,12 @@ RDEPEND="nls? ( sys-devel/gettext )"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile
 }
 
 src_compile() {
 	yes "" | make config
-	cp build/CONFIG build/CONFIG.orig
-	use nls || sed 's/\(ENABLE_NLS\ =\ \)y/\1n/g' build/CONFIG.orig > build/CONFIG
+	use nls || sed -i 's/\(ENABLE_NLS\ =\ \)y/\1n/g' build/CONFIG
 	make PREFIX=/usr || die
 }