Use common epatch_user code now.

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

7 files changed, 25 insertions, 80 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 40da16ced989..9b2017a21230 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.130 2009/07/11 07:38:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.131 2009/08/26 21:49:19 vapier Exp $
+
+  26 Aug 2009; Mike Frysinger <vapier@gentoo.org> iproute2-2.6.26-r2.ebuild,
+  iproute2-2.6.28.ebuild, iproute2-2.6.29.1.ebuild,
+  iproute2-2.6.29.1-r1.ebuild, iproute2-9999.ebuild:
+  Use common epatch_user code now.
 
 *iproute2-2.6.29.1-r1 (11 Jul 2009)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index da4b39c4964d..d3b0572be739 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -7,17 +7,17 @@ AUX iproute2-2.6.29.1-flush.patch 6199 RMD160 2ae7d019fd00a4aafaeb29c90e87a2e6c7
 DIST iproute2-2.6.26.tar.bz2 359574 RMD160 9a6016ceb5d8a87c4e951463faf5d7dcf7731a9a SHA1 95e0f528066eae7304b5d7c610348b522628c92f SHA256 e4468eb1944ef66eb994e9fe3505fe09957b8ab98929287c12c9920caf95137e
 DIST iproute2-2.6.28.tar.bz2 365502 RMD160 8798b9aba50f92882d5aab234801e6ac41305877 SHA1 303601cf70caf61ece62116fe6e3370f423aa134 SHA256 bb54e0abbd4b9b5a928bdfe17039d3e2c42a6d42fd5b82b454b8b72ebba35cb3
 DIST iproute2-2.6.29-1.tar.bz2 367905 RMD160 f96c3ec0877c9d5a2dcba582b399a80ed71a4a8b SHA1 b6a43799bf5e8131307cf88b855031317af90eb4 SHA256 13ffb0ffe5404c9dcc8bed8c692f07d934aa3fd44661df79dd1efbb37f83fb9b
-EBUILD iproute2-2.6.26-r2.ebuild 2845 RMD160 4b2fde3099f6210bb46766558957b758a46ea8b8 SHA1 376c035860c61ccae84137b7945f543864dfcf7b SHA256 1feca0f52303a87a69af5b99c17263af67389ff5193f73db6fcc91d48e29e48f
-EBUILD iproute2-2.6.28.ebuild 3037 RMD160 2b474d6d4d02375039939c9ff0411609cad84601 SHA1 d5217a733d2c6a54860160779e73730873de63d9 SHA256 3ea53d1bb377236dd910c3967eb80c7232a6e954d2fc75803ce2a4b9be26f50a
-EBUILD iproute2-2.6.29.1-r1.ebuild 3163 RMD160 7e4a2a36627fdd16226c35d89857673f4664f350 SHA1 ce78b8f5e97348cb30fcb629e252e0278c3e4ea8 SHA256 193b56469a7b9c22f8759cffe60156ca0f391ccd9d61987cf4b5cfd6af0edb4d
-EBUILD iproute2-2.6.29.1.ebuild 3057 RMD160 e40f8f593bbbdd633286fa220d07c511f18b0716 SHA1 0a66fe2db0cb131fc31da70868214c0becd0ddf2 SHA256 2c4a114cff16cc260dff54b180f8f049753c8fcbf811b1a8021448effaa05594
-EBUILD iproute2-9999.ebuild 3146 RMD160 8501679c62ea7ee69e51d361442717ab5b991981 SHA1 2cd3a97dac6562a57a8450a351a28de53d8541a3 SHA256 1c27394eecab02d6699d53a30278c5c0908d62affc6b24938031be9855755885
-MISC ChangeLog 23144 RMD160 acc2f4dccb1a8ecba26414f3d97db46fe27e4340 SHA1 f12c4b8118fce0f4d707c769668b543d6fd21e20 SHA256 0c654e8ad1b7dbb5e083f80d48df88cee3626a75a6992eb2a4f9955cacfcf06e
+EBUILD iproute2-2.6.26-r2.ebuild 2359 RMD160 063f08cfa912b1c66533056ce9133d18fa4b37ee SHA1 87c8936562628d8f40006ca622f16e1c2144d555 SHA256 8f1906b962c0e0e93ee1ea2090ce3e0073bde1c9653fdf0a0c319e2fffacf6db
+EBUILD iproute2-2.6.28.ebuild 2554 RMD160 1ca7a4b753f91df98aa483ef200110fb29787e61 SHA1 2a80d27a052a3564227d78b747ad1d18859b243c SHA256 0269b40fd84a0c9f6b22fee11c608c424206a988ee4becb8d36c830da70c395a
+EBUILD iproute2-2.6.29.1-r1.ebuild 2677 RMD160 a8593a6ffc766942493bb1e6c24f57cd9a582f89 SHA1 1fd3d3507e0934d42767a9166636617a2ca63fab SHA256 504f0df6a9bbaaf1d23d9412a027b7ec7a8aab1df5afcfb93b3af8211f1f2600
+EBUILD iproute2-2.6.29.1.ebuild 2571 RMD160 2f0eabead9aa34e4b87a0721640eafe95cf577be SHA1 30f9fcac1f4dc873530aca1c325d1b4e0778b708 SHA256 e7b53f36159efc35bb10a421b7389240749e66bd7aa3a345f4fade772c246d1e
+EBUILD iproute2-9999.ebuild 2660 RMD160 a5315a7e3d577880e3403c82ab5570ff685a2ef3 SHA1 0476aa8e7dd851b234d130680eace3ccc593ee20 SHA256 fd2a492e28633b9d7360005068a82943006efd6a306144c73770830041eb4dda
+MISC ChangeLog 23362 RMD160 03f1df58097ea002df13e8d931c10f187be9f9fd SHA1 5e980cec310b69a96cff8c3bd2bdbbf84e49ebfa SHA256 78e3ed911db999fe84112880cab18e221f53fcb75d5ed7e6f2be7b5ceeb339a0
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpYQZgACgkQ9A5kJBGSrsvg3gCggeyTLy9kVZti7+wsOmJb7uEt
-ZNUAn0IZ9imscqcS6SOuAvcHegoCnt40
-=TVUh
+iEYEARECAAYFAkqVreYACgkQlPl3HsVfCDqMHwCfbAFOukLzeeoJ3jYr3IecZFHW
+c5IAn1wwvSdujjb7d0D0jJlLmO/GnNlC
+=SrHG
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild b/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild
index 482a7e419bb4..298f7f27369a 100644
--- a/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.26-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/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild,v 1.11 2009/05/09 22:00:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.26-r2.ebuild,v 1.12 2009/08/26 21:49:19 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -39,19 +39,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-ldflags.patch #236861
 	epatch "${FILESDIR}"/${P}-linux-2.6.27-API.patch
 
-	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
 
 	# don't build arpd if USE=-berkdb #81660
 	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
diff --git a/sys-apps/iproute2/iproute2-2.6.28.ebuild b/sys-apps/iproute2/iproute2-2.6.28.ebuild
index 21b6b512d524..e16b57f6bbf5 100644
--- a/sys-apps/iproute2/iproute2-2.6.28.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.28.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/sys-apps/iproute2/iproute2-2.6.28.ebuild,v 1.8 2009/06/09 02:46:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.28.ebuild,v 1.9 2009/08/26 21:49:19 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -49,19 +49,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-2.6.26-ldflags.patch #236861
 
-	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
 
 	# don't build arpd if USE=-berkdb #81660
 	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
diff --git a/sys-apps/iproute2/iproute2-2.6.29.1-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.29.1-r1.ebuild
index 5b7a3fb93999..ec70bd3dbefc 100644
--- a/sys-apps/iproute2/iproute2-2.6.29.1-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.29.1-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/sys-apps/iproute2/iproute2-2.6.29.1-r1.ebuild,v 1.1 2009/07/11 07:38:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.29.1-r1.ebuild,v 1.2 2009/08/26 21:49:19 vapier Exp $
 
 EAPI="2"
 
@@ -54,19 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.6.26-ldflags.patch #236861
 	epatch "${FILESDIR}"/${PN}-2.6.29.1-flush.patch #274973
 
-	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
 
 	# don't build arpd if USE=-berkdb #81660
 	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
diff --git a/sys-apps/iproute2/iproute2-2.6.29.1.ebuild b/sys-apps/iproute2/iproute2-2.6.29.1.ebuild
index 0d6bb7b5a1e0..8954e52ea7b6 100644
--- a/sys-apps/iproute2/iproute2-2.6.29.1.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.29.1.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/sys-apps/iproute2/iproute2-2.6.29.1.ebuild,v 1.2 2009/05/29 22:30:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.29.1.ebuild,v 1.3 2009/08/26 21:49:19 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -49,19 +49,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-2.6.26-ldflags.patch #236861
 
-	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
 
 	# don't build arpd if USE=-berkdb #81660
 	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index a1ca5ea14372..fcb31bec1dc0 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.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/sys-apps/iproute2/iproute2-9999.ebuild,v 1.5 2009/07/11 07:38:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.6 2009/08/26 21:49:19 vapier Exp $
 
 EAPI="2"
 
@@ -54,19 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.6.26-ldflags.patch #236861
 	epatch "${FILESDIR}"/${PN}-2.6.29.1-flush.patch #274973
 
-	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
 
 	# don't build arpd if USE=-berkdb #81660
 	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile