Move to common epatch code.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

7 files changed, 26 insertions, 83 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 4cb02ab02ff0..ff7bc537ff7e 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.204 2009/07/27 18:16:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.205 2009/08/27 08:57:51 vapier Exp $
+
+  27 Aug 2009; Mike Frysinger <vapier@gentoo.org> iptables-1.3.8-r3.ebuild,
+  iptables-1.4.0-r1.ebuild, iptables-1.4.2-r2.ebuild,
+  iptables-1.4.3.2.ebuild, iptables-1.4.4.ebuild:
+  Move to common epatch code.
 
   27 Jul 2009; Mike Frysinger <vapier@gentoo.org> iptables-1.4.4.ebuild:
   Add USE=ipv6 support by Christian Affolter #277366.
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index e4f8723814a7..cff239605bfa 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -27,17 +27,17 @@ DIST iptables-1.4.2.tar.bz2 435891 RMD160 e20dd33ad3174bdc6a0ef4d6bdfd60a9c6d2c6
 DIST iptables-1.4.3.2.tar.bz2 432131 RMD160 d276516a56d9b173f5ffdf9777650d9a000c22c1 SHA1 4e274ac40ccc1c04a063bd98d38f97301bbb75cc SHA256 dec9b2248ba6824825011b73034bb43ca97d9c2d02e4024dc01549afd09ed3b1
 DIST iptables-1.4.4.tar.bz2 452656 RMD160 8235b988ce8f91b3cb24ee64fb2ac8acb5294ebc SHA1 309b22eeb89a6a6abb3c46e03be84de52348f6f7 SHA256 f38274d992d16220373422c33ba39247b154cd1f4fe5245950596b1602185b6f
 DIST netfilter-layer7-v2.21.tar.gz 174702 RMD160 95b6c86bc73e346c516509c5d769d0ef2b34c8b9 SHA1 1a21b7273478ccd0ac57cfc3f1b6d1893a1c2dfd SHA256 4c3ce80dd6ddc9f7c04ea2b6d9a3f678f33a6a3457de3175949d9c5b0e77021b
-EBUILD iptables-1.3.8-r3.ebuild 7132 RMD160 9da9caa232f1fc421828715a74d18db0d10f0004 SHA1 c9a3b9ec4645cefaec3f1efc41cc9c4d5806c094 SHA256 7ed4cd8ed62a8f571032922276c57bc7e3115f108cd993604baf7465458a7779
-EBUILD iptables-1.4.0-r1.ebuild 6295 RMD160 60d28cb1ba3e54acdee3a7afeebeb82fe4956eb4 SHA1 29f2cf21aeeea06733811f7757af8fd5412d0ddf SHA256 171847cdcc42344ff5d7ea38c230b7ce0a1bd43ec93a0d00434486592ab7f5e6
-EBUILD iptables-1.4.2-r2.ebuild 3262 RMD160 f28cd3243ae6c6028a6537f0d07f00c40d8b5ae7 SHA1 87dada8cc221dd9faec7df0b77cdb38b2be5b62f SHA256 7249be2d9c37d0a5c705603cf8b079cd8d2205baff380445d36f6b5264184b69
-EBUILD iptables-1.4.3.2.ebuild 1814 RMD160 1598f494077f5e256c0d0a39a2589d4193376465 SHA1 157d1e402ef72637732976cde63f05e94b804def SHA256 9039f12f3c3f518d0771205a8370c16432e6acae0eac90db2031cde90bedb984
-EBUILD iptables-1.4.4.ebuild 1896 RMD160 9a2d6c056425da93c99def151c3227fc86b7d1c3 SHA1 e8a1555cb8ae4fe9f750ee9b3be5bb88cae48f83 SHA256 23779610d84d57356b11df023f02200b2491e9051118d2f4420e0f782c4e8f11
-MISC ChangeLog 37638 RMD160 34cd6c0756420760bfde032953fa6ced4088ccd4 SHA1 e9d722c39f7bfcfcab7628e874765520ad22dced SHA256 e0b02009a550b99b2890cd4733d0022f08a12a80602be7e5df33c8f86fa78691
+EBUILD iptables-1.3.8-r3.ebuild 6641 RMD160 01394d3dbb8268f42a5aa12e6a597cd112e703fc SHA1 b4db0c6872ac3772db3c8640c914811e62a74821 SHA256 5c742b1430615f69614c2db5639ae1e41baa11fffa0027343c6181abdf523821
+EBUILD iptables-1.4.0-r1.ebuild 5804 RMD160 45dbea31cedd3c3e3652b38b12c27cd9ba734e02 SHA1 41f140d3dbfcf925fac71b07fba094c1d7897f1f SHA256 98ceef16e920b23a80fbe4cb94f5c7f1ee417fccdbe22fde08f7e0c5e0c2f213
+EBUILD iptables-1.4.2-r2.ebuild 2777 RMD160 e965a969878b6fcc068b7c12145ffbfddd513734 SHA1 b8676d8eb5ef53ed07b548df9bb22795378184ea SHA256 d9fb4f0cf60da0e6c09845bbf02e87093f0a8e68c98267646c11e1d8884d3b33
+EBUILD iptables-1.4.3.2.ebuild 1326 RMD160 95cfc2dde62806c8c7ac4f8ab724a3b04106967e SHA1 621cb14fea6ad19e6cf77830c9d7e7bb8e80bfac SHA256 5fbe84850cbeb6d5e8938b8bce5d32c2f3ada035f930a873731a55773e06633c
+EBUILD iptables-1.4.4.ebuild 1409 RMD160 0c896e95e4b37e7c0d44a4d76ca4151f751fc45a SHA1 c238528b39099284345012bcf8c921d8bebeb0e9 SHA256 1cd55e1e560dadebee255a3ac4064203fe5aacc73b86e2d355045d864778bbcf
+MISC ChangeLog 37849 RMD160 7ee953755d570d3d012e26b5ae157d7a880aef31 SHA1 c362013c8bcbaa00298781f19c932fb2289c6a85 SHA256 3022cbef6e12dabe0425a2508c3965b11b540fb1687fb04a0ef6c22b2e5a8803
 MISC metadata.xml 1278 RMD160 5453b196b5ae00ad8fc8dd0d27731cb5425339d4 SHA1 3e0dabdca50df87aa78c5c9236e04ed747f3bc82 SHA256 d6d81511d3e81d6bb2097be63ea6bc9a8871519f1727e6d0b89bf231bd6ba92b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpt7vEACgkQlPl3HsVfCDrZJACeLj/KCsrj+fFVg9CsqDT/rwzP
-dDIAniwlDJ0ci3gxGUebiqB9KpVWj0v2
-=vNz9
+iEYEARECAAYFAkqWSpYACgkQlPl3HsVfCDoMIACeOjEbDXsVLyyuCOyE93yS+ezp
+6MUAn2CsalNPSywVDLUnJLol+Yi1wWF5
+=I2/1
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/iptables-1.3.8-r3.ebuild b/net-firewall/iptables/iptables-1.3.8-r3.ebuild
index 9b878eea08df..724b2f56e667 100644
--- a/net-firewall/iptables/iptables-1.3.8-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.3.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r3.ebuild,v 1.11 2009/01/30 21:54:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r3.ebuild,v 1.12 2009/08/27 08:57:51 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -78,19 +78,7 @@ src_unpack() {
 		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
 		extensions/Makefile || die "failed to enable stealth extension"
 
-	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
-	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
-		EPATCH_SOURCE=${base}/${CTARGET}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
-		if [[ -d ${EPATCH_SOURCE} ]] ; then
-			EPATCH_SUFFIX="patch"
-			EPATCH_FORCE="yes" \
-			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
-			epatch
-			break
-		fi
-	done
+	epatch_user
 
 	if use imq ; then
 		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
diff --git a/net-firewall/iptables/iptables-1.4.0-r1.ebuild b/net-firewall/iptables/iptables-1.4.0-r1.ebuild
index 24f51605bd4f..1d05bb6cabce 100644
--- a/net-firewall/iptables/iptables-1.4.0-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild,v 1.15 2009/01/30 21:54:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild,v 1.16 2009/08/27 08:57:51 vapier Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -76,19 +76,7 @@ src_unpack() {
 		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
 		extensions/Makefile || die "failed to enable stealth extension"
 
-	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
-	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
-		EPATCH_SOURCE=${base}/${CTARGET}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
-		if [[ -d ${EPATCH_SOURCE} ]] ; then
-			EPATCH_SUFFIX="patch"
-			EPATCH_FORCE="yes" \
-			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
-			epatch
-			break
-		fi
-	done
+	epatch_user
 
 	if use imq ; then
 		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
diff --git a/net-firewall/iptables/iptables-1.4.2-r2.ebuild b/net-firewall/iptables/iptables-1.4.2-r2.ebuild
index a9a0f4c03c1e..4cf7a62d8500 100644
--- a/net-firewall/iptables/iptables-1.4.2-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.2-r2.ebuild,v 1.9 2009/02/16 16:57:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.2-r2.ebuild,v 1.10 2009/08/27 08:57:51 vapier Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -52,19 +52,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-libxt_iprange.c-build.patch
 	epatch "${FILESDIR}"/${P}-hashlimit.patch #254496
 
-	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
-	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
-		EPATCH_SOURCE=${base}/${CTARGET}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
-		if [[ -d ${EPATCH_SOURCE} ]] ; then
-			EPATCH_SUFFIX="patch"
-			EPATCH_FORCE="yes" \
-			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
-			epatch
-			break
-		fi
-	done
+	epatch_user
 
 	if use l7filter ; then
 		cp "${WORKDIR}/${L7_P}/iptables-1.4.1.1-for-kernel-2.6.20forward"/* extensions \
diff --git a/net-firewall/iptables/iptables-1.4.3.2.ebuild b/net-firewall/iptables/iptables-1.4.3.2.ebuild
index 83500becb470..a10dfd095e3e 100644
--- a/net-firewall/iptables/iptables-1.4.3.2.ebuild
+++ b/net-firewall/iptables/iptables-1.4.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.3.2.ebuild,v 1.7 2009/07/23 14:59:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.3.2.ebuild,v 1.8 2009/08/27 08:57:51 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,20 +19,7 @@ RDEPEND=""
 src_unpack() {
 	unpack ${P}.tar.bz2
 	cd "${S}"
-
-	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
-	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
-		EPATCH_SOURCE=${base}/${CTARGET}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
-		if [[ -d ${EPATCH_SOURCE} ]] ; then
-			EPATCH_SUFFIX="patch"
-			EPATCH_FORCE="yes" \
-			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
-			epatch
-			break
-		fi
-	done
+	epatch_user
 }
 
 src_compile() {
diff --git a/net-firewall/iptables/iptables-1.4.4.ebuild b/net-firewall/iptables/iptables-1.4.4.ebuild
index 268f56878c59..ee9e35c8b8c7 100644
--- a/net-firewall/iptables/iptables-1.4.4.ebuild
+++ b/net-firewall/iptables/iptables-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.4.ebuild,v 1.2 2009/07/27 18:16:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.4.ebuild,v 1.3 2009/08/27 08:57:51 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,20 +19,7 @@ RDEPEND=""
 src_unpack() {
 	unpack ${P}.tar.bz2
 	cd "${S}"
-
-	local check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
-	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
-		EPATCH_SOURCE=${base}/${CTARGET}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
-		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
-		if [[ -d ${EPATCH_SOURCE} ]] ; then
-			EPATCH_SUFFIX="patch"
-			EPATCH_FORCE="yes" \
-			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
-			epatch
-			break
-		fi
-	done
+	epatch_user
 }
 
 src_compile() {