[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/

[Michał Górny]

commit:     89e6606811027bdaf5269bc723163678a4d93969
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 07:42:14 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 07:42:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e66068

dev-lang/python: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-lang/python/Manifest                      |  17 -
 dev-lang/python/python-3.10.5.ebuild          | 408 ----------------------
 dev-lang/python/python-3.10.6.ebuild          | 408 ----------------------
 dev-lang/python/python-3.10.6_p1.ebuild       | 408 ----------------------
 dev-lang/python/python-3.11.0_beta4-r2.ebuild | 475 -------------------------
 dev-lang/python/python-3.11.0_beta5-r1.ebuild | 482 --------------------------
 dev-lang/python/python-3.8.13_p2.ebuild       | 358 -------------------
 dev-lang/python/python-3.8.13_p4.ebuild       | 349 -------------------
 dev-lang/python/python-3.8.13_p5.ebuild       | 349 -------------------
 dev-lang/python/python-3.9.13.ebuild          | 402 ---------------------
 dev-lang/python/python-3.9.13_p1.ebuild       | 403 ---------------------
 dev-lang/python/python-3.9.13_p2.ebuild       | 403 ---------------------
 12 files changed, 4462 deletions(-)

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 6fd09569a7d8..23a23bf7582d 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,13 +1,7 @@
 DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 
060a621c91dd8e3d321aec99d44c17aa67381998256a1a002d316b38288349884d5960de35c49352d03129ed0bae599e641ec2225898158ebce50a7a2fd74d2c
 SHA512 
a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
 DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 
1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448
 SHA512 
c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8
-DIST Python-3.10.5.tar.xz 19361320 BLAKE2B 
7f3629f8a16faeb0311947b7d5162bc45d9ed6b2c051f776027d01ebbbdd42e4849efd67921fa57975f68ec67dc34f3135345ce216f2d3f02bfcfa4245d266f1
 SHA512 
aa7f58a9b31de9824185b3e7bfa7da0dcf64ae9e89840664eae9d98d9048a650fa012cd5b873a62ff44b65b856db86f095c4003117406ec5e9583ec5f7e78e90
-DIST Python-3.10.5.tar.xz.asc 833 BLAKE2B 
36da2d557a5c38cfc473b2138412f9bc011d19c8538475e623bf41d81eb2c8f8e977945a3065a48c5b234d2b2c7d0dd5e83112c948591628cec344651dc9055c
 SHA512 
72d0ab09900e2a10b85ccac804efd5536251152798e7347576e0e28bff4ab4a84b08d646329b225f9949047586686f9f4e7f05652526657a0948951b739c14e0
 DIST Python-3.10.6.tar.xz 19600672 BLAKE2B 
b21398f68e13cf8464077aa2c7f08d9044198cc3d2e2829d12239d420c1c922cbad8427f3e0fae3fe62a4b8ebb7db7eff441266eff82f0c78d7a98a62d8e64c3
 SHA512 
f2bf424bf4f4caa524ee1248b431e8e06d0745c3fc3ba457710d75f3698e653733feb4b059cd124f1de2a9e851c30d847f567aa47abef12898c9dc8a6507b476
 DIST Python-3.10.6.tar.xz.asc 833 BLAKE2B 
ea6546c01a4fbfe3f3e56b2f980da53f0692d9c638534bd25fb96a0f657424f979b6a82a01c77c05ddfded30441b4a0348cc407d5b29290ffc653a508ca32ec8
 SHA512 
9288e2f62f2e8c8208ad176372261545a64e675d737bb616403bcd888bc91177909257632e4cc0b5d688d612bea38a274030ec6989dc7d56c03064e32ad9903e
-DIST Python-3.11.0b4.tar.xz 19573532 BLAKE2B 
d28b85c4af39ea8c8b1448857698a7018c9d115f0f861ff1649101e4c9d3ebbea14e1f5da8158b1734bf8743d96ed3683a8192e07ff06c0ccd964ec7ddee3832
 SHA512 
1530f4dcba6325ac8e9bb955604fc504a4306e3291b667d1d8490b78e1c50924d81ff8ab50d08c736e70d3e42788aabaa162179a77c03860ee8064f17f93bb09
-DIST Python-3.11.0b4.tar.xz.asc 833 BLAKE2B 
eaedd106d3599c7ee6974ff9eee33899b119fdb45ab5b760f5f02e51e12ba58b3161f6853464a32638385fd596ddd350097c28dde55e3efeacc6719f16275d84
 SHA512 
8f6c633911755767d351fc86e031df6cedd6091ca5ec0ef55331ac65d2ad532c71e568c173513a2bbb2235e5e3fc9dd77e1b7ed230df1f0d8bd6e23da470b1e2
-DIST Python-3.11.0b5.tar.xz 19792136 BLAKE2B 
574ed58b2d063b954931c39c1154e776f5d233fe6e3f0803e5a93b68f48aacef1d9df60a2839df952b631d8988d6c44fee073dae5486420b808866944a3025d5
 SHA512 
b1013e449c9a0e9b61df5a266b5f05458d284b3524c6c44d44d8a5007bcb95ff754f21296cd695f353111575c7cce71f8a2808a9adf8c573512bf97f691d2200
-DIST Python-3.11.0b5.tar.xz.asc 833 BLAKE2B 
80594608751a141a6e5ded035c4de1a73716d72442228fa2dfcffc10d1ccb9928b864591fad4b5fb3a55e20629a22ad92fcc4a40d8e294858a85088b26d545af
 SHA512 
6f658c7623e7750c0c8c18b4a2fe86d6a2414f3b411487ca4d2dd9840165ae3e6eea8b3468b1376862181b7b58d3fe99681a00d290172a6986f0f2ead5d6c3bd
 DIST Python-3.11.0rc1.tar.xz 19815524 BLAKE2B 
7dae240dbed052667b46927ccbb483a717b0fe0ba199721d526354d1b89a6dd2842ab0f6c3b078385e4acb7557d06f252d61aacb07d70c7f5598ed91567d2053
 SHA512 
2a72ea59277f8115e418ced671969fc0d5ba271c7740f70c665a4b450a59d7752278d061bd59f136dacfa608ed167f983c6589b214a973b1b63ea2115ea298bb
 DIST Python-3.11.0rc1.tar.xz.asc 833 BLAKE2B 
da46a0ab62ef3f2b7a7921294a0d775ca6ab254e3229338232b3d11107aa1d74adc21911678f08f44cc1cd9184beada00d4b60dde60722ef91a247367b13e191
 SHA512 
d4cffc90c2ed7b8ea7228a21f7ac902a92f27003f1420ad751b1691de950974ea174cb0471b6e19ed1548dc5382012fa9ad5fcf83c34646c7ea2d73c88799e38
 DIST Python-3.8.13.tar.xz 19023016 BLAKE2B 
d3cb8624496e56d93d34f2aa5082746869a99210197529bc19e6a9d265f4ce246e0e83a3528a7602a28aac8855bf84e6bf6495b85e9202fcf04ef90600cb5e43
 SHA512 
5c732b5d21b189b99a0e9ccd3ae59466bed60a930d5d3f437a262d38f0797b776cecbf12a1852eaebcfb638a6f2e28e471cc2ebf94237cc728144be21842cb81
@@ -15,18 +9,7 @@ DIST Python-3.8.13.tar.xz.asc 833 BLAKE2B 
918894777e1a783f2a7c7958a808610631cb7a
 DIST Python-3.9.13.tar.xz 19754368 BLAKE2B 
4f583f66c28b791e19cd6d79695fe9eb815fd333542be22aec8bd73d1f4d3f17f2c4e9de198e7b16c1ca6362a613a8a02fb965c7dc7db3e510fd31de15ba2d19
 SHA512 
e9664e7f908092df11236b22465d217531d6f0378e88d889108d19fe77f28f46ffb629b8733f84b41409e255367321893a2b1bd64518930d9d8cae5d1b774d23
 DIST Python-3.9.13.tar.xz.asc 833 BLAKE2B 
db01c01be9d56cd15f9ab4a9e2cfa800faf4ebecb92b01c133865d3b3134bc910258a33b766306c3d01f98e35bbf9c03c7cba697760b7095999cbd63ed6c276c
 SHA512 
9367afe8ec32195adbb64fa32eb9e3881cfdbbb38efcb5e0804a15486232aecbc81ed20a8ffed652f06a881744f3efd2c2df3cc652d70671c94d6668a17a391e
 DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B 
d173f276dd9c0ce31004dcc55a0d18e9ce25a47683c2df3c4dd62e967dfbbb35be59a2f08cf20f30a19475a8a2344dd95b17400eafa88b5fdbe9270a12ccbf32
 SHA512 
d9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f
-DIST python-gentoo-patches-3.10.5.tar.xz 8584 BLAKE2B 
d4a812a33e485b1eae5629e519dca4dc6625b743b07c7f7bbc62562f345d87723ba499893702310b1e96e443d2946e27a8d4971f32ca1125d4827d0d594ccaa6
 SHA512 
77f0478f7d0491e103857a83a97d6e04a9ec68740a7f9357cbbdd316462e7d98ea8236bd05a30e7556457ece5fbcfa4a7a78a25d4eb12779455ce2bb5b6f30d0
-DIST python-gentoo-patches-3.10.6.tar.xz 8580 BLAKE2B 
4ff3839be2f6bf172acdca22bbded702804809d6334e088190cee4ae4c61e25580a3bdc105bfe27b7f3c3b5f219d363cdca21ef895a3e91f13515afb348a77a0
 SHA512 
c58a85f7c48a4e822527411a6e0618be5408e1a82fe72b21a254dac77b4e5d4b01ac24cf70dc277cd16ccdc8499a9fa53b7cebae3b9f8facc9c978adcc8a2876
-DIST python-gentoo-patches-3.10.6_p1.tar.xz 10592 BLAKE2B 
0b0f54faf93e3b6a3ba5ae5fef01ff4adbb1560e3d5c0c8e7d69d80e2e10b15e7fc7f5471f82d5322c86a1eec762f10cda6e8ea650c993481342cda06a47a863
 SHA512 
c4a2ff7d16042729f5a23222d154bc0832f51b7ab5b1dafe4a6c6bd40b037c85a6d40d07516c1207cd0bc9a233865700d7cca4b01ed27a1f21516392992bc6eb
 DIST python-gentoo-patches-3.10.6_p2.tar.xz 12040 BLAKE2B 
75c93fab19137a966b3775308bc20142f4d3648bbb9364e82c4eaffae93beda54011192881c52b85d2e2493a06cfe2a90f50675609908c3d5ebdb0103fe41644
 SHA512 
7e451a8a18a62592c2cd7b2db71065b77256960f43e172a0d7856b22b69138dcb1552f53b39bec14585a761cfe729c81613551c1b616fe1ec8d2b59856b11453
-DIST python-gentoo-patches-3.11.0b4.tar.xz 4388 BLAKE2B 
16b112f1ecdce86022ed64d7c7007fb323b7bd4497b5802a48bb0a86667c282d1a9150d744f44cefbe9321af4916d35941707c1259a0cf175c0161c8e1b17e97
 SHA512 
f9c8c7180da20e839a0862571b9077b2702dbee8a1acd55ebb11329912cf9f81862ba615be484b92d39461c3eb6c38890f8d58bcbce2c4722418a967faedc1f5
-DIST python-gentoo-patches-3.11.0b5.tar.xz 4384 BLAKE2B 
b036e9103f8315d6e2bb6e85a2db12ec60f8e05ccff083183f24c0b4ba16c807a2eb1fa43b88f8d7a253d5bbeef0880b31d60e13b449f7de992156319753ef33
 SHA512 
af6315f97b0f2463d6c0f18a99a5ff5f96c3d18567ae0d73461f0fc82ca2173a8f6c3fedc2fada2b9460547a457d4264bc2acb90f1906599229afe85bcc2afde
 DIST python-gentoo-patches-3.11.0rc1.tar.xz 4384 BLAKE2B 
31bcdc055bfaf3434dbb02543aaf66910eaccd01808d9a0e57bf7cb3b097fc0046c00ac44737d9c37e3b6d074c524f4dd3ab439a741e66d74a0425889ecaead5
 SHA512 
05b044e2d8f881c471528600ee300bfd9cf5160609dfb3d7cbdb8e43f47b681542582a85de97e28e6a3b89a3fb6c8d7398e029d31e20cea9c5a2a71700382d4e
-DIST python-gentoo-patches-3.8.13_p2.tar.xz 18816 BLAKE2B 
8612ca33e5569319c5d1a5a3fb1a81e860bd515bfde656b79f087ccf7020923fbd06b315178bef8630e4c36bb22c27299fe439aadc6a161f1ec93be8778314ee
 SHA512 
be5668a0a4be0a03e61466436973125a3be4f33a61524e4a5c8d86745727cfcae59e5048477887c9f6bfc09727f3aef3652ad47a13a6bf0f1452d3172f1c34dc
-DIST python-gentoo-patches-3.8.13_p4.tar.xz 23084 BLAKE2B 
44be6b19275189bd04c9dcd3c4be4f4b8f92a0003710a12a12d60c0ab182942993a76d8d7f26b289cd0a4226eeeb9a39723822dfb896307fd6e75d6980c3898e
 SHA512 
b78a39a15d361aed4ce887b4726c7967c09c0ee3add614f1dbca24b6f301bd20660fe074c03a58b325f8720ad853c109b334e41102de0b6cc362c467fb669feb
-DIST python-gentoo-patches-3.8.13_p5.tar.xz 26620 BLAKE2B 
24d05e3f46acf339d2e1d0d86efdb6b61719c09aba08879397df6ed40ce41a5bae892f3677bbafe694b4ced5b469a81c27c4002c1de271565a6cd413e627ae7c
 SHA512 
d18d4e6a5fc10990e9ce1cdda311016e9486d6aa90ad73bcd6e306ffe89ca180ae81a905b3b8d94569e0834103e77d5fffea34238b7aeaec8aeeeaf04fb2f72b
 DIST python-gentoo-patches-3.8.13_p6.tar.xz 27968 BLAKE2B 
0cafbdfed47e0d58a9798c1e090abb17428472f769ebe4125cf1210218b90bcfd2ad8790fafbfdc1daccc51078a6bf5e068157f05151c2283eb80d5fe128d85c
 SHA512 
b23d51478cc126a6f7f3d1d6d2302a13f3e873a3fac19c7b2b86b79f4b25bd421b60e5ecbe9bb606ee0eedc0e6871d20c0befd1b6596b525bf6ef79a19230ae2
-DIST python-gentoo-patches-3.9.13.tar.xz 12836 BLAKE2B 
ba687a3d6e00baf4d9640ab78a29c3e21bf1872b5019198991521cf37bb0780f592db742ee4fdfe6bfb1cab1c1f6587889dfdb024cae72766b6c83c2ffe319be
 SHA512 
e393992ff92625771c6ffeb500637862f0163c689c685fd245a6e5bbdd3128154ce439ecab56eaf1359e67ea0d173dfb19f65a4098ea2266922bfb43aba517dc
-DIST python-gentoo-patches-3.9.13_p1.tar.xz 17036 BLAKE2B 
baf534d002c610426f9f183f53b935d83a4cf084834d3946986baa5d983e8197719b1d3e8568cc7f78a6aaa95b084dd8796e8539169415e19f2d9eb8f296242a
 SHA512 
c7eb503defcc5e91d5de39eed84aeba748f96ef28f0d9ae3b3a98f111543d09311f51ae4fe321ec5f397c5f46dc8c715ecc401124f4e4a94c9fe8e2a6db9e052
-DIST python-gentoo-patches-3.9.13_p2.tar.xz 20708 BLAKE2B 
e86a80405683228211ea763523e71aa130f716a19d4e343ec46d1d428804cd59d07cdad0efea09b09d92139bdec93f40f7667db20240b89ed3a7a6bb46b0981f
 SHA512 
1e9f84d0cde9a251e191b3784ec551a307572e779350e7d20ace0164f6cbc47b883632ebc32638a8f5f16f9c0d618a13d9105ef471657a9745bc6a09bf1d13d9
 DIST python-gentoo-patches-3.9.13_p4.tar.xz 22072 BLAKE2B 
a0e084eff35d075d2255b139d0db114d282cb6c9c0c2ea51a8ecb7f5f1dc8096d6578ae5f804b7583a2b7842152b5723ad802ca816d46813c40aaa756118afc8
 SHA512 
cdf8d43fd5263c4956be234f36c0767215ab2495705d4f2a060b32ecbfbe159e618e31693b0538a1b970f7b27ebe4953063f585930d074dcaf59f2f61486e6b6

diff --git a/dev-lang/python/python-3.10.5.ebuild 
b/dev-lang/python/python-3.10.5.ebuild
deleted file mode 100644
index 599c45e4a54d..000000000000
--- a/dev-lang/python/python-3.10.5.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-       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/";
-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 examples gdbm hardened libedit lto +ncurses pgo 
+readline +sqlite +ssl test tk wininst +xml"
-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:=
-       dev-lang/python-exec[python_targets_python3_10(-)]
-       dev-libs/libffi:=
-       sys-apps/util-linux:=
-       >=sys-libs/zlib-1.1.3:=
-       virtual/libcrypt:=
-       virtual/libintl
-       gdbm? ( sys-libs/gdbm:=[berkdb] )
-       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
-       )
-       xml? ( >=dev-libs/expat-2.1:= )
-       !!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-       ${RDEPEND}
-       bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-       sys-devel/autoconf-archive
-       virtual/awk
-       virtual/pkgconfig
-       verify-sig? ( sec-keys/openpgp-keys-python )
-       !sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-       build? ( app-misc/mime-types )
-"
-
-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}
-
-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, libffi and zlib are not used.
-       rm -fr Modules/expat || die
-       rm -fr Modules/_ctypes/libffi* || die
-       rm -fr Modules/zlib || die
-
-       local PATCHES=(
-               "${WORKDIR}/${PATCHSET}"
-       )
-
-       default
-
-       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-               setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-       # force correct number of jobs
-       # https://bugs.gentoo.org/737660
-       local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-       sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-       sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-       eautoreconf
-}
-
-src_configure() {
-       local disable
-       # disable automagic bluetooth headers detection
-       use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-       use gdbm      || disable+=" gdbm"
-       use ncurses   || disable+=" _curses _curses_panel"
-       use readline  || disable+=" readline"
-       use sqlite    || disable+=" _sqlite3"
-       use ssl       || export PYTHON_DISABLE_SSL="1"
-       use tk        || disable+=" _tkinter"
-       use xml       || disable+=" _elementtree pyexpat" # _elementtree uses 
pyexpat.
-       export PYTHON_DISABLE_MODULES="${disable}"
-
-       if ! use xml; then
-               ewarn "You have configured Python without XML support."
-               ewarn "This is NOT a recommended configuration as you"
-               ewarn "may face problems parsing any XML documents."
-       fi
-
-       if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-               einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-       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.
-       tc-export CXX
-
-       # Fix implicit declarations on cross and prefix builds. Bug #674070.
-       use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-       local dbmliborder
-       if use gdbm; then
-               dbmliborder+="${dbmliborder:+:}gdbm"
-       fi
-
-       if use pgo; then
-               local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-               export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x 
test_gdb -u-network"
-
-               # 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)
-               PROFILE_TASK+=" -x test_socket -x test_asyncio -x 
test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
-
-               if has_version "app-arch/rpm" ; then
-                       # Avoid sandbox failure (attempts to write to 
/var/lib/rpm)
-                       PROFILE_TASK+=" -x test_distutils"
-               fi
-       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-system-ffi
-
-               $(use_with lto)
-               $(use_enable pgo optimizations)
-               $(use_with readline readline "$(usex libedit editline 
readline)")
-       )
-
-       # disable implicit optimization/debugging flags
-       local -x OPT=
-       # 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=
-
-       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
-}
-
-src_compile() {
-       # Ensure sed works as expected
-       # https://bugs.gentoo.org/594768
-       local -x LC_ALL=C
-       # Prevent using distutils bundled by setuptools.
-       # https://bugs.gentoo.org/823728
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-       # 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/python3.10/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
-
-       # Skip failing tests.
-       local skipped_tests="gdb"
-
-       if use sparc ; then
-               # bug #788022
-               skipped_tests+=" multiprocessing_fork"
-               skipped_tests+=" multiprocessing_forkserver"
-       fi
-
-       for test in ${skipped_tests}; do
-               mv "${S}"/Lib/test/test_${test}.py "${T}"
-       done
-
-       # bug 660358
-       local -x COLUMNS=80
-       local -x PYTHONDONTWRITEBYTECODE=
-       # workaround https://bugs.gentoo.org/775416
-       addwrite /usr/lib/python3.10/site-packages
-
-       local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-       emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-               CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-       local result=$?
-
-       for test in ${skipped_tests}; do
-               mv "${T}/test_${test}.py" "${S}"/Lib/test
-       done
-
-       elog "The following tests have been skipped:"
-       for test in ${skipped_tests}; do
-               elog "test_${test}.py"
-       done
-
-       elog "If you would like to run them, you may:"
-       elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-       elog "and run the tests separately."
-
-       if [[ ${result} -ne 0 ]]; then
-               die "emake test failed"
-       fi
-}
-
-src_install() {
-       local libdir=${ED}/usr/lib/python${PYVER}
-
-       emake 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
-
-       use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-       use tk || rm -r "${ED}/usr/bin/idle${PYVER}" 
"${libdir}/"{idlelib,tkinter,test/test_tk*} || 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 "${S}"/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"
-
-       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 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/python/python-3.10.6.ebuild 
b/dev-lang/python/python-3.10.6.ebuild
deleted file mode 100644
index 5d9861331971..000000000000
--- a/dev-lang/python/python-3.10.6.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-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 +ensurepip examples gdbm hardened libedit lto
-       +ncurses pgo +readline +sqlite +ssl test tk +xml
-"
-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:=
-       dev-lang/python-exec[python_targets_python3_10(-)]
-       dev-libs/libffi:=
-       sys-apps/util-linux:=
-       >=sys-libs/zlib-1.1.3:=
-       virtual/libcrypt:=
-       virtual/libintl
-       ensurepip? ( dev-python/ensurepip-wheels )
-       gdbm? ( sys-libs/gdbm:=[berkdb] )
-       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
-       )
-       xml? ( >=dev-libs/expat-2.1:= )
-       !!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-       ${RDEPEND}
-       bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-       sys-devel/autoconf-archive
-       virtual/awk
-       virtual/pkgconfig
-       verify-sig? ( sec-keys/openpgp-keys-python )
-       !sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-       !build? ( app-misc/mime-types )
-"
-
-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}
-
-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.
-       rm -r Modules/expat || die
-       rm -r Modules/_ctypes/libffi* || die
-
-       local PATCHES=(
-               "${WORKDIR}/${PATCHSET}"
-       )
-
-       default
-
-       # https://bugs.gentoo.org/850151
-       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-       # force the correct number of jobs
-       # https://bugs.gentoo.org/737660
-       local jobs=$(makeopts_jobs)
-       sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-       sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-       eautoreconf
-}
-
-src_configure() {
-       # disable automagic bluetooth headers detection
-       if ! use bluetooth; then
-               local -x ac_cv_header_bluetooth_bluetooth_h=no
-       fi
-       local disable
-       use gdbm      || disable+=" gdbm"
-       use ncurses   || disable+=" _curses _curses_panel"
-       use readline  || disable+=" readline"
-       use sqlite    || disable+=" _sqlite3"
-       use ssl       || export PYTHON_DISABLE_SSL="1"
-       use tk        || disable+=" _tkinter"
-       use xml       || disable+=" _elementtree pyexpat" # _elementtree uses 
pyexpat.
-       export PYTHON_DISABLE_MODULES="${disable}"
-
-       if ! use xml; then
-               ewarn "You have configured Python without XML support."
-               ewarn "This is NOT a recommended configuration as you"
-               ewarn "may face problems parsing any XML documents."
-       fi
-
-       if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-               einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-       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
-
-       # Fix implicit declarations on cross and prefix builds. Bug #674070.
-       if use ncurses; then
-               append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-       fi
-
-       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
-                       -x test_gdb
-                       -u-network
-
-                       # 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
-               )
-
-               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-system-ffi
-               --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-               $(use_with lto)
-               $(use_enable pgo optimizations)
-               $(use_with readline readline "$(usex libedit editline 
readline)")
-       )
-
-       # disable implicit optimization/debugging flags
-       local -x OPT=
-       # 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=
-
-       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
-       # Prevent using distutils bundled by setuptools.
-       # https://bugs.gentoo.org/823728
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-       # 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/python3.10/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
-
-       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
-
-       # bug 660358
-       local -x COLUMNS=80
-       local -x PYTHONDONTWRITEBYTECODE=
-       # workaround https://bugs.gentoo.org/775416
-       addwrite /usr/lib/python3.10/site-packages
-
-       emake test EXTRATESTOPTS="${test_opts[*]}" \
-               CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
-}
-
-src_install() {
-       local libdir=${ED}/usr/lib/python${PYVER}
-
-       emake 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,test/test_sqlite*} || die
-       fi
-       if ! use tk; then
-               rm -r "${ED}/usr/bin/idle${PYVER}" || die
-               rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-       fi
-
-       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/python/python-3.10.6_p1.ebuild 
b/dev-lang/python/python-3.10.6_p1.ebuild
deleted file mode 100644
index 5d9861331971..000000000000
--- a/dev-lang/python/python-3.10.6_p1.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-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 +ensurepip examples gdbm hardened libedit lto
-       +ncurses pgo +readline +sqlite +ssl test tk +xml
-"
-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:=
-       dev-lang/python-exec[python_targets_python3_10(-)]
-       dev-libs/libffi:=
-       sys-apps/util-linux:=
-       >=sys-libs/zlib-1.1.3:=
-       virtual/libcrypt:=
-       virtual/libintl
-       ensurepip? ( dev-python/ensurepip-wheels )
-       gdbm? ( sys-libs/gdbm:=[berkdb] )
-       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
-       )
-       xml? ( >=dev-libs/expat-2.1:= )
-       !!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-       ${RDEPEND}
-       bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-       sys-devel/autoconf-archive
-       virtual/awk
-       virtual/pkgconfig
-       verify-sig? ( sec-keys/openpgp-keys-python )
-       !sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-       !build? ( app-misc/mime-types )
-"
-
-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}
-
-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.
-       rm -r Modules/expat || die
-       rm -r Modules/_ctypes/libffi* || die
-
-       local PATCHES=(
-               "${WORKDIR}/${PATCHSET}"
-       )
-
-       default
-
-       # https://bugs.gentoo.org/850151
-       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-       # force the correct number of jobs
-       # https://bugs.gentoo.org/737660
-       local jobs=$(makeopts_jobs)
-       sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-       sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-       eautoreconf
-}
-
-src_configure() {
-       # disable automagic bluetooth headers detection
-       if ! use bluetooth; then
-               local -x ac_cv_header_bluetooth_bluetooth_h=no
-       fi
-       local disable
-       use gdbm      || disable+=" gdbm"
-       use ncurses   || disable+=" _curses _curses_panel"
-       use readline  || disable+=" readline"
-       use sqlite    || disable+=" _sqlite3"
-       use ssl       || export PYTHON_DISABLE_SSL="1"
-       use tk        || disable+=" _tkinter"
-       use xml       || disable+=" _elementtree pyexpat" # _elementtree uses 
pyexpat.
-       export PYTHON_DISABLE_MODULES="${disable}"
-
-       if ! use xml; then
-               ewarn "You have configured Python without XML support."
-               ewarn "This is NOT a recommended configuration as you"
-               ewarn "may face problems parsing any XML documents."
-       fi
-
-       if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-               einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-       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
-
-       # Fix implicit declarations on cross and prefix builds. Bug #674070.
-       if use ncurses; then
-               append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-       fi
-
-       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
-                       -x test_gdb
-                       -u-network
-
-                       # 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
-               )
-
-               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-system-ffi
-               --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-               $(use_with lto)
-               $(use_enable pgo optimizations)
-               $(use_with readline readline "$(usex libedit editline 
readline)")
-       )
-
-       # disable implicit optimization/debugging flags
-       local -x OPT=
-       # 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=
-
-       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
-       # Prevent using distutils bundled by setuptools.
-       # https://bugs.gentoo.org/823728
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-       # 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/python3.10/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
-
-       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
-
-       # bug 660358
-       local -x COLUMNS=80
-       local -x PYTHONDONTWRITEBYTECODE=
-       # workaround https://bugs.gentoo.org/775416
-       addwrite /usr/lib/python3.10/site-packages
-
-       emake test EXTRATESTOPTS="${test_opts[*]}" \
-               CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
-}
-
-src_install() {
-       local libdir=${ED}/usr/lib/python${PYVER}
-
-       emake 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,test/test_sqlite*} || die
-       fi
-       if ! use tk; then
-               rm -r "${ED}/usr/bin/idle${PYVER}" || die
-               rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-       fi
-
-       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/python/python-3.11.0_beta4-r2.ebuild 
b/dev-lang/python/python-3.11.0_beta4-r2.ebuild
deleted file mode 100644
index aab4bbbdc169..000000000000
--- a/dev-lang/python/python-3.11.0_beta4-r2.ebuild
+++ /dev/null
@@ -1,475 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-       python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-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 examples gdbm hardened libedit lto +ncurses pgo 
+readline +sqlite +ssl test tk wininst"
-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:=
-       sys-apps/util-linux:=
-       >=sys-libs/zlib-1.1.3:=
-       virtual/libcrypt:=
-       virtual/libintl
-       gdbm? ( sys-libs/gdbm:=[berkdb] )
-       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
-       )
-       !!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-       ${RDEPEND}
-       bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-       sys-devel/autoconf-archive
-       virtual/awk
-       virtual/pkgconfig
-       verify-sig? ( sec-keys/openpgp-keys-python )
-       !sys-devel/gcc[libffi(-)]
-"
-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}
-
-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, libffi and zlib are not used.
-       rm -fr Modules/expat || die
-       rm -fr Modules/_ctypes/libffi* || die
-       rm -fr Modules/zlib || die
-
-       local PATCHES=(
-               "${WORKDIR}/${PATCHSET}"
-       )
-
-       default
-
-       # https://bugs.gentoo.org/850151
-       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-       # force correct number of jobs
-       # https://bugs.gentoo.org/737660
-       local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-       sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-       sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-       eautoreconf
-}
-
-src_configure() {
-       local disable
-       # disable automagic bluetooth headers detection
-       use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-
-       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
-
-       # Fix implicit declarations on cross and prefix builds. Bug #674070.
-       use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-       local dbmliborder
-       if use gdbm; then
-               dbmliborder+="${dbmliborder:+:}gdbm"
-       fi
-
-       if use pgo; then
-               local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-               export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x 
test_gdb -u-network"
-
-               # 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)
-               PROFILE_TASK+=" -x test_socket -x test_asyncio -x 
test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
-
-               if has_version "app-arch/rpm" ; then
-                       # Avoid sandbox failure (attempts to write to 
/var/lib/rpm)
-                       PROFILE_TASK+=" -x test_distutils"
-               fi
-       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-system-ffi
-               --with-platlibdir=lib
-               --with-pkg-config=yes
-
-               $(use_with lto)
-               $(use_enable pgo optimizations)
-               $(use_with readline readline "$(usex libedit editline 
readline)")
-       )
-
-       # disable implicit optimization/debugging flags
-       local -x OPT=
-       # 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=
-
-       if tc-is-cross-compiler ; then
-               # We need to build our own Python on CBUILD first, and feed it 
in.
-               # bug #847910
-               local myeconfargs_cbuild=(
-                       "${myeconfargs[@]}"
-
-                       # 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
-               )
-
-               myeconfargs+=(
-                       # Point the imminent CHOST build to the Python we just
-                       # built for CBUILD.
-                       --with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-               )
-
-               mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-               pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-               ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-               # Avoid as many dependencies as possible for the cross build.
-               cat >> Makefile <<-EOF || die
-               MODULE_NIS_STATE=disabled
-               MODULE__DBM_STATE=disabled
-               MODULE__GDBM_STATE=disabled
-               MODULE__DBM_STATE=disabled
-               MODULE__SQLITE3_STATE=disabled
-               MODULE__HASHLIB_STATE=disabled
-               MODULE__SSL_STATE=disabled
-               MODULE__CURSES_STATE=disabled
-               MODULE__CURSES_PANEL_STATE=disabled
-               MODULE_READLINE_STATE=disabled
-               MODULE__TKINTER_STATE=disabled
-               MODULE_PYEXPAT_STATE=disabled
-               MODULE_ZLIB_STATE=disabled
-               EOF
-
-               # 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
-       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
-
-       # force-disable modules we don't want built
-       local disable_modules=(
-               NIS
-       )
-       use gdbm || disable_modules+=( _GDBM _DBM )
-       use sqlite || disable_modules+=( _SQLITE3 )
-       use ssl || disable_modules+=( _HASHLIB _SSL )
-       use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-       use readline || disable_modules+=( READLINE )
-       use tk || disable_modules+=( _TKINTER )
-
-       local mod
-       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() {
-       # Ensure sed works as expected
-       # https://bugs.gentoo.org/594768
-       local -x LC_ALL=C
-       # Prevent using distutils bundled by setuptools.
-       # https://bugs.gentoo.org/823728
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
-       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/python3.11/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
-
-       # Skip failing tests.
-       local skipped_tests="gdb"
-
-       if use sparc ; then
-               # bug #788022
-               skipped_tests+=" multiprocessing_fork"
-               skipped_tests+=" multiprocessing_forkserver"
-       fi
-
-       for test in ${skipped_tests}; do
-               mv "${S}"/Lib/test/test_${test}.py "${T}"
-       done
-
-       # Expects to find skipped tests and fails
-       mv "${S}"/Lib/test/test_tools/test_freeze.py "${T}" || die
-
-       # bug 660358
-       local -x COLUMNS=80
-       local -x PYTHONDONTWRITEBYTECODE=
-       # workaround https://bugs.gentoo.org/775416
-       addwrite /usr/lib/python3.11/site-packages
-
-       local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-       emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-               CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-       local result=$?
-
-       for test in ${skipped_tests}; do
-               mv "${T}/test_${test}.py" "${S}"/Lib/test
-       done
-
-       mv "${T}"/test_freeze.py "${S}"/Lib/test/test_tools/test_freeze.py || 
die
-
-       elog "The following tests have been skipped:"
-       for test in ${skipped_tests}; do
-               elog "test_${test}.py"
-       done
-
-       elog "If you would like to run them, you may:"
-       elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-       elog "and run the tests separately."
-
-       if [[ ${result} -ne 0 ]]; then
-               die "emake test failed"
-       fi
-}
-
-src_install() {
-       local libdir=${ED}/usr/lib/python${PYVER}
-
-       # -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
-
-       use sqlite || rm -r "${libdir}/"sqlite3 || die
-       use tk || rm -r "${ED}/usr/bin/idle${PYVER}" 
"${libdir}/"{idlelib,tkinter,test/test_tk*} || 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 "${S}"/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/python/python-3.11.0_beta5-r1.ebuild 
b/dev-lang/python/python-3.11.0_beta5-r1.ebuild
deleted file mode 100644
index 1ff2f49f9aa4..000000000000
--- a/dev-lang/python/python-3.11.0_beta5-r1.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-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 +ensurepip examples gdbm hardened libedit lto
-       +ncurses pgo +readline +sqlite +ssl test tk
-"
-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:=
-       sys-apps/util-linux:=
-       >=sys-libs/zlib-1.1.3:=
-       virtual/libcrypt:=
-       virtual/libintl
-       ensurepip? ( dev-python/ensurepip-wheels )
-       gdbm? ( sys-libs/gdbm:=[berkdb] )
-       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
-       )
-       !!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-       ${RDEPEND}
-       bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-       sys-devel/autoconf-archive
-       virtual/awk
-       virtual/pkgconfig
-       verify-sig? ( sec-keys/openpgp-keys-python )
-       !sys-devel/gcc[libffi(-)]
-"
-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}
-
-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.
-       rm -r Modules/expat || die
-       rm -r Modules/_ctypes/libffi* || die
-
-       local PATCHES=(
-               "${WORKDIR}/${PATCHSET}"
-       )
-
-       default
-
-       # https://bugs.gentoo.org/850151
-       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-       # force the correct number of jobs
-       # https://bugs.gentoo.org/737660
-       local jobs=$(makeopts_jobs)
-       sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-       sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-       eautoreconf
-}
-
-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
-
-       # Fix implicit declarations on cross and prefix builds. Bug #674070.
-       if use ncurses; then
-               append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-       fi
-
-       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
-                       -x test_gdb
-                       -u-network
-
-                       # 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
-               )
-
-               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-system-ffi
-               --with-platlibdir=lib
-               --with-pkg-config=yes
-               --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-               $(use_with lto)
-               $(use_enable pgo optimizations)
-               $(use_with readline readline "$(usex libedit editline 
readline)")
-       )
-
-       # disable implicit optimization/debugging flags
-       local -x OPT=
-       # 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=
-
-       if tc-is-cross-compiler ; then
-               # We need to build our own Python on CBUILD first, and feed it 
in.
-               # bug #847910
-               local myeconfargs_cbuild=(
-                       "${myeconfargs[@]}"
-
-                       # 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
-               )
-
-               myeconfargs+=(
-                       # Point the imminent CHOST build to the Python we just
-                       # built for CBUILD.
-                       --with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-               )
-
-               mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-               pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-               ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-               # Avoid as many dependencies as possible for the cross build.
-               cat >> Makefile <<-EOF || die
-                       MODULE_NIS_STATE=disabled
-                       MODULE__DBM_STATE=disabled
-                       MODULE__GDBM_STATE=disabled
-                       MODULE__DBM_STATE=disabled
-                       MODULE__SQLITE3_STATE=disabled
-                       MODULE__HASHLIB_STATE=disabled
-                       MODULE__SSL_STATE=disabled
-                       MODULE__CURSES_STATE=disabled
-                       MODULE__CURSES_PANEL_STATE=disabled
-                       MODULE_READLINE_STATE=disabled
-                       MODULE__TKINTER_STATE=disabled
-                       MODULE_PYEXPAT_STATE=disabled
-                       MODULE_ZLIB_STATE=disabled
-               EOF
-
-               # 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
-       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
-
-       # force-disable modules we don't want built
-       local disable_modules=( NIS )
-       use gdbm || disable_modules+=( _GDBM _DBM )
-       use sqlite || disable_modules+=( _SQLITE3 )
-       use ssl || disable_modules+=( _HASHLIB _SSL )
-       use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-       use readline || disable_modules+=( READLINE )
-       use tk || disable_modules+=( _TKINTER )
-
-       local mod
-       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() {
-       # Ensure sed works as expected
-       # https://bugs.gentoo.org/594768
-       local -x LC_ALL=C
-       # Prevent using distutils bundled by setuptools.
-       # https://bugs.gentoo.org/823728
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
-       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/python3.11/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
-
-       # bug 660358
-       local -x COLUMNS=80
-       local -x PYTHONDONTWRITEBYTECODE=
-       # workaround https://bugs.gentoo.org/775416
-       addwrite /usr/lib/python3.11/site-packages
-
-       emake test EXTRATESTOPTS="${test_opts[*]}" \
-               CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
-}
-
-src_install() {
-       local libdir=${ED}/usr/lib/python${PYVER}
-
-       # -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
-
-       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/python/python-3.8.13_p2.ebuild 
b/dev-lang/python/python-3.8.13_p2.ebuild
deleted file mode 100644
index 38ff1ce0ce26..000000000000
--- a/dev-lang/python/python-3.8.13_p2.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils \
-       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/";
-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 examples gdbm hardened +ncurses +readline +sqlite +ssl 
test tk wininst +xml"
-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:=
-       dev-lang/python-exec[python_targets_python3_8(-)]
-       dev-libs/libffi:=
-       sys-apps/util-linux:=
-       >=sys-libs/zlib-1.1.3:=
-       virtual/libcrypt:=
-       virtual/libintl
-       gdbm? ( sys-libs/gdbm:=[berkdb] )
-       ncurses? ( >=sys-libs/ncurses-5.2:= )
-       readline? ( >=sys-libs/readline-4.1:= )
-       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
-       )
-       xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-       ${RDEPEND}
-       bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-BDEPEND="
-       sys-devel/autoconf-archive
-       virtual/awk
-       virtual/pkgconfig
-       verify-sig? ( sec-keys/openpgp-keys-python )
-       !sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-       build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-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, libffi and zlib are not used.
-       rm -fr Modules/expat || die
-       rm -fr Modules/_ctypes/libffi* || die
-       rm -fr Modules/zlib || die
-
-       local PATCHES=(
-               "${WORKDIR}/${PATCHSET}"
-       )
-
-       default
-
-       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-               setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-       # force correct number of jobs
-       # https://bugs.gentoo.org/737660
-       local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-       sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-       sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-       eautoreconf
-}
-
-src_configure() {
-       local disable
-       # disable automagic bluetooth headers detection
-       use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-       use gdbm      || disable+=" gdbm"
-       use ncurses   || disable+=" _curses _curses_panel"
-       use readline  || disable+=" readline"
-       use sqlite    || disable+=" _sqlite3"
-       use ssl       || export PYTHON_DISABLE_SSL="1"
-       use tk        || disable+=" _tkinter"
-       use xml       || disable+=" _elementtree pyexpat" # _elementtree uses 
pyexpat.
-       export PYTHON_DISABLE_MODULES="${disable}"
-
-       if ! use xml; then
-               ewarn "You have configured Python without XML support."
-               ewarn "This is NOT a recommended configuration as you"
-               ewarn "may face problems parsing any XML documents."
-       fi
-
-       if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-               einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-       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.
-       tc-export CXX
-
-       # Fix implicit declarations on cross and prefix builds. Bug #674070.
-       use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-       local dbmliborder
-       if use gdbm; then
-               dbmliborder+="${dbmliborder:+:}gdbm"
-       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
-               --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-system-ffi
-       )
-
-       # disable implicit optimization/debugging flags
-       local -x OPT=
-       # 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=
-
-       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
-}
-
-src_compile() {
-       # Ensure sed works as expected
-       # https://bugs.gentoo.org/594768
-       local -x LC_ALL=C
-       # Prevent using distutils bundled by setuptools.
-       # https://bugs.gentoo.org/823728
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-       # also need to clear the flags explicitly here or they end up
-       # in _sysconfigdata*
-       emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-       # 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
-
-       # Skip failing tests.
-       local skipped_tests="gdb"
-
-       if use sparc ; then
-               # bug #788022
-               skipped_tests+=" multiprocessing_fork"
-               skipped_tests+=" multiprocessing_forkserver"
-       fi
-
-       for test in ${skipped_tests}; do
-               mv "${S}"/Lib/test/test_${test}.py "${T}"
-       done
-
-       # bug 660358
-       local -x COLUMNS=80
-       local -x PYTHONDONTWRITEBYTECODE=
-
-       local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-       emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-               CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-       local result=$?
-
-       for test in ${skipped_tests}; do
-               mv "${T}/test_${test}.py" "${S}"/Lib/test
-       done
-
-       elog "The following tests have been skipped:"
-       for test in ${skipped_tests}; do
-               elog "test_${test}.py"
-       done
-
-       elog "If you would like to run them, you may:"
-       elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-       elog "and run the tests separately."
-
-       if [[ ${result} -ne 0 ]]; then
-               die "emake test failed"
-       fi
-}
-
-src_install() {
-       local libdir=${ED}/usr/lib/python${PYVER}
-
-       emake DESTDIR="${D}" altinstall
-
-       # Remove static library
-       rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-       # 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
-
-       use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-       use tk || rm -r "${ED}/usr/bin/idle${PYVER}" 
"${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-       use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || 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 "${S}"/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"
-
-       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 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/python/python-3.8.13_p4.ebuild 
b/dev-lang/python/python-3.8.13_p4.ebuild
deleted file mode 100644
index b92def0f1dcf..000000000000
--- a/dev-lang/python/python-3.8.13_p4.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools 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 +ensurepip examples gdbm hardened lto +ncurses pgo
-       +readline +sqlite +ssl test tk wininst +xml
-"
-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:=
-       dev-lang/python-exec[python_targets_python3_8(-)]
-       dev-libs/libffi:=
-       sys-apps/util-linux:=
-       >=sys-libs/zlib-1.1.3:=
-       virtual/libcrypt:=
-       virtual/libintl
-       ensurepip? ( dev-python/ensurepip-wheels )
-       gdbm? ( sys-libs/gdbm:=[berkdb] )
-       ncurses? ( >=sys-libs/ncurses-5.2:= )
-       readline? ( >=sys-libs/readline-4.1:= )
-       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
-       )
-       xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-       ${RDEPEND}
-       bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-       sys-devel/autoconf-archive
-       virtual/awk
-       virtual/pkgconfig
-       verify-sig? ( sec-keys/openpgp-keys-python )
-       !sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-       !build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-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.
-       rm -r Modules/expat || die
-       rm -r Modules/_ctypes/libffi* || die
-
-       local PATCHES=(
-               "${WORKDIR}/${PATCHSET}"
-       )
-
-       default
-
-       # https://bugs.gentoo.org/850151
-       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-       # force the correct number of jobs
-       # https://bugs.gentoo.org/737660
-       local jobs=$(makeopts_jobs)
-       sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-       sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-       eautoreconf
-}
-
-src_configure() {
-       # disable automagic bluetooth headers detection
-       if ! use bluetooth; then
-               local -x ac_cv_header_bluetooth_bluetooth_h=no
-       fi
-       local disable
-       use gdbm      || disable+=" gdbm"
-       use ncurses   || disable+=" _curses _curses_panel"
-       use readline  || disable+=" readline"
-       use sqlite    || disable+=" _sqlite3"
-       use ssl       || export PYTHON_DISABLE_SSL="1"
-       use tk        || disable+=" _tkinter"
-       use xml       || disable+=" _elementtree pyexpat" # _elementtree uses 
pyexpat.
-       export PYTHON_DISABLE_MODULES="${disable}"
-
-       if ! use xml; then
-               ewarn "You have configured Python without XML support."
-               ewarn "This is NOT a recommended configuration as you"
-               ewarn "may face problems parsing any XML documents."
-       fi
-
-       if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-               einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-       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
-
-       # Fix implicit declarations on cross and prefix builds. Bug #674070.
-       if use ncurses; then
-               append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-       fi
-
-       local dbmliborder=
-       if use gdbm; then
-               dbmliborder+="${dbmliborder:+:}gdbm"
-       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
-               --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-system-ffi
-               --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-       )
-
-       # disable implicit optimization/debugging flags
-       local -x OPT=
-       # 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=
-
-       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
-       # Prevent using distutils bundled by setuptools.
-       # https://bugs.gentoo.org/823728
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-       # also need to clear the flags explicitly here or they end up
-       # in _sysconfigdata*
-       emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-       # 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
-
-       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
-
-       # bug 660358
-       local -x COLUMNS=80
-       local -x PYTHONDONTWRITEBYTECODE=
-
-       emake test EXTRATESTOPTS="${test_opts[*]}" \
-               CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
-}
-
-src_install() {
-       local libdir=${ED}/usr/lib/python${PYVER}
-
-       emake DESTDIR="${D}" altinstall
-
-       # Remove static library
-       rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-       # 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,test/test_sqlite*} || die
-       fi
-       if ! use tk; then
-               rm -r "${ED}/usr/bin/idle${PYVER}" || die
-               rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-       fi
-       if ! use wininst; then
-               rm "${libdir}/distutils/command/"wininst-*.exe || die
-       fi
-
-       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/python/python-3.8.13_p5.ebuild 
b/dev-lang/python/python-3.8.13_p5.ebuild
deleted file mode 100644
index b92def0f1dcf..000000000000
--- a/dev-lang/python/python-3.8.13_p5.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools 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 +ensurepip examples gdbm hardened lto +ncurses pgo
-       +readline +sqlite +ssl test tk wininst +xml
-"
-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:=
-       dev-lang/python-exec[python_targets_python3_8(-)]
-       dev-libs/libffi:=
-       sys-apps/util-linux:=
-       >=sys-libs/zlib-1.1.3:=
-       virtual/libcrypt:=
-       virtual/libintl
-       ensurepip? ( dev-python/ensurepip-wheels )
-       gdbm? ( sys-libs/gdbm:=[berkdb] )
-       ncurses? ( >=sys-libs/ncurses-5.2:= )
-       readline? ( >=sys-libs/readline-4.1:= )
-       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
-       )
-       xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-       ${RDEPEND}
-       bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-       sys-devel/autoconf-archive
-       virtual/awk
-       virtual/pkgconfig
-       verify-sig? ( sec-keys/openpgp-keys-python )
-       !sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-       !build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-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.
-       rm -r Modules/expat || die
-       rm -r Modules/_ctypes/libffi* || die
-
-       local PATCHES=(
-               "${WORKDIR}/${PATCHSET}"
-       )
-
-       default
-
-       # https://bugs.gentoo.org/850151
-       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-       # force the correct number of jobs
-       # https://bugs.gentoo.org/737660
-       local jobs=$(makeopts_jobs)
-       sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-       sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-       eautoreconf
-}
-
-src_configure() {
-       # disable automagic bluetooth headers detection
-       if ! use bluetooth; then
-               local -x ac_cv_header_bluetooth_bluetooth_h=no
-       fi
-       local disable
-       use gdbm      || disable+=" gdbm"
-       use ncurses   || disable+=" _curses _curses_panel"
-       use readline  || disable+=" readline"
-       use sqlite    || disable+=" _sqlite3"
-       use ssl       || export PYTHON_DISABLE_SSL="1"
-       use tk        || disable+=" _tkinter"
-       use xml       || disable+=" _elementtree pyexpat" # _elementtree uses 
pyexpat.
-       export PYTHON_DISABLE_MODULES="${disable}"
-
-       if ! use xml; then
-               ewarn "You have configured Python without XML support."
-               ewarn "This is NOT a recommended configuration as you"
-               ewarn "may face problems parsing any XML documents."
-       fi
-
-       if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-               einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-       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
-
-       # Fix implicit declarations on cross and prefix builds. Bug #674070.
-       if use ncurses; then
-               append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-       fi
-
-       local dbmliborder=
-       if use gdbm; then
-               dbmliborder+="${dbmliborder:+:}gdbm"
-       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
-               --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-system-ffi
-               --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-       )
-
-       # disable implicit optimization/debugging flags
-       local -x OPT=
-       # 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=
-
-       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
-       # Prevent using distutils bundled by setuptools.
-       # https://bugs.gentoo.org/823728
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-       # also need to clear the flags explicitly here or they end up
-       # in _sysconfigdata*
-       emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-       # 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
-
-       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
-
-       # bug 660358
-       local -x COLUMNS=80
-       local -x PYTHONDONTWRITEBYTECODE=
-
-       emake test EXTRATESTOPTS="${test_opts[*]}" \
-               CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
-}
-
-src_install() {
-       local libdir=${ED}/usr/lib/python${PYVER}
-
-       emake DESTDIR="${D}" altinstall
-
-       # Remove static library
-       rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-       # 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,test/test_sqlite*} || die
-       fi
-       if ! use tk; then
-               rm -r "${ED}/usr/bin/idle${PYVER}" || die
-               rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-       fi
-       if ! use wininst; then
-               rm "${libdir}/distutils/command/"wininst-*.exe || die
-       fi
-
-       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/python/python-3.9.13.ebuild 
b/dev-lang/python/python-3.9.13.ebuild
deleted file mode 100644
index 13617d95eba3..000000000000
--- a/dev-lang/python/python-3.9.13.ebuild
+++ /dev/null
@@ -1,402 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-       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/";
-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 examples gdbm hardened lto +ncurses pgo +readline 
+sqlite +ssl test tk wininst +xml"
-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:=
-       dev-lang/python-exec[python_targets_python3_9(-)]
-       dev-libs/libffi:=
-       sys-apps/util-linux:=
-       >=sys-libs/zlib-1.1.3:=
-       virtual/libcrypt:=
-       virtual/libintl
-       gdbm? ( sys-libs/gdbm:=[berkdb] )
-       ncurses? ( >=sys-libs/ncurses-5.2:= )
-       readline? ( >=sys-libs/readline-4.1:= )
-       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
-       )
-       xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-       ${RDEPEND}
-       bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-BDEPEND="
-       virtual/awk
-       virtual/pkgconfig
-       sys-devel/autoconf-archive
-       verify-sig? ( sec-keys/openpgp-keys-python )
-       !sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-       !build? ( app-misc/mime-types )
-"
-
-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}
-
-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, libffi and zlib are not used.
-       rm -fr Modules/expat || die
-       rm -fr Modules/_ctypes/libffi* || die
-       rm -fr Modules/zlib || die
-
-       local PATCHES=(
-               "${WORKDIR}/${PATCHSET}"
-       )
-
-       default
-
-       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-               setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-       # force correct number of jobs
-       # https://bugs.gentoo.org/737660
-       local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-       sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-       sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-       eautoreconf
-}
-
-src_configure() {
-       local disable
-       # disable automagic bluetooth headers detection
-       use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-       use gdbm      || disable+=" gdbm"
-       use ncurses   || disable+=" _curses _curses_panel"
-       use readline  || disable+=" readline"
-       use sqlite    || disable+=" _sqlite3"
-       use ssl       || export PYTHON_DISABLE_SSL="1"
-       use tk        || disable+=" _tkinter"
-       use xml       || disable+=" _elementtree pyexpat" # _elementtree uses 
pyexpat.
-       export PYTHON_DISABLE_MODULES="${disable}"
-
-       if ! use xml; then
-               ewarn "You have configured Python without XML support."
-               ewarn "This is NOT a recommended configuration as you"
-               ewarn "may face problems parsing any XML documents."
-       fi
-
-       if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-               einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-       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.
-       tc-export CXX
-
-       # Fix implicit declarations on cross and prefix builds. Bug #674070.
-       use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-       local dbmliborder
-       if use gdbm; then
-               dbmliborder+="${dbmliborder:+:}gdbm"
-       fi
-
-       if use pgo; then
-               local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-               export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x 
test_gdb -u-network"
-
-               # 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)
-               PROFILE_TASK+=" -x test_socket -x test_asyncio -x 
test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc"
-
-               if has_version "app-arch/rpm" ; then
-                       # Avoid sandbox failure (attempts to write to 
/var/lib/rpm)
-                       PROFILE_TASK+=" -x test_distutils"
-               fi
-       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
-               --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-system-ffi
-
-               $(use_with lto)
-               $(use_enable pgo optimizations)
-       )
-
-       # disable implicit optimization/debugging flags
-       local -x OPT=
-       # 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=
-
-       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
-}
-
-src_compile() {
-       # Ensure sed works as expected
-       # https://bugs.gentoo.org/594768
-       local -x LC_ALL=C
-       # Prevent using distutils bundled by setuptools.
-       # https://bugs.gentoo.org/823728
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-       # 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/python3.9/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
-
-       # Skip failing tests.
-       local skipped_tests="gdb"
-
-       if use sparc ; then
-               # bug #788022
-               skipped_tests+=" multiprocessing_fork"
-               skipped_tests+=" multiprocessing_forkserver"
-       fi
-
-       for test in ${skipped_tests}; do
-               mv "${S}"/Lib/test/test_${test}.py "${T}"
-       done
-
-       # bug 660358
-       local -x COLUMNS=80
-       local -x PYTHONDONTWRITEBYTECODE=
-
-       local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-       emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-               CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-       local result=$?
-
-       for test in ${skipped_tests}; do
-               mv "${T}/test_${test}.py" "${S}"/Lib/test
-       done
-
-       elog "The following tests have been skipped:"
-       for test in ${skipped_tests}; do
-               elog "test_${test}.py"
-       done
-
-       elog "If you would like to run them, you may:"
-       elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-       elog "and run the tests separately."
-
-       if [[ ${result} -ne 0 ]]; then
-               die "emake test failed"
-       fi
-}
-
-src_install() {
-       local libdir=${ED}/usr/lib/python${PYVER}
-
-       emake DESTDIR="${D}" altinstall
-
-       # Remove static library
-       rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-       # 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
-
-       use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-       use tk || rm -r "${ED}/usr/bin/idle${PYVER}" 
"${libdir}/"{idlelib,tkinter,test/test_tk*} || 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 "${S}"/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"
-
-       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 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/python/python-3.9.13_p1.ebuild 
b/dev-lang/python/python-3.9.13_p1.ebuild
deleted file mode 100644
index c3fe846a9d19..000000000000
--- a/dev-lang/python/python-3.9.13_p1.ebuild
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-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 +ensurepip examples gdbm hardened lto +ncurses pgo
-       +readline +sqlite +ssl test tk +xml
-"
-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:=
-       dev-lang/python-exec[python_targets_python3_9(-)]
-       dev-libs/libffi:=
-       sys-apps/util-linux:=
-       >=sys-libs/zlib-1.1.3:=
-       virtual/libcrypt:=
-       virtual/libintl
-       ensurepip? ( dev-python/ensurepip-wheels )
-       gdbm? ( sys-libs/gdbm:=[berkdb] )
-       ncurses? ( >=sys-libs/ncurses-5.2:= )
-       readline? ( >=sys-libs/readline-4.1:= )
-       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
-       )
-       xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-       ${RDEPEND}
-       bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-       sys-devel/autoconf-archive
-       virtual/awk
-       virtual/pkgconfig
-       verify-sig? ( sec-keys/openpgp-keys-python )
-       !sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-       !build? ( app-misc/mime-types )
-"
-
-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}
-
-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.
-       rm -r Modules/expat || die
-       rm -r Modules/_ctypes/libffi* || die
-
-       local PATCHES=(
-               "${WORKDIR}/${PATCHSET}"
-       )
-
-       default
-
-       # https://bugs.gentoo.org/850151
-       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-       # force the correct number of jobs
-       # https://bugs.gentoo.org/737660
-       local jobs=$(makeopts_jobs)
-       sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-       sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-       eautoreconf
-}
-
-src_configure() {
-       # disable automagic bluetooth headers detection
-       if ! use bluetooth; then
-               local -x ac_cv_header_bluetooth_bluetooth_h=no
-       fi
-       local disable
-       use gdbm      || disable+=" gdbm"
-       use ncurses   || disable+=" _curses _curses_panel"
-       use readline  || disable+=" readline"
-       use sqlite    || disable+=" _sqlite3"
-       use ssl       || export PYTHON_DISABLE_SSL="1"
-       use tk        || disable+=" _tkinter"
-       use xml       || disable+=" _elementtree pyexpat" # _elementtree uses 
pyexpat.
-       export PYTHON_DISABLE_MODULES="${disable}"
-
-       if ! use xml; then
-               ewarn "You have configured Python without XML support."
-               ewarn "This is NOT a recommended configuration as you"
-               ewarn "may face problems parsing any XML documents."
-       fi
-
-       if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-               einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-       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
-
-       # Fix implicit declarations on cross and prefix builds. Bug #674070.
-       if use ncurses; then
-               append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-       fi
-
-       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
-                       -x test_gdb
-                       -u-network
-
-                       # 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
-               )
-
-               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
-               --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-system-ffi
-               --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-               $(use_with lto)
-               $(use_enable pgo optimizations)
-       )
-
-       # disable implicit optimization/debugging flags
-       local -x OPT=
-       # 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=
-
-       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
-       # Prevent using distutils bundled by setuptools.
-       # https://bugs.gentoo.org/823728
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-       # 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/python3.9/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
-
-       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
-
-       # bug 660358
-       local -x COLUMNS=80
-       local -x PYTHONDONTWRITEBYTECODE=
-
-       emake test EXTRATESTOPTS="${test_opts[*]}" \
-               CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
-}
-
-src_install() {
-       local libdir=${ED}/usr/lib/python${PYVER}
-
-       emake DESTDIR="${D}" altinstall
-
-       # Remove static library
-       rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-       # 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,test/test_sqlite*} || die
-       fi
-       if ! use tk; then
-               rm -r "${ED}/usr/bin/idle${PYVER}" || die
-               rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-       fi
-
-       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/python/python-3.9.13_p2.ebuild 
b/dev-lang/python/python-3.9.13_p2.ebuild
deleted file mode 100644
index c3fe846a9d19..000000000000
--- a/dev-lang/python/python-3.9.13_p2.ebuild
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-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 +ensurepip examples gdbm hardened lto +ncurses pgo
-       +readline +sqlite +ssl test tk +xml
-"
-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:=
-       dev-lang/python-exec[python_targets_python3_9(-)]
-       dev-libs/libffi:=
-       sys-apps/util-linux:=
-       >=sys-libs/zlib-1.1.3:=
-       virtual/libcrypt:=
-       virtual/libintl
-       ensurepip? ( dev-python/ensurepip-wheels )
-       gdbm? ( sys-libs/gdbm:=[berkdb] )
-       ncurses? ( >=sys-libs/ncurses-5.2:= )
-       readline? ( >=sys-libs/readline-4.1:= )
-       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
-       )
-       xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-       ${RDEPEND}
-       bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-       sys-devel/autoconf-archive
-       virtual/awk
-       virtual/pkgconfig
-       verify-sig? ( sec-keys/openpgp-keys-python )
-       !sys-devel/gcc[libffi(-)]
-"
-RDEPEND+="
-       !build? ( app-misc/mime-types )
-"
-
-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}
-
-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.
-       rm -r Modules/expat || die
-       rm -r Modules/_ctypes/libffi* || die
-
-       local PATCHES=(
-               "${WORKDIR}/${PATCHSET}"
-       )
-
-       default
-
-       # https://bugs.gentoo.org/850151
-       sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-       # force the correct number of jobs
-       # https://bugs.gentoo.org/737660
-       local jobs=$(makeopts_jobs)
-       sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-       sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-       eautoreconf
-}
-
-src_configure() {
-       # disable automagic bluetooth headers detection
-       if ! use bluetooth; then
-               local -x ac_cv_header_bluetooth_bluetooth_h=no
-       fi
-       local disable
-       use gdbm      || disable+=" gdbm"
-       use ncurses   || disable+=" _curses _curses_panel"
-       use readline  || disable+=" readline"
-       use sqlite    || disable+=" _sqlite3"
-       use ssl       || export PYTHON_DISABLE_SSL="1"
-       use tk        || disable+=" _tkinter"
-       use xml       || disable+=" _elementtree pyexpat" # _elementtree uses 
pyexpat.
-       export PYTHON_DISABLE_MODULES="${disable}"
-
-       if ! use xml; then
-               ewarn "You have configured Python without XML support."
-               ewarn "This is NOT a recommended configuration as you"
-               ewarn "may face problems parsing any XML documents."
-       fi
-
-       if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-               einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-       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
-
-       # Fix implicit declarations on cross and prefix builds. Bug #674070.
-       if use ncurses; then
-               append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-       fi
-
-       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
-                       -x test_gdb
-                       -u-network
-
-                       # 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
-               )
-
-               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
-               --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-system-ffi
-               --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-               $(use_with lto)
-               $(use_enable pgo optimizations)
-       )
-
-       # disable implicit optimization/debugging flags
-       local -x OPT=
-       # 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=
-
-       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
-       # Prevent using distutils bundled by setuptools.
-       # https://bugs.gentoo.org/823728
-       export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-       # 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/python3.9/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
-
-       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
-
-       # bug 660358
-       local -x COLUMNS=80
-       local -x PYTHONDONTWRITEBYTECODE=
-
-       emake test EXTRATESTOPTS="${test_opts[*]}" \
-               CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
-}
-
-src_install() {
-       local libdir=${ED}/usr/lib/python${PYVER}
-
-       emake DESTDIR="${D}" altinstall
-
-       # Remove static library
-       rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-       # 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,test/test_sqlite*} || die
-       fi
-       if ! use tk; then
-               rm -r "${ED}/usr/bin/idle${PYVER}" || die
-               rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-       fi
-
-       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
-}