diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2020-12-17 22:03:39 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2020-12-23 11:14:43 +0100 |
| commit | c198649a978db824629c09c1017610adaebfec1d (patch) | |
| tree | b071361846e2d55604780daed56b082cd6ed9341 /eclass/python-r1.eclass | |
| parent | python-any-r1.eclass: Update PYTHON_USEDEP to match python-r1 (diff) | |
| download | gentoo-c198649a978db824629c09c1017610adaebfec1d.tar.gz gentoo-c198649a978db824629c09c1017610adaebfec1d.tar.bz2 gentoo-c198649a978db824629c09c1017610adaebfec1d.zip | |
python-r1.eclass: Update PYTHON_USEDEP in python_gen_any_dep()
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass/python-r1.eclass')
| -rw-r--r-- | eclass/python-r1.eclass | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 40944684ec8b..e7a660219c17 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -547,16 +547,16 @@ python_gen_impl_dep() { # @CODE # || ( # ( -# dev-lang/python:2.7 -# dev-python/foo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] -# || ( dev-python/bar[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] -# dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) +# dev-lang/python:3.7 +# dev-python/foo[python_targets_python3_7(-),-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-lang/python:3.3 -# dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] -# || ( dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] -# dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] ) +# dev-lang/python:3.8 +# dev-python/foo[python_targets_python3_8(-),-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(-)] ) # ) # ) # @CODE @@ -571,7 +571,7 @@ python_gen_any_dep() { _python_verify_patterns "${@}" for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do if _python_impl_matches "${i}" "${@}"; then - local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)" + local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)" _python_export "${i}" PYTHON_PKG_DEP local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} @@ -779,7 +779,7 @@ python_setup() { # first check if the interpreter is installed python_is_installed "${impl}" || continue # then run python_check_deps - local PYTHON_USEDEP="python_targets_${impl}(-),python_single_target_${impl}(+)" + local PYTHON_USEDEP="python_targets_${impl}(-),-python_single_target_${impl}(-)" python_check_deps || continue fi |