diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-12-27 20:10:49 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-27 20:10:49 +0000 |
| commit | e44b9cf3e5b67eaf723e4a335faf39c87167abd3 (patch) | |
| tree | 3e6660b30910e7eb33586a99c4e892b52380bad6 /eclass/scons-utils.eclass | |
| parent | 4429be000a778f363162554d59d903a725283d7d (diff) | |
gentoo auto-resync : 27:12:2022 - 20:10:49
Diffstat (limited to 'eclass/scons-utils.eclass')
| -rw-r--r-- | eclass/scons-utils.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index acb51300f348..8d0076de97ec 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -95,7 +95,7 @@ inherit multiprocessing SCONS_DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}" -if [[ ${_PYTHON_ANY_R1} ]]; then +if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then # when using python-any-r1, use any-of dep API BDEPEND="$(python_gen_any_dep "${SCONS_DEPEND}[\${PYTHON_USEDEP}]")" @@ -103,12 +103,12 @@ if [[ ${_PYTHON_ANY_R1} ]]; then python_has_version "${SCONS_DEPEND}[${PYTHON_USEDEP}]" } python_check_deps() { scons-utils_python_check_deps; } -elif [[ ${_PYTHON_SINGLE_R1} ]]; then +elif [[ ${_PYTHON_SINGLE_R1_ECLASS} ]]; then # when using python-single-r1, use PYTHON_USEDEP API BDEPEND=" $(python_gen_cond_dep "${SCONS_DEPEND}[\${PYTHON_USEDEP}]") ${PYTHON_DEPS}" -elif [[ ${_PYTHON_R1} ]]; then +elif [[ ${_PYTHON_R1_ECLASS} ]]; then # when using python-r1, you need to depend on scons yourself # (depending on whether you need any-r1 or full -r1 API) # -- since this is a breaking API change, it applies to EAPI 7+ only @@ -137,9 +137,9 @@ escons() { if [[ ! ${EPYTHON} ]]; then eerror "EPYTHON is unset while calling escons. This most likely means that" eerror "the ebuild did not call the appropriate eclass function before calling scons." - if [[ ${_PYTHON_ANY_R1} ]]; then + if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then eerror "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()." - elif [[ ${_PYTHON_SINGLE_R1} ]]; then + elif [[ ${_PYTHON_SINGLE_R1_ECLASS} ]]; then eerror "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()." else # python-r1 eerror "Please ensure that python_setup is called before escons, or that escons" |