[gentoo-commits] repo/gentoo:master commit in: eclass/

[Alexis Ballier]

commit:     5a08a63420601a47075da957e25dbc909ce33aef
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 21:07:59 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 21:08:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a08a634

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.

 eclass/eutils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index d23a5b7..0004c2c 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}