| 1 |
commit: 2b4226390d9bfeec7c17b395c41c4df0f496ada0 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 1 08:01:53 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 1 08:03:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b422639 |
| 7 |
|
| 8 |
python-any-r1.eclass: Move PYTHON_USEDEP doc before globals |
| 9 |
|
| 10 |
eclass/python-any-r1.eclass | 38 +++++++++++++++++++------------------- |
| 11 |
1 file changed, 19 insertions(+), 19 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass |
| 14 |
index 3491604dea4..a1dd4282c1e 100644 |
| 15 |
--- a/eclass/python-any-r1.eclass |
| 16 |
+++ b/eclass/python-any-r1.eclass |
| 17 |
@@ -126,25 +126,6 @@ if [[ ! ${_PYTHON_ANY_R1} ]]; then |
| 18 |
# dev-lang/python:2.6[gdbm] ) |
| 19 |
# @CODE |
| 20 |
|
| 21 |
-_python_any_set_globals() { |
| 22 |
- local usestr i PYTHON_PKG_DEP |
| 23 |
- [[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]" |
| 24 |
- |
| 25 |
- _python_set_impls |
| 26 |
- |
| 27 |
- PYTHON_DEPS= |
| 28 |
- for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do |
| 29 |
- python_export "${i}" PYTHON_PKG_DEP |
| 30 |
- |
| 31 |
- # note: need to strip '=' slot operator for || deps |
| 32 |
- PYTHON_DEPS="${PYTHON_PKG_DEP%=} ${PYTHON_DEPS}" |
| 33 |
- done |
| 34 |
- PYTHON_DEPS="|| ( ${PYTHON_DEPS})" |
| 35 |
- readonly PYTHON_DEPS |
| 36 |
-} |
| 37 |
-_python_any_set_globals |
| 38 |
-unset -f _python_any_set_globals |
| 39 |
- |
| 40 |
# @ECLASS-VARIABLE: PYTHON_USEDEP |
| 41 |
# @DESCRIPTION: |
| 42 |
# An eclass-generated USE-dependency string for the currently tested |
| 43 |
@@ -166,6 +147,25 @@ unset -f _python_any_set_globals |
| 44 |
# python_targets_python2_7(-)?,python_single_target_python2_7(+)? |
| 45 |
# @CODE |
| 46 |
|
| 47 |
+_python_any_set_globals() { |
| 48 |
+ local usestr i PYTHON_PKG_DEP |
| 49 |
+ [[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]" |
| 50 |
+ |
| 51 |
+ _python_set_impls |
| 52 |
+ |
| 53 |
+ PYTHON_DEPS= |
| 54 |
+ for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do |
| 55 |
+ python_export "${i}" PYTHON_PKG_DEP |
| 56 |
+ |
| 57 |
+ # note: need to strip '=' slot operator for || deps |
| 58 |
+ PYTHON_DEPS="${PYTHON_PKG_DEP%=} ${PYTHON_DEPS}" |
| 59 |
+ done |
| 60 |
+ PYTHON_DEPS="|| ( ${PYTHON_DEPS})" |
| 61 |
+ readonly PYTHON_DEPS |
| 62 |
+} |
| 63 |
+_python_any_set_globals |
| 64 |
+unset -f _python_any_set_globals |
| 65 |
+ |
| 66 |
# @FUNCTION: python_gen_any_dep |
| 67 |
# @USAGE: <dependency-block> |
| 68 |
# @DESCRIPTION: |
Archives