| 1 |
commit: c198649a978db824629c09c1017610adaebfec1d |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 17 21:03:39 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 23 10:14:43 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c198649a |
| 7 |
|
| 8 |
python-r1.eclass: Update PYTHON_USEDEP in python_gen_any_dep() |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/python-r1.eclass | 20 ++++++++++---------- |
| 13 |
1 file changed, 10 insertions(+), 10 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass |
| 16 |
index 40944684ec8..e7a660219c1 100644 |
| 17 |
--- a/eclass/python-r1.eclass |
| 18 |
+++ b/eclass/python-r1.eclass |
| 19 |
@@ -547,16 +547,16 @@ python_gen_impl_dep() { |
| 20 |
# @CODE |
| 21 |
# || ( |
| 22 |
# ( |
| 23 |
-# dev-lang/python:2.7 |
| 24 |
-# dev-python/foo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] |
| 25 |
-# || ( dev-python/bar[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] |
| 26 |
-# dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) |
| 27 |
+# dev-lang/python:3.7 |
| 28 |
+# dev-python/foo[python_targets_python3_7(-),-python_single_target_python3_7(-)] |
| 29 |
+# || ( dev-python/bar[python_targets_python3_7(-),-python_single_target_python3_7(-)] |
| 30 |
+# dev-python/baz[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) |
| 31 |
# ) |
| 32 |
# ( |
| 33 |
-# dev-lang/python:3.3 |
| 34 |
-# dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] |
| 35 |
-# || ( dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] |
| 36 |
-# dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] ) |
| 37 |
+# dev-lang/python:3.8 |
| 38 |
+# dev-python/foo[python_targets_python3_8(-),-python_single_target_python3_8(-)] |
| 39 |
+# || ( dev-python/bar[python_targets_python3_8(-),-python_single_target_python3_8(-)] |
| 40 |
+# dev-python/baz[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) |
| 41 |
# ) |
| 42 |
# ) |
| 43 |
# @CODE |
| 44 |
@@ -571,7 +571,7 @@ python_gen_any_dep() { |
| 45 |
_python_verify_patterns "${@}" |
| 46 |
for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do |
| 47 |
if _python_impl_matches "${i}" "${@}"; then |
| 48 |
- local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" |
| 49 |
+ local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" |
| 50 |
_python_export "${i}" PYTHON_PKG_DEP |
| 51 |
|
| 52 |
local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} |
| 53 |
@@ -779,7 +779,7 @@ python_setup() { |
| 54 |
# first check if the interpreter is installed |
| 55 |
python_is_installed "${impl}" || continue |
| 56 |
# then run python_check_deps |
| 57 |
- local PYTHON_USEDEP="python_targets_${impl}(-),python_single_target_${impl}(+)" |
| 58 |
+ local PYTHON_USEDEP="python_targets_${impl}(-),-python_single_target_${impl}(-)" |
| 59 |
python_check_deps || continue |
| 60 |
fi |
Archives