Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 2/4] python-r1.eclass: Update PYTHON_USEDEP in python_gen_any_dep()
Date: Thu, 17 Dec 2020 21:25:19
Message-Id: 20201217212450.317226-2-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/4] python-any-r1.eclass: Update PYTHON_USEDEP to match python-r1 by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/python-r1.eclass | 20 ++++++++++----------
4 1 file changed, 10 insertions(+), 10 deletions(-)
5
6 diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
7 index 40944684ec8b..e7a660219c17 100644
8 --- a/eclass/python-r1.eclass
9 +++ b/eclass/python-r1.eclass
10 @@ -547,16 +547,16 @@ python_gen_impl_dep() {
11 # @CODE
12 # || (
13 # (
14 -# dev-lang/python:2.7
15 -# dev-python/foo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
16 -# || ( dev-python/bar[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
17 -# dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
18 +# dev-lang/python:3.7
19 +# dev-python/foo[python_targets_python3_7(-),-python_single_target_python3_7(-)]
20 +# || ( dev-python/bar[python_targets_python3_7(-),-python_single_target_python3_7(-)]
21 +# dev-python/baz[python_targets_python3_7(-),-python_single_target_python3_7(-)] )
22 # )
23 # (
24 -# dev-lang/python:3.3
25 -# dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?]
26 -# || ( dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?]
27 -# dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] )
28 +# dev-lang/python:3.8
29 +# dev-python/foo[python_targets_python3_8(-),-python_single_target_python3_8(-)]
30 +# || ( dev-python/bar[python_targets_python3_8(-),-python_single_target_python3_8(-)]
31 +# dev-python/baz[python_targets_python3_8(-),-python_single_target_python3_8(-)] )
32 # )
33 # )
34 # @CODE
35 @@ -571,7 +571,7 @@ python_gen_any_dep() {
36 _python_verify_patterns "${@}"
37 for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
38 if _python_impl_matches "${i}" "${@}"; then
39 - local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)"
40 + local PYTHON_USEDEP="python_targets_${i}(-),-python_single_target_${i}(-)"
41 _python_export "${i}" PYTHON_PKG_DEP
42
43 local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
44 @@ -779,7 +779,7 @@ python_setup() {
45 # first check if the interpreter is installed
46 python_is_installed "${impl}" || continue
47 # then run python_check_deps
48 - local PYTHON_USEDEP="python_targets_${impl}(-),python_single_target_${impl}(+)"
49 + local PYTHON_USEDEP="python_targets_${impl}(-),-python_single_target_${impl}(-)"
50 python_check_deps || continue
51 fi
52
53 --
54 2.29.2