scons-utils.eclass: Migrate to PYTHON_MULTI_USEDEP
authorMichał Górny <mgorny@gentoo.org>
Fri, 7 Feb 2020 21:05:17 +0000 (22:05 +0100)
committerMichał Górny <mgorny@gentoo.org>
Sun, 9 Feb 2020 16:10:26 +0000 (17:10 +0100)
Signed-off-by: Michał Górny <mgorny@gentoo.org>
eclass/scons-utils.eclass

index 35cf4e3221889ec69ab4e12c25ceb9be14016432..33838e3ec8bb6286893758f99102308cf72934dd 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: scons-utils.eclass
@@ -126,8 +126,9 @@ if [[ ${_PYTHON_ANY_R1} ]]; then
        }
        python_check_deps() { scons-utils_python_check_deps; }
 elif [[ ${_PYTHON_SINGLE_R1} ]]; then
-       # when using python-single-r1, use plain PYTHON_USEDEP API
-       BDEPEND="${SCONS_DEPEND}[${PYTHON_USEDEP}]
+       # when using python-single-r1, use PYTHON_MULTI_USEDEP API
+       BDEPEND="
+               $(python_gen_cond_dep "${SCONS_DEPEND}[\${PYTHON_MULTI_USEDEP}]")
                ${PYTHON_DEPS}"
 elif [[ ${EAPI:-0} == [0123456] ]]; then
        # in older EAPIs, just force Python 2.7