Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: python@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 2/7] python-single-r1.eclass: Use new-style flags for python-exec dep
Date: Sat, 30 Nov 2019 12:42:39
Message-Id: 20191130124126.169871-3-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/7] python-single-r1.eclass: New split usedep API by "Michał Górny"
1 Depend on PYTHON_TARGETS directly in dev-lang/python-exec dep,
2 instead of relying on old-style PYTHON_USEDEP.
3
4 Signed-off-by: Michał Górny <mgorny@g.o>
5 ---
6 eclass/python-single-r1.eclass | 15 ++++++++-------
7 1 file changed, 8 insertions(+), 7 deletions(-)
8
9 diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
10 index ad7e39558cf1..f042bf4e1167 100644
11 --- a/eclass/python-single-r1.eclass
12 +++ b/eclass/python-single-r1.eclass
13 @@ -250,15 +250,16 @@ _python_single_set_globals() {
14 requse+=" python_single_target_${i}? ( python_targets_${i} )"
15
16 python_export "${i}" PYTHON_PKG_DEP
17 - deps+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) "
18 + # 1) well, python-exec would suffice as an RDEP
19 + # but no point in making this overcomplex, BDEP doesn't hurt anyone
20 + # 2) python-exec should be built with all targets forced anyway
21 + # but if new targets were added, we may need to force a rebuild
22 + deps+="python_single_target_${i}? (
23 + ${PYTHON_PKG_DEP}
24 + >=dev-lang/python-exec-2:=[python_targets_${i}]
25 + ) "
26 done
27
28 - # 1) well, python-exec would suffice as an RDEP
29 - # but no point in making this overcomplex, BDEP doesn't hurt anyone
30 - # 2) python-exec should be built with all targets forced anyway
31 - # but if new targets were added, we may need to force a rebuild
32 - deps+=">=dev-lang/python-exec-2:=[${usedep}]"
33 -
34 if [[ ${PYTHON_DEPS+1} ]]; then
35 if [[ ${PYTHON_DEPS} != "${deps}" ]]; then
36 eerror "PYTHON_DEPS have changed between inherits (PYTHON_REQ_USE?)!"
37 --
38 2.24.0