From 59856cf0ce83b35027c13e74d9d3061d876a4e34 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 13 Jan 2025 07:08:23 +0000 Subject: [PATCH] eclass/python-any-r1: Sync with Gentoo It's from Gentoo commit 142233f08e4be891468e74727ce4e0e538adc5c7. --- .../third_party/portage-stable/eclass/python-any-r1.eclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/python-any-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/python-any-r1.eclass index 0c01a49f90..adc7b1bfec 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/python-any-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/python-any-r1.eclass @@ -167,8 +167,7 @@ inherit python-utils-r1 # @CODE _python_any_set_globals() { - local usestr deps i PYTHON_PKG_DEP - [[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]" + local deps i PYTHON_PKG_DEP _python_set_impls @@ -259,7 +258,7 @@ python_gen_any_dep() { local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} i_depstr=${i_depstr//\$\{PYTHON_SINGLE_USEDEP\}/${PYTHON_SINGLE_USEDEP}} # note: need to strip '=' slot operator for || deps - out="( ${PYTHON_PKG_DEP%:=} ${i_depstr} ) ${out}" + out="( ${PYTHON_PKG_DEP/:=} ${i_depstr} ) ${out}" done echo "|| ( ${out})" }