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.
johu · Feb 17, 2016 · 5a08a63 · 5a08a63
1 parent f85d12e
commit 5a08a63
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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}