diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2021-06-20 10:31:36 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2021-06-23 23:44:12 +0200 |
| commit | 1f4c0a2258a530cc6bfc4ee62d5d2ed1c096396d (patch) | |
| tree | a2c9832e960999b1c87222cacb0454b88c048299 /eclass/python-any-r1.eclass | |
| parent | python-any-r1.eclass: Remove obsolete eselect-python use (diff) | |
| download | gentoo-1f4c0a2258a530cc6bfc4ee62d5d2ed1c096396d.tar.gz gentoo-1f4c0a2258a530cc6bfc4ee62d5d2ed1c096396d.tar.bz2 gentoo-1f4c0a2258a530cc6bfc4ee62d5d2ed1c096396d.zip | |
python-any-r1.eclass: Remove obsolete PYTHON_USEDEP single-r1 hack
Remove the QA hack for PYTHON_USEDEP that originally prevented python-r1
ebuilds from wrongly depending on python-single-r1 packages. Since
the latter no longer define python_targets*, these dependencies are now
caught without any hacks.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass/python-any-r1.eclass')
| -rw-r--r-- | eclass/python-any-r1.eclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index cb343b320f0c..2f38155c39fd 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -144,7 +144,7 @@ EXPORT_FUNCTIONS pkg_setup # # Example value: # @CODE -# python_targets_python3_7(-),-python_single_target_python3_7(-) +# python_targets_python3_7(-) # @CODE # @ECLASS-VARIABLE: PYTHON_SINGLE_USEDEP @@ -239,14 +239,14 @@ if [[ ! ${_PYTHON_ANY_R1} ]]; then # ( # dev-lang/python:3.7 # dev-python/foo[python_single_target_python3_7(-)] -# || ( dev-python/bar[python_targets_python3_7(-),-python_single_target_python3_7(-)] -# dev-python/baz[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) +# || ( dev-python/bar[python_targets_python3_7(-) +# dev-python/baz[python_targets_python3_7(-) ) # ) # ( # dev-lang/python:3.8 # dev-python/foo[python_single_target_python3_8(-)] -# || ( dev-python/bar[python_targets_python3_8(-),-python_single_target_python3_8(-)] -# dev-python/baz[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) +# || ( dev-python/bar[python_targets_python3_8(-)] +# dev-python/baz[python_targets_python3_8(-)] ) # ) # ) # @CODE @@ -258,7 +258,7 @@ python_gen_any_dep() { local i PYTHON_PKG_DEP out= for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" + local PYTHON_USEDEP="python_targets_${i}(-)" local PYTHON_SINGLE_USEDEP="python_single_target_${i}(-)" _python_export "${i}" PYTHON_PKG_DEP @@ -294,7 +294,7 @@ _python_EPYTHON_supported() { if has "${i}" "${_PYTHON_SUPPORTED_IMPLS[@]}"; then if python_is_installed "${i}"; then if declare -f python_check_deps >/dev/null; then - local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" + local PYTHON_USEDEP="python_targets_${i}(-)" local PYTHON_SINGLE_USEDEP="python_single_target_${i}(-)" python_check_deps return ${?} |