diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2021-06-20 09:57:56 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2021-06-23 23:44:15 +0200 |
| commit | 40dd1436f16c41bb14a85d02d292e7b1611150c6 (patch) | |
| tree | ab1d7ce9e619f9ed4133ec650da7ee02612cea4e /eclass | |
| parent | python-single-r1.eclass: Update doc for -2/-3 arg removal (diff) | |
| download | gentoo-40dd1436f16c41bb14a85d02d292e7b1611150c6.tar.gz gentoo-40dd1436f16c41bb14a85d02d292e7b1611150c6.tar.bz2 gentoo-40dd1436f16c41bb14a85d02d292e7b1611150c6.zip | |
python-single-r1.eclass: Ban PYTHON_MULTI_USEDEP in EAPI 8
PYTHON_MULTI_USEDEP was a temporary transition measure, and is now
equivalent to PYTHON_USEDEP. Ban it in EAPI 8 to clean up ebuilds.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/python-single-r1.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 50ec69fa2ddb..db483a9b184f 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -179,12 +179,6 @@ EXPORT_FUNCTIONS pkg_setup # python_targets_python3_4(-) # @CODE -# @ECLASS-VARIABLE: PYTHON_MULTI_USEDEP -# @OUTPUT_VARIABLE -# @DESCRIPTION: -# This is a backwards-compatibility placeholder. Use PYTHON_USEDEP -# instead. - # @ECLASS-VARIABLE: PYTHON_REQUIRED_USE # @OUTPUT_VARIABLE # @DESCRIPTION: @@ -392,6 +386,12 @@ python_gen_cond_dep() { fi local multi_usedep="python_targets_${impl}(-)" + if [[ ${EAPI} != [67] ]]; then + if [[ ${dep} == *\$\{PYTHON_MULTI_USEDEP\}* ]]; then + die "Replace PYTHON_MULTI_USEDEP with PYTHON_USEDEP in EAPI ${EAPI}" + fi + fi + local subdep=${dep//\$\{PYTHON_MULTI_USEDEP\}/${multi_usedep}} matches+=( "python_single_target_${impl}? ( ${subdep//\$\{PYTHON_USEDEP\}/${multi_usedep}} )" ) |