11 files changed, 11 insertions, 253 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 71f8749e6b3b..ebcc7ce35f32 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/pypy/Manifest b/dev-lang/pypy/Manifest
index e1a92e992170..dfe6f47f6855 100644
--- a/dev-lang/pypy/Manifest
+++ b/dev-lang/pypy/Manifest
@@ -1,9 +1,7 @@
 DIST pypy2.7-gentoo-patches-7.3.17.tar.xz 5324 BLAKE2B 866f172a6df6f0e94a98c611b37ae58635623e33a47619a5e44658d3908337a3f9029ff7de6997f760c3f1679fc83bfc6ddfb66852c492a581b3336b5eec3ed2 SHA512 6ce5266d0748f3c18a5546aa2bd8479ecb45923eb7df8a140a195e7f7b44999b9167ffdd44f7fd789ddd3a62cd77cb917863b0144180a1127befce1f290e650a
 DIST pypy2.7-v7.3.17-src.tar.bz2 19907140 BLAKE2B de62ebc4e8102867effdecddca64c19c40458b112a6a56ac0c95247047b9f5437a5da68dffb51c14c21bce463c2ca489c6e6a4f86e8cc597b57df2eca707081e SHA512 82b2b9dbf0ea32c405ddc53d98a3a7a153f494d286e8719a0c40960168aadc0f49c3b313416488338f7f51c8fdb58120de41b1d47a8c8eda7db6d4ec4273b4eb
-DIST pypy3.10-gentoo-patches-7.3.17_p1.tar.xz 18104 BLAKE2B 4b6c8c012d34b7ead8f7499edbe4292f21d2d7437694341de0bfb5f74d0717a11eb1c302a60baeb3ab123851a2436657458dad47c2b86a81218eea12d6aa9344 SHA512 73e0733f07be79f444b2fbf18ca7dcad6a76368cb8c185eb630d82e6886ed909548bc1779bf618588e34a572b5d48be0f9a86fc5758d302cf3ff0e94649b4815
 DIST pypy3.10-gentoo-patches-7.3.17_p2.tar.xz 19304 BLAKE2B acc36ad6711eb474341836da94cab425a12720902f66a74432fa03b61618abe43bd3706cba9ed0a763cbda16364d7d6ae45a742047a35599c40759eee85ff90a SHA512 510a3dbcd44d2c261f620bbf6c92d6a96b7f826b9e714ac957b52df9ca91599cc00c1435489e02274f972970c31882ab21360b3fe58ef78966ba11cc7f2cdbc7
 DIST pypy3.10-v7.3.17-src.tar.bz2 23350562 BLAKE2B 0a7a091976b352de61057f238fa386f767dd4d2fbcdcc0b4376066c20c2ad35d3818fa6e9e163ab5fd341856802e8ad1e2891decf5948c13cdb26726cd42019e SHA512 46e30845bbc73cf56f5033a24d3583253ce198522f3a28ae4e789884063ba167d401fc08ae7fc8c7769feed9cd942a8ab38961c8b8794d7fae8f9955479faa96
 EBUILD pypy-2.7.7.3.17.ebuild 7390 BLAKE2B b840b2c94b60e9d39aae7d5062c56f398428e4d31f1613cda39e34a6de1c279d06eace53774e08c7f5d2ab01f85d9bb30184de5fdbf9374ad276b97f58ac4e5a SHA512 8ffceda18cdc35e932d65ccb2c1962ce13c1fb46585afa9c909b9882e251ee8503822d1d0aac4f1ea669f566e0ae87a527fa467a2fc8578d899e67d58cca07bc
-EBUILD pypy-3.10.7.3.17_p1.ebuild 7140 BLAKE2B db6bfe1c3d44cdf9f4a1639c6bf8e35253c0ac3687f3a1315bfd52ca82c4a6fa0c3626c2aad938f8bcf2b2b6851db6fa1ed5f1847a891a08800040e0e4c27ea4 SHA512 efe64c07cfbdcb2fafbbbb93adeda1fd3ba22164130cb908d8bf26d0d82713fca179463f44673fb262573dca96a468573b53e67ab97d3f51563e23888afadfff
-EBUILD pypy-3.10.7.3.17_p2.ebuild 7142 BLAKE2B b5e91d74131969730bdd91d4bf2055f7e7a213d2916b27ac3fe395b563d6e2b3c5e8a5c59fea3dc8bbee196c9b6a9163037836f07ea86a4ad1bbcf31733279bd SHA512 0fc1f19af204b70f13cbf1f5e1e6d864cea64fee85a0cd41b638a75d8c2f3dc91c840406a121e64dc40ebe79dc1baf210da74fca0c011128f4e3d7b3e9fffdab
+EBUILD pypy-3.10.7.3.17_p2.ebuild 7140 BLAKE2B db6bfe1c3d44cdf9f4a1639c6bf8e35253c0ac3687f3a1315bfd52ca82c4a6fa0c3626c2aad938f8bcf2b2b6851db6fa1ed5f1847a891a08800040e0e4c27ea4 SHA512 efe64c07cfbdcb2fafbbbb93adeda1fd3ba22164130cb908d8bf26d0d82713fca179463f44673fb262573dca96a468573b53e67ab97d3f51563e23888afadfff
 MISC metadata.xml 1124 BLAKE2B f1d09d26175cf20d1440a9a83352cf6f2f2e514d35d95116caf4a5ee86547f0165a6369e7a6b129ded75d28ba5a0c1c8f4da7d664d7c1e3c1e95153593057b3c SHA512 ae95400c9a1efc75372201c2353b128302355d1d087094953d73c325fa72bc24662d31c7287ae6a2583448ac345bb60744ac19391e07f8da8ef0327627e0e462
diff --git a/dev-lang/pypy/pypy-3.10.7.3.17_p1.ebuild b/dev-lang/pypy/pypy-3.10.7.3.17_p1.ebuild
deleted file mode 100644
index 798985845580..000000000000
--- a/dev-lang/pypy/pypy-3.10.7.3.17_p1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs
-
-PYVER=$(ver_cut 1-2)
-PATCHSET_PV=$(ver_cut 3-)
-PYPY_PV=${PATCHSET_PV%_p*}
-
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PATCHSET_PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="${PYVER}/pypy310-pp73-384"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite +symlink +test-install tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy3_10-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/pypy3_10-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3_10
-	symlink? (
-		!<dev-python/pypy3-7.3.17-r100
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir "include/pypy${PYVER}" || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" pypy${PYVER}-c || die
-	cp -p "${BROOT}/usr/include/pypy${PYVER}/${PYPY_PV}"/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* "include/pypy${PYVER}/" || die
-	mv pypy/module/cpyext/parse/*.h "include/pypy${PYVER}/" || die
-	pax-mark m "pypy${PYVER}-c"
-
-	# verify the subslot
-	local soabi=$(
-		"./pypy${PYVER}-c" - <<-EOF
-			import importlib.util
-			import sysconfig
-			soabi = sysconfig.get_config_var("SOABI")
-			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
-			print(f"{soabi}-{magic}")
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	"./pypy${PYVER}-c" -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	"./pypy${PYVER}-c" - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=(
-		pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem
-		ctypes_test testmultiphase
-	)
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"../pypy${PYVER}-c" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-	# testcapi does not have a "build" script
-	"../pypy${PYVER}-c" -c "import _testcapi" || die
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=a4138e48
-	local local_cksum=$(
-		"../pypy${PYVER}-c" - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	local dest="/usr/lib/pypy${PYVER}"
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym "pypy${PYVER}-c-${PYPY_PV}" "/usr/bin/pypy${PYVER}"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r "include/pypy${PYVER}"
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}/usr/include/pypy${PYVER}/${PYPY_PV}"/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	rm -r "${ED}${dest}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${ED}${dest}"/ensurepip || die
-	fi
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use test-install; then
-		rm -r "${ED}${dest}"/{ctypes,sqlite3,tkinter,unittest}/test \
-			"${ED}${dest}"/{distutils,lib2to3}/tests \
-			"${ED}${dest}"/idlelib/idle_test || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-	# remove test last since we have some file removals above
-	if ! use test-install; then
-		rm -r "${ED}${dest}"/test || die
-	fi
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x PYTHON="${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	# exclude list from CPython Makefile.pre.in
-	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-
-	if use symlink; then
-		dosym pypy${PYVER} /usr/bin/pypy3
-
-		# install symlinks for python-exec
-		local EPYTHON=pypy3
-		local scriptdir=${D}$(python_get_scriptdir)
-		mkdir -p "${scriptdir}" || die
-		ln -s "../../../bin/pypy3" "${scriptdir}/python3" || die
-		ln -s python3 "${scriptdir}/python" || die
-	fi
-}
diff --git a/dev-lang/pypy/pypy-3.10.7.3.17_p2.ebuild b/dev-lang/pypy/pypy-3.10.7.3.17_p2.ebuild
index 788436ddabcc..798985845580 100644
--- a/dev-lang/pypy/pypy-3.10.7.3.17_p2.ebuild
+++ b/dev-lang/pypy/pypy-3.10.7.3.17_p2.ebuild
@@ -28,7 +28,7 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="${PYVER}/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ensurepip gdbm +jit ncurses sqlite +symlink +test-install tk"
 # many tests are failing upstream
 # see https://buildbot.pypy.org/summary?branch=py${PYVER}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 10fe57110bc8..1b45d4e2f8e4 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -33,17 +33,17 @@ DIST python-gentoo-patches-3.9.20_p1.tar.xz 34944 BLAKE2B 332454661adc03033c7e8a
 DIST python-gentoo-patches-3.9.20_p2.tar.xz 36140 BLAKE2B af0a9e08f3bfd8eb631760d100ec8f54db968a6bd201820192c4ea63ec88e0f83ffe77c709fcf4da43ad8d44eeb239ca1984561c3e7846e3fe4edd757d2321a4 SHA512 d451b41401de631eed996c34f40f2146d4d2f11bfa04fffa762c9b654e690d0ef95be0f51224a964a7c33784bb9b21e58434f6fee17cf39c20b5af34200569d5
 EBUILD python-2.7.18_p16-r2.ebuild 8597 BLAKE2B c472b0b3c49d4f848d910ac9d1d5fcffdbdf3f6f1454a4471807a1bc5129d7d6ff86c1af4515dec79056f3b079d1a0ea81e1693cfd49af2c2338462bb1f04cff SHA512 a7b48dff6e121915589a3ad746da6f52d29bef98d0d0a02578a5cc31cf9adcb1c32c82747cb768f355671e64825f75a8593d8424b7da36c09e8523a142b1ce1f
 EBUILD python-3.10.15_p1.ebuild 15523 BLAKE2B a1508c8905c930ce888e70a076feee030acdc90662bd5642a299048d12f9440d471c07c2796491aeb0782b245126d815b356f58e9a35157f1ca7d4d3cb894e0b SHA512 f602b8dbfe520768454f7af99394fedcafa4b3b508c98a09c037e47d6e1454679a48c874142f833285472afcc9f836f797941e2e2fdf5f931a39283ddabf192b
-EBUILD python-3.10.15_p2.ebuild 15529 BLAKE2B a539718591dd6d36dac288c3515db47f040869642ebc1f41c34e404879567902893169e641666f52d684d88358abfb602a59664eaf5cf7fc869ff0cd9ebb316f SHA512 7b7718f5769827a94f1c047ffb5e10ffb4ad42ee1aaf1d2d8812b53c226640481d1f1d9897270aeb282558920253f510a395d2072bcec2fc434108aa4532cf01
+EBUILD python-3.10.15_p2.ebuild 15524 BLAKE2B 376351fee14208c7675be7551f2c4a4add9d125457a2ef89bdc29bcd9b143b180e772fd407eef881c6f1b18a327c74e182f122ec965baf195c4cfb11deac4b5c SHA512 dc5450ee103cbb860a2ad41ab371ab3903deeb921735cfe94d605669dc4de7cd325e0da87b11838ff95707b6d1e2ae346343b61bd819328f83e5b92e4729ee9a
 EBUILD python-3.11.10_p1.ebuild 16744 BLAKE2B 67c6f7bb0379c0c787f626baf541f34b043020ddffd6e5c2105f8a14bfd7bcf1347ae8ea33f75f62fa7f1b2c3924fe4e62911fdd2f8dd042bdac9cd3db3c38e9 SHA512 0b42f9a994b0ffef790f45a19a5aa85d875a070a3c5eb862c1a045db42b06b9c37a6ef1fe87503a4727153ca9d06d497da789e68f126e43b1e89b3231075d24d
 EBUILD python-3.12.6_p2.ebuild 15689 BLAKE2B efdee37be4d2d2f6dbe4c697d5b468b50f254d7d77d9b7cab10591fb17a20d4e18cd96dce12a3e9477728c125fdd2693a86aebec556e139041980b402bad8b40 SHA512 f9d7eb72d5426519bc83873aca8125de6177fce7d4ed79233670f9c8a312ee3f9264ee96e0cfb41c702e20391cdc44d42d4d90037e34b861a93fd15371744820
 EBUILD python-3.12.6_p4.ebuild 15626 BLAKE2B 6c6ee6f42200236bbb9bb517fe42b8023cbea4a9e56b87ff256c9b3446f76b12a59ef908677c6b27c7b8ca96ed29ea335f92b50533568f2e3b7209ffe132a5ca SHA512 f4cb2fe15a211d2bc66314ff389a9b48d43833844a91abb67f9c95e0cdc8d50d63093c6db32a70133803775373e32aa4bafc5de54753001640235c814a92aceb
-EBUILD python-3.12.7_p1.ebuild 15670 BLAKE2B 8820e2b460f1de4a930331795e434b432cf7e8abbcc190319ac802c2e2417ddd8bf95e02ddac0376c5d51affb11b5f4647351ac573958ac9b85fcf2ab2a5d39b SHA512 b9cc0a44e0b810c20caef84d699980d4a64865579e6f3c3ce50d5fe6e42ff531562738bb9e1859b47fea87543c4d53340456f50ad16ae20f3c89fd9afbf03624
+EBUILD python-3.12.7_p1.ebuild 15669 BLAKE2B ae0fc6fb4dd0148891eee8da6b5cdfaf320c1763a02a1487a146449ccdf765765bbeba67475d6bd33adc5fbb69826b77a5f79456cd791efac37142c619c21726 SHA512 c58092a61e5bbf2ca0eafc932643abb2c082820a521afd6cb95970e671dc45533da8fcf2f52f9a93745226597a7e33546e46793806565f1f39e017873c4b69ad
 EBUILD python-3.13.0-r100.ebuild 17138 BLAKE2B 64e0860da5a8866493fe0d6d94d9ff705ce5c314173b2f75855ddabdab5832879544dba5bf46abf1055df59c440da8eeeb3abf66225b706d0b5bb3acc609e72d SHA512 501e9541adca7ae4a3d01686a48defcdcddb5a5774007dca42233e6bfc1207ac9f55429ec61641ee4d77c45c944ee82f49c40781250bbfe5a2893e0dcc1966fa
 EBUILD python-3.13.0.ebuild 17408 BLAKE2B 18edd2c2c00071918a40889f5280494cd6c3e0d5ad239926f1fe568455746058ec243d824abc230b0b380f0ce79dca97fbaffe77f89bf870eee405744a3c73ef SHA512 fac5685cc3af66ce9dd3a2b2e104696820beeb6ecf03761f415c48cb45e45bc637695cfe5255c0811f51ad74df2c47f4e40c5f3b41bdb8050871b2afb3741b71
 EBUILD python-3.14.0_alpha1-r100.ebuild 17173 BLAKE2B bd956cebdad0ebfedbdc6b0af2ee073054433cbb386dd6d7eb3f271f6b32b049e888cffeec3cf562e70d39108d0349ec9f4955100c24a4629a7665e3eb9ede74 SHA512 859aa6f10ab4ac12003ab901eef6ff7fd1b096b114b43ec5a380e8ef0206d6a3e04881118fd054b26ead308ceb910fd73914e338749dbbb83bb58ec2cd364e2f
 EBUILD python-3.14.0_alpha1.ebuild 16790 BLAKE2B a0b472210ae93c784194fb214b72bc0726a26224337602aa1591d37e0a7f49c054233c73ce4d78ec2d04c58fe53152a5f0b418959ec6badc4de5e50139790932 SHA512 9261bcae291df1654a3cc8ce912889f9e90dbaca088a7cdfb6b3254ff8b6e022376e82aed6c8496d4adceeee56fd9499da6aa93b7165736ab1c620b745206640
 EBUILD python-3.8.20_p2.ebuild 13325 BLAKE2B 0a1908bc54a0d8bc2dd0757e62817061af71de61d7bdcd787f8323dd7600c5f8ec590e4bf8f416eb495b9dcfd4eef0980d91d5cc09675d49aaf3c538eda56c4e SHA512 6395f6b29fba5973f8c18d8835c82f70a6cbea507db1eaf0e52ba0e581b82bfce29846d6dbf14153b0876674b875d366ad77d8e65c10c9b244d2fe8d0969d491
-EBUILD python-3.8.20_p4.ebuild 13331 BLAKE2B 1ec5fc24af522faf04b2408962452f684388a5e546e4f987a8734f0a520ed89985c6fc600483f6b6dccdde23c4b8d541651ad9a0144072836a343ae769356c58 SHA512 5b6379d8a0235e747d0ad7e12c2fa583e309fe2c65a7f0070fe225a02e9d1792fed34232ad801d834177148b4e40d2d230f1f80a94c180f858c6b006702e03e8
+EBUILD python-3.8.20_p4.ebuild 13327 BLAKE2B 7c94fac6af125bcf347cb84f97ef05f9fc01c4ed4eacd00d315540fef6816ba341d531ed456e5cde59f9ed2da6bbb8d77e079ca29e7633cae9919ad04fa3a023 SHA512 365091d10243afaecac7aef7a1e7acfe9ac92d3d65dddd3c9f0c544933babf34d95d60825362865807ec8eb0f9d470ea86b43626224c70a1f837fb5672877f6e
 EBUILD python-3.9.20_p1.ebuild 15374 BLAKE2B 65c06c62dca369cc7e1e02f0909df2e5a733c6b766bf7c93e66fe36f9118fa1e526df77272184b3b9afd262193b311ba58cca721d6bd1c208bea6a017a13d402 SHA512 c5fc0f145dc18f12f3f14914d786337577b56b46770aeb95a24c58bebd2b3afa67a18c2968597b4625b0c23f9c9c8f8136f11570cd0483494e5ba1aa71504d9c
-EBUILD python-3.9.20_p2.ebuild 15380 BLAKE2B c384e45f5cf8385f2aab6076d6cd3c9adc72ef944520daba66182b31dfab858ce3e56907377627aa90dd784544c60782110d4d9403686ca1adf4e0af4c0db985 SHA512 459f11b4a4e725198b6fb21bcab026f3df7b72cc09cfa148411d7b9dc4fedbaaad8d0be8ac2c8abf2faedcb60f312fb79fcdd6155df12509768ae0a8761a7831
+EBUILD python-3.9.20_p2.ebuild 15375 BLAKE2B 8c085e8e9e52a5d76dd98f4561ce7250f5e5c9f49e51af12cfe68f79bbf91db827f9240a4621970cc577c8fbfa40a41f9801f38bb6526c961281f5311bd33ebb SHA512 0875267996acbb530fc01ab11f5892df9682b1a815f4827a8fae7f7dbd2cf1eb08635e295db2c024d0dc6acfd56392e8f6c8af1a90afcd87ac528e13e4c3b786
 MISC metadata.xml 1437 BLAKE2B 22f737ad283774c5ffc55173878bf07b6f89d91b0ebd9cf41c11e518b35461ebc9ecfc8017a519673698869450c1ebe55b5dc2577a8b03ea716d30b99ce21d3e SHA512 9f684412c916a3909bb7c2bbfeeb93c66e1de22d4313d657370162ab8b7438e6397bc7d31641d0bbb06d3373966fbbf7578dc0a30ed44558cb1b8a3bb5bfecec
diff --git a/dev-lang/python/python-3.10.15_p2.ebuild b/dev-lang/python/python-3.10.15_p2.ebuild
index 81cddec6567c..ca655efa4656 100644
--- a/dev-lang/python/python-3.10.15_p2.ebuild
+++ b/dev-lang/python/python-3.10.15_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/python/python-3.12.7_p1.ebuild b/dev-lang/python/python-3.12.7_p1.ebuild
index 2cddd9127640..830a9bb0f57e 100644
--- a/dev-lang/python/python-3.12.7_p1.ebuild
+++ b/dev-lang/python/python-3.12.7_p1.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/python/python-3.8.20_p4.ebuild b/dev-lang/python/python-3.8.20_p4.ebuild
index 740ab91216df..02f6fb5c3734 100644
--- a/dev-lang/python/python-3.8.20_p4.ebuild
+++ b/dev-lang/python/python-3.8.20_p4.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm +ncurses pgo
 	+readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/python/python-3.9.20_p2.ebuild b/dev-lang/python/python-3.9.20_p2.ebuild
index f63ff0133b5d..aa65518937fb 100644
--- a/dev-lang/python/python-3.9.20_p2.ebuild
+++ b/dev-lang/python/python-3.9.20_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm +ncurses pgo
 	+readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 1c0990320683..fcc27aa2460c 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -270,7 +270,7 @@ EBUILD rust-1.77.1-r100.ebuild 20928 BLAKE2B 5329265cf9bb4c6c9c382c6de93feca85d5
 EBUILD rust-1.77.1.ebuild 25245 BLAKE2B d514569674cc230e4959a9e73d38f14b263dac22fa7ec3f91c417d142caf65f5920ab44bc28e0e23c32bc7113f73c1b27fbf74a82215e35c33dd97ac4b3f2ee4 SHA512 b36d066101a248f31560fd7db39f9367e42618ba882c43df3807fc70823ec319365096623e2d41dd37a9babd83d2d55c007145ae7185a1818bd926783ad3eb5c
 EBUILD rust-1.79.0-r100.ebuild 21163 BLAKE2B e3f75ae68de3d60fd73cfaa13e0e330dcf5a95f329b8f57b071d30ab82b46ff7de7b9492b28f66730f0d76ea50ea1ad20f303d57f92c62294b026a8f95b64d79 SHA512 66a2f8691a6ca0ec95d1c1f30450d0823f1d887bba39e9d1ecb5794cc0396662b9b424ab123cefb00c2e044c34c2e1aaab9614d63ed4c3d5572032bf7cb0ea3d
 EBUILD rust-1.79.0.ebuild 25480 BLAKE2B d2087cce728db5d5383e324476ba5380f95776d0d4742917742d9bd332b643c498f7a30ae32045d44a7aaeba7f235a614add12aa739765e4c308a02027ef02b4 SHA512 04ca9c5dcf088a0398ab05a39eb77119dd495248217fffe7451736cdee3c3ab1a274a54c4b6257384d39678cc87102d3e2ea3f0dcb40cbd657a0e07b7b93eaac
-EBUILD rust-1.80.1-r100.ebuild 21078 BLAKE2B c69a6270515108dbd409b99e327e040504569b7e3d37ff694e0c0861927a95e0043d655ef8a339504308f8ce526587371adb5cfa95176230edbc8a3a21ad3eea SHA512 3b0c4e74454cc2866c84d5f39479fc047800bd2cbc43e76b724a91ebef9e6a63e30db0f58ad240d5712d6589d80876f594b685ae658ca50676c214e711243122
+EBUILD rust-1.80.1-r100.ebuild 21035 BLAKE2B c546968d461e2db25b9f109ff0e5755a419183f97cca103419eca3b8e221fcfd2fa75be44aa3809406d1e13d668822ecfd6d966b2cbfd0158553b75e0dbb24ef SHA512 bc77654c89239c2ba33c3f1b4fca7137360e92f081b2317b6a9ad970a1c694744491020b63390c50474a58b6594e380d88e708c63a45495b0a6ae9579c81a591
 EBUILD rust-1.80.1.ebuild 25412 BLAKE2B 4905111b95c2710d39f414f7eb645a5906e24258608a3fd4b3e4d160846ca0a546a113474079ff8772012469bda7d7b915dc3de0ebd7c3f8038df3e35ef5efe2 SHA512 e10c2e029100faa54caec1fe98fb19c23c8b06a1f6b1a52b899eb1761945e7de1a835e4aa2526c060b952cd12d52f70a28118bff80d2ba51053cf88eef460dde
 EBUILD rust-1.81.0-r100.ebuild 21223 BLAKE2B 0b269a49c85236dd75feef10fabc2a2a3de14994ebf2ec02865d64a120c22afc4a04dc915c65a6fd3c833c2137c2afb56fc6fbf7485a636c6778cb857d8138d4 SHA512 c25d0db934b41d03d3c637a3f55f6b81d14577c4303a504df14b56feae9d0817efe5e422c63dbba69e5c04f5c92dc884cea1bd44f2eeb266f342eb6708333f85
 EBUILD rust-1.81.0.ebuild 25380 BLAKE2B c213ba368f9f49be7e3c6f0260684f9b7c7f1afa7727ca7a7db7802b5a40a9009756464f9fb5a3165cbb5161e3e18181973a67d97a2e1cde13e4d6733ac5f2b9 SHA512 56501ddc2d06c2e7ff98e704a255d850897028d115588bca21ba43530f6d8a39ad684642e802faded8ae83da06dd6d6e503c76759e6d1df9f0fdebc0f6d6ec6c
diff --git a/dev-lang/rust/rust-1.80.1-r100.ebuild b/dev-lang/rust/rust-1.80.1-r100.ebuild
index 8ec473296069..717fccf2b8e8 100644
--- a/dev-lang/rust/rust-1.80.1-r100.ebuild
+++ b/dev-lang/rust/rust-1.80.1-r100.ebuild
@@ -574,7 +574,6 @@ src_install() {
 		rust-gdb
 		rust-gdbgui
 		rust-lldb
-		rust-demangler
 	)
 
 	use clippy && symlinks+=( clippy-driver cargo-clippy )
@@ -619,7 +618,6 @@ src_install() {
 	cat <<-_EOF_ > "${T}/provider-${P}"
 		/usr/bin/cargo
 		/usr/bin/rustdoc
-		/usr/bin/rust-demangler
 		/usr/bin/rust-gdb
 		/usr/bin/rust-gdbgui
 		/usr/bin/rust-lldb