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 20/30] python-single-r1.eclass: Remove PYTHON_MULTI_USEDEP
Date: Sun, 06 Feb 2022 12:55:13
Message-Id: 20220206124841.1299133-21-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/30] One batch of Python eclass updates to rule them all by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/python-single-r1.eclass | 7 -------
4 1 file changed, 7 deletions(-)
5
6 diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
7 index 73afcdc3ed6c..0e9a16a47d0e 100644
8 --- a/eclass/python-single-r1.eclass
9 +++ b/eclass/python-single-r1.eclass
10 @@ -341,14 +341,7 @@ python_gen_cond_dep() {
11 local single_usedep="python_single_target_${impl}(-)"
12 local multi_usedep="python_targets_${impl}(-)"
13
14 - if [[ ${EAPI} != [67] ]]; then
15 - if [[ ${dep} == *\$\{PYTHON_MULTI_USEDEP\}* ]]; then
16 - die "Replace PYTHON_MULTI_USEDEP with PYTHON_USEDEP in EAPI ${EAPI}"
17 - fi
18 - fi
19 -
20 local subdep=${dep//\$\{PYTHON_SINGLE_USEDEP\}/${single_usedep}}
21 - subdep=${subdep//\$\{PYTHON_MULTI_USEDEP\}/${multi_usedep}}
22 matches+=( "python_single_target_${impl}? (
23 ${subdep//\$\{PYTHON_USEDEP\}/${multi_usedep}} )" )
24 fi
25 --
26 2.35.1