| 1 |
Remove the QA hack for PYTHON_USEDEP that originally prevented python-r1 |
| 2 |
ebuilds from wrongly depending on python-single-r1 packages. Since |
| 3 |
the latter no longer define python_targets*, these dependencies are now |
| 4 |
caught without any hacks. |
| 5 |
|
| 6 |
Signed-off-by: Michał Górny <mgorny@g.o> |
| 7 |
--- |
| 8 |
eclass/python-any-r1.eclass | 14 +++++++------- |
| 9 |
1 file changed, 7 insertions(+), 7 deletions(-) |
| 10 |
|
| 11 |
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass |
| 12 |
index cb343b320f0c..2f38155c39fd 100644 |
| 13 |
--- a/eclass/python-any-r1.eclass |
| 14 |
+++ b/eclass/python-any-r1.eclass |
| 15 |
@@ -144,7 +144,7 @@ EXPORT_FUNCTIONS pkg_setup |
| 16 |
# |
| 17 |
# Example value: |
| 18 |
# @CODE |
| 19 |
-# python_targets_python3_7(-),-python_single_target_python3_7(-) |
| 20 |
+# python_targets_python3_7(-) |
| 21 |
# @CODE |
| 22 |
|
| 23 |
# @ECLASS-VARIABLE: PYTHON_SINGLE_USEDEP |
| 24 |
@@ -239,14 +239,14 @@ if [[ ! ${_PYTHON_ANY_R1} ]]; then |
| 25 |
# ( |
| 26 |
# dev-lang/python:3.7 |
| 27 |
# dev-python/foo[python_single_target_python3_7(-)] |
| 28 |
-# || ( dev-python/bar[python_targets_python3_7(-),-python_single_target_python3_7(-)] |
| 29 |
-# dev-python/baz[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) |
| 30 |
+# || ( dev-python/bar[python_targets_python3_7(-) |
| 31 |
+# dev-python/baz[python_targets_python3_7(-) ) |
| 32 |
# ) |
| 33 |
# ( |
| 34 |
# dev-lang/python:3.8 |
| 35 |
# dev-python/foo[python_single_target_python3_8(-)] |
| 36 |
-# || ( dev-python/bar[python_targets_python3_8(-),-python_single_target_python3_8(-)] |
| 37 |
-# dev-python/baz[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) |
| 38 |
+# || ( dev-python/bar[python_targets_python3_8(-)] |
| 39 |
+# dev-python/baz[python_targets_python3_8(-)] ) |
| 40 |
# ) |
| 41 |
# ) |
| 42 |
# @CODE |
| 43 |
@@ -258,7 +258,7 @@ python_gen_any_dep() { |
| 44 |
|
| 45 |
local i PYTHON_PKG_DEP out= |
| 46 |
for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do |
| 47 |
- local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" |
| 48 |
+ local PYTHON_USEDEP="python_targets_${i}(-)" |
| 49 |
local PYTHON_SINGLE_USEDEP="python_single_target_${i}(-)" |
| 50 |
_python_export "${i}" PYTHON_PKG_DEP |
| 51 |
|
| 52 |
@@ -294,7 +294,7 @@ _python_EPYTHON_supported() { |
| 53 |
if has "${i}" "${_PYTHON_SUPPORTED_IMPLS[@]}"; then |
| 54 |
if python_is_installed "${i}"; then |
| 55 |
if declare -f python_check_deps >/dev/null; then |
| 56 |
- local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" |
| 57 |
+ local PYTHON_USEDEP="python_targets_${i}(-)" |
| 58 |
local PYTHON_SINGLE_USEDEP="python_single_target_${i}(-)" |
| 59 |
python_check_deps |
| 60 |
return ${?} |
| 61 |
-- |
| 62 |
2.32.0 |
Archives