sed and epatch updates

30 files changed, 82 insertions, 91 deletions

diff --git a/app-admin/bastille/ChangeLog b/app-admin/bastille/ChangeLog
index 530f7d0269ef..a52b66feea83 100644
--- a/app-admin/bastille/ChangeLog
+++ b/app-admin/bastille/ChangeLog
@@ -1,8 +1,8 @@
 # ChangeLog for app-admin/bastille
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/ChangeLog,v 1.1 2003/09/18 23:56:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/ChangeLog,v 1.2 2003/09/26 20:45:47 aliz Exp $
 
-*bastille-2.1.1 (17 Sep 2003)
+*bastille-2.1.1-r1 (17 Sep 2003)
 
   17 Sep 2003; Seemant Kulleen <seemant@gentoo.org> bastille-2.1.1.ebuild,
   metadata.xml:
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
index b4771654b38c..3c03d63ff609 100644
--- a/app-admin/bastille/Manifest
+++ b/app-admin/bastille/Manifest
@@ -1,6 +1,6 @@
-MD5 1b44f1b1ca25c306324078b603a1ca08 bastille-2.1.1.ebuild 3094
+MD5 4bc1e2aad8cc80e001baa39cf285583e ChangeLog 1286
 MD5 cb5441a1e97abcdd0ea1520b9562ae9c bastille-2.1.1-r1.ebuild 2404
-MD5 137fefe9fe4182cc6a5c9e7c138d27de ChangeLog 1286
+MD5 1b44f1b1ca25c306324078b603a1ca08 bastille-2.1.1.ebuild 3094
 MD5 624441f5e21afa19251eedc583e0c4e7 metadata.xml 433
-MD5 5952693da32f1292a5b6013e8e755799 files/digest-bastille-2.1.1-r1 146
 MD5 5952693da32f1292a5b6013e8e755799 files/digest-bastille-2.1.1 146
+MD5 5952693da32f1292a5b6013e8e755799 files/digest-bastille-2.1.1-r1 146
diff --git a/app-admin/logsentry/ChangeLog b/app-admin/logsentry/ChangeLog
index 07c02a950779..f68e59d9a368 100644
--- a/app-admin/logsentry/ChangeLog
+++ b/app-admin/logsentry/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-admin/logsentry
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logsentry/ChangeLog,v 1.7 2003/06/09 21:07:40 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logsentry/ChangeLog,v 1.8 2003/09/26 20:45:47 aliz Exp $
 
   09 Jun 2003; <msterret@gentoo.org> logsentry-1.1.1.ebuild:
   DEPEND on sed >=4; use sed -i; fix SRC_URI and comment out HOMEPAGE since
@@ -9,7 +9,7 @@
   07 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> logsentry-1.1.1.ebuild :
   Updated dependencies, closes #13332.
 
-*logsentry-1.1.1 (27 Sept. 2002)
+*logsentry-1.1.1 (27 Sep 2002)
 
   28 Mar 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> logsentry-1.1.1 :
   Moved to stable on ppc
diff --git a/app-admin/logsentry/Manifest b/app-admin/logsentry/Manifest
index e759427bd0e4..350827906669 100644
--- a/app-admin/logsentry/Manifest
+++ b/app-admin/logsentry/Manifest
@@ -1,3 +1,3 @@
-MD5 d7c1c08406db1625940407907ee462e5 ChangeLog 860
+MD5 31c984832af1d10a8004095c56231af6 ChangeLog 854
 MD5 b7181e5461ba6bca73da1d1c9cd5c42f logsentry-1.1.1.ebuild 1569
 MD5 03f9002c435a60fa69ed010578e34fd7 files/digest-logsentry-1.1.1 66
diff --git a/app-admin/metalog/ChangeLog b/app-admin/metalog/ChangeLog
index 60069e68f5e7..9fd73158e8f6 100644
--- a/app-admin/metalog/ChangeLog
+++ b/app-admin/metalog/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-admin/metalog
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.14 2003/09/17 22:28:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.15 2003/09/26 20:45:47 aliz Exp $
 
 *metalog-0.6-r11 (17 Sep 2003)
 
@@ -8,6 +8,8 @@
   metalog-0.7-r1.ebuild:
   version bump to provide virtual/logger
 
+*metalog-0.7-r1 (17 Sep 2003)
+
 *metalog-0.7 (12 Jun 2003)
 
   12 Jun 2003; Chris PeBenito <pebenito@gentoo.org> metalog-0.7.ebuild,
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index d8f0e7428fdd..f92cbf3d256c 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -1,4 +1,4 @@
-MD5 8fc988be782f791e720899c0748ec7b7 ChangeLog 2311
+MD5 a668553edcf18de0a3c98afbfce891d1 ChangeLog 2339
 MD5 9c12dddc3cfb6759575547669bb3ef0d metalog-0.6-r10.ebuild 1203
 MD5 9a4aa235ad80e7d51de042e4538677f8 metalog-0.7.ebuild 1278
 MD5 d74c27be835e3499db68902d45e63853 metalog-0.6-r11.ebuild 1235
diff --git a/app-admin/otpcalc/Manifest b/app-admin/otpcalc/Manifest
index 70b6ed569a26..aaa3338d5cd3 100644
--- a/app-admin/otpcalc/Manifest
+++ b/app-admin/otpcalc/Manifest
@@ -1,4 +1,4 @@
-MD5 d133533be80e7d798fd197cda5d388c5 otpcalc-0.96.ebuild 813
 MD5 85f8833a67ebe843e65e9a48c3d17f43 ChangeLog 533
 MD5 78714bd1cdeb6709df0a6dcc4c5347ce metadata.xml 410
+MD5 7cd87d493d41ad0214f3266f76cabc4b otpcalc-0.96.ebuild 748
 MD5 1ce297d1a90353ea4e3ee49a9d21be6d files/digest-otpcalc-0.96 64
diff --git a/app-admin/otpcalc/otpcalc-0.96.ebuild b/app-admin/otpcalc/otpcalc-0.96.ebuild
index a076575744d8..150c80f336bf 100644
--- a/app-admin/otpcalc/otpcalc-0.96.ebuild
+++ b/app-admin/otpcalc/otpcalc-0.96.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/otpcalc/otpcalc-0.96.ebuild,v 1.5 2003/09/15 10:03:36 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/otpcalc/otpcalc-0.96.ebuild,v 1.6 2003/09/26 20:45:47 aliz Exp $
 
 DESCRIPTION="A One Time Password and S/Key calculator for X"
 HOMEPAGE="http://killa.net/infosec/otpCalc/"
@@ -20,12 +20,11 @@ S=${WORKDIR}/${P/c/C}
 
 src_unpack() {
 	unpack ${A}
-	sed -e "s/VERSION/${PV}/g" ${S}/otpCalc.man > ${S}/otpCalc.1
+	sed -i -e "s/VERSION/${PV}/g" ${S}/otpCalc.man
 	sed -i "s#-s -O3#${CFLAGS}#g" ${S}/Makefile.in
 }
 
 src_install() {
-	sed -e "s/VERSION/${PV}/g" ${S}/otpCalc.man > ${S}/otpCalc.1
-	doman otpCalc.1
+	newman otpCalc.man otpCalc.1
 	dobin otpCalc
 }
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 7549ff39c626..8150fad7f2c0 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,4 +1,4 @@
-MD5 103f9713efd223804dff8f0237c7b40a setools-20030609.ebuild 2956
-MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505
 MD5 5adc255c47fbf2e805d9261e3d1810f5 ChangeLog 448
+MD5 5f0bba1204f85bb7e7bc3bd887ba4d43 setools-20030609.ebuild 2472
+MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505
 MD5 452654a1740a7defb4b5a8b2644c8285 files/digest-setools-20030609 65
diff --git a/app-admin/setools/setools-20030609.ebuild b/app-admin/setools/setools-20030609.ebuild
index 75fd6710b9cc..19f29ad0298a 100644
--- a/app-admin/setools/setools-20030609.ebuild
+++ b/app-admin/setools/setools-20030609.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/setools/setools-20030609.ebuild,v 1.3 2003/09/23 01:41:03 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-20030609.ebuild,v 1.4 2003/09/26 20:45:47 aliz Exp $
 
 DESCRIPTION="SELinux graphical policy tools"
 HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
@@ -23,26 +23,20 @@ RDEPEND="dev-lang/tk
 src_compile() {
 	# fix stupid hard-coded paths
 	cd ${S}/libapol
-	sed -e 's:local/::g' < apol_tcl.h > apol_tcl.h.new
-	mv -f apol_tcl.h.new apol_tcl.h
+	sed -i -e 's:local/::g' apol_tcl.h
 	cd ${S}/apol
-	sed -e 's:local/selinux/::' < head.tcl > head.tcl.new
-	mv -f head.tcl.new head.tcl
+	sed -i -e 's:local/selinux/::' head.tcl
 	cd ${S}/sepct
-	sed -e 's:local/::g' < top.tcl > top.tcl.new
-	mv -f top.tcl.new top.tcl
+	sed -i -e 's:local/::g' top.tcl
 	cd ${S}/seuser
-	sed -e 's:local/selinux/::' < seuser_head.tcl > seuser_head.tcl.new
-	mv -f seuser_head.tcl.new seuser_head.tcl
-	sed -e "s:/etc/security/selinux/src/policy/users:${POLICYDIR}/users:" \
+	sed -i -e 's:local/selinux/::' seuser_head.tcl
+	sed -i -e "s:/etc/security/selinux/src/policy/users:${POLICYDIR}/users:" \
 		-e "s:/etc/security/selinux/src/policy$:${POLICYDIR}:" \
-			< seuser.conf > seuser.conf.new
-	mv -f seuser.conf.new seuser.conf
+		seuser.conf
 	cd ${S}
 
 	# fix the Makefile to listen to portage CFLAGS
-	sed -e 's:-g:$(EXTRA_CFLAGS):' < Makefile > Makefile.new
-	mv -f Makefile.new Makefile
+	sed -i -e 's:-g:$(EXTRA_CFLAGS):' Makefile
 
 	# adjust for tcl/tk versions
 	has_version '>=dev-lang/tk-8.4' && \
@@ -56,18 +50,14 @@ src_compile() {
 		# fix up the scripts we're going to install
 		cd ${S}/seuser
 
-		sed -e 's:local/selinux/::g' < seuseradd > seuseradd.new
-		sed -e 's:local/selinux/::g' < seuserdel > seuserdel.new
-		sed -e 's:local/selinux/::g' < seusermod > seusermod.new
-		mv -f seuseradd.new seuseradd
-		mv -f seuserdel.new seuserdel
-		mv -f seusermod.new seusermod
+		sed -i -e 's:local/selinux/::g' seuseradd
+		sed -i -e 's:local/selinux/::g' seuserdel
+		sed -i -e 's:local/selinux/::g' seusermod
 
 		# fix up the file contexts
 		cd ${S}/policy
-		sed -e 's:local/selinux/::' -e 's:local/::' \
-			< seuser.fc > seuser.fc.new
-		mv -f seuser.fc.new seuser.fc
+		sed -i -e 's:local/selinux/::' -e 's:local/::' \
+			seuser.fc
 	fi
 }
 
diff --git a/app-admin/sysklogd/ChangeLog b/app-admin/sysklogd/ChangeLog
index d994d39ad3e7..84fee4130a91 100644
--- a/app-admin/sysklogd/ChangeLog
+++ b/app-admin/sysklogd/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-admin/sysklogd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.18 2003/09/17 22:27:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.19 2003/09/26 20:45:47 aliz Exp $
 
   17 Sep 2003; Jon Portnoy <avenj@gentoo.org> sysklog-1.4.1-r6.ebuild :
   ia64 keywords.
@@ -13,6 +13,10 @@
   sysklogd-1.4.1-r9.ebuild:
   version bump to register the virtual/logger provides
 
+*sysklogd-1.4.1-r8 (17 Sep 2003)
+
+*sysklogd-1.4.1-r7 (17 Sep 2003)
+
 *sysklogd-1.4.1-r6 (09 Sep 2003)
 
   09 Sep 2003; Martin Holzer <mholzer@gentoo.org> sysklogd-1.4.1-r6.ebuild:
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 7fb33fd80af9..21ca061e4968 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -1,4 +1,4 @@
-MD5 97f2a4cc5ee973c7597c0584a00abd24 ChangeLog 3321
+MD5 126357ac8033d8871ad235863143803a ChangeLog 3386
 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
diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index a73895bd59a5..6720e58b3e27 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.36 2003/09/17 22:27:51 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.37 2003/09/26 20:45:47 aliz Exp $
+
+*syslog-ng-1.6.0_rc3-r1 (17 Sep 2003)
 
 *syslog-ng-1.6.0_rc1-r2 (17 Sep 2003)
 
@@ -10,6 +12,8 @@
   syslog-ng-1.6.0_rc3-r1.ebuild, syslog-ng-1.6.0_rc3.ebuild:
   version bump to provide virtual/logger
 
+*syslog-ng-1.4.16-r2 (17 Sep 2003)
+
 *syslog-ng-1.4.16-r1 (12 Mar 2003)
 
   29 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> :
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index e3b15615b58b..16f8950f901e 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,11 +1,11 @@
-MD5 bb1353cabd1610c4c5e3dcc9f800cfe7 syslog-ng-1.6.0_rc3-r1.ebuild 2070
-MD5 e842163b9f78e2bbb688e5b30e5d932e syslog-ng-1.4.16-r2.ebuild 1297
+MD5 c5d6eb41da485360a6dcbb404201df01 ChangeLog 6933
 MD5 8a3a61ae58c2eca6eee2dbc6d4830f6c syslog-ng-1.6.0_rc1-r2.ebuild 2069
-MD5 f928da32e8e8e9cf7fe88a99ed334574 ChangeLog 6861
-MD5 e8a440e8948386dfd73e6844897d16d8 files/syslog-ng.conf.sample 3731
-MD5 50d7756f32c32672482ecf192dd69ce3 files/digest-syslog-ng-1.6.0_rc1-r2 70
+MD5 e842163b9f78e2bbb688e5b30e5d932e syslog-ng-1.4.16-r2.ebuild 1297
+MD5 bb1353cabd1610c4c5e3dcc9f800cfe7 syslog-ng-1.6.0_rc3-r1.ebuild 2070
 MD5 2f74ad6ee4a5100535a90c156a866ecd files/digest-syslog-ng-1.6.0_rc3-r1 70
-MD5 839ff13317bf86060c90e4d870c68ea4 files/digest-syslog-ng-1.4.16-r2 68
+MD5 e8a440e8948386dfd73e6844897d16d8 files/syslog-ng.conf.sample 3731
 MD5 18cdd4fe0da2cc59abe6f22363e0be69 files/syslog-ng.rc6 1208
-MD5 581c44e616907a96e8dbebde1def848d files/syslog-ng.logrotate 340
+MD5 50d7756f32c32672482ecf192dd69ce3 files/digest-syslog-ng-1.6.0_rc1-r2 70
 MD5 3616c4aa203d3e3f1fd54c773213ff9f files/syslog-ng.conf.gentoo 1066
+MD5 581c44e616907a96e8dbebde1def848d files/syslog-ng.logrotate 340
+MD5 839ff13317bf86060c90e4d870c68ea4 files/digest-syslog-ng-1.4.16-r2 68
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 56efb595c850..6ff80cdda1e9 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 fca2da3641f1f45aeca07f18b6b5d5c4 sysstat-4.0.7.ebuild 931
 MD5 6d8c047307b59fea566a7d61b52c12e5 files/digest-sysstat-3.3.6-r1 64
 MD5 6d9a61061bc468e70100ba366eb4515a files/digest-sysstat-4.0.7 65
diff --git a/app-admin/sysstat/sysstat-4.0.7.ebuild b/app-admin/sysstat/sysstat-4.0.7.ebuild
index a141bb050e69..bd387faffa81 100644
--- a/app-admin/sysstat/sysstat-4.0.7.ebuild
+++ b/app-admin/sysstat/sysstat-4.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/sysstat/sysstat-4.0.7.ebuild,v 1.4 2003/06/29 15:24:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-4.0.7.ebuild,v 1.5 2003/09/26 20:45:47 aliz Exp $
 
 DESCRIPTION="System performance tools for Linux"
 SRC_URI="http://perso.wanadoo.fr/sebastien.godard/${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
 }
 
diff --git a/app-admin/tmpwatch/Manifest b/app-admin/tmpwatch/Manifest
index 225372694aed..0d609d7a1880 100644
--- a/app-admin/tmpwatch/Manifest
+++ b/app-admin/tmpwatch/Manifest
@@ -1,5 +1,5 @@
 MD5 cf22cacbc46eb3360f9c5d56c8f73311 ChangeLog 885
-MD5 b10e3a536a1780c29245767f876a916e tmpwatch-2.8.4.ebuild 998
+MD5 dc4af209b9b90fcb92b6d3ad47d0b475 tmpwatch-2.8.4.ebuild 955
 MD5 dd13dfdc2b24d2ba9601c10cbba72b69 tmpwatch-2.9.0.ebuild 1033
 MD5 dda6f902f6f95e2696dadeecd0bfeb64 files/digest-tmpwatch-2.8.4 68
 MD5 185828eaf60e27de261fa50a676a47b6 files/digest-tmpwatch-2.9.0 68
diff --git a/app-admin/tmpwatch/tmpwatch-2.8.4.ebuild b/app-admin/tmpwatch/tmpwatch-2.8.4.ebuild
index dbd5b2b938ef..04e09d9c1b2a 100644
--- a/app-admin/tmpwatch/tmpwatch-2.8.4.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.8.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/tmpwatch/tmpwatch-2.8.4.ebuild,v 1.4 2003/06/29 15:24:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.8.4.ebuild,v 1.5 2003/09/26 20:45:47 aliz Exp $
 
 RPM_V="4"
 
@@ -22,9 +22,8 @@ src_unpack() {
 	tar zxf ${P}.tar.gz
 
 	cd ${S}
-	sed "s:..RPM_OPT_FLAGS.:${CFLAGS}:" \
-		< Makefile > Makefile.new
-	mv -f Makefile.new Makefile
+	sed -i "s:..RPM_OPT_FLAGS.:${CFLAGS}:" \
+		Makefile
 }
 
 src_compile() {
diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 5e0fa82f75c2..ee799d616c14 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.12 2003/08/28 13:41:24 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.13 2003/09/26 20:45:47 aliz Exp $
 
   28 Aug 2003; Alastair Tse <liquidx@gentoo.org> ulogd-1.01.ebuild,
   files/ulogd-1.01:
@@ -22,7 +22,7 @@
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
-*ulogd-0.97-r1,  (20 Jun 2002)
+*ulogd-0.97-r1 (20 Jun 2002)
 
   17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> ulogd-0.97-r1.ebuild :
   Added IUSE.
@@ -39,7 +39,7 @@
 
   Added a sed script to fix paths in ulogd.conf
 
-*ulogd-0.97,  (23 May 2002)
+*ulogd-0.97 (23 May 2002)
 
   24 May 2002; George Shapovalov <george@gentoo.org> Changelog :
 
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 7e2666518157..73c7e6ef1abd 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,6 +1,6 @@
-MD5 c128c2f8b82e6dd17411076eb35e8b05 ChangeLog 1457
-MD5 f278fc939d07207f5dc87b40832d89bf ulogd-0.97-r1.ebuild 1118
-MD5 c1aef7fe3a4035f21381bc3e1b4e64d4 ulogd-0.98.ebuild 1164
+MD5 85faba8ab9444e78d7b5d74fd43c4b4f ChangeLog 1450
+MD5 3d163c4f70e4233d6d1f4aa10fe4b34a ulogd-0.97-r1.ebuild 1072
+MD5 a4e290520ee38139806ab1c81bf74e41 ulogd-0.98.ebuild 1118
 MD5 94667f92497a7dae3db8e3bbf3f69b10 ulogd-1.01.ebuild 1077
 MD5 04005ad49c96b691ff84b1305379d3c8 files/digest-ulogd-0.97-r1 61
 MD5 d21cc9239b60422b448ef743edaf9560 files/ulogd 755
diff --git a/app-admin/ulogd/ulogd-0.97-r1.ebuild b/app-admin/ulogd/ulogd-0.97-r1.ebuild
index b07e9552222a..0ea0398e5d57 100644
--- a/app-admin/ulogd/ulogd-0.97-r1.ebuild
+++ b/app-admin/ulogd/ulogd-0.97-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/ulogd/ulogd-0.97-r1.ebuild,v 1.16 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-0.97-r1.ebuild,v 1.17 2003/09/26 20:45:47 aliz Exp $
 
 DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging"
 SRC_URI="ftp://ftp.netfilter.org/pub/ulogd/${P}.tar.gz"
@@ -14,8 +14,7 @@ IUSE="mysql"
 DEPEND="net-firewall/iptables"
 
 src_compile() {
-	cp ulogd.conf ulogd.conf.orig
-	sed -e "s:/usr/local/lib/:/usr/lib/:" ulogd.conf.orig > ulogd.conf
+	sed -i -e "s:/usr/local/lib/:/usr/lib/:" ulogd.conf
 
 	local myconf
 	use mysql && myconf="--with-mysql"
diff --git a/app-admin/ulogd/ulogd-0.98.ebuild b/app-admin/ulogd/ulogd-0.98.ebuild
index fef597ac3bfe..bfcf14b98d42 100644
--- a/app-admin/ulogd/ulogd-0.98.ebuild
+++ b/app-admin/ulogd/ulogd-0.98.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/ulogd/ulogd-0.98.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-0.98.ebuild,v 1.7 2003/09/26 20:45:47 aliz Exp $
 
 DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging"
 SRC_URI="ftp://ftp.netfilter.org/pub/ulogd/${P}.tar.gz"
@@ -14,8 +14,7 @@ IUSE="mysql"
 DEPEND="net-firewall/iptables"
 
 src_compile() {
-	cp ulogd.conf ulogd.conf.orig
-	sed -e "s:/usr/local/lib/:/usr/lib/:" ulogd.conf.orig > ulogd.conf
+	sed -i -e "s:/usr/local/lib/:/usr/lib/:" ulogd.conf
 
 	local myconf
 	use mysql && myconf="--with-mysql"
diff --git a/app-admin/watchfolder/Manifest b/app-admin/watchfolder/Manifest
index f0977dbb9ba0..30d2c4d8ccfd 100644
--- a/app-admin/watchfolder/Manifest
+++ b/app-admin/watchfolder/Manifest
@@ -1,3 +1,3 @@
-MD5 dc35a8413c2ac69ffc39a48998c43bad files/digest-watchfolder-0.3.1.1 71
-MD5 4c21dbba8e5d5e78a0fab93f81c4b791 watchfolder-0.3.1.1.ebuild 791
 MD5 84bd063b7cb98ade914d5b183ca69323 ChangeLog 393
+MD5 a07f53b3d9e20e5222fde1e6bfafe45c watchfolder-0.3.1.1.ebuild 752
+MD5 dc35a8413c2ac69ffc39a48998c43bad files/digest-watchfolder-0.3.1.1 71
diff --git a/app-admin/watchfolder/watchfolder-0.3.1.1.ebuild b/app-admin/watchfolder/watchfolder-0.3.1.1.ebuild
index d670219922af..70121bb25991 100644
--- a/app-admin/watchfolder/watchfolder-0.3.1.1.ebuild
+++ b/app-admin/watchfolder/watchfolder-0.3.1.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/watchfolder/watchfolder-0.3.1.1.ebuild,v 1.3 2003/06/29 15:24:08 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchfolder/watchfolder-0.3.1.1.ebuild,v 1.4 2003/09/26 20:45:47 aliz Exp $
 
 MY_PV="${PV:0:5}_p1"
 
@@ -20,8 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	mv Makefile Makefile.orig
-	sed "3s:OPT=:OPT=${CFLAGS} :" Makefile.orig >Makefile
+	sed -i "3s:OPT=:OPT=${CFLAGS} :" Makefile
 }
 
 src_compile() {
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 8419a92ad5ea..986789cc0295 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,7 +1,7 @@
-MD5 8f91f34713e5cb5c0a47c1a45c0e9f6c webalizer-2.01.10-r3.ebuild 1912
-MD5 f3b2ef74726177318f4a4631bcd869eb webalizer-2.01.10-r2.ebuild 1561
 MD5 4e4b00b1c06cc55d557edb8789e6f96a ChangeLog 2033
+MD5 f3b2ef74726177318f4a4631bcd869eb webalizer-2.01.10-r2.ebuild 1561
+MD5 ccf13d9985e24554803d2d716669d2f9 webalizer-2.01.10-r3.ebuild 1797
 MD5 243a553aac1ac7c50842856ce779c0d0 files/apache.webalizer 345
 MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r2 74
-MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r3 74
 MD5 4ef1125cc62ca88536c33ba937ed6a6b files/webalizer-2.01.10.conf 23843
+MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r3 74
diff --git a/app-admin/webalizer/webalizer-2.01.10-r3.ebuild b/app-admin/webalizer/webalizer-2.01.10-r3.ebuild
index 3cbc5f844ade..10fa59328532 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r3.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r3.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/webalizer/webalizer-2.01.10-r3.ebuild,v 1.3 2003/07/30 15:17:53 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r3.ebuild,v 1.4 2003/09/26 20:45:47 aliz Exp $
 
 MY_P=${P/.10/-10}
 S=${WORKDIR}/${MY_P}
@@ -42,9 +42,7 @@ src_install() {
 
 	if [ "`use apache2`" ]; then
 		# patch for apache2
-		cp ${D}/etc/webalizer.conf ${D}/etc/webalizer.conf.1;
-		sed -e "s/apache/apache2/g" ${D}/etc/webalizer.conf.1 > ${D}/etc/webalizer.conf;
-		rm ${D}/etc/webalizer.conf.1
+		sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
 		insinto /etc/apache2/conf
 	else
 		insinto /etc/apache/conf
diff --git a/app-admin/whowatch/Manifest b/app-admin/whowatch/Manifest
index 8faf7ada71e9..23372457e512 100644
--- a/app-admin/whowatch/Manifest
+++ b/app-admin/whowatch/Manifest
@@ -1,4 +1,4 @@
 MD5 032c9f37702597f432c057c399058d4d ChangeLog 863
-MD5 d8a36851188b523db19ef68a822a6261 whowatch-1.5.2.ebuild 757
+MD5 96737d0055f8b61272295674bf4349e8 whowatch-1.5.2.ebuild 743
 MD5 28a6caa17456e7a25e61c5ff223b3494 files/digest-whowatch-1.5.2 65
 MD5 f9118c4c52dc9a3258fcb7a65aa1f55d files/whowatch-1.5.2-gentoo.diff 430
diff --git a/app-admin/whowatch/whowatch-1.5.2.ebuild b/app-admin/whowatch/whowatch-1.5.2.ebuild
index cb5389bafe03..f25c71d15c85 100644
--- a/app-admin/whowatch/whowatch-1.5.2.ebuild
+++ b/app-admin/whowatch/whowatch-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/whowatch/whowatch-1.5.2.ebuild,v 1.14 2003/02/13 05:33:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.5.2.ebuild,v 1.15 2003/09/26 20:45:47 aliz Exp $
 
 DESCRIPTION="interactive who-like program that displays information about users currently logged on in real time."
 SRC_URI="http://wizard.ae.krakow.pl/~mike/download/${P}.tar.gz"
@@ -15,7 +15,7 @@ DEPEND="sys-libs/ncurses"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff || die
+	epatch ${FILESDIR}/${PF}-gentoo.diff
 }
 
 src_compile() {
diff --git a/app-admin/xsu2/ChangeLog b/app-admin/xsu2/ChangeLog
index ac1d4a4ae6c4..8d89b51cfb9e 100644
--- a/app-admin/xsu2/ChangeLog
+++ b/app-admin/xsu2/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for app-admin/xsu2
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/xsu2/ChangeLog,v 1.4 2003/07/09 17:25:03 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/xsu2/ChangeLog,v 1.5 2003/09/26 20:45:47 aliz Exp $
 
   09 Jul 2003; Alastair Tse <liquidx@gentoo.org> xsu2-0.2.5.ebuild:
   add pkgconfig dep
 
-*xsu2-0.2.5  (05 Nov 2002)
+*xsu2-0.2.5 (05 Nov 2002)
 
   28 Mar 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> xsu2-0.2.5.ebuild :
   moved to ~ppc
diff --git a/app-admin/xsu2/Manifest b/app-admin/xsu2/Manifest
index 397ab9c086e7..9b0912f7ce79 100644
--- a/app-admin/xsu2/Manifest
+++ b/app-admin/xsu2/Manifest
@@ -1,4 +1,4 @@
-MD5 f40b607d5c9f8d52880c4fd847a50da4 ChangeLog 594
+MD5 9a8e1c284f145dd0f19100c572d887bb ChangeLog 590
 MD5 389587a41fcf35c7a2b71d2c61fddfed xsu2-0.2.5.ebuild 810
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 12c834e1603175fa655753c19e49d897 files/digest-xsu2-0.2.5 62