| 1 |
commit: 9156695ec0f85fc30bbf5293732c425cbdc7012d |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 12 16:21:44 2020 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 12 16:27:24 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9156695e |
| 7 |
|
| 8 |
Revert "epatch.eclass: drop 'estack.eclass' usage" |
| 9 |
|
| 10 |
estack.eclass is needed for evar_push/evar_pop. The issue mentioned |
| 11 |
in bug 662586 was fixed indenpendently in estack.eclass, so there is |
| 12 |
no longer any need for the workaround (see comment #27 of that bug). |
| 13 |
|
| 14 |
This reverts commit b21e386a064e1ed49981d9527f968ddc5e1eeb86. |
| 15 |
|
| 16 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 17 |
|
| 18 |
eclass/epatch.eclass | 11 ++++++----- |
| 19 |
1 file changed, 6 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass |
| 22 |
index 1ea657a3b6f..da936413677 100644 |
| 23 |
--- a/eclass/epatch.eclass |
| 24 |
+++ b/eclass/epatch.eclass |
| 25 |
@@ -19,6 +19,8 @@ case ${EAPI:-0} in |
| 26 |
die "${ECLASS}: banned in EAPI=${EAPI}; use eapply* instead";; |
| 27 |
esac |
| 28 |
|
| 29 |
+inherit estack |
| 30 |
+ |
| 31 |
# @VARIABLE: EPATCH_SOURCE |
| 32 |
# @DESCRIPTION: |
| 33 |
# Default directory to search for patches. |
| 34 |
@@ -209,14 +211,13 @@ epatch() { |
| 35 |
# Let people filter things dynamically |
| 36 |
if [[ -n ${EPATCH_EXCLUDE}${EPATCH_USER_EXCLUDE} ]] ; then |
| 37 |
# let people use globs in the exclude |
| 38 |
- local prev_noglob=$(shopt -p -o noglob) |
| 39 |
- set -o noglob |
| 40 |
+ eshopts_push -o noglob |
| 41 |
|
| 42 |
local ex |
| 43 |
for ex in ${EPATCH_EXCLUDE} ; do |
| 44 |
if [[ ${patchname} == ${ex} ]] ; then |
| 45 |
einfo " Skipping ${patchname} due to EPATCH_EXCLUDE ..." |
| 46 |
- ${prev_noglob} |
| 47 |
+ eshopts_pop |
| 48 |
continue 2 |
| 49 |
fi |
| 50 |
done |
| 51 |
@@ -224,12 +225,12 @@ epatch() { |
| 52 |
for ex in ${EPATCH_USER_EXCLUDE} ; do |
| 53 |
if [[ ${patchname} == ${ex} ]] ; then |
| 54 |
einfo " Skipping ${patchname} due to EPATCH_USER_EXCLUDE ..." |
| 55 |
- ${prev_noglob} |
| 56 |
+ eshopts_pop |
| 57 |
continue 2 |
| 58 |
fi |
| 59 |
done |
| 60 |
|
| 61 |
- ${prev_noglob} |
| 62 |
+ eshopts_pop |
| 63 |
fi |
| 64 |
|
| 65 |
if [[ ${SINGLE_PATCH} == "yes" ]] ; then |
Archives