From c7f0266eeb1922bba8e2b3be779af6d803b9916f Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 16 Sep 2024 07:13:17 +0000
Subject: [PATCH] eclass/distutils-r1: Sync with Gentoo

It's from Gentoo commit 08cb1492fe62e8f15aa0d546db59ba27ec7a5ab3.
---
 .../third_party/portage-stable/eclass/distutils-r1.eclass   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass
index 0f9dc8d14d..5a6ebdcede 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass
@@ -1253,7 +1253,9 @@ distutils_pep517_install() {
 	fi
 
 	local cmd=() config_settings=
-	has cargo ${INHERITED} && cmd+=( cargo_env )
+	if has cargo ${INHERITED} && [[ ${_CARGO_GEN_CONFIG_HAS_RUN} ]]; then
+		cmd+=( cargo_env )
+	fi
 
 	case ${DISTUTILS_USE_PEP517} in
 		maturin)
@@ -2109,8 +2111,10 @@ _distutils-r1_post_python_install() {
 		local strays=()
 		local p
 		mapfile -d $'\0' -t strays < <(
+			# jar for jpype, https://bugs.gentoo.org/937642
 			find "${sitedir}" -maxdepth 1 -type f '!' '(' \
 					-name '*.egg-info' -o \
+					-name '*.jar' -o \
 					-name '*.pth' -o \
 					-name '*.py' -o \
 					-name '*.pyi' -o \