Use common epatch_user code now.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

6 files changed, 16 insertions, 71 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/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