Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 1/2] distutils-r1.eclass: Switch setuptools dep to PYTHON_MULTI_USEDEP
Date: Fri, 07 Feb 2020 12:22:55
Message-Id: 20200207122217.503103-1-mgorny@gentoo.org
Signed-off-by: Michał Górny <mgorny@g.o>
---
 eclass/distutils-r1.eclass | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index a840769cdecf..3d6866b8db5f 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: distutils-r1.eclass
@@ -117,15 +117,23 @@ _distutils_set_globals() {
 	local rdep=${PYTHON_DEPS}
 	local bdep=${rdep}
 
+	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+		local sdep="dev-python/setuptools[${PYTHON_USEDEP}]"
+	else
+		local sdep="$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')"
+	fi
+
 	case ${DISTUTILS_USE_SETUPTOOLS} in
 		no|manual)
 			;;
 		bdepend)
-			bdep+=" dev-python/setuptools[${PYTHON_USEDEP}]"
+			bdep+=" ${sdep}"
 			;;
 		rdepend)
-			bdep+=" dev-python/setuptools[${PYTHON_USEDEP}]"
-			rdep+=" dev-python/setuptools[${PYTHON_USEDEP}]"
+			bdep+=" ${sdep}"
+			rdep+=" ${sdep}"
 			;;
 		*)
 			die "Invalid DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}"
-- 
2.25.0

Replies