From 05b8b0e0af1d72e51a3ee61522941bf7605cd01c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 4 Jul 2020 14:05:23 +0100
Subject: gentoo resync : 04.07.2020

---
 eclass/distutils-r1.eclass | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'eclass/distutils-r1.eclass')

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index d29abf71fe30..092c0887d878 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -116,40 +116,40 @@ fi
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
 _distutils_set_globals() {
-	local rdep=${PYTHON_DEPS}
-	local bdep=${rdep}
-
-	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		local sdep=">=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]"
-	else
-		local sdep="$(python_gen_cond_dep '
-			>=dev-python/setuptools-42.0.2[${PYTHON_MULTI_USEDEP}]
-		')"
-	fi
+	local rdep bdep
+	local setuptools_dep='>=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]'
 
 	case ${DISTUTILS_USE_SETUPTOOLS} in
 		no|manual)
 			;;
 		bdepend)
-			bdep+=" ${sdep}"
+			bdep+=" ${setuptools_dep}"
 			;;
 		rdepend)
-			bdep+=" ${sdep}"
-			rdep+=" ${sdep}"
+			bdep+=" ${setuptools_dep}"
+			rdep+=" ${setuptools_dep}"
 			;;
 		pyproject.toml)
-			bdep+=" dev-python/pyproject2setuppy[${PYTHON_USEDEP}]"
+			bdep+=' dev-python/pyproject2setuppy[${PYTHON_USEDEP}]'
 			;;
 		*)
 			die "Invalid DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}"
 			;;
 	esac
 
-	RDEPEND=${rdep}
+	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+		bdep=${bdep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
+		rdep=${rdep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
+	else
+		[[ -n ${bdep} ]] && bdep="$(python_gen_cond_dep "${bdep}")"
+		[[ -n ${rdep} ]] && rdep="$(python_gen_cond_dep "${rdep}")"
+	fi
+
+	RDEPEND="${PYTHON_DEPS} ${rdep}"
 	if [[ ${EAPI} != [56] ]]; then
-		BDEPEND=${bdep}
+		BDEPEND="${PYTHON_DEPS} ${bdep}"
 	else
-		DEPEND=${bdep}
+		DEPEND="${PYTHON_DEPS} ${bdep}"
 	fi
 	REQUIRED_USE=${PYTHON_REQUIRED_USE}
 }
-- 
cgit v1.2.3