diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
| commit | 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch) | |
| tree | 6208a7f4fc744684fce0f55acbb47511acace498 /eclass/epatch.eclass | |
| parent | 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff) | |
gentoo resync : 25.08.2018
Diffstat (limited to 'eclass/epatch.eclass')
| -rw-r--r-- | eclass/epatch.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass index 8e03478c26ce..1ea657a3b6f8 100644 --- a/eclass/epatch.eclass +++ b/eclass/epatch.eclass @@ -4,6 +4,7 @@ # @ECLASS: epatch.eclass # @MAINTAINER: # base-system@gentoo.org +# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 # @BLURB: easy patch application functions # @DESCRIPTION: # An eclass providing epatch and epatch_user functions to easily apply @@ -18,8 +19,6 @@ 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. @@ -210,13 +209,14 @@ epatch() { # Let people filter things dynamically if [[ -n ${EPATCH_EXCLUDE}${EPATCH_USER_EXCLUDE} ]] ; then # let people use globs in the exclude - eshopts_push -o noglob + local prev_noglob=$(shopt -p -o noglob) + set -o noglob local ex for ex in ${EPATCH_EXCLUDE} ; do if [[ ${patchname} == ${ex} ]] ; then einfo " Skipping ${patchname} due to EPATCH_EXCLUDE ..." - eshopts_pop + ${prev_noglob} continue 2 fi done @@ -224,12 +224,12 @@ epatch() { for ex in ${EPATCH_USER_EXCLUDE} ; do if [[ ${patchname} == ${ex} ]] ; then einfo " Skipping ${patchname} due to EPATCH_USER_EXCLUDE ..." - eshopts_pop + ${prev_noglob} continue 2 fi done - eshopts_pop + ${prev_noglob} fi if [[ ${SINGLE_PATCH} == "yes" ]] ; then |