1 |
commit: 40dd1436f16c41bb14a85d02d292e7b1611150c6 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 20 07:57:56 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 23 21:44:15 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40dd1436 |
7 |
|
8 |
python-single-r1.eclass: Ban PYTHON_MULTI_USEDEP in EAPI 8 |
9 |
|
10 |
PYTHON_MULTI_USEDEP was a temporary transition measure, and is now |
11 |
equivalent to PYTHON_USEDEP. Ban it in EAPI 8 to clean up ebuilds. |
12 |
|
13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
14 |
|
15 |
eclass/python-single-r1.eclass | 12 ++++++------ |
16 |
1 file changed, 6 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass |
19 |
index 50ec69fa2dd..db483a9b184 100644 |
20 |
--- a/eclass/python-single-r1.eclass |
21 |
+++ b/eclass/python-single-r1.eclass |
22 |
@@ -179,12 +179,6 @@ EXPORT_FUNCTIONS pkg_setup |
23 |
# python_targets_python3_4(-) |
24 |
# @CODE |
25 |
|
26 |
-# @ECLASS-VARIABLE: PYTHON_MULTI_USEDEP |
27 |
-# @OUTPUT_VARIABLE |
28 |
-# @DESCRIPTION: |
29 |
-# This is a backwards-compatibility placeholder. Use PYTHON_USEDEP |
30 |
-# instead. |
31 |
- |
32 |
# @ECLASS-VARIABLE: PYTHON_REQUIRED_USE |
33 |
# @OUTPUT_VARIABLE |
34 |
# @DESCRIPTION: |
35 |
@@ -392,6 +386,12 @@ python_gen_cond_dep() { |
36 |
fi |
37 |
local multi_usedep="python_targets_${impl}(-)" |
38 |
|
39 |
+ if [[ ${EAPI} != [67] ]]; then |
40 |
+ if [[ ${dep} == *\$\{PYTHON_MULTI_USEDEP\}* ]]; then |
41 |
+ die "Replace PYTHON_MULTI_USEDEP with PYTHON_USEDEP in EAPI ${EAPI}" |
42 |
+ fi |
43 |
+ fi |
44 |
+ |
45 |
local subdep=${dep//\$\{PYTHON_MULTI_USEDEP\}/${multi_usedep}} |
46 |
matches+=( "python_single_target_${impl}? ( |
47 |
${subdep//\$\{PYTHON_USEDEP\}/${multi_usedep}} )" ) |