Revert "python*-r1.eclass: Replace non-portable use of 'declare -g'"

This reverts commit 44d3345. This was triggering "No supported implementation in PYTHON_COMPAT.".
johu · Dec 11, 2015 · d296b5d · d296b5d
1 parent da4a1ca
commit d296b5d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
@@ -133,7 +133,7 @@ _python_any_set_globals() {
 
 		PYTHON_DEPS="${PYTHON_PKG_DEP} ${PYTHON_DEPS}"
 	done
-	readonly PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
+	declare -g -r PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
 }
 _python_any_set_globals
 unset -f _python_any_set_globals

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
@@ -216,8 +216,8 @@ _python_set_globals() {
 	optflags+=,${flags_st[@]/%/(-)}
 
 	IUSE=${flags[*]}
-	readonly PYTHON_REQUIRED_USE="|| ( ${flags[*]} )"
-	readonly PYTHON_USEDEP=${optflags// /,}
+	declare -g -r PYTHON_REQUIRED_USE="|| ( ${flags[*]} )"
+	declare -g -r PYTHON_USEDEP=${optflags// /,}
 
 	# 1) well, python-exec would suffice as an RDEP
 	# but no point in making this overcomplex, BDEP doesn't hurt anyone

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
@@ -238,7 +238,7 @@ _python_single_set_globals() {
 			PYTHON_DEPS+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) "
 		done
 	fi
-	readonly PYTHON_USEDEP=${optflags// /,}
+	declare -g -r PYTHON_USEDEP=${optflags// /,}
 
 	# 1) well, python-exec would suffice as an RDEP
 	# but no point in making this overcomplex, BDEP doesn't hurt anyone

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
@@ -40,7 +40,7 @@ inherit toolchain-funcs
 # @INTERNAL
 # @DESCRIPTION:
 # All supported Python implementations, most preferred last.
-readonly _PYTHON_ALL_IMPLS=(
+declare -g -r _PYTHON_ALL_IMPLS=(
 	python2_7
 	python3_3 python3_4 python3_5
 	pypy pypy3