From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 7 Feb 2020 21:05:17 +0000 (+0100)
Subject: scons-utils.eclass: Migrate to PYTHON_MULTI_USEDEP
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=594fc996480a61320a0a1b2458a7fbf4bb3c400f;p=gentoo.git

scons-utils.eclass: Migrate to PYTHON_MULTI_USEDEP

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index 35cf4e322188..33838e3ec8bb 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -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