diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-02-17 22:07:59 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-02-17 22:08:07 +0100 |
| commit | 5a08a63420601a47075da957e25dbc909ce33aef (patch) | |
| tree | 5196f27381e0b777481299acc30b89deb7a69695 /eclass/eutils.eclass | |
| parent | media-plugins/gst-plugins-libav: Fix build and runtime with ffmpeg 3.0. Bug #... (diff) | |
| download | gentoo-5a08a63420601a47075da957e25dbc909ce33aef.tar.gz gentoo-5a08a63420601a47075da957e25dbc909ce33aef.tar.bz2 gentoo-5a08a63420601a47075da957e25dbc909ce33aef.zip | |
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.
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 2 |
1 files changed, 1 insertions, 1 deletions
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} |