From 7709567da4015fc3e6e7ea17a965fc364196d298 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 19 Jun 2023 07:14:04 +0000
Subject: [PATCH] eclass/estack: Sync with Gentoo

It's from Gentoo commit 8209b1269bd0e9b24dd7a330cd0434452d80f550.
---
 .../src/third_party/portage-stable/eclass/estack.eclass       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/estack.eclass b/sdk_container/src/third_party/portage-stable/eclass/estack.eclass
index c0823adb03..d00c931e11 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/estack.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/estack.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: estack.eclass
@@ -156,7 +156,7 @@ evar_pop() {
 eshopts_push() {
 	# Save both "shopt" and "set -o" option sets, because otherwise
 	# restoring posix would disable expand_aliases by side effect. #662586
-	estack_push eshopts "$(shopt -p -o) $(shopt -p)"
+	estack_push eshopts "$(shopt -p -o; shopt -p)"
 	if [[ $1 == -[su] ]] ; then
 		[[ $# -le 1 ]] && return 0
 		shopt "$@" || die "${FUNCNAME}: bad options to shopt: $*"