1 |
commit: d296b5daa59eae73fa3cb0995547d0336697fedd |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 11 22:26:44 2015 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 11 22:26:44 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d296b5da |
7 |
|
8 |
Revert "python*-r1.eclass: Replace non-portable use of 'declare -g'" |
9 |
|
10 |
This reverts commit 44d3345d828af162b2fbfd623dd8f0d7ac4ae2f9. |
11 |
|
12 |
This was triggering "No supported implementation in PYTHON_COMPAT.". |
13 |
|
14 |
eclass/python-any-r1.eclass | 2 +- |
15 |
eclass/python-r1.eclass | 4 ++-- |
16 |
eclass/python-single-r1.eclass | 2 +- |
17 |
eclass/python-utils-r1.eclass | 2 +- |
18 |
4 files changed, 5 insertions(+), 5 deletions(-) |
19 |
|
20 |
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass |
21 |
index 846c0da..82ead76 100644 |
22 |
--- a/eclass/python-any-r1.eclass |
23 |
+++ b/eclass/python-any-r1.eclass |
24 |
@@ -133,7 +133,7 @@ _python_any_set_globals() { |
25 |
|
26 |
PYTHON_DEPS="${PYTHON_PKG_DEP} ${PYTHON_DEPS}" |
27 |
done |
28 |
- readonly PYTHON_DEPS="|| ( ${PYTHON_DEPS})" |
29 |
+ declare -g -r PYTHON_DEPS="|| ( ${PYTHON_DEPS})" |
30 |
} |
31 |
_python_any_set_globals |
32 |
unset -f _python_any_set_globals |
33 |
|
34 |
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass |
35 |
index 5c1f1b3..4b9c6f3 100644 |
36 |
--- a/eclass/python-r1.eclass |
37 |
+++ b/eclass/python-r1.eclass |
38 |
@@ -216,8 +216,8 @@ _python_set_globals() { |
39 |
optflags+=,${flags_st[@]/%/(-)} |
40 |
|
41 |
IUSE=${flags[*]} |
42 |
- readonly PYTHON_REQUIRED_USE="|| ( ${flags[*]} )" |
43 |
- readonly PYTHON_USEDEP=${optflags// /,} |
44 |
+ declare -g -r PYTHON_REQUIRED_USE="|| ( ${flags[*]} )" |
45 |
+ declare -g -r PYTHON_USEDEP=${optflags// /,} |
46 |
|
47 |
# 1) well, python-exec would suffice as an RDEP |
48 |
# but no point in making this overcomplex, BDEP doesn't hurt anyone |
49 |
|
50 |
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass |
51 |
index 3c33f37..1582295 100644 |
52 |
--- a/eclass/python-single-r1.eclass |
53 |
+++ b/eclass/python-single-r1.eclass |
54 |
@@ -238,7 +238,7 @@ _python_single_set_globals() { |
55 |
PYTHON_DEPS+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) " |
56 |
done |
57 |
fi |
58 |
- readonly PYTHON_USEDEP=${optflags// /,} |
59 |
+ declare -g -r PYTHON_USEDEP=${optflags// /,} |
60 |
|
61 |
# 1) well, python-exec would suffice as an RDEP |
62 |
# but no point in making this overcomplex, BDEP doesn't hurt anyone |
63 |
|
64 |
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
65 |
index 42c33eb..cf0e134 100644 |
66 |
--- a/eclass/python-utils-r1.eclass |
67 |
+++ b/eclass/python-utils-r1.eclass |
68 |
@@ -40,7 +40,7 @@ inherit toolchain-funcs |
69 |
# @INTERNAL |
70 |
# @DESCRIPTION: |
71 |
# All supported Python implementations, most preferred last. |
72 |
-readonly _PYTHON_ALL_IMPLS=( |
73 |
+declare -g -r _PYTHON_ALL_IMPLS=( |
74 |
python2_7 |
75 |
python3_3 python3_4 python3_5 |
76 |
pypy pypy3 |