epatch and sed updates

5 files changed, 29 insertions, 37 deletions

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() {