From 1cf25d8d399d0948fc9aace316b512dcfadeeac7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 7 Feb 2020 12:44:00 +0100 Subject: [PATCH] distutils-r1.eclass: Switch setuptools dep to PYTHON_MULTI_USEDEP MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- 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.26.2