Ebuild cleanup to use epatch and not abuse sed.

5 files changed, 21 insertions, 13 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index d7fb46a3c963..ca3032352ca9 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/db
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.97 2004/08/23 11:54:09 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.98 2004/09/01 18:24:55 robbat2 Exp $
+
+  01 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> db-4.1.25_p1-r3.ebuild,
+  db-4.1.25_p1-r4.ebuild, db-4.2.52_p1.ebuild, db-4.2.52_p2.ebuild:
+  Ebuild cleanup to use epatch and not abuse sed.
 
   23 Aug 2004; <pauldv@gentoo.org> db-3.3.11.ebuild:
   Add IUSE
diff --git a/sys-libs/db/db-4.1.25_p1-r3.ebuild b/sys-libs/db/db-4.1.25_p1-r3.ebuild
index 36a7441d2fa9..d6b82886bd42 100644
--- a/sys-libs/db/db-4.1.25_p1-r3.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-r3.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.23 2004/06/24 23:03:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.24 2004/09/01 18:24:55 robbat2 Exp $
 
 inherit eutils gnuconfig db
 
 #Number of official patches
-PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
 if [ "${PATCHNO}" == "${PV}" ]; then
 	MY_PV=${PV}
 	MY_P=${P}
@@ -40,7 +41,7 @@ src_unpack() {
 	cd ${WORKDIR}/${MY_P}
 	for (( i=1 ; i<=$PATCHNO ; i++ ))
 	do
-		patch -p0 <${DISTDIR}/patch.${MY_PV}.${i}
+		epatch ${DISTDIR}/patch.${MY_PV}.${i}
 	done
 	epatch ${FILESDIR}/${P}-jarlocation.patch
 
diff --git a/sys-libs/db/db-4.1.25_p1-r4.ebuild b/sys-libs/db/db-4.1.25_p1-r4.ebuild
index ed0f15ce6019..e6894752520c 100644
--- a/sys-libs/db/db-4.1.25_p1-r4.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-r4.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.5 2004/06/25 16:18:30 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.6 2004/09/01 18:24:55 robbat2 Exp $
 
 inherit eutils gnuconfig db
 
 #Number of official patches
-PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
 if [ "${PATCHNO}" == "${PV}" ]; then
 	MY_PV=${PV}
 	MY_P=${P}
@@ -40,7 +41,7 @@ src_unpack() {
 	cd ${WORKDIR}/${MY_P}
 	for (( i=1 ; i<=$PATCHNO ; i++ ))
 	do
-		patch -p0 <${DISTDIR}/patch.${MY_PV}.${i}
+		epatch ${DISTDIR}/patch.${MY_PV}.${i}
 	done
 	epatch ${FILESDIR}/${P}-jarlocation.patch
 
diff --git a/sys-libs/db/db-4.2.52_p1.ebuild b/sys-libs/db/db-4.2.52_p1.ebuild
index 58da602cdecb..9c84e4dac349 100644
--- a/sys-libs/db/db-4.2.52_p1.ebuild
+++ b/sys-libs/db/db-4.2.52_p1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p1.ebuild,v 1.6 2004/06/24 23:03:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p1.ebuild,v 1.7 2004/09/01 18:24:55 robbat2 Exp $
 
 IUSE="tcltk java doc"
 
 inherit eutils gnuconfig db
 
 #Number of official patches
-PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
 if [ "${PATCHNO}" == "${PV}" ]; then
 	MY_PV=${PV}
 	MY_P=${P}
@@ -42,7 +43,7 @@ src_unpack() {
 	cd ${WORKDIR}/${MY_P}
 	for (( i=1 ; i<=$PATCHNO ; i++ ))
 	do
-		patch -p0 <${DISTDIR}/patch.${MY_PV}.${i}
+		epatch ${DISTDIR}/patch.${MY_PV}.${i}
 	done
 	epatch ${FILESDIR}/${PN}-${SLOT}-jarlocation.patch
 
diff --git a/sys-libs/db/db-4.2.52_p2.ebuild b/sys-libs/db/db-4.2.52_p2.ebuild
index e89d3ad64269..c83d82a51211 100644
--- a/sys-libs/db/db-4.2.52_p2.ebuild
+++ b/sys-libs/db/db-4.2.52_p2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p2.ebuild,v 1.6 2004/08/18 17:46:14 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p2.ebuild,v 1.7 2004/09/01 18:24:55 robbat2 Exp $
 
 IUSE="tcltk java doc"
 
 inherit eutils gnuconfig db
 
 #Number of official patches
-PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+PATCHNO=${PV/*.*.*_p}
 if [ "${PATCHNO}" == "${PV}" ]; then
 	MY_PV=${PV}
 	MY_P=${P}
@@ -42,7 +43,7 @@ src_unpack() {
 	cd ${WORKDIR}/${MY_P}
 	for (( i=1 ; i<=$PATCHNO ; i++ ))
 	do
-		patch -p0 <${DISTDIR}/patch.${MY_PV}.${i}
+		epatch ${DISTDIR}/patch.${MY_PV}.${i}
 	done
 	epatch ${FILESDIR}/${PN}-${SLOT}-jarlocation.patch