1 |
--- |
2 |
eclass/python-r1.eclass | 18 ++++++++++-------- |
3 |
1 file changed, 10 insertions(+), 8 deletions(-) |
4 |
|
5 |
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass |
6 |
index 549474630353..1cf65056f637 100644 |
7 |
--- a/eclass/python-r1.eclass |
8 |
+++ b/eclass/python-r1.eclass |
9 |
@@ -165,14 +165,13 @@ inherit multibuild python-utils-r1 |
10 |
# @CODE |
11 |
|
12 |
_python_set_globals() { |
13 |
- PYTHON_DEPS= |
14 |
- local i PYTHON_PKG_DEP |
15 |
+ local deps i PYTHON_PKG_DEP |
16 |
|
17 |
_python_set_impls |
18 |
|
19 |
for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do |
20 |
python_export "${i}" PYTHON_PKG_DEP |
21 |
- PYTHON_DEPS+="python_targets_${i}? ( ${PYTHON_PKG_DEP} ) " |
22 |
+ deps+="python_targets_${i}? ( ${PYTHON_PKG_DEP} ) " |
23 |
done |
24 |
|
25 |
local flags=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_targets_}" ) |
26 |
@@ -186,10 +185,8 @@ _python_set_globals() { |
27 |
|
28 |
local flags_st=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/-python_single_target_}" ) |
29 |
optflags+=,${flags_st[@]/%/(-)} |
30 |
- |
31 |
- IUSE=${flags[*]} |
32 |
- PYTHON_REQUIRED_USE="|| ( ${flags[*]} )" |
33 |
- PYTHON_USEDEP=${optflags// /,} |
34 |
+ local requse="|| ( ${flags[*]} )" |
35 |
+ local usedep=${optflags// /,} |
36 |
|
37 |
# 1) well, python-exec would suffice as an RDEP |
38 |
# but no point in making this overcomplex, BDEP doesn't hurt anyone |
39 |
@@ -198,8 +195,13 @@ _python_set_globals() { |
40 |
if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then |
41 |
die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2" |
42 |
else |
43 |
- PYTHON_DEPS+=">=dev-lang/python-exec-2:=[${PYTHON_USEDEP}]" |
44 |
+ deps+=">=dev-lang/python-exec-2:=[${usedep}]" |
45 |
fi |
46 |
+ |
47 |
+ PYTHON_DEPS=${deps} |
48 |
+ IUSE=${flags[*]} |
49 |
+ PYTHON_REQUIRED_USE=${requse} |
50 |
+ PYTHON_USEDEP=${usedep} |
51 |
readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_USEDEP |
52 |
} |
53 |
_python_set_globals |
54 |
-- |
55 |
2.12.0 |