gentoo auto-resync : 15:07:2022 - 13:42:19

2 files changed, 21 insertions, 18 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 55d3a17ecf64..624a73e0e701 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -33,7 +33,7 @@ EBUILD python-3.10.5.ebuild 11702 BLAKE2B d24101e18a5cc846de6ab9ec1578a8fb520b11
 EBUILD python-3.11.0_beta3.ebuild 13176 BLAKE2B f3ff342908575b3e8651f5eba8b7428f60b8f799f44f46f5f04f98e82b82b5ac85127e90475b0d3d9653f9b56e15fa606437c0a8bf98c2affe5a4bc65845f24f SHA512 f9d84559aec861e6e1426914da6b0430878d2bb141def8c064f06d21431ffb8b915b905802505dfc1a98d555c4d3bb130ee45247b717b38c5ea9f7a9056da1ba
 EBUILD python-3.11.0_beta3_p1.ebuild 13176 BLAKE2B f3ff342908575b3e8651f5eba8b7428f60b8f799f44f46f5f04f98e82b82b5ac85127e90475b0d3d9653f9b56e15fa606437c0a8bf98c2affe5a4bc65845f24f SHA512 f9d84559aec861e6e1426914da6b0430878d2bb141def8c064f06d21431ffb8b915b905802505dfc1a98d555c4d3bb130ee45247b717b38c5ea9f7a9056da1ba
 EBUILD python-3.11.0_beta3_p2.ebuild 13272 BLAKE2B 658ba9c4c5454b17b5000b554af41f47f2b0b57284f8b2239cb9d290171d626e7201f62c6d8e8042dd2d417defed0f23723464b957aaaffb7794c16fb5671257 SHA512 6a0d31c7d39112ad9f5b1971ccd81088078f524d07888d06a52d6853d0b6e62944f6c0729977fea85e1e18220f56612a8909dc58e7dd319e21bd8309933625ed
-EBUILD python-3.11.0_beta4-r1.ebuild 13360 BLAKE2B 194f07eab45298a5d355312eb55647ab1a45c0d321fc9c402d8cc1b271b3e6c66a6b9d2411fe2a9b52428325009fda20c086f1a447c4fec6a08526ecfa5afb62 SHA512 f65578af6a1fa14c19beeca2d1c59bd31bd4f2cc6eed5c74db6dbd787d6dccd7274eeb3007fab4ccd23e0ac06b13e620d2df08a943d7346d144a4a301858e078
+EBUILD python-3.11.0_beta4-r2.ebuild 13637 BLAKE2B 230701d089c7e42f80b0666a1ac6c5d48ff6fe8a5b7822ee3d4cd41adfe6e50143ecde143e228416f97cc0886910b22bc0fbb83ffad3ad19006aebcc382516fc SHA512 ec7a302106654abefb0672e25e1f189506d35111be4a983ae5b51281bd195a452fe1fb7170b77f8048c880563664f8b9b3624c434594a4f3b36306a203e299e9
 EBUILD python-3.8.13.ebuild 10279 BLAKE2B dc700b2729f44840d33306fa0e50565d3c134ff74db39c83aebcc9994899479736bad15897e4135904bf7a6f4914c40e9b73caa64a0376aba10664d07c351227 SHA512 51b826ed0c99f777b684341141c83fca557942496a670aa4385f6c8c6379e445d7ec953c2f1b9562d5b4ee921038677f597c27fc8f355f076d72f66e6ae6ee9e
 EBUILD python-3.8.13_p2.ebuild 10220 BLAKE2B 2bdcd798eb692ea3965c397bdb85b9fa98cff275ec7bdd9e5ef75b86dcfc5cb74c4850ebfa8d3c46eded5cdae7a83f930f241ad09bc7ad103b83843a0ada8e1f SHA512 bcea714655f490fa8f816b3f969cd9079f69692fc86e74d52bfbfd06d9ea3076bb69eda64b4cf333139bf7b71c2372ceefcb3ba04c31d49737fb2b4388044725
 EBUILD python-3.9.12.ebuild 11522 BLAKE2B a1847835a23e863957ab089d1449a01c377ce9e1460ab3ed3453d863d6ad38824802bed23490dfa27c88615c1d70b8690d086997da143987657bf595d592ef2b SHA512 0e0d46e25e1f353152daddd3d67b870f393124a48e1cb9f9f464b3174d5254cba2580e7351dcba91558885cda7342e843a2e69631100bf6d15d791fadc3d8d2b
diff --git a/dev-lang/python/python-3.11.0_beta4-r1.ebuild b/dev-lang/python/python-3.11.0_beta4-r2.ebuild
index 648a47f45541..aab4bbbdc169 100644
--- a/dev-lang/python/python-3.11.0_beta4-r1.ebuild
+++ b/dev-lang/python/python-3.11.0_beta4-r2.ebuild
@@ -278,6 +278,9 @@ src_configure() {
 	for mod in "${disable_modules[@]}"; do
 		echo "MODULE_${mod}_STATE=disabled"
 	done >> Makefile || die
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
 }
 
 src_compile() {
@@ -424,25 +427,9 @@ src_install() {
 		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
 		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		cat > python.wrap <<-EOF || die
-			#!/bin/sh
-			export LD_LIBRARY_PATH=\${PWD}\${LD_LIBRARY_PATH+:\${LD_LIBRARY_PATH}}
-			exec ./python "\${@}"
-		EOF
-		chmod +x python.wrap || die
-		local -x PYTHON=./python.wrap
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
 	# python-exec wrapping support
 	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
 	local scriptdir=${D}$(python_get_scriptdir)
 	mkdir -p "${scriptdir}" || die
 	# python and pythonX
@@ -470,3 +457,19 @@ src_install() {
 			"${scriptdir}/idle" || die
 	fi
 }
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
+			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
+			ewarn "installed previously are no longer valid and will be regenerated"
+			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
+			ewarn "when installing some packages and checksum mismatches when removing"
+			ewarn "old versions.  To actively prevent this, rebuild all packages"
+			ewarn "installing Python 3.11 modules, e.g. using:"
+			ewarn
+			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
+		fi
+	done
+}