diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2020-02-12 17:21:44 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2020-02-12 17:27:24 +0100 |
| commit | 9156695ec0f85fc30bbf5293732c425cbdc7012d (patch) | |
| tree | 5b401bba31a55616c535e60f3e86bd32cce30ef1 /eclass/epatch.eclass | |
| parent | media-tv/kodi-9999: require libfmt 6.1.2 (diff) | |
| download | gentoo-9156695ec0f85fc30bbf5293732c425cbdc7012d.tar.gz gentoo-9156695ec0f85fc30bbf5293732c425cbdc7012d.tar.bz2 gentoo-9156695ec0f85fc30bbf5293732c425cbdc7012d.zip | |
Revert "epatch.eclass: drop 'estack.eclass' usage"
estack.eclass is needed for evar_push/evar_pop. The issue mentioned
in bug 662586 was fixed indenpendently in estack.eclass, so there is
no longer any need for the workaround (see comment #27 of that bug).
This reverts commit b21e386a064e1ed49981d9527f968ddc5e1eeb86.
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'eclass/epatch.eclass')
| -rw-r--r-- | eclass/epatch.eclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass index 1ea657a3b6f8..da9364136777 100644 --- a/eclass/epatch.eclass +++ b/eclass/epatch.eclass @@ -19,6 +19,8 @@ case ${EAPI:-0} in die "${ECLASS}: banned in EAPI=${EAPI}; use eapply* instead";; esac +inherit estack + # @VARIABLE: EPATCH_SOURCE # @DESCRIPTION: # Default directory to search for patches. @@ -209,14 +211,13 @@ epatch() { # Let people filter things dynamically if [[ -n ${EPATCH_EXCLUDE}${EPATCH_USER_EXCLUDE} ]] ; then # let people use globs in the exclude - local prev_noglob=$(shopt -p -o noglob) - set -o noglob + eshopts_push -o noglob local ex for ex in ${EPATCH_EXCLUDE} ; do if [[ ${patchname} == ${ex} ]] ; then einfo " Skipping ${patchname} due to EPATCH_EXCLUDE ..." - ${prev_noglob} + eshopts_pop continue 2 fi done @@ -224,12 +225,12 @@ epatch() { for ex in ${EPATCH_USER_EXCLUDE} ; do if [[ ${patchname} == ${ex} ]] ; then einfo " Skipping ${patchname} due to EPATCH_USER_EXCLUDE ..." - ${prev_noglob} + eshopts_pop continue 2 fi done - ${prev_noglob} + eshopts_pop fi if [[ ${SINGLE_PATCH} == "yes" ]] ; then |