From: Alexis Ballier <aballier@gentoo.org>
Date: Wed, 17 Feb 2016 21:07:59 +0000 (+0100)
Subject: eclass/eutils.eclass: epatch_user: Strip subslot when taking patches from  /etc/porta... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5a08a63420601a47075da957e25dbc909ce33aef;p=gentoo.git

eclass/eutils.eclass: epatch_user: Strip subslot when taking patches from  /etc/portage/patches/$CAT/$PN:$SLOT. Bug #574966.

This makes it similar to what portage does with eapply_user.
---

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index d23a5b7db8fe..0004c2cd764f 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1731,7 +1731,7 @@ epatch_user() {
 
 	# don't clobber any EPATCH vars that the parent might want
 	local EPATCH_SOURCE check
-	for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT}}; do
+	for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT%/*}}; do
 		EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CTARGET}/${check}
 		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CHOST}/${check}
 		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${check}