| 1 |
commit: e57711012dfd82be7dcb8d10836197fb2b0cff06 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 17 20:58:41 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 23 10:14:42 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5771101 |
| 7 |
|
| 8 |
python-any-r1.eclass: Update PYTHON_USEDEP to match python-r1 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/python-any-r1.eclass | 29 ++++++++++++++--------------- |
| 13 |
1 file changed, 14 insertions(+), 15 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass |
| 16 |
index c634e19813e..9fd7fd6bc27 100644 |
| 17 |
--- a/eclass/python-any-r1.eclass |
| 18 |
+++ b/eclass/python-any-r1.eclass |
| 19 |
@@ -131,20 +131,19 @@ EXPORT_FUNCTIONS pkg_setup |
| 20 |
# An eclass-generated USE-dependency string for the currently tested |
| 21 |
# implementation. It is set locally for python_check_deps() call. |
| 22 |
# |
| 23 |
-# The generate USE-flag list is compatible with packages using python-r1, |
| 24 |
-# python-single-r1 and python-distutils-ng eclasses. It must not be used |
| 25 |
-# on packages using python.eclass. |
| 26 |
+# The generate USE-flag list is compatible with packages using python-r1 |
| 27 |
+# eclass. It must not be used on packages using other eclasses. |
| 28 |
# |
| 29 |
# Example use: |
| 30 |
# @CODE |
| 31 |
# python_check_deps() { |
| 32 |
-# has_version "dev-python/foo[${PYTHON_USEDEP}]" |
| 33 |
+# has_version "dev-python/foo[${PYTHON_USEDEP}]" |
| 34 |
# } |
| 35 |
# @CODE |
| 36 |
# |
| 37 |
# Example value: |
| 38 |
# @CODE |
| 39 |
-# python_targets_python2_7(-)?,python_single_target_python2_7(+)? |
| 40 |
+# python_targets_python3_7(-),-python_single_target_python3_7(-) |
| 41 |
# @CODE |
| 42 |
|
| 43 |
_python_any_set_globals() { |
| 44 |
@@ -213,16 +212,16 @@ if [[ ! ${_PYTHON_ANY_R1} ]]; then |
| 45 |
# @CODE |
| 46 |
# || ( |
| 47 |
# ( |
| 48 |
-# dev-lang/python:2.7 |
| 49 |
-# dev-python/foo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] |
| 50 |
-# || ( dev-python/bar[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] |
| 51 |
-# dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) |
| 52 |
+# dev-lang/python:3.7 |
| 53 |
+# dev-python/foo[python_targets_python3_7(-),-python_single_target_python3_7(-)] |
| 54 |
+# || ( dev-python/bar[python_targets_python3_7(-),-python_single_target_python3_7(-)] |
| 55 |
+# dev-python/baz[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) |
| 56 |
# ) |
| 57 |
# ( |
| 58 |
-# dev-lang/python:3.3 |
| 59 |
-# dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] |
| 60 |
-# || ( dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] |
| 61 |
-# dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] ) |
| 62 |
+# dev-lang/python:3.8 |
| 63 |
+# dev-python/foo[python_targets_python3_8(-),-python_single_target_python3_8(-)] |
| 64 |
+# || ( dev-python/bar[python_targets_python3_8(-),-python_single_target_python3_8(-)] |
| 65 |
+# dev-python/baz[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) |
| 66 |
# ) |
| 67 |
# ) |
| 68 |
# @CODE |
| 69 |
@@ -234,7 +233,7 @@ python_gen_any_dep() { |
| 70 |
|
| 71 |
local i PYTHON_PKG_DEP out= |
| 72 |
for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do |
| 73 |
- local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" |
| 74 |
+ local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" |
| 75 |
_python_export "${i}" PYTHON_PKG_DEP |
| 76 |
|
| 77 |
local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} |
| 78 |
@@ -268,7 +267,7 @@ _python_EPYTHON_supported() { |
| 79 |
if has "${i}" "${_PYTHON_SUPPORTED_IMPLS[@]}"; then |
| 80 |
if python_is_installed "${i}"; then |
| 81 |
if declare -f python_check_deps >/dev/null; then |
| 82 |
- local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" |
| 83 |
+ local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" |
| 84 |
python_check_deps |
| 85 |
return ${?} |
| 86 |
fi |
Archives