summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2022-12-27 17:30:07 +0100
committerDavid Seifert <soap@gentoo.org>2022-12-27 17:30:07 +0100
commit3d67b1ccfacc37308a7236625035dff1156b025c (patch)
treeb9aa6b7f4962580359eee5e1814c78849f304632 /eclass/scons-utils.eclass
parentpython-r1.eclass: drop EAPI 6 support (diff)
downloadgentoo-3d67b1ccfacc37308a7236625035dff1156b025c.tar.gz
gentoo-3d67b1ccfacc37308a7236625035dff1156b025c.tar.bz2
gentoo-3d67b1ccfacc37308a7236625035dff1156b025c.zip
python-single-r1.eclass: drop EAPI 6 support
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'eclass/scons-utils.eclass')
-rw-r--r--eclass/scons-utils.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index 619230ecca6a..8d0076de97ec 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -103,7 +103,7 @@ if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; 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}]")
@@ -139,7 +139,7 @@ escons() {
eerror "the ebuild did not call the appropriate eclass function before calling scons."
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"