9 files changed, 540 insertions, 6 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f05ff0f579ae..f209b0f34c85 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/algol68g/Manifest b/dev-lang/algol68g/Manifest
index 73abd0275a3c..23118737c696 100644
--- a/dev-lang/algol68g/Manifest
+++ b/dev-lang/algol68g/Manifest
@@ -2,7 +2,7 @@ AUX algol68g-3.3.21-configure-implicit.patch 236 BLAKE2B e59d1e65f6d1b83ac1bb43f
 DIST algol68g-3.3.24.tar.gz 660171 BLAKE2B b70e568c48d4a4f1b142de97c7eaf4a52237e4bd74469318dbfa5bfdd3510f1770aaf4def2a95fe984dfa183206b70646ea0f3cd41486b64ab435ebaa4f70693 SHA512 e6d4baec87bdfc853ee6c17c80b121ce90d90409344bf55243a339e68b4bc79bcaf8cad56ca6e5eedc7742e445550c4eb6673e74352bf446a39b3ce1712de857
 DIST algol68g-3.4.2.tar.gz 661224 BLAKE2B 1f07ff0aa1734755886d03ea4c0e6116303db72d27956a6d2d816e146b84db26b406b684c2166d6ebfc48f08399c7f54399b6f139f73fb2f3177780dc322d711 SHA512 1c3924ea9bd752cf754dfe188dc57c8ef4433180d88543dd5559203fdcda8dd4aec3528fe952ce64d2c0665065ff44dc7fa205a1a74d0269cfa9176efd8f6f8e
 DIST algol68g-3.4.3.tar.gz 660981 BLAKE2B d160d851306a4f5975ce0f7254c22e11aed5b7fd659e32717755b1e8b6ac3a7ca6fc5208a466979a5a400940cd93a06456fbb3520a14b8adb617786004606474 SHA512 d3a4f0381624076c5dece247bb60babc22b603d310614316fb4565cf4b04ea46890377e7e9d7ee82e816df2d1881f37f0bc299f2677a03df6c46a6966b69ccad
-EBUILD algol68g-3.3.24.ebuild 947 BLAKE2B efe202e1c73de4a41a2462d1026512f6ce622cd4e3c4f3c4488660bcf1be9cbaec6b6fb5b01b16904fc1fe1d3be07921db0b8bc3ca591f02eada8416ceb3b0f4 SHA512 84428d78b17cfc764bcdbc8dbd5efe65cf631d01e25ccae803d3ba0af7f910bb8a01cfd7212fd303506dac017ad1f9bee325a79d7ed82e5e21ab9ec0a19bcfb5
+EBUILD algol68g-3.3.24.ebuild 946 BLAKE2B 609343d646c2fa3b96ce05c42d4ffc78768e441a8b79e7f38c1a4266a0e3deb454db6d33a620e4c6df81faf10b83a0f27242899090b141688c57224fc4efae09 SHA512 f9bdbbe26e6d68fcac101941178d957367c73f15fed114ee0ae5de0a183aa35ab4bb659eb8299b4a5bc6854659fc6c3945e79858cab7dc35c5a0608fdb7aef09
 EBUILD algol68g-3.4.2.ebuild 947 BLAKE2B efe202e1c73de4a41a2462d1026512f6ce622cd4e3c4f3c4488660bcf1be9cbaec6b6fb5b01b16904fc1fe1d3be07921db0b8bc3ca591f02eada8416ceb3b0f4 SHA512 84428d78b17cfc764bcdbc8dbd5efe65cf631d01e25ccae803d3ba0af7f910bb8a01cfd7212fd303506dac017ad1f9bee325a79d7ed82e5e21ab9ec0a19bcfb5
 EBUILD algol68g-3.4.3.ebuild 947 BLAKE2B efe202e1c73de4a41a2462d1026512f6ce622cd4e3c4f3c4488660bcf1be9cbaec6b6fb5b01b16904fc1fe1d3be07921db0b8bc3ca591f02eada8416ceb3b0f4 SHA512 84428d78b17cfc764bcdbc8dbd5efe65cf631d01e25ccae803d3ba0af7f910bb8a01cfd7212fd303506dac017ad1f9bee325a79d7ed82e5e21ab9ec0a19bcfb5
 MISC metadata.xml 665 BLAKE2B 2b9b283f86666d64dd77164c5afb0d76403c63f9f0dfac3170eb2ade95bcc382b09d14248cb720edf7c1b055e78ca5ca0017b6784caf4381d970a011301058bd SHA512 b3171d505f9f9e4dcdd5b5a0c6d302849fa017538402832dd3db205c48c68a39867089aae4d1f3c158a45bfc170b21f83789cba16511f251d70300020e102b0a
diff --git a/dev-lang/algol68g/algol68g-3.3.24.ebuild b/dev-lang/algol68g/algol68g-3.3.24.ebuild
index f1c0cc53d018..bff3227720c0 100644
--- a/dev-lang/algol68g/algol68g-3.3.24.ebuild
+++ b/dev-lang/algol68g/algol68g-3.3.24.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://jmvdveer.home.xs4all.nl/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+curl +gsl +mpfr +ncurses plotutils postgres +readline"
 
 RDEPEND="
diff --git a/dev-lang/dzaima-bqn/Manifest b/dev-lang/dzaima-bqn/Manifest
index 35d666490f81..c05c1d92bf80 100644
--- a/dev-lang/dzaima-bqn/Manifest
+++ b/dev-lang/dzaima-bqn/Manifest
@@ -1,4 +1,4 @@
 DIST dzaima-bqn-0.2.1.tar.gz 315654 BLAKE2B 1b11ad6901ec2fbb6b10a87d7e46e098cceb2ffdfd351d82a3709df3370f30e0aaee1b2e270c4d228f305ed573f1e1a979238fcbc6ca8ac690f26048a30bff2c SHA512 92ab33ed64ace127ece76526ea298f131d720e7deaa917551e16c0eb0e626b1b0074668260fcc652e18b1c90603149f8631a574b0e98d2b715bd73dbc3340d8e
-EBUILD dzaima-bqn-0.2.1.ebuild 1248 BLAKE2B 6ba353796c526b0106ca41b5c81c22c98e3f785ced445605c323b9f85013505b273effe58fe7668fb41b4fba4ebfff15accf6f83a7eee37ab4bea9ee5913265e SHA512 4b2fe0b31c45058261a2514b72a1caebe65de33ad303192ed3a496c4478a6758f9219c408b62f5aafaa9a54dd241745ddfa1f22cb0c1b469958c28bf9529df7a
+EBUILD dzaima-bqn-0.2.1.ebuild 1247 BLAKE2B cc7f046f4416174f35052d108ac3c2d77e969ce9d67ce9be7ec963695abed79121e7163996e34f8e7c98cda79024e7d4142282f24c76bd60c2ac0f7dea107378 SHA512 ef27519002b7a5323f5fca65830e8770b3298f11e49dcd0a9a43be363dc563ff68ea99fc74c56f4b4397f459e29d4e23bbc8087e57ca8936c4dc7afe5aa15ed0
 EBUILD dzaima-bqn-9999.ebuild 1248 BLAKE2B 6ba353796c526b0106ca41b5c81c22c98e3f785ced445605c323b9f85013505b273effe58fe7668fb41b4fba4ebfff15accf6f83a7eee37ab4bea9ee5913265e SHA512 4b2fe0b31c45058261a2514b72a1caebe65de33ad303192ed3a496c4478a6758f9219c408b62f5aafaa9a54dd241745ddfa1f22cb0c1b469958c28bf9529df7a
 MISC metadata.xml 391 BLAKE2B ad7dca8c5f86fa31d5d50cf9a0f0ba1f45c1ecef285d144a1e4ce7ad38a279a28191364d9d4e8ee36846724cf90bd2b11896f3da302768e94be9b9e76240ac56 SHA512 4e8a6cf419a6aaef930c6ae716c55600bb35c0ffb4e6ef386984366a735b572648431bb16f4296c708811a0970bf69b96a6f87c7e38dfd0f7c1ff23b10f015d8
diff --git a/dev-lang/dzaima-bqn/dzaima-bqn-0.2.1.ebuild b/dev-lang/dzaima-bqn/dzaima-bqn-0.2.1.ebuild
index 9c7b4bd92031..de1b210a761b 100644
--- a/dev-lang/dzaima-bqn/dzaima-bqn-0.2.1.ebuild
+++ b/dev-lang/dzaima-bqn/dzaima-bqn-0.2.1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/dzaima/BQN/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/BQN-${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index e2c401fea17b..ec823dba4bb1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -29,6 +29,7 @@ DIST python-gentoo-patches-3.10.13.tar.xz 13996 BLAKE2B 0123a18c8c39397ac03b1be1
 DIST python-gentoo-patches-3.11.5.tar.xz 7124 BLAKE2B 04e19b0cce37794622d211fb7758988e734eca7298be59169fff81f8ec98f9c2454be3bba0944e681efcdca0810b74b4a07993965d89cdc0261cbc61862cd6f1 SHA512 3e137ab2b7ff4aaa41e4c760a7340d86cc3fb226c47985bd0f0bb8a4ef4fc157e1442e69995e585db15f04f95a734a19d80534a89067981ea314ef5be042b02e
 DIST python-gentoo-patches-3.11.6.tar.xz 7568 BLAKE2B 7ff4b1f4f2549b2df46aeff875c20fb6de40778d88071c1aa054bf2e3494f718dbb39a42d9cb791c1e0db1a025ae8eb13b24f7bd712f08b3c00ca638100bb732 SHA512 57c655d9d0df4284e167f3ed9b4e0d1c4554e5fe08605c64db253c104ac2e64da2439c8500fe60460d2545683467f8689d7fee68214cfa414584d71434735473
 DIST python-gentoo-patches-3.12.0.tar.xz 5156 BLAKE2B 42d23d4567b09878000a6b01425e06e377c779e8e3713af6d7522f8cdbe22d2bcb67dbfd04e8d7104ce3bd9b7e3950bbe0ac0dfa3892e1c1e5992642d6ef0ce7 SHA512 dcc6afe0c91436cdbad7bedb72557c72b0cc97c1714bbe41905e5e3fd6956e47c82226df09be2041d1935bd4031fdbc1c1b178e031d3eaaf6f587a0cf3d68f42
+DIST python-gentoo-patches-3.12.0_p1.tar.xz 6104 BLAKE2B 9064e4bd96d6aed60398113cc4e624ec53a04694146e3cc532453228bdbe1b65fed2f426ed99aa5e76dc10f2513fa5af356e6a505e71e9f66e890c2254f55280 SHA512 5ca6e8fb255fd4b3ec25e7f9d7889d1490661d121907bb86134a0dffb4ecabb2d0b0423429b83f0411a85ec1ec24b8f5162064365f298e356877d55dd570413f
 DIST python-gentoo-patches-3.12.0b4_p2.tar.xz 8132 BLAKE2B 4c1df7c8e1dda483724d8c3bb8ab7a7739fcdee16eaf1a2a5aeedb6011c13769ee9f2d0b1cf849df12aaf3230c0771b16533496539e1a0fab633e38699c8a75f SHA512 9051311d1e31163d13b8d2b1981d700ad2cf297b30f8d2867df8fe535fdb7da11efcb6fef8a201a76ff05aa8ae91c3679eeee72a729dc7249714796f6af2be9f
 DIST python-gentoo-patches-3.12.0rc1_p5.tar.xz 348764 BLAKE2B 8f71d6172ca4e557c195f4226d548f10b888842a110824db6c73613016d5b1c900545a2a3331519cc35cd9cc740fba3970737f40cdb64bd4d48e23a2be9e8be6 SHA512 e05f6e51a0689f0b5bdc745518742aebc3ae9fe145cb82c5e43a1a048df0ea4f11711ac4850726f807a73e232f76cfdc09c62d513ad0007acea7d5d5420c8569
 DIST python-gentoo-patches-3.12.0rc1_p6.tar.xz 349384 BLAKE2B 975aae449a01a31c459b287a47bd4d1a2d8b0b39e594a1c976371acc4948765bcb4733dd9e10b70c87dfb9409d4db6b2492004841db61577576852634a40365c SHA512 f262d1a9291867e1bdc8f92c682338369b1b52f210d6db0c648c3bbabea68c6b596dfd8d13507f6d65de37d1b83beb336be3abff239d2a588054794b5bebeb81
@@ -44,6 +45,7 @@ EBUILD python-3.11.5.ebuild 15113 BLAKE2B 798ec18287d66c76fdcb7a711475cb7a3b8bd4
 EBUILD python-3.11.6.ebuild 15117 BLAKE2B ba7865c5b8e95c551d1663fc6d23446a91792459d78b77e201d252c600557f5f88cc9238624a6650e2aeb60138dd180c9aa8dd32eff8d613492f3cc0ec84ecf9 SHA512 9d08dfd2e7a3b97501e9e7de82452474f36cac0e92a84e18c898d969960568ff390487fa89f8469b22d1ca3353bbe752315ba62f1679f486674b37946b488d2f
 EBUILD python-3.12.0.ebuild 14677 BLAKE2B 0b0182288a8fe078b4c9a87858e7e5c4f9c166ffd2581988d226d4f505e421ce49ebe5d11933af17ccb52f9cbb64fcfab69846eed105b961695672d1cdfcc462 SHA512 ce7a499f2bb71b5964a012afd051c82750c0804a7202529ce04c83423987b4f41046f65e11c61237e4dd2878a428d0aa033ff68ff71756d1a8a8ab65493fb040
 EBUILD python-3.12.0_beta4_p2.ebuild 15038 BLAKE2B f228f611b0294effb0f8fda97c48c1c322c224feea5d3e1e71e55bf1335085d266e0858c88f5be407eede13df39e6b1f920e017c7dca2257f4f12eb60ea7590c SHA512 78c08885e6b8dfd25e88abbaafdbc4d0c73594945852fd7e124dce3521dc09ee959d9a1d2e23222c63bb5b7aec2b925a74c0b1650649775e87b3afbec037cfd9
+EBUILD python-3.12.0_p1.ebuild 14681 BLAKE2B 9cdf429936b069e99782907e013fe94f4c80253103b30266a42cd1c74a4f0844f83f92cc679cba0199e99c4e5935d866fd9a5e39b90077bb1bf420f1fd8287cb SHA512 d179af9d4244b450177f6f1053c0650998c4d41ebd7b8d99f3d417e1354e4290dfdc0b2e57bf22d3be7e14963408fcaf4a4a34c9aef6652701e1aa6074bb622b
 EBUILD python-3.12.0_rc1_p5.ebuild 15037 BLAKE2B 0a12685727c7b54f442e6f5bad91a7f154b6c00efb9784516109add90f69fc0b975a5c797148bba1a30385b982e8448b6fc1bfb4d2fef16c6bf76e6349ef0169 SHA512 b683086fab83c08f6667656d133703c4941d1fdf6569c84951a66437f59d335b7ad727ce1e6b5cdf91c2d429eba84e13658b4831b4cc75f0c14126be446b3e41
 EBUILD python-3.12.0_rc1_p6.ebuild 15037 BLAKE2B 0a12685727c7b54f442e6f5bad91a7f154b6c00efb9784516109add90f69fc0b975a5c797148bba1a30385b982e8448b6fc1bfb4d2fef16c6bf76e6349ef0169 SHA512 b683086fab83c08f6667656d133703c4941d1fdf6569c84951a66437f59d335b7ad727ce1e6b5cdf91c2d429eba84e13658b4831b4cc75f0c14126be446b3e41
 EBUILD python-3.12.0_rc2_p1-r1.ebuild 14681 BLAKE2B 9cdf429936b069e99782907e013fe94f4c80253103b30266a42cd1c74a4f0844f83f92cc679cba0199e99c4e5935d866fd9a5e39b90077bb1bf420f1fd8287cb SHA512 d179af9d4244b450177f6f1053c0650998c4d41ebd7b8d99f3d417e1354e4290dfdc0b2e57bf22d3be7e14963408fcaf4a4a34c9aef6652701e1aa6074bb622b
diff --git a/dev-lang/python/python-3.12.0_p1.ebuild b/dev-lang/python/python-3.12.0_p1.ebuild
new file mode 100644
index 000000000000..1a53a9eb0e9f
--- /dev/null
+++ b/dev-lang/python/python-3.12.0_p1.ebuild
@@ -0,0 +1,532 @@
+# Copyright 1999-2023 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build debug +ensurepip examples gdbm libedit lto
+	+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-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[extra-filters(+)]
+		dev-python/ensurepip-pip
+		dev-python/ensurepip-setuptools
+		dev-python/ensurepip-wheel
+	)
+	valgrind? ( dev-util/valgrind )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/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=${BROOT}/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
+
+	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() {
+	local disable
+	# 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
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# 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
+
+	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
+
+			-x test_gdb
+			-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_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
+		)
+
+		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
+		--with-system-expat
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with debug assertions)
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+		$(use_with valgrind)
+	)
+	# 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}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	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=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${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}" 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 ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	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,test/test_tk*} || 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
+}
+
+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
+}
diff --git a/dev-lang/qore/Manifest b/dev-lang/qore/Manifest
index 8300b4440030..30e9f11a1d9b 100644
--- a/dev-lang/qore/Manifest
+++ b/dev-lang/qore/Manifest
@@ -1,5 +1,5 @@
 DIST qore-1.19.0.tar.gz 3932880 BLAKE2B 8987a818e4fef495d9e07477715f18ad70541c81108bbc3aac56660e4d2ee9349303654ba07a849a7bfb43952d0ee8b868224f029254c83f435aa024def08669 SHA512 5264db098644ba39316e7825f1ed8243240c506a22c15836fcfa9500b173807ee9c4d213577d3a9eee7220d5d15ad171f05f75a431fb0537c95ab3dc761cbba3
 DIST qore-1.19.1.tar.gz 3933768 BLAKE2B 8e3002a55f1cf15f22ff604b1ceaf71995727510e365ae6ab03b71a91ddc1a82c5d6d89514b989a3509a5b39228fcf8fe11b6d88df8af784cace9b56b9d22482 SHA512 bf2203f8fe81cd4a604e06859380664f5cf635f5496e1ce6b6d5760d4cba82e510c78acef7ced4fdacd6df722f6eb305307106f12df3201003858a5a55256d9e
-EBUILD qore-1.19.0.ebuild 1330 BLAKE2B ef97569c496585dce76260b37c4168f5732251fa1aa5a380e7f5f9dd170dd055f9da71c4666bdf913992d67fe28377610e78aac99b9d971dce5fa0e398b801de SHA512 24f3a62d7c3dd0e2eff6ae295bdd5054bd57f0f532fc6dc409489e84562e52ad3ff4608a77277f44d3377e76c50cf444e4da2b6079e6467155906cea91f317c9
+EBUILD qore-1.19.0.ebuild 1329 BLAKE2B eac4430808aeb82d6542a3f2adee48d3a89c0214c3d0b1b41e95c631548b9461e0df7280a0431a5357ce648a809ccd288332fe2f528a0989f21c42c2c011ab7d SHA512 c79ac9edb6d54b34649a16f30b2cd789a9ae1a9981c107473f2b634f46c9890b2ac83e8ada1e6ee3e4d437f734280fa8bae5b69d6c7b15ff91fe8e6496d06ee3
 EBUILD qore-1.19.1.ebuild 1330 BLAKE2B ef97569c496585dce76260b37c4168f5732251fa1aa5a380e7f5f9dd170dd055f9da71c4666bdf913992d67fe28377610e78aac99b9d971dce5fa0e398b801de SHA512 24f3a62d7c3dd0e2eff6ae295bdd5054bd57f0f532fc6dc409489e84562e52ad3ff4608a77277f44d3377e76c50cf444e4da2b6079e6467155906cea91f317c9
 MISC metadata.xml 988 BLAKE2B 3a74a6ca601e603b3fd02afac98ac66a2918537ad2c2d44620a2bf458a246c9c0e26bd733a5af26b7baca9c3bd69949f0ae7332bf5efbc184a3714580c545322 SHA512 39372b45ba7b12127a355ced7e18b2c537bd09127e0db503fb0e3dbb3584f2095a77f69f000473451ce73b0f1dc38243478d34312def725c9936c49485607638
diff --git a/dev-lang/qore/qore-1.19.0.ebuild b/dev-lang/qore/qore-1.19.0.ebuild
index 470c8707dfd1..38b2af9a08c7 100644
--- a/dev-lang/qore/qore-1.19.0.ebuild
+++ b/dev-lang/qore/qore-1.19.0.ebuild
@@ -18,7 +18,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-release-${PV}"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT"