gentoo auto-resync : 06:12:2022 - 21:11:24

6 files changed, 55 insertions, 15 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index ca22e047d4ac..34e9429f812b 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -22,10 +22,10 @@ DIST python-gentoo-patches-3.12.0a2.tar.xz 6164 BLAKE2B 734068ed87dae1bb30b61f42
 DIST python-gentoo-patches-3.8.15_p3-r1.tar.xz 30604 BLAKE2B 68ddeff291a70dfe22e8a0276b30db5a37d7e53dfc5d52c311573136f6fc322cddc65478684ed6339cd8156170588fe8ea3a454a5ec18e0bb91a898dc7c99f1e SHA512 ce9c73cd2b53c5c7f8bb27c65d5ea02bb7c38bfc1b25c972203fcea52bd1ffe4afcb65eedc8556b026a2faf0fc402f566c38b91ee54d6580bc958c0322e90e0a
 DIST python-gentoo-patches-3.9.15_p3-r1.tar.xz 26400 BLAKE2B 27198acf3e9087b96ef15328b9da6d80837a459c62b21c9785fde77dc6f4a5c8c4ccbc3cb48e5af684a253a978c5562fb1a342e6a554d2247aa968fd5890d6f5 SHA512 d658dc89ca29070de2a39d643cc9585ae7f66232dececfd7007cb57a6c6ededd30ae030dbe9226686b8517c48fdb5ed7e681decb64b207e41173a0993f461aea
 EBUILD python-2.7.18_p16.ebuild 8398 BLAKE2B f136256fc59c3d6808f964e647a50bf5107e9e9154ec3420de1ab8602421bc96541951ee607b4ef2c106982b2f7c280b9bb9eb86a324492c780bde5f26f0f60e SHA512 a36f0ae948b4cae1d86c3f8080cb41ba98b507ebb3a79142f79e1db25f5056b872862c2d76291a22e9eeba32cb6929aac54de5422d24b7e81f15c855012316d3
-EBUILD python-3.10.8_p3.ebuild 12978 BLAKE2B 9e40d2fdfb4ddcbf245324cfa1675c3b0ed3899db7f4c40194fd2a1420204877295aedc031fcc4f014133cc337f27499a8d7d46e2a2d6d2a7a675bc45cb6538f SHA512 8296d770efa6134320705c6200b84904738556b0a29bde6d9ca878a685e4b66191d6c61dbed511a42f66a3c9f342b6b99669eba495d7253705c7cc9c2cb6f7cf
-EBUILD python-3.11.0_p2.ebuild 13877 BLAKE2B c647db023362cc5bbc23725e1e0d7de9c2893567a21aa13be5500fe8347298b3d4270a88134dedc51e55b737550c2baea047748eb1bcd73a889157725fd6e528 SHA512 7fdc89a25c86bdee50ddf411e2bc60a6996a14bf36f2940db74e75c758542a339f0ed60e58cb792768604cbd7759dfa3e949c7ae9bfdfaa72e6d877e3d1aac35
+EBUILD python-3.10.8_p3.ebuild 13469 BLAKE2B 68b7ea28aced494f3d9d6c1f7cbcff9070c0d1f1e8849de8ab97456150d05c36c10e93f7ccea52522629fa1bd6c6e84beea90a3c5863b0ace3a1675539d1237d SHA512 939df93f05796c2d0f989a8068a5cc68a84a4643f7e4bcabf380f854f8b84c60df35f5fcd4226bcae245bbddd1bc014b8393849eaa0ea3f9dbc205f66ccf8d5b
+EBUILD python-3.11.0_p2.ebuild 14368 BLAKE2B 3e97d14d8c6b361b3ebd0bb450e782a9df67dd8b071049baea418496bb325d52b248e4092133d54962ff65a8689ee4be6c3bd37b01ba8ed3fb12cebd29c4ebf2 SHA512 a8fddbe9f027a5dd4f81c876e447bf85d4687e3d112caa2ee3859a364738e2666fd0ca96570883212a478e677bfd953f5bbc12044893f3f9b80025694fd6e31a
 EBUILD python-3.12.0_alpha1_p2.ebuild 13706 BLAKE2B 9da066781527c5e03fd85a2968b40f4b249f378e283a5475843ff8b90714a826ba788375fd17d5571d8003e31cff2dee15966539344c27801fed36a0acdf8728 SHA512 c5ff9fd0f33729eb19aeeba94b3e67c03833855e261ed1a1ad4e6584de2d0a08e63aafab71c315060db6512337abc8552ae95973b452b367ec5324cb033724cc
-EBUILD python-3.12.0_alpha2.ebuild 13644 BLAKE2B ae285742f8af9471e3dea2f25fea2d76cd72f7c7a6311ee92c440d6ba1894ebb8ee8d62f1e6c722ac77e8238f5d065692f43593b8bd71017c4c46e4077bd450f SHA512 c1247454ae5c16c88d7ec0cc60a62961385bb0ce56d7a0776890da145d81a075ee3246fda88f9d727fad912da15f87d2dcdcedfa7ecd0869e903907075ab39d3
-EBUILD python-3.8.15_p3.ebuild 11517 BLAKE2B 5a7a6960f2fda4a5804b6651a30427dd97cd863f96741e5d01ca1fb86598da4cbf060084480a0000468f2167fc2366a92ac7c81c1ba4b80b2c8b8c4ccbac3c41 SHA512 390f8e2d694926458f7b20d62e00808c8bc9af927db998a361a3b7bb6a55c741d19cd99da24f1c9089825721e3dc641281e2f12b124e18b96531af06935af971
-EBUILD python-3.9.15_p3.ebuild 12776 BLAKE2B c2ff085146850d7b3762016c38dbc6442e634b0df55426f7dba7f027ad809f7ac5481341631910f635b9f3e137ba7fffc89a400c3cc5a21065998a44cfc05d0f SHA512 e111128bf44ec80fd2bfa390223428e26c8f6ecac1854cdfdc9bb82bd06d700f216b21301fd370880afa8126841896c6aa273af5fe3d57bcb845d8dc49e39720
+EBUILD python-3.12.0_alpha2.ebuild 14135 BLAKE2B 227f90a9c6f94260f411ca441ad53e7ad7cd26c955921b201dadef15642706f3c900d8ff5992e1c1edca95aee28af1549b9f63244a61c955e6dbc910f48c913c SHA512 5f4c14dc3f7d510af049314e71204b66fbfbac096574552559f37f3ab8f251fcb57668566493f4c53f7fcbbf8802843f7351b2145021543fc34e6c226c380513
+EBUILD python-3.8.15_p3.ebuild 12008 BLAKE2B af69b201609e4bb47a0d9481696a4e59d446e1b1dedb27e14ccdae1890f0c28c201db7c6023cd9ff86cf1138d2d5f6ffa2e2eb39d683e089a58adf8ecd9905a3 SHA512 9815723c7b3b91e6871256583e812381851585275a9fd4eb12227bb720bbfd5650b7839237ce6330166983333acc74187c14d6a591d4f75521ab2b4e2ca367a2
+EBUILD python-3.9.15_p3.ebuild 13267 BLAKE2B cf1cc7b39eaf5643332741ea03d01571a8b5729715ddc5165f7433990a1642bdd92e3a17cbb3fa40ae5f8edefab48ece0f9733b039b4225a81934eaf52d77b0f SHA512 8dcf39c9f207b56ca590b1848887b4bf7497c1cd161fe4174b5180e39c6e2922fb6aa4a8928d85fba34c0b97f65ccbc887073ae634ad828a17bb1f2ac867a722
 MISC metadata.xml 1315 BLAKE2B eb468cc22ed763d197ee9292e5531bfad6d05123a68466fb9a1f3c3f790d3ee7e16e2fb74ce652a1dde33ed38d089fc442b629395f711f056dcda34d3058feaa SHA512 9c38f152b3ee3bb9d9f0d5640ccbb28032c9e770d0aaad266fb2758218259c28ca3f6c76542a5b79f6c20ca09ad284772ecc6c7e484d77e995ad51f418f616ec
diff --git a/dev-lang/python/python-3.10.8_p3.ebuild b/dev-lang/python/python-3.10.8_p3.ebuild
index e7125a5118a9..e491313aed70 100644
--- a/dev-lang/python/python-3.10.8_p3.ebuild
+++ b/dev-lang/python/python-3.10.8_p3.ebuild
@@ -230,6 +230,9 @@ src_configure() {
 	local -x OPT=
 
 	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
 		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
 		# propagated to sysconfig for built extensions
 		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
@@ -241,6 +244,8 @@ src_configure() {
 		local myeconfargs_cbuild=(
 			"${myeconfargs[@]}"
 
+			--libdir="${cbuild_libdir:2}"
+
 			# As minimal as possible for the mini CBUILD Python
 			# we build just for cross.
 			--without-lto
@@ -253,7 +258,10 @@ src_configure() {
 
 		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
 		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
 
 		# Avoid as many dependencies as possible for the cross build.
 		cat >> Makefile <<-EOF || die
@@ -276,7 +284,7 @@ src_configure() {
 		# not in src_compile, because CHOST configure for Python
 		# will check the existence of the Python it was pointed to
 		# immediately.
-		emake
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
 		popd &> /dev/null || die
 	fi
 
diff --git a/dev-lang/python/python-3.11.0_p2.ebuild b/dev-lang/python/python-3.11.0_p2.ebuild
index 6888041b8060..4eb6b8b120b6 100644
--- a/dev-lang/python/python-3.11.0_p2.ebuild
+++ b/dev-lang/python/python-3.11.0_p2.ebuild
@@ -219,6 +219,9 @@ src_configure() {
 	local -x OPT=
 
 	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
 		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
 		# propagated to sysconfig for built extensions
 		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
@@ -230,6 +233,8 @@ src_configure() {
 		local myeconfargs_cbuild=(
 			"${myeconfargs[@]}"
 
+			--libdir="${cbuild_libdir:2}"
+
 			# As minimal as possible for the mini CBUILD Python
 			# we build just for cross to satisfy --with-build-python.
 			--without-lto
@@ -245,7 +250,10 @@ src_configure() {
 
 		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
 		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
 
 		# Avoid as many dependencies as possible for the cross build.
 		cat >> Makefile <<-EOF || die
@@ -268,7 +276,7 @@ src_configure() {
 		# not in src_compile, because CHOST configure for Python
 		# will check the existence of the --with-build-python value
 		# immediately.
-		emake
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
 		popd &> /dev/null || die
 	fi
 
diff --git a/dev-lang/python/python-3.12.0_alpha2.ebuild b/dev-lang/python/python-3.12.0_alpha2.ebuild
index ec1c57a29503..6a277535661c 100644
--- a/dev-lang/python/python-3.12.0_alpha2.ebuild
+++ b/dev-lang/python/python-3.12.0_alpha2.ebuild
@@ -215,6 +215,9 @@ src_configure() {
 	local -x OPT=
 
 	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
 		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
 		# propagated to sysconfig for built extensions
 		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
@@ -226,6 +229,8 @@ src_configure() {
 		local myeconfargs_cbuild=(
 			"${myeconfargs[@]}"
 
+			--libdir="${cbuild_libdir:2}"
+
 			# As minimal as possible for the mini CBUILD Python
 			# we build just for cross to satisfy --with-build-python.
 			--without-lto
@@ -241,7 +246,10 @@ src_configure() {
 
 		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
 		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
 
 		# Avoid as many dependencies as possible for the cross build.
 		cat >> Makefile <<-EOF || die
@@ -264,7 +272,7 @@ src_configure() {
 		# not in src_compile, because CHOST configure for Python
 		# will check the existence of the --with-build-python value
 		# immediately.
-		emake
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
 		popd &> /dev/null || die
 	fi
 
diff --git a/dev-lang/python/python-3.8.15_p3.ebuild b/dev-lang/python/python-3.8.15_p3.ebuild
index 5f5bccbf6686..39a9badeb2d6 100644
--- a/dev-lang/python/python-3.8.15_p3.ebuild
+++ b/dev-lang/python/python-3.8.15_p3.ebuild
@@ -184,6 +184,9 @@ src_configure() {
 	local -x OPT=
 
 	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
 		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
 		# propagated to sysconfig for built extensions
 		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
@@ -195,6 +198,8 @@ src_configure() {
 		local myeconfargs_cbuild=(
 			"${myeconfargs[@]}"
 
+			--libdir="${cbuild_libdir:2}"
+
 			# As minimal as possible for the mini CBUILD Python
 			# we build just for cross.
 			--without-lto
@@ -207,7 +212,10 @@ src_configure() {
 
 		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
 		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
 
 		# Avoid as many dependencies as possible for the cross build.
 		cat >> Makefile <<-EOF || die
@@ -230,7 +238,7 @@ src_configure() {
 		# not in src_compile, because CHOST configure for Python
 		# will check the existence of the Python it was pointed to
 		# immediately.
-		emake
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
 		popd &> /dev/null || die
 	fi
 
diff --git a/dev-lang/python/python-3.9.15_p3.ebuild b/dev-lang/python/python-3.9.15_p3.ebuild
index 4ab4f51b7faf..eff2605e1374 100644
--- a/dev-lang/python/python-3.9.15_p3.ebuild
+++ b/dev-lang/python/python-3.9.15_p3.ebuild
@@ -224,6 +224,9 @@ src_configure() {
 	local -x OPT=
 
 	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
 		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
 		# propagated to sysconfig for built extensions
 		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
@@ -235,6 +238,8 @@ src_configure() {
 		local myeconfargs_cbuild=(
 			"${myeconfargs[@]}"
 
+			--libdir="${cbuild_libdir:2}"
+
 			# As minimal as possible for the mini CBUILD Python
 			# we build just for cross.
 			--without-lto
@@ -247,7 +252,10 @@ src_configure() {
 
 		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
 		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
 
 		# Avoid as many dependencies as possible for the cross build.
 		cat >> Makefile <<-EOF || die
@@ -270,7 +278,7 @@ src_configure() {
 		# not in src_compile, because CHOST configure for Python
 		# will check the existence of the Python it was pointed to
 		# immediately.
-		emake
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
 		popd &> /dev/null || die
 	fi