From 9156695ec0f85fc30bbf5293732c425cbdc7012d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Wed, 12 Feb 2020 17:21:44 +0100
Subject: [PATCH] Revert "epatch.eclass: drop 'estack.eclass' usage"
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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>
---
 eclass/epatch.eclass | 11 ++++++-----
 1 file 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
-- 
2.26.2