eclass/eutils.eclass: epatch_user: Strip subslot when taking patches from /etc/porta...
authorAlexis Ballier <aballier@gentoo.org>
Wed, 17 Feb 2016 21:07:59 +0000 (22:07 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Wed, 17 Feb 2016 21:08:07 +0000 (22:08 +0100)
This makes it similar to what portage does with eapply_user.

eclass/eutils.eclass

index d23a5b7db8fe393eb7bdf26a8f4f016d519c27ca..0004c2cd764fa7c882e424cabbdf532075193abb 100644 (file)
@@ -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}