summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'eclass/python-single-r1.eclass')
-rw-r--r--eclass/python-single-r1.eclass12
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}} )" )