9 files changed, 612 insertions, 189 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 55930d244c54..8f248b65be72 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 8718beaf2f2c..852c2f4536bc 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,8 +1,6 @@
 AUX nim-2.0.6-testament-skipfile.txt 2594 BLAKE2B 58af9e632d595e1dc8f6b4fadacf55f10697d75a1ff21a2a6be2feb14eb7e86c27d5fb10737614b2dad3eb7ee3b4a8d76d30ef1c7117e1b7738ca00960450c4c SHA512 940b9ad7eb1debee502568abf30f81970fc431785c3f9b00d8322eaa686f17e6b641e66baaecc7a6ec288076139d180f87978dec24a9ac949e14b5051829228f
 AUX nim-sets.conf 162 BLAKE2B 976422f31cf8a64e1fad537f4db38a07e0022b9460936c63e0220cb3858ba02704857841d5010ad8c7bde0e6192c4c3c1329aeca8080a48a728e8b288cefc0fb SHA512 61a07de9973fc77998515bbb62498ffd1de991241bf32805f4acc0e4325e39d767ac862f2546757763aa8d0a7f35b95a9e1df91e6aa6f241eed6e93c8e3c46f0
-DIST nim-2.0.6.tar.xz 7668088 BLAKE2B 1cc2b3be355b236b467fa6629747de55b60b6d2f3e9d8bc584fa4f30ba842d68a0db984aff234df1299b0a782af1d464382bb37fa62c0c7a952e667bf0d3c3be SHA512 9668b34decb55fd27f0edb8c6dcdd2d8dbed00f71e8ce5c177422aedbcc359f4b943b29a38875f4715c1903a32b8388e2a4662d5ceb301349b23eb2277dbde1e
 DIST nim-2.0.8.tar.xz 7617556 BLAKE2B 96ab3e92c7c9d3dcb54de6528f2ae788f3ff4a927d693f2ca4917231441d85d12c8bda44c41c8f363979dbd0d8db54098648512caf7780bdc40e393c4f7803ec SHA512 e64abc379c046a9432515d1c8074a7e10ff72a1076663a5b7bdd39ae92852c98ba2cab96aa5e968fc31ca393e778e70b2392d6ab56bca7ac956d0176b4b69a83
 DIST nim-atlas-0.8.0.tar.gz 59097 BLAKE2B 231b238ac3b15cc2c2d9ad927f80ae72d8ae4c649277515f32df6cc04275ccd38db5307d627572af547501e6522c06c86dc279dc3e13b5385f14e24032f6fe69 SHA512 747c13e2c5bd45a1dc6c1426f8c7637f638ada9dd4c9aa3edf4ef8367060e73226dc4bcde6380fac25ed47ebf4097fd223c72fadc3cceba8c71dd0f0571e47eb
-EBUILD nim-2.0.6.ebuild 4405 BLAKE2B f33ab0ba4705016172352572f6d9578274b504ca0920289e764a2988d46a2cd290e905166577755c594732b3cfaebccbb90dcd3414680199e4012db27de5ee74 SHA512 9d42ca7771522685af89dbf520d7e43b603351c4015775c12d9560b868ba30f4ee2ff1a86930625d4d016e8e3d8e65c67971ecb7eea2f5212a62b72576f8aad9
 EBUILD nim-2.0.8.ebuild 4515 BLAKE2B bb5d9853831522b70bcdac9b1af83436e334b87d317656bcb80c23df088e0b7c12cc8b3fcaa07e782d26d0022e318cb905a495c5dc60ab84bb57fd245aa7d94f SHA512 c180a6712575768784b025ce79d9f863e5372244a956f30d5de6bb4b71622c845b010501c07a7bf62a4a26c55b6c59127c7dcf6651f98a5d06a504996105ae9b
 MISC metadata.xml 2093 BLAKE2B 250d27e71538be674ff7f32fe55089fca33f0d6ab55fdbe2b0f858f3d4373e729f273c16b2bf0bc3265be4289e7de1438096bf60e69bd0100e126fc5cc6173eb SHA512 74a188f13cc0653aa30d0c18126ed1cfb11d4325d71ffca6af03ad62b135796cd64d269e2ea85280cd1e486b527947b287eee4db648600451336e323882ff0e3
diff --git a/dev-lang/nim/nim-2.0.6.ebuild b/dev-lang/nim/nim-2.0.6.ebuild
deleted file mode 100644
index d73e284e011c..000000000000
--- a/dev-lang/nim/nim-2.0.6.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ATLAS_V="0.8.0"
-
-inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
-
-DESCRIPTION="Compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/
-	https://github.com/nim-lang/Nim/"
-SRC_URI="
-	https://nim-lang.org/download/${P}.tar.xz
-	https://github.com/nim-lang/atlas/archive/refs/tags/${ATLAS_V}.tar.gz
-		-> nim-atlas-${ATLAS_V}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="test-js test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-db/sqlite:3
-		dev-libs/boehm-gc
-		dev-libs/libffi
-		dev-libs/libpcre:3
-		dev-libs/openssl
-		media-libs/libsdl
-		media-libs/libsfml
-	)
-"
-BDEPEND="
-	sys-process/parallel
-	test? (
-		test-js? (
-			net-libs/nodejs
-		)
-	)
-"
-
-src_configure() {
-	xdg_environment_reset  # bug #667182
-
-	unset NIMBLE_DIR
-	tc-export CC CXX LD
-
-	mkdir "${HOME}/.parallel" || die
-	touch "${HOME}/.parallel/will-cite" || die "parallel setup failed"
-
-	cat > nim.cfg <<- EOF || die "Failed to create Nim config"
-		cc:"gcc"
-		gcc.exe:"$(tc-getCC)"
-		gcc.linkerexe:"$(tc-getCC)"
-		gcc.cpp.exe:"$(tc-getCXX)"
-		gcc.cpp.linkerexe:"$(tc-getCXX)"
-		gcc.options.speed:"${CFLAGS}"
-		gcc.options.size:"${CFLAGS}"
-		gcc.options.debug:"${CFLAGS}"
-		gcc.options.always:"${CPPFLAGS}"
-		gcc.options.linker:"${LDFLAGS}"
-		gcc.cpp.options.speed:"${CXXFLAGS}"
-		gcc.cpp.options.size:"${CXXFLAGS}"
-		gcc.cpp.options.debug:"${CXXFLAGS}"
-		gcc.cpp.options.always:"${CPPFLAGS}"
-		gcc.cpp.options.linker:"${LDFLAGS}"
-
-		$([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"')
-		-d:"release"
-		--parallelBuild:"$(makeopts_jobs)"
-
-		# some tests don't work with processing hints
-		--processing:"off"
-	EOF
-
-	cp -r "${WORKDIR}/atlas-${ATLAS_V}" "${S}/dist/atlas" || die
-}
-
-src_compile() {
-	local -x PATH="${S}/bin:${PATH}"
-
-	edo ./build.sh --parallel "$(makeopts_jobs)"
-
-	ebegin "Waiting for unfinished parallel jobs"
-	while [[ ! -f "bin/nim" ]] ; do
-		sleep 3
-	done
-	sleep 10
-	eend 0
-
-	edo chmod +x ./bin/nim
-	edo ./bin/nim compile -d:release koch
-	edo ./koch boot -d:nimUseLinenoise -d:release --skipParentCfg:off
-	edo ./koch tools -d:release
-	edo ./bin/nim compile -d:release ./tools/niminst/niminst.nim
-}
-
-src_test() {
-	local -x PATH="${S}/bin:${PATH}"
-	local -a nimflags=(
-		# Leave only the safe hints enabled.
-		--hint:all:off
-		--hint:User:on
-		--hint:UserRaw:on
-	)
-	local -a testament_args=(
-		--skipFrom:"${FILESDIR}/${PN}-2.0.6-testament-skipfile.txt"
-		--nim:"bin/nim"
-		--targets:"$(usex test-js 'c js' 'c')"
-	)
-
-	[[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] \
-		&& testament_args+=( --colors:off )
-
-	local -a categories
-	readarray -t categories < <(find tests -mindepth 1 -maxdepth 1 -type d -printf "%P\n" | sort)
-
-	# AdditionalCategories from "testament/categories.nim".
-	categories+=( debugger examples lib )
-
-	local test_return=0
-
-	local tcat
-	local checkpoint
-	for tcat in "${categories[@]}"; do
-		# Use checkpoints for less painful testing.
-		checkpoint="${T}/.testament-${tcat}"
-
-		[[ -f "${checkpoint}" ]] && continue
-
-		case "${tcat}" in
-			testdata )
-				:
-				;;
-			arc | gc | ic | js | msgs | stylecheck \
-				| testament | untestable | objects | valgrind )
-				einfo "Skipped nim test category: ${tcat}"
-				;;
-			* )
-				einfo "Running tests in category '${tcat}'"
-				nonfatal edo ./bin/testament "${testament_args[@]}" \
-						 category "${tcat}" "${nimflags[@]}" \
-					|| test_return=1
-				;;
-		esac
-
-		touch "${checkpoint}" || die
-	done
-
-	[[ "${test_return}" -eq 1 ]] \
-		&& die "tests failed, please inspect the failed test categories above"
-}
-
-src_install() {
-	local -x PATH="${S}/bin:${PATH}"
-
-	edo ./koch install "${ED}/usr/lib"
-	dosym -r /usr/lib/nim/bin/nim /usr/bin/nim
-
-	# "./koch install" installs only "nim" binary but not the rest.
-	exeinto /usr/bin
-	local exe
-	while read -r exe ; do
-		einfo "Installing nim support tool: ${exe}"
-		doexe "${exe}"
-	done < <(find ./bin -type f -not -iname nim)
-
-	newbashcomp tools/nim.bash-completion nim
-	newbashcomp dist/nimble/nimble.bash-completion nimble
-
-	insinto /usr/share/zsh/site-functions
-	newins tools/nim.zsh-completion _nim
-	newins dist/nimble/nimble.zsh-completion _nimble
-
-	# Install the @nim-rebuild set for Portage.
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}/nim-sets.conf" nim.conf
-
-	einstalldocs
-}
diff --git a/dev-lang/oorexx/Manifest b/dev-lang/oorexx/Manifest
index cf97dedf8126..f66910cb5542 100644
--- a/dev-lang/oorexx/Manifest
+++ b/dev-lang/oorexx/Manifest
@@ -1,4 +1,4 @@
 AUX oorexx-5.0.0-man.patch 1080 BLAKE2B 17e105f80a5efd4fa28312c1cc81050b57c39357b7fc83ff0b8703970976e4530f03e942f09cfe79fa4dae35a7616be45058355133aa46ebc359f8578800cedf SHA512 530397a95170e08aca60db967af54c4ec22ae322f98ae7c0fb38737067f58cd8409700a00025fa85da05d54b76fc5090c0c0c02ed5502d2a84ae5468d4cefe2a
 DIST oorexx-5.0.0-12583.tar.gz 6398458 BLAKE2B 3df1eb024eae75f9c29bd46a7c9e0c8fffecf54545e5926f872b6757f0cba56530c4b457e94ec44debbd98e514e1043ba751384dc0f1dabb4812aa52da4381e0 SHA512 141af22e0a99731d50492940d5db55cc59099e5a7fa8acba918d1ae82bcd6e2983fb0ca71bbbf044cc4fc89e740c8a0ac81237eea5812d7a570f825bba5d08b9
-EBUILD oorexx-5.0.0.ebuild 780 BLAKE2B fcd09507b288581010865bc328b10e6f3902548d530252cd7ddd96c7635fe5ce956fb276f2e947299f7bd0449d8613c46cbfffa636cd223389e56c6348495c56 SHA512 5650476b8ce2de94eb3025220a40e3cf5db50e3480d3cf07fe4130bbbb2632b82368895cd6c36d06cc60eedc1e5935db7747c12d636c632d47b9fddf8160dd53
+EBUILD oorexx-5.0.0.ebuild 778 BLAKE2B fe5da47856e2cfe6db741ac82cbe6038e316cbdd50eb81ae2a0ba795de42f0599f30c8263563e94421fff1ab4bc71895be089179b925abe033541ef35c5a7466 SHA512 3a371af93b7afec479dc1f3a944f54c5492a05c5d5af8b42ed461e5e6a0157b1776e55e5162819eaada082e2f2dc99dd87ba797342985a98287ffcb5cc192e0f
 MISC metadata.xml 791 BLAKE2B 5e8ab7a5472b3864c1f1c66559518072fa4364276afbdb1939b8a81a3fcb8279bfb07c3f929edfc49faf1768d14171a870825e23ffee6e1f8fbf151879c95f8d SHA512 1e7a42ad84daee790eb4bb400365645432c895940fb4a380d575123782b77251d8be4efc108239f5587865434bef3b3f4cb90761e0e7f4425d5387f4f7e31cdc
diff --git a/dev-lang/oorexx/oorexx-5.0.0.ebuild b/dev-lang/oorexx/oorexx-5.0.0.ebuild
index 73dac6c302b3..73538a1b9325 100644
--- a/dev-lang/oorexx/oorexx-5.0.0.ebuild
+++ b/dev-lang/oorexx/oorexx-5.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}-${APP_
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 ~x86"
 
 RDEPEND="
 	sys-libs/ncurses:=
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index c4f4c0235659..e1d22e80eb79 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -53,6 +53,7 @@ DIST python-gentoo-patches-3.12.6.tar.xz 6048 BLAKE2B 577032d7aa4bab423781bffad8
 DIST python-gentoo-patches-3.12.6_p2.tar.xz 8144 BLAKE2B 2f36ce972e0b3e2884c9df629e3aeb1af05e4c77dffb866ff28e08a0a7df3c7cf36a9de250d148d909c07fd5bad483c95b3267818657c04e7d0d6fe512e21f9a SHA512 caa86c6cf693f9293b3aa8944452d117b78c1c3f8d6a6aa658cb5c2d2ffb0cecc6cf14b293872bd2101766ee7167ba88183904b2814090f8cbc64c1fa3b771be
 DIST python-gentoo-patches-3.12.6_p4.tar.xz 8764 BLAKE2B a75b9bc3768f1e07272f43d1a8f0fb6858eee7c786bc3141cd152382c287ee984b92ff1301e5894db7c24af994ee52ac7374a3edf692aa4255c1413b73209020 SHA512 237c9e8b50173a757204621d7019f68f230ea3e520ea1f078528acfb509fe7f44c0919a8ac0245e79b1a51c3e3545dd9ded51047451048ca782e35b1c4365363
 DIST python-gentoo-patches-3.12.7.tar.xz 8752 BLAKE2B 79fd69eba63bb6aafe05aaf95a3733a3b66d0e2b86eae8498a4f4b98bd492029f1c197a9f70738d4d17283653921b13fc7aba854223e498cb0093a93228f7f0b SHA512 513deafc50f2af13c88b01f2651899ce1bb5bd52a8035ca3edb469095c910e473b66d9dc120a61b78310a406147436feee1f77dcba32ce85db00979a01431e61
+DIST python-gentoo-patches-3.12.7_p1.tar.xz 10228 BLAKE2B 71cc6034201198d9483414fa362d68b550bfcbf75ca6f44dd8ab9d90b201098a05cbf4799b1db9359f4dc464acfcee9b0ce59045db27e8e9ce916b5aab010448 SHA512 22f9256c28b96723ad86878cbe44da155e280a8df08c6bcc568dc5296aca1a6fcc41ab823ee9e6d34ce5954bbedb76aea7dba2d9189e0558c536e8b2b9a3c8ce
 DIST python-gentoo-patches-3.13.0rc1_p2.tar.xz 12748 BLAKE2B 851d16e16d2a98fde62c38054d9bedf3538d88a59e19dcfd8ee7d86f3f67a3b66105664da9181dbfb9ad16aa0042815ccf469225348fb0ba8854337b0a736d33 SHA512 8264aa65bf71e97a4afe47a9fba58815163bc950ea70ff708c5f265722c5b4b8af19fbbe8a9c3673957a6de3af8307a9ba0ed9f4e42472ca24c5ed930682a038
 DIST python-gentoo-patches-3.13.0rc1_p3.tar.xz 15148 BLAKE2B 668060644372e8ddf2d9686796ec304ae7689f5c10ecbc6862f054f96504c418b0e4df28675e4fbb610889f9a665a7a54f23633036b0df35f19f40ef8e6bab32 SHA512 c0cbdf9e0fe2ad29175302e548ebfda1d2af42af0ffeb363eb8b0dc53e1059f5abd7dcd02fd8e9eb9ba7bef2b34b7693633f0a62dc1ab933f43077feacf00fbc
 DIST python-gentoo-patches-3.13.0rc2.tar.xz 5696 BLAKE2B 4e716d1d6225e811b598d029ef1dbdc413df614ef00ab8051ea697e633477a0114a3660cae037bdf4142f76c9f2efdefc25b604af11c31eb77d6d98d8f932cff SHA512 c20b53772bd7d305562657722aec70de78fffbf8ab7939f59d496e06c21b31fcd7b4a92573b1000d3bee4d90fd8b7422543f9cfdad15d60bc9a7ecf2a2259599
@@ -91,6 +92,7 @@ EBUILD python-3.12.6.ebuild 14874 BLAKE2B ec6cfd8d1ac7af5a7e90e40c48ac0929b41dda
 EBUILD python-3.12.6_p2.ebuild 15658 BLAKE2B 82c1cf6ebc34be46805d58a70a5e9fe7829d42e2bb13bc5180d4a4943bc2a48e2761d47ea95138b3a721e2d567a750e12a4622cf257e5ed376b27b4d8b0db2fc SHA512 974713fd76ee07a4baa8c399ff4753924392a64563cf8894c6cca1233ca350cb2b338f12c02617bc6aa8efc815e6fe4fc5957096b0390e26aa46747911f8a788
 EBUILD python-3.12.6_p4.ebuild 15596 BLAKE2B bdc8da8694982b262a9b4f5f8ad7ee2ad1f5f9c83f27f9081d80a7d4bc0e74c40e7640357556998d96d4dba5bbf5bafc70edad152a5fe56b44636b523fdd28ff SHA512 549ca4647cf73ed9398da44381efe3923ad15e7bdc4ac4659efa32938aedb6c3ae8d324c6db3d08e2428ab60402c501a51210dbb7adb3d83aaad4a35f5700ecd
 EBUILD python-3.12.7.ebuild 15596 BLAKE2B bdc8da8694982b262a9b4f5f8ad7ee2ad1f5f9c83f27f9081d80a7d4bc0e74c40e7640357556998d96d4dba5bbf5bafc70edad152a5fe56b44636b523fdd28ff SHA512 549ca4647cf73ed9398da44381efe3923ad15e7bdc4ac4659efa32938aedb6c3ae8d324c6db3d08e2428ab60402c501a51210dbb7adb3d83aaad4a35f5700ecd
+EBUILD python-3.12.7_p1.ebuild 15596 BLAKE2B bdc8da8694982b262a9b4f5f8ad7ee2ad1f5f9c83f27f9081d80a7d4bc0e74c40e7640357556998d96d4dba5bbf5bafc70edad152a5fe56b44636b523fdd28ff SHA512 549ca4647cf73ed9398da44381efe3923ad15e7bdc4ac4659efa32938aedb6c3ae8d324c6db3d08e2428ab60402c501a51210dbb7adb3d83aaad4a35f5700ecd
 EBUILD python-3.13.0_rc1_p2.ebuild 16995 BLAKE2B d090d335537d051dbfc2769bc8f2dc0637e3d19c1e1162b09df0dbf4f35bac77b9ee00e0fa1bec3e53b65326f272d443683e3311bce3362a7c1fbbfcab36c2a0 SHA512 cfb85ba067e0a252b98bc9dcaaa276a61fc43b2b127666373275a855bb9f7cf27a02a15d481899815146f279134e55dbc582c00d030cfa2f8942495d0580ced3
 EBUILD python-3.13.0_rc1_p3-r1.ebuild 16997 BLAKE2B dcf872868d9e61a2e0408dd1b953ac0ec373c67766bea1cb59f7c0831bf8b856eaf918773ee249737a4041b55ff9674e625107d600966192d3144ded561c8842 SHA512 00a91d9ac3d62f4d5db0faaf3d90b89c0d35d05dd6c47b694b1f8920e86a0dd1fcb23e1d04ed3886987395138e44a00feb394261da790a2b1cdfb41820ff2e77
 EBUILD python-3.13.0_rc1_p3.ebuild 16995 BLAKE2B d090d335537d051dbfc2769bc8f2dc0637e3d19c1e1162b09df0dbf4f35bac77b9ee00e0fa1bec3e53b65326f272d443683e3311bce3362a7c1fbbfcab36c2a0 SHA512 cfb85ba067e0a252b98bc9dcaaa276a61fc43b2b127666373275a855bb9f7cf27a02a15d481899815146f279134e55dbc582c00d030cfa2f8942495d0580ced3
diff --git a/dev-lang/python/python-3.12.7_p1.ebuild b/dev-lang/python/python-3.12.7_p1.ebuild
new file mode 100644
index 000000000000..6a78029784d4
--- /dev/null
+++ b/dev-lang/python/python-3.12.7_p1.ebuild
@@ -0,0 +1,606 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+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
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-crypt/libb2
+	>=dev-libs/expat-2.1:=
+	dev-libs/libffi:=
+	dev-libs/mpdecimal:=
+	dev-python/gentoo-common
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-pip )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	kernel_linux? ( sys-apps/util-linux:= )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? (
+		app-arch/xz-utils
+		dev-python/ensurepip-pip
+		dev-python/ensurepip-setuptools
+		dev-python/ensurepip-wheel
+	)
+	valgrind? ( dev-debug/valgrind )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	dev-build/autoconf-archive
+	app-alternatives/awk
+	virtual/pkgconfig
+	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+if [[ ${PV} != *_alpha* ]]; then
+	RDEPEND+="
+		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
+	"
+fi
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	# TODO: Makefile has annoying deps on expat headers
+	#rm -r Modules/expat || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
+
+	# breaks tests when using --with-wheel-pkg-dir
+	rm -r Lib/test/wheeldata || die
+
+	eautoreconf
+}
+
+build_cbuild_python() {
+	# 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
+	#
+	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
+	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
+	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
+	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
+
+	# We need to build our own Python on CBUILD first, and feed it in.
+	# bug #847910
+	local myeconfargs_cbuild=(
+		"${myeconfargs[@]}"
+
+		--prefix="${BROOT}"/usr
+		--libdir="${cbuild_libdir:2}"
+
+		# Avoid needing to load the right libpython.so.
+		--disable-shared
+
+		# As minimal as possible for the mini CBUILD Python
+		# we build just for cross to satisfy --with-build-python.
+		--without-lto
+		--without-readline
+		--disable-optimizations
+	)
+
+	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+
+	# Avoid as many dependencies as possible for the cross build.
+	mkdir Modules || die
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		_dbm _gdbm
+		_sqlite3
+		_hashlib _ssl
+		_curses _curses_panel
+		readline
+		_tkinter
+		pyexpat
+		zlib
+		# We disabled these for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
+		# and uncommented if needed.
+		#_ctypes _crypt
+	EOF
+
+	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+	# Unfortunately, we do have to build this immediately, and
+	# not in src_compile, because CHOST configure for Python
+	# will check the existence of the --with-build-python value
+	# immediately.
+	emake
+	popd &> /dev/null || die
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	# Set baseline test skip flags.
+	COMMON_TEST_SKIPS=(
+		# this is actually test_gdb.test_pretty_print
+		-x test_pretty_print
+	)
+
+	# Arch-specific skips.  See #931888 for a collection of these.
+	case ${CHOST} in
+		alpha*)
+			COMMON_TEST_SKIPS+=(
+				-x test_builtin
+				-x test_capi
+				-x test_cmath
+				-x test_float
+				# timeout
+				-x test_free_threading
+				-x test_math
+				-x test_numeric_tower
+				-x test_random
+				-x test_statistics
+				# bug 653850
+				-x test_resource
+				-x test_strtod
+			)
+			;;
+		mips*)
+			COMMON_TEST_SKIPS+=(
+				-x test_ctypes
+				-x test_external_inspection
+				-x test_statistics
+			)
+			;;
+		powerpc64-*) # big endian
+			COMMON_TEST_SKIPS+=(
+				-x test_descr
+			)
+			;;
+		riscv*)
+			COMMON_TEST_SKIPS+=(
+				-x test_urllib2
+			)
+			;;
+		sparc*)
+			COMMON_TEST_SKIPS+=(
+				# bug 788022
+				-x test_multiprocessing_fork
+				-x test_multiprocessing_forkserver
+
+				-x test_ctypes
+				-x test_descr
+				# bug 931908
+				-x test_exceptions
+			)
+			;;
+	esac
+
+	# musl-specific skips
+	use elibc_musl && COMMON_TEST_SKIPS+=(
+		# various musl locale deficiencies
+		-x test__locale
+		-x test_c_locale_coercion
+		-x test_locale
+		-x test_re
+
+		# known issues with find_library on musl
+		# https://bugs.python.org/issue21622
+		-x test_ctypes
+
+		# fpathconf, ttyname errno values
+		-x test_os
+	)
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-u-network
+
+			# We use a timeout because of how often we've had hang issues
+			# here. It also matches the default upstream PROFILE_TASK.
+			--timeout 1200
+
+			"${COMMON_TEST_SKIPS[@]}"
+
+			-x test_dtrace
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_concurrent_futures
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+
+			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
+			# bug #900429
+			-x test_tools
+		)
+
+		# Arch-specific skips.  See #931888 for a collection of these.
+		case ${CHOST} in
+			alpha*)
+				profile_task_flags+=(
+					-x test_os
+				)
+				;;
+			hppa*)
+				profile_task_flags+=(
+					-x test_descr
+					# bug 931908
+					-x test_exceptions
+					-x test_os
+				)
+				;;
+			powerpc64-*) # big endian
+				profile_task_flags+=(
+					# bug 931908
+					-x test_exceptions
+				)
+				;;
+			riscv*)
+				profile_task_flags+=(
+					-x test_statistics
+				)
+				;;
+		esac
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--without-lto
+		--with-system-expat
+		--with-system-libmpdec
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with debug assertions)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+		$(use_with valgrind)
+	)
+
+	# https://bugs.gentoo.org/700012
+	if tc-is-lto; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+		myeconfargs+=(
+			--with-lto
+		)
+	fi
+
+	# Force-disable modules we don't want built.
+	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		$(usev !gdbm '_gdbm _dbm')
+		$(usev !sqlite '_sqlite3')
+		$(usev !ssl '_hashlib _ssl')
+		$(usev !ncurses '_curses _curses_panel')
+		$(usev !readline 'readline')
+		$(usev !tk '_tkinter')
+	EOF
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+
+	if tc-is-cross-compiler ; then
+		build_cbuild_python
+		myeconfargs+=(
+			# Point the imminent CHOST build to the Python we just
+			# built for CBUILD.
+			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
+		)
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	# Gentoo hack to disable accessing system site-packages
+	export GENTOO_CPYTHON_BUILD=1
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# this just happens to skip test_support.test_freeze that is broken
+	# without bundled expat
+	# TODO: get a proper skip for it upstream
+	local -x LOGNAME=buildbot
+
+	local test_opts=(
+		--verbose3
+		-u-network
+		-j "$(makeopts_jobs)"
+		"${COMMON_TEST_SKIPS[@]}"
+	)
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	# the Makefile rules are broken
+	# https://github.com/python/cpython/issues/100221
+	mkdir -p "${libdir}"/lib-dynload || die
+
+	# -j1 hack for now for bug #843458
+	emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use sqlite; then
+		rm -r "${libdir}/"sqlite3 || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter} || die
+	fi
+
+	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/regina-rexx/Manifest b/dev-lang/regina-rexx/Manifest
index cb0e448f78c8..be132fa701cd 100644
--- a/dev-lang/regina-rexx/Manifest
+++ b/dev-lang/regina-rexx/Manifest
@@ -1,5 +1,5 @@
 AUX regina-rexx-3.9.5-makefile.patch 13712 BLAKE2B e9a185bcd1f5d6b156a3807afb6b629c6dafaa7c7f4fe71c850fea16e4339c7664e7197e9d3ed71fd209a1eefbaa325f454a9b22b94251db6156640a1c44a340 SHA512 549f1e916784ce287c3d7b9773169f72f4a873c21388b07c86c44277d18e630278aa4b2862793f759a2233467d5940e2af15fd3b5a9fb8726cacf19dc44810a8
 AUX rxstack-r1 268 BLAKE2B 1bec862218eb0ef5087d5859f53adacf6fa22f3fc4b05a04ae89a861f32f800261e07620e1bab97a1aa7548f1232aad86367fc69c1696cd126edc4168064eb2b SHA512 823cc12df4986919b3177590b9da73c76474012361ff41eb93a04376df2efb3445b27da8931b9fdc5d960f5231a34ddaa7724d35d139eb2a1e340b025dfc460c
 DIST regina-rexx-3.9.5.tar.gz 2705272 BLAKE2B f26d4c7c582e1dafb97c2280651d07bba67549ccf9f58eb42e88e92ddbbb3184a36e5d3480977adccafdd1d9fdd1ca208950cd2700201600b6fbc0da7ebbd336 SHA512 bff25e5d218441306d021924582c19ed29c652b691e73988a4b53b9de4b51b758b1ee08704685967bd9bea469e93bf57b19875207fd4649d5af3e53dade39dd2
-EBUILD regina-rexx-3.9.5.ebuild 1022 BLAKE2B 7c6869488649b8c99d49f60db95787f1bd55f591147c6b955ccbce4937cda1ba93a32b9c52c15bd480005a31939304f06062d71ad4081ec4a243750192b5389c SHA512 28ae5704d6f9fef9b4fa3b9fb935d2a60227d8f112113e74735ad17dc5de3493b77efe30d52a8c746ddd6acd5e02247b1194d5ffa475b816743a2b27265dcf93
+EBUILD regina-rexx-3.9.5.ebuild 1020 BLAKE2B 3ba3bce891f3b99b519d85ab44f8b8cd1bab1b257386399967e7920873f193a638c29b92a430d124e8ec70fdf62a1eca33aed5bf6ade57728c0ddef77e5c80d5 SHA512 1f0218ae7dde15686510bec9b9b84d339153250e4809db14784452b1986739e17eae302169fe271e69775d6695c658757bd11d9fd29a8b7ad1d2bef430dd83b8
 MISC metadata.xml 843 BLAKE2B c4e0e30ab78a6984374059eca8588e03111d6164aced096017be50e0324ffef411a7bdb731712f12bb48142e5c0430d6ddae4a2e701225bf2a3669ce062660d0 SHA512 adf11a12bd49b8a1690263f8d21fba9aa3a4038074a11ee0c351803be8980608f14790706b1d95cd48c51f67e6fe7a46730dd86c2790432acbb2e39393b9e0be
diff --git a/dev-lang/regina-rexx/regina-rexx-3.9.5.ebuild b/dev-lang/regina-rexx/regina-rexx-3.9.5.ebuild
index 6783de3c6f87..80909f1b885d 100644
--- a/dev-lang/regina-rexx/regina-rexx-3.9.5.ebuild
+++ b/dev-lang/regina-rexx/regina-rexx-3.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1 MPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ppc64"
 
 RDEPEND="virtual/libcrypt:=
 	!dev-lang/oorexx"