Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 09 Feb 2022 09:39:36
Message-Id: 1644396232.1f2b04df57902db5f38d248a0601236492681b99.mgorny@gentoo
1 commit: 1f2b04df57902db5f38d248a0601236492681b99
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 4 18:48:03 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 9 08:43:52 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2b04df
7
8 python-single-r1.eclass: Remove PYTHON_MULTI_USEDEP
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 eclass/python-single-r1.eclass | 7 -------
13 1 file changed, 7 deletions(-)
14
15 diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
16 index 73afcdc3ed6c..0e9a16a47d0e 100644
17 --- a/eclass/python-single-r1.eclass
18 +++ b/eclass/python-single-r1.eclass
19 @@ -341,14 +341,7 @@ python_gen_cond_dep() {
20 local single_usedep="python_single_target_${impl}(-)"
21 local multi_usedep="python_targets_${impl}(-)"
22
23 - if [[ ${EAPI} != [67] ]]; then
24 - if [[ ${dep} == *\$\{PYTHON_MULTI_USEDEP\}* ]]; then
25 - die "Replace PYTHON_MULTI_USEDEP with PYTHON_USEDEP in EAPI ${EAPI}"
26 - fi
27 - fi
28 -
29 local subdep=${dep//\$\{PYTHON_SINGLE_USEDEP\}/${single_usedep}}
30 - subdep=${subdep//\$\{PYTHON_MULTI_USEDEP\}/${multi_usedep}}
31 matches+=( "python_single_target_${impl}? (
32 ${subdep//\$\{PYTHON_USEDEP\}/${multi_usedep}} )" )
33 fi