gentoo auto-resync : 12:10:2022 - 07:39:50

author: V3n3RiX <venerix@koprulu.sector> 2022-10-12 07:39:50 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-12 07:39:50 +0100
commit: 9f3ff9d79a788d420003387392ec40fd0548efae (patch)
tree: 9dde8e6738d63f629a7879a0fd5949b1e7916b40
parent: c07955fffc8c82b9d37211c3f7f38455d7ef0599 (diff)
106 files changed, 2313 insertions, 657 deletions
diff --git a/Manifest b/Manifest
index ae209270d334..9e504304517b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29605 BLAKE2B 3769f1047cb1269a4a9385f521218e390d4f89ac9da38cb6e3cca26c9bb8eda0074db0df19ceaf18f94ca8971774594d9face685018d3686e497e1ab60c4eb6c SHA512 e57c2769c4236849e365444aa809a11e2654a5bac0375a73b76d65270c61b4de505774b6327fc4b76dfed02c1a92c3172a3ed531c48af0fb0821519521c80658
-TIMESTAMP 2022-10-11T23:39:48Z
+MANIFEST Manifest.files.gz 29606 BLAKE2B a5541c3fc8d11093fe86614c6a472b6b6fa6a2fdaa523dd7941d6f5ad693d7efc26a23c9fc50272c615392d72cd363933e06ea6df82c075397815bb9e875bfca SHA512 e1da2ce2f8cb70a7ae31830412caadaf484070022ef28ab80dd28419e099f144bb625f18329f9a88d84d70a7273d2e1eb9a20d00c65da85273ff7b88741b9444
+TIMESTAMP 2022-10-12T05:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNF/sRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNGUyFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA64g/9H4jDcWtc7b6uI1tv2/VF+RW9TLKcx1WcJNmwLSapA0+EY3nSWrmwdUEw
-SbXeWJJhK1vaXnnfD6hzAxaHJ4egyL/mjSHRrR82RYEH7SCiAL0I7qzCaEWUvWQh
-3qYvnHjHC6g3OaUCqoctNuIVF+sy2cWOL6GLp+kyQoeOkJJG6mK45JZdv+ztwEFh
-tgsiW04fW2Tfa2KansQmZSdcV94iqW3T2TYa9vStjaz34OdX6P8KQT1gCIFbtOkJ
-pH3vVxqix3ULwfVMD3h/j02hQZKJSaPqUWrJmW4BzTji9W5cfgYXPokmvlSl8Fq5
-0B0g5XbrW2QRRKcEuXPXEnMqAHALGcBNpp8g7HWrtr91mgKVd5ki9oN8cH8s02cu
-saByXxZIlIGbjgusVlxd0cI/DGaxkwnxZp7dU4lGerdc/LMyznD1lnfJb5r/gYDw
-N0/9TW309WbKTWHOf2MV9jRZHqhNNhXVoNbeOALr0yQQ3DVjqSETBcyAdZuIZFuB
-t8MpXsCrJNQbmRlZd0JxpJfiYaFPXpdAt7GXUaV2ZcoGDuHyLyb8QGnH/oPYPEIS
-eskC3yeEp81WVPbH+GX6Za4+iMNUocBCsRubkvOXwhcdlUv/NsFZOx4zXWBnswq8
-L4cSg6g52/1lWbfCm5yJBV6hmITguYxxmwGiBM/LlDttFs1mnHE=
-=88JR
+klArKxAAo9oKLzV0DtwUVSBhOasX9TafWSoiQB1gm4+5yW49JuLN18t803ZZH9Qu
+2IqTFN4neYabWG1NseEvaCptCchw23MY6YWGG/hKps4svASUk0Z2eqbhpfFduI8p
+MyNKtHROAtJCDvreHfsb2lvJNeK8mHH1pmSRMImfimhmjCxjSWSM0uC/8dR/GG/O
+HUkOmU5V9FY/dQbp2Po2bOgOokNDUqiFat6RSKzg6x7I+kfSRAqRRYK47SbDhVx5
+VDlApnw9jvdv2zLTGECFQFl/4WWCMxNcDXr5Iq1Evmsv0oKTidBInlFsL0sdruYM
+FEiSfWsYCRx6icmlwTLTJGab5zOMV2rqjVyvkRdfwiInBilDzNG+LnpMY3lYfKV1
+FAbhh/HxBCY3QVjHV3DMF+aXxWtVmKtlu7tbhA8rlt48O35ToozisPtj77XEvUAx
+YE85rlQvQOQBkFQ0Zt5iOvvxtpoaOGThET04OGLsjYxV8Yyh6/Mpg1YTFeORacy3
+9qu7kaHznCSBYGh0ygbWq8wbhXpDG3IBio8UYBeqxzhxdUAJL7QMrHw8Px/hHGKg
+RfeFYi7enAUN0tjVl9kAe69ZPbDkbxEaoVeEUuVSEX+p8qKFgsWTFhbN6Zqk/+Q9
+egKjXpTJRRWCz+i8X/4eqonArtjClv9TUfCDLLsaimxAUkPyyPo=
+=kGMo
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 604ee891004e..509e98e67526 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 679065978407..1cefb3be6557 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/dasel/Manifest b/app-misc/dasel/Manifest
index 0b2e9ea33452..fe219ea14ac1 100644
--- a/app-misc/dasel/Manifest
+++ b/app-misc/dasel/Manifest
@@ -1,10 +1,4 @@
 DIST dasel-1.24.3-deps.tar.xz 20531068 BLAKE2B 6cd947a88c54e46300432c2f87c0ef757a53739e0755af48f4596a87ba46faf12c967145a0f263e13abb8f01ffe10c51b45f641de348fc02e7af39417b709d1d SHA512 27696cd5a5c93b3e29ba12fd2730c04047dc752ef17a32db73e7cbc8e5d38d914705720da9ff0ffb0c8d3fb383b5070eb552b24a4e72e72ebad70c2e1085cab3
-DIST dasel-1.24.3.tar.gz 3052243 BLAKE2B bc6621515781272d45f2b459f99a5c8ab3c51a869d147bf8e0d7ea1f0f3b9e8afd0b80a4091ecccfcaa7e8e5e375d6851400dac9432aa911374d011b8c36ec36 SHA512 fc836413e0e6538102e63f08fb0030ed93fde048d11e98291f22f02ee5d5cff51523f25052b8ef7f268d52c2487086408ddc8547d2e12fb3a672d3a754838ce9
-DIST dasel-1.25.0.tar.gz 3053827 BLAKE2B 2902cddbb2feb4ce3f4d643e26c4b1f82f3b25a2d6e016257767fefe499bc4e52cefa784723ae2c33ff68614501a10e0aea2a8b8f000de3748c3e7f4fb0ff28f SHA512 ec2b1d0ca0acd84dc9465b0f4aa27b054a0897efbcb4dd6a94cf6de73415933e44b857e8dbcb01d3bac266597d2dfe132146d282c168b087dcd77512e5f06e72
-DIST dasel-1.26.0.tar.gz 3054355 BLAKE2B d75b64558abc1ac6f2eeb966badc44de60765a7f216de17dc9d5b4c233b59fe3c7a9113714f7ce6b44a5037a4fa1d1762c710cc00647a40d3dbe00b9ec77b6b4 SHA512 7467c075c84543dc656a2ce5f92d49a23585b65b75179fb31a3c89f859a47d09caf4628c39da2a54aa5625005b6eae16054f1a0203f338d8e9684170c5adbff3
 DIST dasel-1.26.1.tar.gz 3054446 BLAKE2B 760f03ee0feb1b6e0e0da9a92922f13bb3786b90ab01bda040d2be2cf10ed5d8a8c2db69ac146ac2ec64f6c4503eaaa87d32c73068f27ebc9ce87045052b4af3 SHA512 07efcf0bf31573decc856a8b41842af9658dc1a3b968510b8e4c642ec8cfe24e97de64b6ef2c296da7d5623ca47e92d42e3f7bb927a8a25e54f97546fac279f0
-EBUILD dasel-1.24.3.ebuild 674 BLAKE2B f1d497570051729a0c6820c126548f4829f0b8f02cebf03baf74f59a6297144c56e3b1363518af75021b6d974ca03a6c72a9cb7f8d98d01036849d393168fd9f SHA512 d8455abd5890808df6e2c1f8d5e5b714123b4009b62b953e55af24a0ed34df1779b3912b4fc1f64780960c5bb93d39c92b6398aefbfee59b5efa329f5b6a6a36
-EBUILD dasel-1.25.0.ebuild 682 BLAKE2B 4e42f9e1c0b72e2e8e0822edfd2fe2cd143a93e3ef4fd192285a5fb907bfed3764d6b2712a56d681fd0acbb8e224a067eced93c29d17adc58c47f245124a9731 SHA512 c9bb3d0094eec3ab1d9f7e9f0d6eb0622f9cc744b9095a8f26a706121ea645e5349f35651f495d506b03150c233a2dd36d0d1f7a0ec91067e24330d9bbce79cc
-EBUILD dasel-1.26.0.ebuild 682 BLAKE2B 4e42f9e1c0b72e2e8e0822edfd2fe2cd143a93e3ef4fd192285a5fb907bfed3764d6b2712a56d681fd0acbb8e224a067eced93c29d17adc58c47f245124a9731 SHA512 c9bb3d0094eec3ab1d9f7e9f0d6eb0622f9cc744b9095a8f26a706121ea645e5349f35651f495d506b03150c233a2dd36d0d1f7a0ec91067e24330d9bbce79cc
 EBUILD dasel-1.26.1.ebuild 682 BLAKE2B 4e42f9e1c0b72e2e8e0822edfd2fe2cd143a93e3ef4fd192285a5fb907bfed3764d6b2712a56d681fd0acbb8e224a067eced93c29d17adc58c47f245124a9731 SHA512 c9bb3d0094eec3ab1d9f7e9f0d6eb0622f9cc744b9095a8f26a706121ea645e5349f35651f495d506b03150c233a2dd36d0d1f7a0ec91067e24330d9bbce79cc
 MISC metadata.xml 325 BLAKE2B 468cbe90bb22931af07591f3852927393460a119d19acf0a14328ef11682cc1725bb70ef74309a8e106b5cb1fe36a234027050aab84a1a551e881347e12e76d3 SHA512 75eca3b8efbd254410160102d574cd6268eabc197deb3899a4d67fad265f5397b86f85121fd24f269814154e4f6246c320f6befac5cbca840bcd424a9ce0b972
diff --git a/app-misc/dasel/dasel-1.24.3.ebuild b/app-misc/dasel/dasel-1.24.3.ebuild
deleted file mode 100644
index f6878298fce2..000000000000
--- a/app-misc/dasel/dasel-1.24.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Query, update and convert data structures from the command line"
-HOMEPAGE="https://github.com/TomWright/dasel"
-SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-src_compile() {
-	CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X 'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
-}
-
-src_install() {
-	dobin bin/dasel
-	dodoc CHANGELOG.md README.md
-}
diff --git a/app-misc/dasel/dasel-1.25.0.ebuild b/app-misc/dasel/dasel-1.25.0.ebuild
deleted file mode 100644
index 261c64912713..000000000000
--- a/app-misc/dasel/dasel-1.25.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Query, update and convert data structures from the command line"
-HOMEPAGE="https://github.com/TomWright/dasel"
-SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz"
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-src_compile() {
-	CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X 'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
-}
-
-src_install() {
-	dobin bin/dasel
-	dodoc CHANGELOG.md README.md
-}
diff --git a/app-misc/dasel/dasel-1.26.0.ebuild b/app-misc/dasel/dasel-1.26.0.ebuild
deleted file mode 100644
index 261c64912713..000000000000
--- a/app-misc/dasel/dasel-1.26.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Query, update and convert data structures from the command line"
-HOMEPAGE="https://github.com/TomWright/dasel"
-SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz"
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-src_compile() {
-	CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X 'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
-}
-
-src_install() {
-	dobin bin/dasel
-	dodoc CHANGELOG.md README.md
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ef89132036c9..add72dbebdd4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index a3ffaa0908a6..668f53ff7841 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -3,9 +3,9 @@ DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
-EBUILD tomcat-el-api-10.0.27.ebuild 1083 BLAKE2B 58f51c703d498d80e40648224ffe877fb0d7ec4b2d4f561f9c6be1778d66b55b93927b170893d1ac11a2d8db99e4b68f1ac5017609e65937708c44a225312b9e SHA512 c7ce691177ba5a77cb4fd25f6e9007289b106567775e30fe68d2191a6636032be04fb0f5fbaf9af450388524ac62148682c98569c9a812e6cdf34d0a741445cf
+EBUILD tomcat-el-api-10.0.27-r1.ebuild 1085 BLAKE2B 239bfc2e6138a76b292aa480e1f8b85824de37e25f1119b8b5c4f8a5512f5b94a6ed19b2378b0cda06ef5214eb81d8409b5dc7dce73d7663c1f029433946e20c SHA512 2a7257c8223b48fe88cd28eb781b5a4cd1509d49df3e2bd7f0495256a3ec940166f45b71f37a0bae6ee7f4ae2c9f935c23df64210708fc544b017568d62c8714
 EBUILD tomcat-el-api-10.1.0.ebuild 1082 BLAKE2B adc315817fed7b3e6a1a45b27b25b0e957c429635afd31e49175c82cbaa47b5a4174bab46e41dd82d01e60a682fc81b42d96284a5a7512759f67afcd74343a52 SHA512 6d282345502bb66b6382b4fa3d8ccdb6ed76433a82a434affb05b455eead27c4665e5ee1481ea55317d2d9b5b887da63b298cdfc4536bb3e2508b1e76451cf3b
 EBUILD tomcat-el-api-10.1.1.ebuild 1082 BLAKE2B 20ff75d660d6d5ee3dfa7a72cf12cddf1cf2050a77aa126eff41b4d8a66c12b857ae6c41c455948ef55115bf528d32360cff146e5cd09dae2da646b624923cd1 SHA512 47056f27631aba63f320f3db12a6cf4994a1bb3584fd62bc4214eb529ad6a58a335de3359466a0243fc060594e5fafea5b7b7b3a3fba506689e07fde0326ff70
-EBUILD tomcat-el-api-8.5.83.ebuild 1076 BLAKE2B aa49bde0626113e99ce532715428320ed9043a75951bee403b4d05487f583d6dba2b8da3212868abb36315f1dfd39d4d57d6d9323c6209f3d3f6df10e05db69b SHA512 322f2be36089bef983e2b57e326f99efa85fe336861e98cd1b865d03069b7372b2cc56725c1e179d4f483ed7796a5953fbca89c537bc83eef9ec659dc58b5551
-EBUILD tomcat-el-api-9.0.68.ebuild 1076 BLAKE2B 45700d1bc3ed251e678a22e6a1bff5a4b868adc0ec00041c19cf172dae7e2bcf6893295d47f574a1a19088d61fda870281259cf9def483dd5f950f3077ec4d24 SHA512 5066ba19d61dec2d1bc18f9843947f8f041b134d82a415b9ec7592a1df7cb4682e985dcf57e74c65bfb71decda5fda3cf16901990fc7838d629c93543248e94b
+EBUILD tomcat-el-api-8.5.83-r1.ebuild 1078 BLAKE2B eee0be9538f96beac5d029f94738024ad0039112beae20b6d993e28fd6f9f16ce550699c29752afcd6650a9cb8aace5caa7056868ea70d9a5a8bdf545c9e6ec2 SHA512 1710953af638d3bf09ce71ed655e3d33edfc5d2e29a2965a93ced88ef01d04bf4c5dc5f2c48b40ff7eef925d449ecb7eab27cab608b60f1ce3f5c0f7880c1616
+EBUILD tomcat-el-api-9.0.68-r1.ebuild 1078 BLAKE2B a050aae2999b94167e2d8fd0863a460909b18181c30548d6323f3767b0873937ec606c2704bc9c2a0fdc563c279640896d301c892608029e108cc3484dbdf78e SHA512 fd6d23a5515c405ce695b5ff1064db09641085f441f75dbbde017a07b7e92ab6b718a850119b191042fc365a5e807074f5d8e3b519411d83956ddc3dfc6dc3a3
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.0.27.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild
index c37846a39e08..9835da231517 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.0.27.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild
@@ -16,8 +16,8 @@ LICENSE="Apache-2.0"
 SLOT="4.0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-11:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/apache-tomcat-${PV}-src"
 
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-8.5.83.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild
index e39d522dbf7a..4bb1ecb9f608 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-8.5.83.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild
@@ -16,8 +16,8 @@ LICENSE="Apache-2.0"
 SLOT="3.0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-11:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/apache-tomcat-${PV}-src"
 
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-9.0.68.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
index 5aa4a644ef09..61f7984c3420 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-9.0.68.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
@@ -16,8 +16,8 @@ LICENSE="Apache-2.0"
 SLOT="3.0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-11:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/apache-tomcat-${PV}-src"
 
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index b98cbf69192b..76de98d092d5 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -3,9 +3,9 @@ DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
-EBUILD tomcat-jsp-api-10.0.27.ebuild 1126 BLAKE2B 7b0e41b08f2f7633a2bc9dd2bf32016a7dbd13b2d6a3958e4b6a5a45af141a68a56bd123f2596eec5ffeed19363fabe6934b8df52403352f30d36a3318812aa5 SHA512 a3a63b9fdf8894d74e6b40510c2ee2fdaa8e7fa383c67daffa020c8d388ee8390d93bbfbb83e125d0944719a16c080efacc9d340f61b821f10467b4723c51b01
+EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1128 BLAKE2B 93ac23cb14cdcc5e4a501dde03de69bfd5e45a0535b38e36a961e7d09ab191331cf27d85e31e239378abf82bad2077f1755981db1ac8bda33e3e4f7001cd024e SHA512 bae8727d620a8b3786b01c3c2cb0c32cbdf7aec482d19f6c07acb9d991509f191d6611cc4ba0dd47efba7d7b0140a72d907ce1c975cbf1dd40193f6a84d50be0
 EBUILD tomcat-jsp-api-10.1.0.ebuild 1125 BLAKE2B 5c59fe6a146a1540ee6bacdb34d80b3d171f97a7c902b5cbb0e7a49fb04f2d6baaec3561dabb3a7c95d9411629bf5b0ed654535d09bd59553b2653a3456695a7 SHA512 3162b038a1dcce3557941f850e430f55d95acdbaa9916c4b5c59cb12f9afebb9bad2fbdedfb59e3cbdfb43f409dea9baaa5051ce5f94a48d889a54d091b9595b
 EBUILD tomcat-jsp-api-10.1.1.ebuild 1125 BLAKE2B f3b45e551b1e1daa68659cb713479edab10d31983a1a2ec70c83dfa84028b7bac7f85af3c07ab65447c04c1184d01a635043c31f916e49f13d2f37af604c403f SHA512 ba7f23b9bc7b74ba0c5b51bef0ba276a481455c4056461c4e340e1b2d37dc498fc76eccf12679b64e6c46ec3f31bb147049953cd1e61ae494006750c6a47d661
-EBUILD tomcat-jsp-api-8.5.83.ebuild 1119 BLAKE2B b6cb219a30b2c4f3e5b0fb390aad6787bcf3bc1ba0b8f35b8ddb3cd43d45b15ed54af57eee2dfdd66b6e21dd953cff872b73da8020d07f1db21adecb55fdcc40 SHA512 012b78a1736e4684c80fdd945a6c5923d61bce6bd3e9c53fd2f1fc4490c6bcf153569e858d209ea79b83fb1c84389600d7c6055eaa70aa3f4ad6f66a027aafeb
-EBUILD tomcat-jsp-api-9.0.68.ebuild 1119 BLAKE2B 1273b3f1f9c82d68e2f4cf035f009342921c02175f4f1431ac36920cbb48975688e26b3ee5b556280e680a6005398168c32611717c71175ae774f19370069752 SHA512 eb9c5994b8459e4c2baf9a0bf843e953d841165998499600afef7d591d12b1dddb1733810763ea7c19ba65f61b23940b78c2e680e20ed9cb426f4f70886bde31
+EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1121 BLAKE2B bece346b9599cb9c10cb042fba31a28889dc43b245309da3d16270bb12b24555812e770121b2b2197065492244d48caa1f015647dc9b6180f2fd109a49bcb9b1 SHA512 6ce13e8d973b93a33dc5deb95c7bc72d3b38a77528e15f55756ff8202089e49dd2deb267885b7dd66f84d7d4dae08ea70c1712f757d38f0ca32e1349b2c80d2f
+EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1121 BLAKE2B 3af7559e822c96d90093fe681b2dcefbd8963b843b11e8d5dc11ba49c13ca2e3adcbccf21488d9d4d62ca10c027acd31b69c57f1617a6ebc261c56de64c35afb SHA512 b0b9892ff2274730152a4b12b8c006134e2dc6b341a8afbdd1fd588f02a37a1a8e4ed294d8bb6ea499207e8e487985165df31b00c886f4292024c4bb9da86047
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild
index 2eb2bb85a441..e838e36e4359 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild
@@ -22,11 +22,11 @@ CP_DEPEND="
 "
 
 DEPEND="
-	>=virtual/jdk-11:*
+	>=virtual/jdk-1.8:*
 	${CP_DEPEND}"
 
 RDEPEND="
-	>=virtual/jre-11:*
+	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
 S="${WORKDIR}/apache-tomcat-${PV}-src"
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild
index 960e6f41d937..b9d201f10b20 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild
@@ -22,11 +22,11 @@ CP_DEPEND="
 "
 
 DEPEND="
-	>=virtual/jdk-11:*
+	>=virtual/jdk-1.8:*
 	${CP_DEPEND}"
 
 RDEPEND="
-	>=virtual/jre-11:*
+	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
 S="${WORKDIR}/apache-tomcat-${PV}-src"
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
index 9bc55855a97f..14d40969d205 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
@@ -22,11 +22,11 @@ CP_DEPEND="
 "
 
 DEPEND="
-	>=virtual/jdk-11:*
+	>=virtual/jdk-1.8:*
 	${CP_DEPEND}"
 
 RDEPEND="
-	>=virtual/jre-11:*
+	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
 S="${WORKDIR}/apache-tomcat-${PV}-src"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index b97b02c9011d..4de384bb114b 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -17,7 +17,7 @@ DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
 EBUILD tomcat-servlet-api-10.0.23.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a
 EBUILD tomcat-servlet-api-10.0.26.ebuild 3025 BLAKE2B 2198be652150c8c8d0cb4c7dab9beca30094e184e1812038df79b193a8c3c148d076fe8164a9d0b746b667dfbe9b261da266513573352229980b3481faf4fb56 SHA512 5ea6ad3fba96aef3ff05897fb1a13f58b7b106a6b9a8dc265851747719592dda261fa6b7fca1640c1dc1b3aa4e4e75b5ba8e22d4a2797a66f8b708bdfb5ed32b
-EBUILD tomcat-servlet-api-10.0.27.ebuild 1173 BLAKE2B 7c3971c88e6ecd675d7f755e50ac0ee541018b95b920c6172531ad3fbd089d68916476551566e1cf776e8f65251bc569058639d6cd784850b9c4f6c7562db853 SHA512 1827595648bc70984c47d712209f9d448db9f1dea5a795943858ad6e1a3c79a5bc17c7322c15359cf3d0b614568919ee30426464be11de6f6201c25492e42ddf
+EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1175 BLAKE2B 8251cf902d082fae48bd5f0906bb23ad4dd2a69008ea6f127a50d009eb2e6f70a274b775d8edbc5eadd4c421b4d2d23d3176d92aebe017ada09186cca396c557 SHA512 cbc958b1ca9385a5bc04f9a689386b787a580f72f379217d3ddad8915d072f4f8c600a77bcb072972efa16f17a89b6f1e631215ce2d27777b739319ee82d08af
 EBUILD tomcat-servlet-api-10.1.0-r1.ebuild 1172 BLAKE2B 4f7067a7e31c04bf55c66c0fa25c10a3744bc6e010db04ad922739b4ad57130e667da67c3513636ecbd61f126866e9edafa0c05dedaed2a60ce4adc875183971 SHA512 73640743378e8914d06fd4ab02cb7418356b03b152e24272a3600a14eaaaa85045c8e4f47378c3bb397a6bf08a9366fe13aa3f2bf574cdc6cc33ed1ed10756e6
 EBUILD tomcat-servlet-api-10.1.1.ebuild 1172 BLAKE2B a0e939bb1464ee12c11cd92ccba5ea6c868aaeea83fe0dd4a65d44ff5b04e9bbc7a8723575796833123232b351456e313530aa86cb9fdb94f1cd336bb355f9dd SHA512 98311d5bdcbb1e784bb8228b185c78bec7d46f06ec9ef6bae0f6bfc6f58dc0d5e5bc36b84df604864a332a4b53da5b750a092c99dcde8e1175b996b3a97433f5
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
@@ -25,8 +25,8 @@ EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.82.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
-EBUILD tomcat-servlet-api-8.5.83.ebuild 1326 BLAKE2B a90306fb1a462e1809dde942fd2668cc65321fc57b828b181b885a33f07d2da63cab8d60018a822fa9fde189649876c99fc86bfb49a81c84c359b09838ec4bd7 SHA512 360da67856ac13a38afaa2bc918e033602debfbf9e72ffd97226601e9ac72210bd3cb7930316350a0141eb3dea8e661b527884a4718d9699d0b20c0e45af3224
+EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1328 BLAKE2B 385d32707719ae49dff0255a2a5a432adfdd02ab57467c2b71e7edf70bcd6f502c30707e3a02ae80d243fa9453bcd4b6da0345a1f462b28a40c58aa3097607bc SHA512 4b22424585b88d442cf0441a810752d1dc8243d23cac139ab5259393a522a342d340b376e0adab288e6520732bad221950063c0b76eff7b165387b08c62ab254
 EBUILD tomcat-servlet-api-9.0.65.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
 EBUILD tomcat-servlet-api-9.0.67.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
-EBUILD tomcat-servlet-api-9.0.68.ebuild 1166 BLAKE2B 718a2cc124743c9fdb34cffad24dcd1590a12e5617bb2b4c69e9a204bd7c08c534487aa6aa92d1946747d994ab4d1182c45122d7645bafb274571b44350620ec SHA512 8de007c84239c733ce28fc7480daeeb1a8cb489a2deb0176318b113cbdcbeabc0c2d1be32830fccac46d46ecae78bed9d8e70d61f35df37946556f070955a955
+EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1168 BLAKE2B 772b7aa6f72ba5aa6534e8e866c167864415c780e431c3304413abdfb0f568630108c8ab2bbd388edcc4e88ed816de8992d341bd7a42823ca311ff43761c9fc1 SHA512 070aedbac428440cfe68810109c5a598fcb9ccc8a6a3cdf205f15e5769f91809c75a2ab6c3cb50214dcf6289b4a5b9f0bcfccb5901ba5d6684771caf2e5e8c79
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild
index 4cd61104c574..8b1ec19d3a5b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild
@@ -19,11 +19,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x
 CP_DEPEND="~dev-java/tomcat-el-api-${PV}:4.0"
 
 DEPEND="
-	>=virtual/jdk-11:*
+	>=virtual/jdk-1.8:*
 	${CP_DEPEND}"
 
 RDEPEND="
-	>=virtual/jre-11:*
+	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
 S="${WORKDIR}/apache-tomcat-${PV}-src"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild
index e5260644b3ab..696bde7efc5a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild
@@ -21,11 +21,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x
 CP_DEPEND=">=dev-java/tomcat-el-api-${PV}:3.0"
 
 DEPEND="
-	>=virtual/jdk-11:*
+	>=virtual/jdk-1.8:*
 	${CP_DEPEND}"
 
 RDEPEND="
-	>=virtual/jre-11:*
+	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
 S="${WORKDIR}/apache-tomcat-${PV}-src"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
index 7a5b784fa0df..7f3ba3864e80 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
@@ -19,11 +19,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x
 CP_DEPEND="~dev-java/tomcat-el-api-${PV}:3.0"
 
 DEPEND="
-	>=virtual/jdk-11:*
+	>=virtual/jdk-1.8:*
 	${CP_DEPEND}"
 
 RDEPEND="
-	>=virtual/jre-11:*
+	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
 S="${WORKDIR}/apache-tomcat-${PV}-src"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 44641ecfb30c..21d521b6a063 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 08b44a35d871..fc6a7e300df9 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -6,39 +6,53 @@ DIST Python-3.10.6.tar.xz 19600672 BLAKE2B b21398f68e13cf8464077aa2c7f08d9044198
 DIST Python-3.10.6.tar.xz.asc 833 BLAKE2B ea6546c01a4fbfe3f3e56b2f980da53f0692d9c638534bd25fb96a0f657424f979b6a82a01c77c05ddfded30441b4a0348cc407d5b29290ffc653a508ca32ec8 SHA512 9288e2f62f2e8c8208ad176372261545a64e675d737bb616403bcd888bc91177909257632e4cc0b5d688d612bea38a274030ec6989dc7d56c03064e32ad9903e
 DIST Python-3.10.7.tar.xz 19618696 BLAKE2B 45e38e8b8a87ea5c041998a9be5e8fb25c2b57c1f26823833518b06bbf8795b30256fae71ff2175ec53e7af51bf383e6f5109d8fabe370e4aa5f6fc61821c889 SHA512 dc3432d72ee7382617318c9645204876d13bb61d4caf3fbbb65e6b14897261123c743049657c95e159e5566daf4dcde613d2e393f025de758f610b44eb958313
 DIST Python-3.10.7.tar.xz.asc 833 BLAKE2B 201ef40872ac8dc8886128b98fc13a0b14ab80db03ec467933fef0356f4a8728679eb77ae1044c51653cf3bd81e93f0a00f59c6f852e75499af95b34f2d6607d SHA512 a65d152d87870de763de3384a1c0ff0309068a2af0fcdfa39a6f968a52b59c56229553cf6a955ec0af1d3db5bf4641c4e91d6150764548d2e9fb0e9a01ab759d
+DIST Python-3.10.8.tar.xz 19619508 BLAKE2B 8bbfbae34fbc517c4a746e5e4c360efc57aca175c50fe46a378aa9d6d023a3d90c7df816149e4cca0c9b64ca0142267d8df552e8f8dc53a04b5251e8848dce74 SHA512 40e3e77d79618c81d6fc57c5d119b99c2959dcf932f40aad6b26f2ec39c5e713e6ff298f7597b4fad2ab94680db3732483b5ca0a45e6ae58c14580b3ea44cb0f
+DIST Python-3.10.8.tar.xz.asc 833 BLAKE2B 1e94822a57d055f5db1a5d2915df24be9d6fd9e6b301d148919a7643285a93ca1c8a16db7d74e0adabe7d2a21678b5126e3df7fffb253b35f8db6f74284a0aba SHA512 0c2ef09d898257ba5e9ec7c5bb224a7e50e5ebca96843b4d9e25be6cdd2f17144772aafc92280af20c21491e3c8cedc697414688ece613c93b28ff7ecddcf93f
 DIST Python-3.11.0rc2.tar.xz 19828340 BLAKE2B c4e8578d967917fc6f19355c466ba8e5487e83a17b373dd03ae90f2a73f5f6d07c38ec308c03435d23454cdcb06e63b74fc9ceb3900079996ae71b9327a4a5b3 SHA512 8b37bc9df3c966bd35cffdb7d6406a3c1a5ccfbea10bd8dad498880e3b1492f8cdbbe227ab3a30557843eb05d8fb93077c791e25d71b33ed420992d54b6c9473
 DIST Python-3.11.0rc2.tar.xz.asc 833 BLAKE2B 80ea3e8a3565fef6552da2287a5bf07a764002c273842b7d03a417a75adfe616e1b7816c161c42751a495b32ab8d8c11efc6c90ade97c0b31be54f7391ee9c9d SHA512 13e6bfa719db29aa169763399203168923cbfbb01d209e18269399ca84723582f480134edd3bf9f24785cd5ab0486411132d6bbb354fa45ebbba68bf4c70021a
 DIST Python-3.8.13.tar.xz 19023016 BLAKE2B d3cb8624496e56d93d34f2aa5082746869a99210197529bc19e6a9d265f4ce246e0e83a3528a7602a28aac8855bf84e6bf6495b85e9202fcf04ef90600cb5e43 SHA512 5c732b5d21b189b99a0e9ccd3ae59466bed60a930d5d3f437a262d38f0797b776cecbf12a1852eaebcfb638a6f2e28e471cc2ebf94237cc728144be21842cb81
 DIST Python-3.8.13.tar.xz.asc 833 BLAKE2B 918894777e1a783f2a7c7958a808610631cb7a6039df84675158e8d2fd66782f29921d44ab9b4625c4ca3821852e0d0e0005163b086c7d0c3d617e3a76cb7033 SHA512 6683c4ae6cf20a97a29165f96b9f5dd09d618892583650d803aa677240695968dfe344294fc33db68fd4669c82021afcc29a1f6afe49915be51fae281eeeedbe
 DIST Python-3.8.14.tar.xz 19031932 BLAKE2B 5044743ba4d0b9dd634b42c08e6693126ee396a75b4b728e80333aaac94ade447a12bed16e29d32c480fd670e75b44315ea6951489cc9b85c7fd385116b383ef SHA512 380de19b461e71e268943ef555b78ba68814f4ff77a7576fbcd45d6690db750590213171e1905326b8bcb217070adf66228a00792350293ec6575c20b27a6cc3
 DIST Python-3.8.14.tar.xz.asc 833 BLAKE2B fe4ae94ecc96ea78089d36db79922825d0207301ab45ab202c2333d7b16cce2699446699614ab0e96ff58ddc6488734697c1c47b44e49d6546a166d1ea128928 SHA512 1226702abc3027c29004b2fe2bd35e7a06b72146e428d92b1ec13600456e5948b1f814a3c031dd2439854cee696d4ccb0871112a0c66f135db611d6da1932f3d
+DIST Python-3.8.15.tar.xz 19038408 BLAKE2B 4ce84171b2f7ca8c9cf1d130adf70f16a0899766cea98965c3e7afcb84b73c482bcb400b59b91736d20e31c57be79edc178f6eeecd775a1f8920a8fbfdd90c24 SHA512 4fb3827b13c2452faa75e5ed18dddf381e80b4fffcfde046e289b4629cff0bb87fba1d09916b9b8a6f8039dc422c952293ebdb381c49f8ca7e7893ae4be6c28d
+DIST Python-3.8.15.tar.xz.asc 833 BLAKE2B bff055e28f4a2e59bb9e6d131ed39f954b729ac791279a6ac618521b545ace16e4eba3aaab629ca1c155d973c0c255b3d184b38fd82ee943d59a328d0603b1b6 SHA512 8ed69db7773a111e7b356848e18fc35b8835426e8d2cb8f311644d511682960c97740232c32c92196391adaecebc0ff842c2f918aad07e5dd46b168e8277ac04
 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-3.9.14.tar.xz 19750176 BLAKE2B 0f6b5177fc3572f40d14ddfca4ee37e7839b996826b5c929551a6d152cd2707de6312a8b0cd05dba62c98fd309b00ece07a750cca88803de2a18dd4a09238ae3 SHA512 691a7814cf6c7bee96d8dbb7c5c85cb11f2e999101e20491b99435cdec07c3bbd5ce43ad3d9c64f695383b79197884caa1965c4346e4525e23b09c686271e4ab
 DIST Python-3.9.14.tar.xz.asc 833 BLAKE2B 16baf31f01c2e008e77379231355bb5e80bdf394219fa797f89881d408243b81cd0744a208f46675e2c4fa7f524f1eb456ca1bf10cf6b9bcc8c7eaa46b6b621c SHA512 7cffff00ecc94d32a61e763b4ebd73caf83994e3a24b682d45453f34631e4feabcffbaae5e511952656ab6e64945bc2a3d1fb440f788352f262ffa00ec3d2203
+DIST Python-3.9.15.tar.xz 19712208 BLAKE2B a8490c998c89ed4e3e87ef48e3b5d622e5d06ebd7b8b79db564d668cd1f0c7fe89e0ef37ec4481ff82b30778e2be1a96c1b16199b9dce1f82de32f73b4343ddd SHA512 9310d263bc7a7925f73a6f66fd254ae61f377f43011a6bc5c58e57c8b170c2da4f197a646927ab9d05f8912ed8be4369c09576063931a3f93c3b0228ccb33a39
+DIST Python-3.9.15.tar.xz.asc 833 BLAKE2B c325fb52fae254153456c24c1039b07c9ccf8734df3665640215d35219ccacb705f99d94c9f8b644d15d4ea4612f5ac0da599814f68f7d3b6fc1fdc175db9002 SHA512 722625091731536757b9db447590c31620665133d45076367a3281f2ee3add23a781b10ce5cea582d65caabb18814583c1a347689d2b396214e36a6771182f38
 DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004dcc55a0d18e9ce25a47683c2df3c4dd62e967dfbbb35be59a2f08cf20f30a19475a8a2344dd95b17400eafa88b5fdbe9270a12ccbf32 SHA512 d9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f
 DIST python-gentoo-patches-3.10.6_p2.tar.xz 12040 BLAKE2B 75c93fab19137a966b3775308bc20142f4d3648bbb9364e82c4eaffae93beda54011192881c52b85d2e2493a06cfe2a90f50675609908c3d5ebdb0103fe41644 SHA512 7e451a8a18a62592c2cd7b2db71065b77256960f43e172a0d7856b22b69138dcb1552f53b39bec14585a761cfe729c81613551c1b616fe1ec8d2b59856b11453
 DIST python-gentoo-patches-3.10.6_p3.tar.xz 26712 BLAKE2B 701a7a4da1a09f71dee8fdf924a45e030b8ae93e469a2789b28b904d2fd6b011589fb940eb0c262e8b19005af523a2f66075d053fb60892d6ebd473159fce718 SHA512 ed43ba18735ddf72c434bfe905894d156a144a77f9fb8266378d384e840b376c6220859d8d1af83f304293368bf1dd45881316c1797ba25d618a064daaacab17
 DIST python-gentoo-patches-3.10.6_p4.tar.xz 28612 BLAKE2B 197ef33c3086cb9efaf09868145826e2889f61d6fb207df8b60ac6cfc4ca637c8a87fd10afa2d8a7a47ae81bcf0ae589085c694523e1ca6f85acdc4e517b7d07 SHA512 8bd0aa8f7a775d12914d542dbb04c7b555055228002dd826a815255d4a35392e09c44d560cc5da7df1feae98e2f73e8fbf476e2811ae5269f91120c11cbb6291
 DIST python-gentoo-patches-3.10.7.tar.xz 12040 BLAKE2B fcbf07894376fff4145534d592c97a5be6b361e9754c548ae483a388916acca8e7ff6c6cab1344d36af52974166590c82bf548e681401a6d2e5604f3e4ae9e23 SHA512 d67e16fc19afed997ac383284afa08fc079cf8128b457a8a5d15218ae7d6718f81e88bed60207f10318fa7ce7a415d0645655b5610d7b2087383fbd07d0ef2c6
+DIST python-gentoo-patches-3.10.8.tar.xz 10104 BLAKE2B a2e5fa956652fda1464c65ba4f648da2d77a545d53bf8d2429bce745c93e82eaea40bf6da3289f4216fe4b029b97ccf6ac0c3cfbdcc179f3c5f9e64e89cd5fe4 SHA512 e506c7fc3f6ebff340f090b462716c745f1acfa95c00a39a58367941efb356b8dcd72a3fa46d6760422733c0d6b65b79f0e8bedc77b93289c51ca4dc2ea0db2a
 DIST python-gentoo-patches-3.11.0rc2.tar.xz 5124 BLAKE2B 2e8150c45d8da16309902757f57c8433d871d531153e1b51aa6868dad36d16c1eaada4ba67bfa8057315ff6771f6d17502de8b9b07a5c7c734cbc8f9b379cba7 SHA512 f9d84262204a6eb4a76e4e7c16e9f2f0f23a5d0458e81648f4c5c79c83b865000d2d34ee65f01316e14b596fa68f8b036f558a6bbbb06c66b33db7d2b891a5b5
+DIST python-gentoo-patches-3.11.0rc2_p1.tar.xz 6292 BLAKE2B e52e0066ca3f53e2efd2d71c035849cd619d3a8cdeb9767cc28369f4b7f04ffd74419e7c02913d4b10958937dc8960fa4287862e8db627e5f421472a18efeb73 SHA512 a6ae37288e7621275b46ab1a813dfbbbf24ee511d644b4027e396f5cba56fccf94e19cb354468ea4c35cd86db2040b165c87c8e24cc2c9e598e91946a1f80863
 DIST python-gentoo-patches-3.8.13_p6.tar.xz 27968 BLAKE2B 0cafbdfed47e0d58a9798c1e090abb17428472f769ebe4125cf1210218b90bcfd2ad8790fafbfdc1daccc51078a6bf5e068157f05151c2283eb80d5fe128d85c SHA512 b23d51478cc126a6f7f3d1d6d2302a13f3e873a3fac19c7b2b86b79f4b25bd421b60e5ecbe9bb606ee0eedc0e6871d20c0befd1b6596b525bf6ef79a19230ae2
 DIST python-gentoo-patches-3.8.13_p8.tar.xz 43204 BLAKE2B 6fb162bfcd2ab8c1fb4208716382aa144bf21b1bd8c2f00a2bd60e7cd0b0d8e034803e8f4129cf49cf6e594467aa2e4a45eb4cb72ddd8516ffd8f797570d59cd SHA512 41ec04e3257021fdcc848587c2275b241d0b31d1d6c10162e30b86920109286c92171d6143bb8be6d1f1c9070d43d31dc0290bdffac50d09d32c2493e631637c
 DIST python-gentoo-patches-3.8.14.tar.xz 25700 BLAKE2B de4ff020ecc6889a1c7ae29917cf0f06f930dbfbc2084d13149d8c64e25e1f9881b9f6ded5943101df871e91176a05bf983efdaa293831cc7801a8bad8e8f6d7 SHA512 8073bf34b12cbe71fcc54cf438b8686cd1b073e41846a6877482483951ed25e09fc74106b787f3f6c5705961b83e83f0c79184c1b5b4de3539a4e670b70efcb2
+DIST python-gentoo-patches-3.8.15.tar.xz 25700 BLAKE2B 1f13964caed36f70f5d5d2637ce39ac06efd52b744c353463486844dfaa411d38c37e3e50921a97183315bf44aa36557bd071dbfd8b2a69e8f1a05de5f11bba8 SHA512 39326cd1cff1794ca607c769750525a77cb0a4e6435d0fab141cff82cb05d68a6269014f8a30d7143b57b51170b3efcf43bfa6b41a079f588880e5562a63d54f
 DIST python-gentoo-patches-3.9.13_p4.tar.xz 22072 BLAKE2B a0e084eff35d075d2255b139d0db114d282cb6c9c0c2ea51a8ecb7f5f1dc8096d6578ae5f804b7583a2b7842152b5723ad802ca816d46813c40aaa756118afc8 SHA512 cdf8d43fd5263c4956be234f36c0767215ab2495705d4f2a060b32ecbfbe159e618e31693b0538a1b970f7b27ebe4953063f585930d074dcaf59f2f61486e6b6
 DIST python-gentoo-patches-3.9.13_p6.tar.xz 37508 BLAKE2B 6d55aec9ae139cbe6d35b84335174d5fba5784bf52eb665e2d3a27693a2abb843bce1f190c92bfd173359c3782cae06a6b3520932b08aec678332928c5a27277 SHA512 1b1dec45d959849bf72b0646329e8cf74301e0f5373d6e2dbefb63d60fdddbe9fc33abda7d2312af8c52feadf3bacd04b627626d876acecc8984d3192a2d029d
 DIST python-gentoo-patches-3.9.14.tar.xz 20208 BLAKE2B 964f1eca6423247bbe862de36ea6d3a337acd70405d5f046493907da3519bad99f6ab9065b2d8af1ce31bbad4183cf95c285f1040d55ce1b5dfca986fc2c849a SHA512 271ccfdc065fe6ef26621d79eb9e758264c53aad2b74d1d50bdb0bf64462389019503a3383c8d5b044231e9c3e2019d7f1240b27ca7fb9502a0beb728161b9bb
+DIST python-gentoo-patches-3.9.15.tar.xz 20200 BLAKE2B 4367cdeb0d9c27110f52f5061717e37da6b9d8a167de24417fdf2b88b4cf6d512fba2c81df90a19f02e929baaf755e70ede305b5ebbb0be94bd5ab3dc3f1bdfa SHA512 9c3a20b49a29d83d2c55d7432f606ebdcaf6210c6bf6d891084d0b2161502002c6f6738cee6e05eceb8ffd6b6a40d4c6ea42f6e07634388644aaeb8f87dbdf8e
 EBUILD python-2.7.18_p15-r1.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
 EBUILD python-2.7.18_p15.ebuild 9827 BLAKE2B 77ebeacfa236e518ec0c0a791e0da60f8158d369e870c88ce69d1eef25cdc99e658903abf313452b849254e97b4c9f583e0edb75ec845faf5b47fb2fc3173ce4 SHA512 19219cd43391d8d53838c9b0e15b30f8ccb5d5a23503a213cc961ff2fa545cd17a5ecc6ce253e2a01534db3bc931be212969c40885c2e99f203c23a5ecb689a1
 EBUILD python-3.10.6_p2.ebuild 11181 BLAKE2B f8180bd07e43dffedafd7d912bcb9a002e93c1514c72055b24c65f36b7ef477e748bb777fa02da4c6d2c6391a1eaa9f59266b09fafb2e7ca8a67a96efd6f423c SHA512 4613ab1e7336e38a91877d4b1c5558e5221a770d8171d92fff319c6a4f64127bd9cb6dd8c56d84e70558de8ac647a315d740336834cdfa1ad3b86b184408c54b
 EBUILD python-3.10.6_p3.ebuild 11161 BLAKE2B b1d379be929e3a5ef8eb45beff1581e99085fdfc3af2aad29c9202284b73c225b82ba8ae81fe1db6191bc97f45d59ad9de2bcf664407269e890bb658da4072e5 SHA512 724f964f56c8c8e7859719eaf3b009f84371b5c70c509147f2a010959e93455daf469399c4159a3cba61de80ab08c327e908d8ffdbbbdb2e9893e88172969a41
 EBUILD python-3.10.6_p4.ebuild 11158 BLAKE2B ffc60d5825f03183cf13557e9c88af963bef569bdea2a410c0d2b7efedbac0f6c7f6ea90647bf46e012567c87da49f5f9744cac3cce9faaad64418295135ddcb SHA512 945b1f59c7c9c805f331f88e2d69321c9d7df9b0d9471cb5a0fc40507bf815ebae9399b0853f1669cca89ce81f528ebc8d30f97ff2be3d9378ed9e547011aba4
 EBUILD python-3.10.7.ebuild 12456 BLAKE2B a895977e2543f8ea7d79bd344ec29cfa75eb126b22c6307375b0dca9f9c9f0a616813869eeb1b0b0bb164fb59c6103f8dccb10e0bf357dd0e9ec7c4c108e6c81 SHA512 92196f1eb1e0264f85a3c20703fe79eaf3ac401be9f9adcdfe1fc8aa4defc42361072eef6d13e1c801be8621bcb0d4ce268cf45fc72de92a807c76b7164546bb
+EBUILD python-3.10.8.ebuild 12458 BLAKE2B c909306608377114dfe589c7788a7791bdfdca432dc76dd12a79107a36d8979b753040d35251aa7ca8f33ceecf243a4c156c4e7b868da42f06d6b21375bfee18 SHA512 0a1ee4ef5aa2cfe41fb02df2444e4bae93946a1c5b7d3a7bdc04b5a9621d870d2af029994930251ff83a9d48103944f32ddb4fe84c06825705a1bc8effbd2a05
 EBUILD python-3.11.0_rc2.ebuild 13357 BLAKE2B fac65a9fba93a49af0ed0dd91f532e6cd729b815ae71b06dcdc40391dbf5252c56067be5a8085576cee41bf96d011fe9264ec0c390bb22db2265579d8b696092 SHA512 faa9b3067f81e57d8969825fa7851ac74690fdaab8b380f963f8567a09ce69a250592ee23df42f584c25261a49e93bafcecd23ab9d392d90ad4794e2c532d7e7
+EBUILD python-3.11.0_rc2_p1.ebuild 13357 BLAKE2B fac65a9fba93a49af0ed0dd91f532e6cd729b815ae71b06dcdc40391dbf5252c56067be5a8085576cee41bf96d011fe9264ec0c390bb22db2265579d8b696092 SHA512 faa9b3067f81e57d8969825fa7851ac74690fdaab8b380f963f8567a09ce69a250592ee23df42f584c25261a49e93bafcecd23ab9d392d90ad4794e2c532d7e7
 EBUILD python-3.8.13_p6.ebuild 9731 BLAKE2B 0660743997da89023e3192c16bee0c1a14289ddc2f3fa43e19f105d208359eed8155a8345f29c214322ada0aa5c7e5eb50a564546f506abc3ea2204f44d1217c SHA512 b47a01911ed23390ef2091b1f09edf16d2398178ba0d9ec792f8afd06fcf1fb472c020a908af3a6b7c20396f8c6049767d2f11cfe9d15afa4df135b2cc0ee046
 EBUILD python-3.8.13_p8.ebuild 9705 BLAKE2B ce8180be109068fe25e8b2931a69f4247ee10f841a15528d7d976ad0acd36bbc6a58cdcb72a2158abc6fe79e8f581f8abb5ac61af6e8f157b0993c1ff9febfcc SHA512 9c0169004d8c820ce53b62576898ad0ca36df2ef0c41cb313943042f5cb76b0246165a3aecf7c14f5c233d86273dcbf1800bfc928714947f304316db2412a357
 EBUILD python-3.8.14.ebuild 11004 BLAKE2B 487c52ba5cd66a625b6f0f4acce651293b88684446ba19b5355724b8ed37a2481bb97c9d9594c79a7690fe54200660b5fa37e26b0a5b7500fff9846f07fbc832 SHA512 ecc441c03fe4d9c04fc56947e5c7a26c6546d96477e21287740c0fcc3913b9e587f79938f4e8e80420a5b647c6b3109d9c43ee223e49532de268d9d0710b1248
+EBUILD python-3.8.15.ebuild 11008 BLAKE2B f458a619bb577dec40d3d727a6e906bff0907e3ead72b711a721990109ff2cd9f996644ce790973b3932d14a56368beda1122f4dc764f8274b4e3b9df59cfa2f SHA512 e946e1b7785edb25c8aa464af181ed613f00590be482c5ffbffa1622e769093651e826818c639b6848eb8ebc7b1f016b8e86842e23073da019c73fa1de361470
 EBUILD python-3.9.13_p4.ebuild 10984 BLAKE2B 8743da1a832eb69289727f94f19a9ca7c9e42156847d25168adb1bee66cbc980d28f2969260baf5ddca124c01498f085bb9fd50c5e80083609a5d987337429b4 SHA512 d8cf0aae2e36445efb4a0d0df4a028ab7d990f017196a18127973b7d88dc4979585901102106c32d8281f640334b079a8efedea8f45fca75a13c2453cff4b64c
 EBUILD python-3.9.13_p6.ebuild 10960 BLAKE2B dcd386bfd116294e4723017de6afe87f8b99749553a57d20671e1a3454cfa481af0e2e15353dc2f0aa85fa050ae64b542e8c4707090fc0736496eb17407c7cde SHA512 13263d81cbd8e40e0428034753a6c290e48c44a149b438c5e23132b15b908fd49991a64515772860c89a9fd0dc867e4a309341ad52289242505ef7d92044d759
 EBUILD python-3.9.14.ebuild 12255 BLAKE2B 9b36b65864095d95b3581bdc5683664f513f2c8c78da3512dc1cc80590df6925faf3658e342df9770970a6442cd63d918f46f34aaf3b45fd0a118bb4c0d0c3bd SHA512 1131ca44e90a211c6cb726bfd2a0dc3ee72fc02e46d368be83d57314d7cd294bb8924e13ca96e8014d7b41ef2091116e9657d1c4ea892f5818949d8b07161c3a
+EBUILD python-3.9.15.ebuild 12261 BLAKE2B b606d502a1205fe3a542fad2bd6f8366c66ac149fbfe98d63c79021dd7d25b06394be616cdf02f9ef79fe207784f26311c21faac0cc87a4a2fbfe2fe2f0adba1 SHA512 ebbf748942124ff8ccb7abd757d29b9fd01c2561e116f066affc5f0f98a7f8a36c5c9cfc28842c9b6f38b953c514b53b02b7433f1b01a2ca090cf3624b0479e3
 MISC metadata.xml 1068 BLAKE2B 3c3511739ae8251d11bde32aa3a21225fd3468f2b1f31c459de956c5bb7dbc2de4103a288dd29b26d1023e40bac62631fa953d1515513e934f5c3962d9c715a7 SHA512 0f7d3f9305cc539619568aea7e54cdb9a3319579e811108cf03d7c66290e4f21080a87ca02f1a62264d4ecd41a243c91f0a639e6c064ccf2b24b460508c848b8
diff --git a/dev-lang/python/python-3.10.8.ebuild b/dev-lang/python/python-3.10.8.ebuild
new file mode 100644
index 000000000000..e9f9940f5d4c
--- /dev/null
+++ b/dev-lang/python/python-3.10.8.ebuild
@@ -0,0 +1,452 @@
+# 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 )
+"
+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=
+
+	if tc-is-cross-compiler ; then
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		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=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=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 Python it was pointed to
+		# 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
+
+	# 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_rc2_p1.ebuild b/dev-lang/python/python-3.11.0_rc2_p1.ebuild
new file mode 100644
index 000000000000..bba860f7875a
--- /dev/null
+++ b/dev-lang/python/python-3.11.0_rc2_p1.ebuild
@@ -0,0 +1,481 @@
+# 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
+"
+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 )
+"
+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.15.ebuild b/dev-lang/python/python-3.8.15.ebuild
new file mode 100644
index 000000000000..31b7bf19bd50
--- /dev/null
+++ b/dev-lang/python/python-3.8.15.ebuild
@@ -0,0 +1,393 @@
+# 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 )
+"
+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=
+
+	if tc-is-cross-compiler ; then
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		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=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=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 Python it was pointed to
+		# 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
+
+	# 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.15.ebuild b/dev-lang/python/python-3.9.15.ebuild
new file mode 100644
index 000000000000..61844b082450
--- /dev/null
+++ b/dev-lang/python/python-3.9.15.ebuild
@@ -0,0 +1,447 @@
+# 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 )
+"
+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=
+
+	if tc-is-cross-compiler ; then
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		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=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=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 Python it was pointed to
+		# 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
+
+	# 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-python/Manifest.gz b/dev-python/Manifest.gz
index 356c426f28e7..1e11654bb980 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index b2ddd0d18fde..a6f5b045d7c4 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,15 +1,21 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
 DIST python-3.10.4-docs-html.tar.bz2 7267784 BLAKE2B 15ee98d9b4cd2b31e796dd53f38c127c54a0e76573bac1a1448fc0cd6774ee22d55480654b8933483e1bdbe0a283265b570aa6d8dc5c29d1559889d30adf5620 SHA512 765664aa3e292e63b8935492ff71ab1bb523e1390fc22d88cdde0be99eabc263bc1d8c1f12c58c448413dc8f5c60d61e6f7ef667e8078245b57149f8061260a3
 DIST python-3.10.7-docs-html.tar.bz2 7347443 BLAKE2B fbd2ddca4469fef92af35add0418c313a1148e5d312cb43995f8856562d4b7faafd9da69f4534aa0f92bcc7c49aaec6b965b838098787c25ba10f98b92c4a360 SHA512 cb976e67866e45ca531428e2969bd707bbcddb5928f9f15b40c9ebdb8b4968019b5d95e4da9eb5409d5d7d3c32a63d93761a8b6fbeda49dc0b980189752542cf
+DIST python-3.10.8-docs-html.tar.bz2 7362386 BLAKE2B 7d6b17f1aab2e39c21a0ce7efdcabf3dd1a561c4d1770f57b21d55bfed10cd0ebc68694ea9c14a33b3faa079c4633e79cd202d19f1860f33628b619eed3febe2 SHA512 20640ddad52fa18704942cef8469d750ef60f830d8380c39943af13705b99fc697629c8ee6a12d827bc8b9758a30773811fb0e37dd960e7a81f118cd3e8d4f02
 DIST python-3.8.13-docs-html.tar.bz2 6698035 BLAKE2B 4c26c4bca374a24c33cf67c8bce3b4443e5640be278b46cd9da2eaa8eb44ecb6fe796d1a546ed71412f203c71a43f241c4e9ea1d700758ac59e18ad71a82e8d2 SHA512 244a9236762523f9c9784d00892254c0a8ae824536a649d858a68babac664b6f840bddf3ea41cb55a4f2c00f38180a72060cf5811f01a91f342ef5c41ccbc6b3
 DIST python-3.8.14-docs-html.tar.bz2 6693920 BLAKE2B 985a260298c6352d17f921a0f0be4d432a5e845558cfec4c3798d820f0b354008f21276fca4fc0ad360d44e479e74fd245c2a824cbf6b9789c6d5b2408bb5c07 SHA512 a294dc94aea8776f183db1d2420bbe50cf1d1ae22f776015ad8e7fb1eac0f7d152fec5e5ea883a1607041e2798d99b512c820235c0f124bd5d2c2c25a92008f9
+DIST python-3.8.15-docs-html.tar.bz2 6695025 BLAKE2B 614bd68c7038887e4d8f1758b7396e11683121fa22b8b3335dc9425fb6991e398ee64cf07ed4ca0d7273dc4943e7c9fcefe36cf4dcb51dcaa439219011bbe4e1 SHA512 c05cdf16c59ef213872b08bd54d0ddcef5f11bd80cfa78be21c9e57828bd0c7a63b553f525b6e68c578d6098c427e84f5f609680a74421c6a9baa58186b46c34
 DIST python-3.9.12-docs-html.tar.bz2 6954359 BLAKE2B 28f66392a7e9e7d39088b2db99db269aa935b11df1c06b5fdf1267dafc38da647aa8bb3cce6315104deaf0f997f46aaeffd5931fd33b2263af98a745224109f1 SHA512 f8b05a5d8cdff47d3cfcf323c23744597e1868e878f29d983be42ea02e1239c1f387f607dc9991beb3acf110a89a03dedcd4b3309a825a0fa00b9709061a5b23
 DIST python-3.9.14-docs-html.tar.bz2 6991666 BLAKE2B 442a2c0fb17061bfa1a54783707cee005d9f7965ff5211e9b8c3d3e484c69b937925084ba54ad81e92f8c5cf262c0524c97f457f0116740dc90f3e498f2ceb48 SHA512 481e16efc420b3da9ceb33b6757484ac6c03347ff159666c747cab953c084c8fe8035f754fc3bbcf32800e6188ac65d5683a9e8074dac1d06750222e12a1c0d3
+DIST python-3.9.15-docs-html.tar.bz2 6964615 BLAKE2B c5faf1c6d86dba0ceae0a613a0c0bfd86b9605a134762872bc30dd6df113cc836d551032cfb4ba5812aa0d47933bcff28eeff0b68331e4dff1d27497d6e20ff9 SHA512 7f94c2c9569f3e9aa87ab90edbe584b6871a686fee72d8e257a7ae63af301596f7aae1bd63fcac30fa67bdf396453ec6cadc85d3b668514514927131cf70b5d0
 EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
 EBUILD python-docs-3.10.4.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.10.7.ebuild 633 BLAKE2B 0e7da774e53563b6caf0d9799cc805374bb698da38b823b83be6cc5ec15991a39ce4ec6d06711ff8d25f997aca924a32d9fbad6b863b51ded72b30e9c24a7624 SHA512 42a621737a2351f2c7b186d1a08056a601e41a4defa2a792f7fe11774b3f1f45fe86a99dae3debcee2ba3cdbd091e0a39bf093c8ce913148ea517d6f1e8dc39b
+EBUILD python-docs-3.10.8.ebuild 635 BLAKE2B d39c4e43cbdc4c940acc9674bbf4a8fc6401f2798a526303f3259470e5b47a65fb0e397a794b561f1e529d50ac7a6ee790b199f961d16c59338e4800abdad5d5 SHA512 2519f14e72ce7a82bfe977bb01a85a62522fbc6075ac28165e365063b7012dc002a071adac590c2c436f3814af645b73fa195ab90aa188de5bec914f3feb1fa0
 EBUILD python-docs-3.8.13.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.8.14.ebuild 631 BLAKE2B eafda8f7f6ef13d10f2566e8507b0c7699bf61b61d73bd1ea8440e21601bcc8c84652108ac0d6c2c356c6c268e8fcf032a26176dfd8ac83064a0166ae99cbd09 SHA512 ace3e35c8374954638e177ba6ef3064f1c1d4eb34df4fe15f6a9fa73d37ea9f46885f43f8d9e01bca9e0632c34a680be75afa427a16be62face825d23fdfaa7f
+EBUILD python-docs-3.8.15.ebuild 635 BLAKE2B d39c4e43cbdc4c940acc9674bbf4a8fc6401f2798a526303f3259470e5b47a65fb0e397a794b561f1e529d50ac7a6ee790b199f961d16c59338e4800abdad5d5 SHA512 2519f14e72ce7a82bfe977bb01a85a62522fbc6075ac28165e365063b7012dc002a071adac590c2c436f3814af645b73fa195ab90aa188de5bec914f3feb1fa0
 EBUILD python-docs-3.9.12.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.9.14.ebuild 629 BLAKE2B e5c5729ff3651c41927190b1a017aa7ce14b88685bac8d4ba3e4c84e08b6b62548bc6216859159b6041b8718fa9fdc2c89b1128683a51ddbe4b43be8487e71c5 SHA512 b90d98a7fc6cc8a6c54c7899cf0692dc6511b146f5937baf8a98a7b0bf9bb74c948f3be3aa8608270379ded3dd6e740052853fdb2208c1dcff8a6401e2efb8d7
+EBUILD python-docs-3.9.15.ebuild 635 BLAKE2B d39c4e43cbdc4c940acc9674bbf4a8fc6401f2798a526303f3259470e5b47a65fb0e397a794b561f1e529d50ac7a6ee790b199f961d16c59338e4800abdad5d5 SHA512 2519f14e72ce7a82bfe977bb01a85a62522fbc6075ac28165e365063b7012dc002a071adac590c2c436f3814af645b73fa195ab90aa188de5bec914f3feb1fa0
 MISC metadata.xml 237 BLAKE2B e0ddb660341d52285c05ef71475c4790faf6a2c02dfcae63852cf6ec1d59f8d8d05f0053f4dabcc655cee5c52d4105ab7c49b1d073ef81564776ef2ab1dd18cd SHA512 b7c9ef68c5b33164535e398194694d571950d673409429aba5d40fdeffbc69871645509798671b80e47bce55e4237c094e50968e22534b4e83a020b11f4804f3
diff --git a/dev-python/python-docs/python-docs-3.10.8.ebuild b/dev-python/python-docs/python-docs-3.10.8.ebuild
new file mode 100644
index 000000000000..db7df46c6ffb
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.10.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.8.15.ebuild b/dev-python/python-docs/python-docs-3.8.15.ebuild
new file mode 100644
index 000000000000..db7df46c6ffb
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.8.15.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.9.15.ebuild b/dev-python/python-docs/python-docs-3.9.15.ebuild
new file mode 100644
index 000000000000..db7df46c6ffb
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.9.15.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index bd040e91c25f..e5071df6cc0f 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 090b51403644..c645a38a2fac 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,4 +1,4 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
 DIST gnome-tweaks-40.10.tar.xz 251712 BLAKE2B 7e9e04b86ffcff25cafd2a6dfc0c7be14c8caa4ae003369c34ed2c40c36ce857b05de9994f7c2187cbdd535f464b92f782ec91b835318c2b5d2219ad817fbe56 SHA512 1247933ad2f93bd7817af367d715468591840df4840d45641033ca19ea26c64239828ba3e24fafb8694014a98024b911266c314172ba8e37d6c4165e7e6e8a29
-EBUILD gnome-tweaks-40.10.ebuild 1348 BLAKE2B b8e170da11721de60b5305efbcfdf03d7f611d99ee3bf49fc7063e70515cf4e93959b7fade4ad539e5dcaa5216b81c711b30a3dc5f268dc774b18bd232c66072 SHA512 40d9e6f3f39c4fd5266403828213f991258e6c5910a16502dda48ca7d82ec8daaa45ee1d618c7600a5646dd51566c4627155e5a53de04c753741e1cce227668e
+EBUILD gnome-tweaks-40.10-r1.ebuild 1311 BLAKE2B f57ca56b188d2a2ceeb216ad063defd2f1515fc8371b0b858bc5250167533d19c3db28ff41f5d09ae9658fb1e165bbdebd2f2966f5ab22bdc99e67afc1b4dca7 SHA512 8ef1b2bea6836bd60b2d6e117b6b1d985d6bf266e3dd0cc7153414c2b662c8c39c4616faa35fa6c891369de6f1a575360531a5d28699f850a56fca19620d1b95
 MISC metadata.xml 557 BLAKE2B 377b3b95f3dfade66ceb83a955bae45820c7db9cb286fbc9fb7f597909d6e58b3ccbdde1acc5bc01bda97bcde90a062a8e4676c8593edfc95c46f27c311ca83e SHA512 9a24c8eedb00ba7ceaba017cfeef778a7def43d7baf62c23067376f7648fad3b333e16a9dc4f8c41f66279b4bbe8acf54844ab5460d56366d32c325ea5d06e2d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.10-r1.ebuild
index 883e664b39ae..39b92775cd1c 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.10-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -29,7 +29,6 @@ RDEPEND="${DEPEND}
 	>=x11-libs/gtk+-3.12:3[introspection]
 	>=gnome-base/gnome-desktop-3.30:3[introspection]
 	gui-libs/libhandy:1[introspection]
-	net-libs/libsoup:2.4[introspection]
 	x11-libs/libnotify[introspection]
 
 	>=gnome-base/gsettings-desktop-schemas-40.0
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a5a12283e7d2..0961d8dcd410 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9bb22b1e6caa..c44ece54a308 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Oct 2022 23:39:44 +0000
+Wed, 12 Oct 2022 05:39:41 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fa323ff6063f..469bd23bab3a 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 529253 BLAKE2B 4870d0ebed8f73802444d2a3e204d4fe556355a8b2b4d4ffdd695d17206e94777c458bc34f39aee9fe92a996aea872cf895c73e601729b57032c40785dea2d65 SHA512 ca03ae189444f830ef68a97bf0be8dd0ed5045d9010eaead8695ce26c0591587965b16cbf215850d4c87fa27139a325c616d08f336a7213ad4483bb7e1f46baa
-TIMESTAMP 2022-10-11T23:39:47Z
+TIMESTAMP 2022-10-12T05:39:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNF/sNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNGUyBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBM/w//SETdc1Gn4lNdFipiy0bM0L/GZNKu5GDfKEun7cvsO5qVZ+MInFyPbHlt
-WT7b7Egyyf9latzJw0IlBTCcp4B8w5VjTDY44RQsDcUduyClTUKlv2fIkTTTu4Id
-aN6vBTIDsN+RKmoAIpfEJBmz/61ageAWzJbI9aRHm/V92+gSqPwKy4nFFyGdrlxN
-iuF7NS0pplTJelkHggmAu2PmvKELiexCD7ag2NP1C4TWmgZKIyFxD5u7HRbISsFq
-xEOnHI83IKIvGTaMgEjD2pLO0hKBkZGp4HeKSa5BPU7S8uB2uSpP94EqJe1ota24
-4EfBqzBxnHOJMQu3cfXwhHQg0PQvQc44GHLoee6IB2XnqWd6sjfdOKHvuiX2iSdW
-R+Zwf3bFO43/QhXaKbv3iKZk4QQ4vvYxZkFp20Mq7krGGkYhyhO83VackM98gvsV
-0ZzGEVE2iJk5+wtKzAmV8ujmVxI6mxQ9V05ix2Tm4u3IJAshFRcN28YEnN21P/ia
-9Z4JeFm5BqWvyNSPrbIOFhkyYYfBzIk250wr8jLQW6xTJNfvBCrJny0e31s1kFN7
-wKQyqIc23kg7a+wlAoefzg5QjGq88SZJyUc/sguQqzCNThRu7jNUSrIGOhhScUqI
-w+vrbT9MRBVuXiOdnJd77xc0tgAEzun9st1OCGHFCVD8GzexCWs=
-=DSXs
+klBUWw/+L19V8LNVJIXCD8vXn820gNf/dw6rGpmr7tjNW1fii4MDmEdb5CRsYwiR
+FOZo1rGm9WvEu25+46CUfXk00cArMU4MTawCRv4/Sa0agDN+tvAZ8N1u1cK2MGsR
+2uQfjg3M2hdThp9X1S23SWLTO4uGT9wXzXXDjkrnEB7jXRAZjdD4yu0wXWFZ0WzC
+krHes+HkoEarB67dKuqk+wLKNSEQ1NoqsKG5He0K2Kzlz9HuQPNup5NQsPeBbnam
+9ikKP23LuL4NDWxqSuXQxDPXZ5J1ANhbSTb2zjr0Y8YHOBp7YUbbLn7vRaXMgY+S
+OAdCSMsBR/WwyIueV5jQbIQzL5psrLVPqH1ORSWzfQ/Ju2Yjn3NxMPP4dSOdANfA
+wEq/Z7k2/u96z/x3yVeFdI4uXG1skkbcx/qU77lclX6jtqtoVXYkSojI71VQfK05
+e+OgWRlnBlqGiKSETY58lWnioWiRaJ5oOvPJrA+Ge11SyKONKlq2JMmousYWN8lS
+1cP/PsvTCS7rjDY2HAWD5NEm3Fucu3ksekLqclR4pRBryUmIJXpmRoKAMDepla3C
+xxnmH3tQYkmYFoy1m1jjVfL+RjyN3A6eMq9kDy0NWTODjfIWLRqHQtxjomty6cGv
+BWN/hpY33MJ+lxGZrb010jHUeKhyOdAILdI945zk2Bxo0pbGszg=
+=HLe+
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9bb22b1e6caa..c44ece54a308 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Oct 2022 23:39:44 +0000
+Wed, 12 Oct 2022 05:39:41 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0a708a4a4a58..fb9d9b996982 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 34f5edeb860d..ffae667bafae 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/dasel-1.24.3 b/metadata/md5-cache/app-misc/dasel-1.24.3
deleted file mode 100644
index 1d479a8b4429..000000000000
--- a/metadata/md5-cache/app-misc/dasel-1.24.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Query, update and convert data structures from the command line
-EAPI=7
-HOMEPAGE=https://github.com/TomWright/dasel
-INHERIT=go-module
-KEYWORDS=~amd64
-LICENSE=MIT Apache-2.0 BSD BSD-2 ISC
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/TomWright/dasel/archive/v1.24.3.tar.gz -> dasel-1.24.3.tar.gz https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz
-_eclasses_=go-module	b088539f282ed242c23f38fa65472184
-_md5_=d6aa9c8482e728715c812eb557bf3b69
diff --git a/metadata/md5-cache/app-misc/dasel-1.25.0 b/metadata/md5-cache/app-misc/dasel-1.25.0
deleted file mode 100644
index 72b47666f7f2..000000000000
--- a/metadata/md5-cache/app-misc/dasel-1.25.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Query, update and convert data structures from the command line
-EAPI=7
-HOMEPAGE=https://github.com/TomWright/dasel
-INHERIT=go-module
-KEYWORDS=~amd64
-LICENSE=MIT Apache-2.0 BSD BSD-2 ISC
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/TomWright/dasel/archive/v1.25.0.tar.gz -> dasel-1.25.0.tar.gz https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz
-_eclasses_=go-module	b088539f282ed242c23f38fa65472184
-_md5_=ce1600e259c6e673a4252b4c13bd1e25
diff --git a/metadata/md5-cache/app-misc/dasel-1.26.0 b/metadata/md5-cache/app-misc/dasel-1.26.0
deleted file mode 100644
index 5f3f70fe4a0c..000000000000
--- a/metadata/md5-cache/app-misc/dasel-1.26.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Query, update and convert data structures from the command line
-EAPI=7
-HOMEPAGE=https://github.com/TomWright/dasel
-INHERIT=go-module
-KEYWORDS=~amd64
-LICENSE=MIT Apache-2.0 BSD BSD-2 ISC
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/TomWright/dasel/archive/v1.26.0.tar.gz -> dasel-1.26.0.tar.gz https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz
-_eclasses_=go-module	b088539f282ed242c23f38fa65472184
-_md5_=ce1600e259c6e673a4252b4c13bd1e25
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 7dc6d5f6e1d8..93828e01dd17 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-10.0.27 b/metadata/md5-cache/dev-java/tomcat-el-api-10.0.27-r1
index f441184e421d..b7d1991d878c 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-10.0.27
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-10.0.27-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Tomcat's EL API 5.0 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.27/src/apache-tomcat-10.0.27-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=2a2b8ffc8dfd9d0e20b3e24e0620d425
+_md5_=c1ef28e808c81dc313eb569d65a259ea
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-8.5.83 b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.83-r1
index 52afc8a0b6a0..6ab3ee8fed8b 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-8.5.83
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.83-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Tomcat's EL API 5.0 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.83/src/apache-tomcat-8.5.83-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=5951a5bcc0dbb63771e8830b37dc31e2
+_md5_=6952bc6e44200ab162c44b574374de4d
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.68 b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.68-r1
index d35fafdfeb71..a1959d76f8f6 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.68
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.68-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Tomcat's EL API 5.0 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.68/src/apache-tomcat-9.0.68-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=f91a2103a26823fe3367682cd93abed3
+_md5_=925daa3c52fd113d1d3eab199ebbf83c
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.0.27 b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.0.27-r1
index 3a9705297b95..94e753dc812b 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.0.27
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.0.27-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-10.0.27:4.0 ~dev-java/tomcat-servlet-api-10.0.27:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-10.0.27:4.0 ~dev-java/tomcat-servlet-api-10.0.27:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Tomcat's JSP API 3.1 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.0.27:4.0 ~dev-java/tomcat-servlet-api-10.0.27:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-10.0.27:4.0 ~dev-java/tomcat-servlet-api-10.0.27:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.27/src/apache-tomcat-10.0.27-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=a81640493adfcc6023408c1823e660df
+_md5_=d8d792607aa3f67fb8eacc30b7b5b2d9
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.83 b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.83-r1
index 4de78b5f8c09..0a7637f33be5 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.83
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.83-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-8.5.83:3.0 ~dev-java/tomcat-servlet-api-8.5.83:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-8.5.83:3.0 ~dev-java/tomcat-servlet-api-8.5.83:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Tomcat's JSP API 3.1 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-8.5.83:3.0 ~dev-java/tomcat-servlet-api-8.5.83:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-8.5.83:3.0 ~dev-java/tomcat-servlet-api-8.5.83:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.83/src/apache-tomcat-8.5.83-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=60f39e00d07c7c3eac521f29e7928bf5
+_md5_=e6bec05b9c1fcc5ba7bdf9f5c54fc279
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.68 b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.68-r1
index 1298a0f2e61a..47ef47cf99fb 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.68
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.68-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-9.0.68:3.0 ~dev-java/tomcat-servlet-api-9.0.68:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-9.0.68:3.0 ~dev-java/tomcat-servlet-api-9.0.68:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Tomcat's JSP API 3.1 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-9.0.68:3.0 ~dev-java/tomcat-servlet-api-9.0.68:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.68:3.0 ~dev-java/tomcat-servlet-api-9.0.68:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.68/src/apache-tomcat-9.0.68-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=7e81baa6b59ff2fc7d5b86e623d2e23b
+_md5_=a3acf375e23ad93f631ab3d0f3e4e73d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.27 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.27-r1
index 9c82ad1b7f80..09c139e21a41 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.27
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.27-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-10.0.27:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-10.0.27:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Tomcat's Servlet API 6.0 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.0.27:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-10.0.27:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.27/src/apache-tomcat-10.0.27-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=eefc7aa09ffaab8fd8903ff870cfe86e
+_md5_=c1e80b4510a935bd917bf8da7f5f9de3
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.83 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.83-r1
index 5253893072d5..5fa1f23378e5 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.83
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.83-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* >=dev-java/tomcat-el-api-8.5.83:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/tomcat-el-api-8.5.83:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Tomcat's Servlet API 6.0 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-11:* >=dev-java/tomcat-el-api-8.5.83:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/tomcat-el-api-8.5.83:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.83/src/apache-tomcat-8.5.83-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=191f89a594cb7bc4fc00195305561143
+_md5_=e865ef92561225668986c155522f9a48
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.68 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.68-r1
index 3ffb4d05eac6..a7ce3101c6d6 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.68
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.68-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-9.0.68:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-9.0.68:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Tomcat's Servlet API 6.0 implementation
 EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
@@ -7,8 +7,8 @@ INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-9.0.68:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.68:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.68/src/apache-tomcat-9.0.68-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=bb6afdb0612e13409a0621cd1bcef648
+_md5_=dccfc0a42be76901bdf14dc5372421a1
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 30e9a865e469..3bd9727f7781 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-3.10.8 b/metadata/md5-cache/dev-lang/python-3.10.8
new file mode 100644
index 000000000000..069cddc1e242
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.10.8
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=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? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+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 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.10
+SRC_URI=https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.8.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=4b7e1517e45584226a868fd661c97c0d
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0_rc2_p1 b/metadata/md5-cache/dev-lang/python-3.11.0_rc2_p1
new file mode 100644
index 000000000000..074f58f32dbb
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.11.0_rc2_p1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=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? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+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 !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
+RESTRICT=!test? ( test )
+SLOT=3.11
+SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0rc2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0rc2_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0rc2.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=0ca13eafa109603ce724914b4d4a9423
diff --git a/metadata/md5-cache/dev-lang/python-3.8.15 b/metadata/md5-cache/dev-lang/python-3.8.15
new file mode 100644
index 000000000000..a6e73b319617
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.15
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=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? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+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:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.8
+SRC_URI=https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.15.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=d7fd4c902cbd2c5d6b10ff6427afeb09
diff --git a/metadata/md5-cache/dev-lang/python-3.9.15 b/metadata/md5-cache/dev-lang/python-3.9.15
new file mode 100644
index 000000000000..1987588821fb
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.9.15
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=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? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+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:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.9
+SRC_URI=https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.15.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=fe75efd369aab71d12a94d08ef45f2b1
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index facc3c63d8fc..f344a080d71f 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/python-docs-3.10.8 b/metadata/md5-cache/dev-python/python-docs-3.10.8
new file mode 100644
index 000000000000..72042a8be303
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-docs-3.10.8
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=HTML documentation for Python
+EAPI=7
+HOMEPAGE=https://www.python.org/doc/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=PSF-2
+SLOT=3.10
+SRC_URI=https://www.python.org/ftp/python/doc/3.10.8/python-3.10.8-docs-html.tar.bz2
+_md5_=a40c5990b9325f6cb13b3809ae89dcb9
diff --git a/metadata/md5-cache/dev-python/python-docs-3.8.15 b/metadata/md5-cache/dev-python/python-docs-3.8.15
new file mode 100644
index 000000000000..d78f3c5cf952
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-docs-3.8.15
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=HTML documentation for Python
+EAPI=7
+HOMEPAGE=https://www.python.org/doc/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=PSF-2
+SLOT=3.8
+SRC_URI=https://www.python.org/ftp/python/doc/3.8.15/python-3.8.15-docs-html.tar.bz2
+_md5_=a40c5990b9325f6cb13b3809ae89dcb9
diff --git a/metadata/md5-cache/dev-python/python-docs-3.9.15 b/metadata/md5-cache/dev-python/python-docs-3.9.15
new file mode 100644
index 000000000000..c9e8bccfd6f8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-docs-3.9.15
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=HTML documentation for Python
+EAPI=7
+HOMEPAGE=https://www.python.org/doc/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=PSF-2
+SLOT=3.9
+SRC_URI=https://www.python.org/ftp/python/doc/3.9.15/python-3.9.15-docs-html.tar.bz2
+_md5_=a40c5990b9325f6cb13b3809ae89dcb9
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index cad532a4fcf5..be8be2b6dcf9 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10 b/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10
deleted file mode 100644
index bd02d464ef97..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Customize advanced GNOME options
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
-INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-3+ CC0-1.0
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_10(-)] ) >=gnome-base/gnome-settings-daemon-3 x11-themes/sound-theme-freedesktop >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.12:3[introspection] >=gnome-base/gnome-desktop-3.30:3[introspection] gui-libs/libhandy:1[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gsettings-desktop-schemas-40.0 >=gnome-base/gnome-shell-3.24 x11-wm/mutter
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-tweaks/40/gnome-tweaks-40.10.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8960e5613e50fa7f9698a931cf9b531e
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10-r1 b/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10-r1
new file mode 100644
index 000000000000..6fdbe2e089b2
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+DESCRIPTION=Customize advanced GNOME options
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
+LICENSE=GPL-3+ CC0-1.0
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_11(-)] ) >=gnome-base/gnome-settings-daemon-3 x11-themes/sound-theme-freedesktop >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.12:3[introspection] >=gnome-base/gnome-desktop-3.30:3[introspection] gui-libs/libhandy:1[introspection] x11-libs/libnotify[introspection] >=gnome-base/gsettings-desktop-schemas-40.0 >=gnome-base/gnome-shell-3.24 x11-wm/mutter
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-tweaks/40/gnome-tweaks-40.10.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=eefa19186459be0c6b6d2667c9e5c3c8
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 241a056fec85..e4260db3633a 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libsoup-2.74.3 b/metadata/md5-cache/net-libs/libsoup-2.74.3
new file mode 100644
index 000000000000..cc13496c2723
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libsoup-2.74.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/glib dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.58:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( >=app-arch/brotli-1.0.6-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=HTTP client/server library for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/libsoup
+INHERIT=gnome.org meson-multilib vala xdg
+IUSE=brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.58:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( >=app-arch/brotli-1.0.6-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba ) >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=2.4
+SRC_URI=mirror://gnome/sources/libsoup/2.74/libsoup-2.74.3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=fd3be5a40810078169b6c19ef3eea310
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 912093240114..b38313f5abc7 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/gupnp-tools-0.12.0 b/metadata/md5-cache/net-misc/gupnp-tools-0.12.0
new file mode 100644
index 000000000000..92998af0374d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gupnp-tools-0.12.0
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=net-libs/gssdp-1.6.0:= >=net-libs/gupnp-1.6.0:= >=net-libs/libsoup-3.0:3.0 >=net-libs/gupnp-av-0.5.5:0= >=x11-libs/gtk+-3.10:3 >=dev-libs/glib-2.68:2 >=dev-libs/libxml2-2.4:2 x11-libs/gtksourceview:4
+DESCRIPTION=Collection of developer-oriented UPnP tools
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org meson xdg
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=net-libs/gssdp-1.6.0:= >=net-libs/gupnp-1.6.0:= >=net-libs/libsoup-3.0:3.0 >=net-libs/gupnp-av-0.5.5:0= >=x11-libs/gtk+-3.10:3 >=dev-libs/glib-2.68:2 >=dev-libs/libxml2-2.4:2 x11-libs/gtksourceview:4
+SLOT=0
+SRC_URI=mirror://gnome/sources/gupnp-tools/0.12/gupnp-tools-0.12.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=19929ab1759d78c273df887b18b26f88
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 952c3dda4f24..a1e8ba2bb3e9 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-43.0 b/metadata/md5-cache/sci-geosciences/gnome-maps-43.0
index 7bd8d558166e..e37d434af488 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-43.0
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-43.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1 >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0= dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection]
+DEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
 DESCRIPTION=A map application for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Maps
@@ -8,8 +8,8 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson xdg
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1 >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0= dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection]
+RDEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/43/gnome-maps-43.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=35b0e152df723e96be9f61c7d1440c30
+_md5_=64a91046246fe95623957e83d1c0bdb6
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 3401e1993df8..f9b18b060279 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.12.7 b/metadata/md5-cache/sys-apps/flatpak-1.12.7
deleted file mode 100644
index 0088a8adc34f..000000000000
--- a/metadata/md5-cache/sys-apps/flatpak-1.12.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( >=dev-util/gtk-doc-1.20 dev-libs/libxslt ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) )
-DEFINED_PHASES=configure prepare setup
-DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Linux application sandboxing and distribution framework
-EAPI=7
-HOMEPAGE=https://flatpak.org/
-INHERIT=linux-info python-any-r1
-IUSE=doc introspection policykit seccomp systemd X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=sys-apps/xdg-desktop-portal
-RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.12.7/flatpak-1.12.7.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cf970ecc72167f76b8a9d1897daea56f
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.13.2 b/metadata/md5-cache/sys-apps/flatpak-1.13.2
deleted file mode 100644
index 781854e4ebb8..000000000000
--- a/metadata/md5-cache/sys-apps/flatpak-1.13.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( >=dev-util/gtk-doc-1.20 dev-libs/libxslt ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) )
-DEFINED_PHASES=configure install prepare setup
-DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Linux application sandboxing and distribution framework
-EAPI=7
-HOMEPAGE=https://flatpak.org/
-INHERIT=linux-info python-any-r1
-IUSE=doc introspection policykit seccomp systemd X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=sys-apps/xdg-desktop-portal
-RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.13.2/flatpak-1.13.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9dfaafc81d7785a74ff9d9eb509fc0e5
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.13.3 b/metadata/md5-cache/sys-apps/flatpak-1.13.3
deleted file mode 100644
index 3756635e401b..000000000000
--- a/metadata/md5-cache/sys-apps/flatpak-1.13.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( >=dev-util/gtk-doc-1.20 dev-libs/libxslt ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) )
-DEFINED_PHASES=configure install prepare setup
-DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Linux application sandboxing and distribution framework
-EAPI=7
-HOMEPAGE=https://flatpak.org/
-INHERIT=linux-info python-any-r1
-IUSE=doc introspection policykit seccomp systemd X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=sys-apps/xdg-desktop-portal
-RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.13.3/flatpak-1.13.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9dfaafc81d7785a74ff9d9eb509fc0e5
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.14.0 b/metadata/md5-cache/sys-apps/flatpak-1.14.0-r1
index e68959965f56..097adfdd20c2 100644
--- a/metadata/md5-cache/sys-apps/flatpak-1.14.0
+++ b/metadata/md5-cache/sys-apps/flatpak-1.14.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( app-text/xmlto dev-libs/libxslt ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=configure install prepare setup
-DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
+DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] dev-util/ostree[curl] >=gnome-base/dconf-0.26:= net-misc/curl:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
 DESCRIPTION=Linux application sandboxing and distribution framework
 EAPI=7
 HOMEPAGE=https://flatpak.org/
@@ -9,9 +9,9 @@ IUSE=doc introspection policykit seccomp systemd X
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
 PDEPEND=sys-apps/xdg-desktop-portal
-RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
+RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] dev-util/ostree[curl] >=gnome-base/dconf-0.26:= net-misc/curl:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.14.0/flatpak-1.14.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dc198cc965d9e95f44eeae418f061ece
+_md5_=af1fb76f948bd274ebdaae6634f1e579
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index cb9c16177bbc..dde2223b3f21 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gettext-0.21.1 b/metadata/md5-cache/sys-devel/gettext-0.21.1
index c5495687169a..7732f8cc14b0 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.21.1
+++ b/metadata/md5-cache/sys-devel/gettext-0.21.1
@@ -1,16 +1,15 @@
-BDEPEND=!git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) verify-sig? ( sec-keys/openpgp-keys-gettext ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=!git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) verify-sig? ( sec-keys/openpgp-keys-gettext ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
 DEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( virtual/jdk:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=GNU locale utilities
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/gettext/
-INHERIT=java-pkg-opt-2 multilib-minimal verify-sig
+INHERIT=java-pkg-opt-2 libtool multilib-minimal verify-sig
 IUSE=acl cvs +cxx doc emacs git java ncurses nls openmp static-libs java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-3+ cxx? ( LGPL-2.1+ )
 PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( virtual/jdk:1.8 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-SRC_URI=mirror://gnu/gettext/gettext-0.21.1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gettext/gettext-0.21.1-java-autoconf-regenerate.patch.xz verify-sig? ( mirror://gnu/gettext/gettext-0.21.1.tar.xz.sig )
-_eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=20847f0ba58127cac43b22647fb32261
+SRC_URI=mirror://gnu/gettext/gettext-0.21.1.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.21.1.tar.xz.sig )
+_eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=9290598aa2bed03effba212a1b8a06c5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 33367e77eefd..66dce0bb96f6 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-11T23:39:47Z
+TIMESTAMP 2022-10-12T05:39:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNF/sNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNGUyBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB50g//YSCdNYqdCfP5EJhlNe4AaFQyFhq+OMRjrpomu8DGyzACag+5kAHAtu9e
-wQ+aNNv/qzRd/P3TJp+8nFPwO8dXhhnFFSqVNtWcYPoHBLm9GPRPxrXG3JPnhYN6
-JhWDOt4VyeR+wljvkvZ0s8ZX5Q7eWe9mq0iRX+G3Kpx1jc4ZEI39h4oUA9H8Q9Qp
-Kk4gRlJ1jWXTD7sL42RfACtFmlNzmVAm0cAUUvxziHZ4f8IYaZczsHlo1BaItNL3
-am6WHby0/S73Ky0ayPOM0XOOIkBX/+XKUFo3cDaPCohWW+mkwZPOFM3yZYbB6ruq
-hJElZMz2dRkJ/QUD5kqqsS9kOrSZVOGS8esCy9zhmZm2sMVBYoC1Q7TkqcC5CC3h
-+wPB/yYIQ3GzJiGff0rI9mLctRxfugD3rXjMMYz4KNDm57TMmqXmuBJ/SkfSiVtk
-w+J8e6Zf9koYc9AeY4wfJv0Le0TcgDT+ovt9ZWYZ2VN6xqrDjsi7+kBZADs5AgRH
-sTNhHm4XzXoJd6dl4xSLIGeLtHWk3eOP8YkcRk3volSiIF/VhgndTwiN15LWlUuW
-K/uooxYDC+rntHpoQsNWyvlG2fU1QPbEdCfr5vuH6WSl+xmTaCDUZg6MT5MJD7kd
-x/kzm4gQqogb8njq5W7XJkbJ0vXq7PTGsV3f2i5BeGB6KmWcTIg=
-=FvjI
+klBkvg//eYS8SQZjrSdn+J/39z8pg/i4ycLaVeQfhK2ycc+nhEAh6anThtHqRhOe
+nNB1jxJumhPsoaFcZ1jbPx8Zay0o1lESGKHn3JdaIaxnvXXyu4xPHQ0bZOvBRDQW
+0o/H1g42Uy0M8tjk/jhum/Ykhl58BE7YbPdz7uramFI8pSxLEfLs/xmPq0JmLPth
+wwwtmYh/dNZoMgD+u6KiN1xg2oDJ9uw39ZTegW9VfY3yuFhX9bgyDlhV1Wm0CTO6
+lns6KG/jniob79G1YJTjpzeCqT1pZeSboOhfyxu+rtkDy+P4tGLhzuKW+4zIem/j
+dFV2YQlh1Ogef70+smOpegbjifE4xx77G7sgiOhPvzp9lp98wEVIeYIVLd7QpPnt
+oBzJSbgR80IIqOEktH5/HX5x5xpzY8NCtdRh9GZiCtyCL3P5H4tDrpz0/o5i4Y8E
+sd7xHLxWqDhmUxdc373vcXhclOEUGJL3vcYMzLzWQ7usrDHN4IXWSypwcYXZjYpK
+sr6r4HIm1YdGpuypiw/EwcH5r7e8gm84hksKDLzq3Ukirsb5RPyCal5NmpADHE+z
+dhUSZd/mxM92Sa05PSzbC7Jon+eAONbgzVZQuxZ9tNBfxQbz0/47o45aE356uTuJ
+qSNGYtFB8dQ89Umy5jMrfAH5ggk6T3rv+/kEtJPrF6GTRRxHZ5U=
+=/ruc
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9bb22b1e6caa..c44ece54a308 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Oct 2022 23:39:44 +0000
+Wed, 12 Oct 2022 05:39:41 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 929fa71d6d8c..45ecf79e5d78 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Oct 11 11:39:44 PM UTC 2022
+Wed Oct 12 05:39:41 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 11ebf14b96e8..1f6558f7aef8 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Oct 2022 23:45:01 +0000
+Wed, 12 Oct 2022 05:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 879bfc161492..df031d7ec2b8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f99733502c417e043f89f01042abec3b854d203c 1665529154 2022-10-11T22:59:14+00:00
+d0225d2fc94f18eee1d65de3b13b9fb6a2ef3098 1665551757 2022-10-12T05:15:57+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 00e1cadb603c..834ca6c48177 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1665531601 Tue 11 Oct 2022 11:40:01 PM UTC
+1665553201 Wed 12 Oct 2022 05:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9bb22b1e6caa..c44ece54a308 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Oct 2022 23:39:44 +0000
+Wed, 12 Oct 2022 05:39:41 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index de78c6a208e1..a1e8087db5a0 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index bbd3dbc0d711..880a93c86d13 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,8 +1,10 @@
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
 DIST libsoup-2.74.2.tar.xz 1497356 BLAKE2B b05e5d06e20a95042334c79e3a633ec43db0e7444b425f8577045fbdee7b78bd697e743f4283ed79265bbe538145a541ef2ef55636ae235667a89d00910d5bf2 SHA512 6f9da3296364e210103093cef9ef34fb40f694a8ef90966fc1fbd834c11f3db1031784a0901e9181bf3124e0682708148bd3598a31d60f1cce61eaae2e19ba7a
+DIST libsoup-2.74.3.tar.xz 1504804 BLAKE2B 91f441197414314bb78cf15e7c13b54714e669145784812fb7a68cc41c8965ea29c53dc686d690e00f28f711be9f767038e5cc43b11aa0136f190dd2d41ec2a0 SHA512 72f8a055df984cb35105fe67f4ca67d3fb110d40a9cacb660fccd89f93b06bc32e25d94375dcc76608a245f7c5e081d968d7aaf5952eb16013d81c741247cb4c
 DIST libsoup-3.0.8.tar.xz 1535496 BLAKE2B 7f5531f7771df557e6ce65ae684ba83c9eeddf98547f1c025204f17a087fc1ec34ed6baf7c278528d41b4298a694bb9cb0726387dae6f313b896c9dfba2d2c57 SHA512 91d7de5dc642bfc1aa69fed9686fcafcc10094f3ae568f827dcebecfc9c919a00486b93c5f43710628cb3ab415bd7146d28455c5f9e916f4fe57ff4c0e66ad56
 DIST libsoup-3.2.0.tar.xz 1526272 BLAKE2B 782e872fd135d1b9fead3714ca0bdb3884b38baaf54bf2dd91212a6b362c818f8046a829bcdb57de255dad12bf4e5ca0682bbd8acd529b28a2d3fca8db6239bd SHA512 e4dc4cda297ec2c2e8ced82d141e00c186b552c9308eb0d05d55a1397de1b037d8fe053ea0ada12691ce7c0ff42c03f5f8177049005a1455cc3b0e1df77c99ea
 EBUILD libsoup-2.74.2.ebuild 2942 BLAKE2B 83795dff978db6701967be68903382ce13f25a138a7d851cdaf25c18d0a21813ef8366c38102ed9cad349b2a4aae3492e89830029128a7ac3c7e4c64b46f780c SHA512 4d018f152a378112785f6af8d040a969a3ba8bcb81423261126f3971d8118e4e5ea550690b1d48b9b3f1c7ecd98271d0f30334264b5ac7281c6ce24e2c3ef005
+EBUILD libsoup-2.74.3.ebuild 2949 BLAKE2B 32fc2e678708db3b376ef7469e32d330545c0d402136c25b0283b8e4c001bf5a108fd3efe11caab3207f4b5bcb26698891d7ef5e45cecc44c19ec9f969e1d508 SHA512 db5d4c64ed92c8faac117430c214688dde5aaddea288bce819a120c7f4047b984c71c20ad1fdb2b0ca902df5726c6c38fe8855bc8d6560368e5cfc5241676959
 EBUILD libsoup-3.0.8.ebuild 2924 BLAKE2B 4edf981426806b0998b339da797b1f212b49601bc843d1e1e2ecf50fa923d89753498c47f228196c1d7ff0f63cb51f702aca9b1fdb335241683b2b902cf84ffc SHA512 909656228775b3bdf03f050d2dccd29b07f1013840fc61f865a917dac36bbdbaeb4f2b3be2c5c9a6a8b1daafd0abc39d619aa2917170d32a18b36705fa2e3be9
 EBUILD libsoup-3.2.0.ebuild 3137 BLAKE2B c8302c2b2a869080491c97e0203d61054b3bfa999fa8fe4ace0c46cf1f2661ed2ce738d938225090e0de7e283bf4dee1c54399c5923780528e14772caa934a79 SHA512 b2efeace7ee8e5d03f13a17b38cc147293fca5627248c39ae48955b1dffd38a59c43871ee065031b1962c051524537a342e638e0b790725fc939adfc6765f479
 MISC metadata.xml 578 BLAKE2B eb74705e02403da0706e9eba5fd7ce416721a8f4eaa7f0548376a11767f8d6f0214b6c696e8a65c3b2b1b9753bd1397bc2c9b5cdd953e89f23c00749884d7966 SHA512 120645b4e9ca76acaba6ae6eb86daca28be6af566576458b443996ff7e2c922eda059db209aa92dda28123d0474640e69e25236908b10d8472f4442608b7a6a2
diff --git a/net-libs/libsoup/libsoup-2.74.3.ebuild b/net-libs/libsoup/libsoup-2.74.3.ebuild
new file mode 100644
index 000000000000..64c87fbeb301
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.74.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson-multilib vala xdg
+
+DESCRIPTION="HTTP client/server library for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.4"
+
+# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146
+IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+	sys-libs/zlib
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	samba? ( net-fs/samba )
+"
+RDEPEND="${DEPEND}
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-libs/glib
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+PATCHES=(
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	"${FILESDIR}"/disable-apache-tests.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+	# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
+	sed -e '/hsts/d' -i tests/meson.build || die
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	# But necessary while apache tests are disabled
+	#addpredict /usr/share/snmp/mibs/.index
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature gssapi)
+		-Dkrb5_config="${CHOST}-krb5-config"
+		$(meson_feature samba ntlm)
+		$(meson_feature brotli)
+		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
+		-Dtls_check=false # disables check, we still rdep on glib-networking
+		-Dgnome=false
+		$(meson_native_use_feature introspection)
+		$(meson_native_use_feature vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		$(meson_feature sysprof)
+	)
+	meson_src_configure
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 12edfd5c0e63..c39472600155 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
index be6e0c5196d0..0534ef92de8d 100644
--- a/net-misc/gupnp-tools/Manifest
+++ b/net-misc/gupnp-tools/Manifest
@@ -1,3 +1,5 @@
 DIST gupnp-tools-0.10.3.tar.xz 180596 BLAKE2B 26140962cc24cda867465a4f94d251a26849db544fe1cb017ca86e6208f037b09e772109bfac150a9f6db845d1212af5a5c624d81958816349b3c60e45b80933 SHA512 a95a169c65e50d9953b79b96b92abbad709adc0bf74db47abaa529bd7989ebe2d41ae30ab340d09e5a727b61200d55a6d34b04d6981327b920d23a7c916babbe
+DIST gupnp-tools-0.12.0.tar.xz 181736 BLAKE2B aa33ab97ece72f9baebda4db20a0f72d995017ff45abf0e2da0ae4644d6ede6309b7aa2172c75607a4caf4fbcc65b5e88d1766a8819af96ffe054c83ef87ec77 SHA512 e9c4882f910adee6021433904b78bad89abf4a0d978e24b61cc1c07736e27f0d7e79592e18bbbae8fa13a65f86e72cb8bd7783d74140c6f5d3c65fea4f57da30
 EBUILD gupnp-tools-0.10.3.ebuild 695 BLAKE2B 8029775879538d43e563b6383f894f692e99ac01f7879a6e959cb697e2c3211da46810fa728219a4f8a2eaa6f9a156da1f7ddc156bd6e228f1aa0284c54274c0 SHA512 7725ac9160633f59ca27b08cc062882088734f75e7176a769e102b3ba10697c952991a82d798217a7230c6252cf43575210d077e5e51377ffd271934a7425eef
+EBUILD gupnp-tools-0.12.0.ebuild 696 BLAKE2B 5b340a2361fed527efeadf019b344291e62a9e90fb48ff40a13b7cdd0e05a9a0ead436d0195568473db0b616a1d1a13de88a0c3ea897379b191aa17fbf8992fa SHA512 adde1a63e80cebe5f3dcdd2bc73bd459c37296d7284042a27a858a058b8d3f1cbe22971d51c9e0dd1df3cf2d8b3cea513aaa1bd28ccad860e6231fae91742a0a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.12.0.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.12.0.ebuild
new file mode 100644
index 000000000000..764657ef5841
--- /dev/null
+++ b/net-misc/gupnp-tools/gupnp-tools-0.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org meson xdg
+
+DESCRIPTION="Collection of developer-oriented UPnP tools"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=net-libs/gssdp-1.6.0:=
+	>=net-libs/gupnp-1.6.0:=
+	>=net-libs/libsoup-3.0:3.0
+	>=net-libs/gupnp-av-0.5.5:0=
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/glib-2.68:2
+	>=dev-libs/libxml2-2.4:2
+	x11-libs/gtksourceview:4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dav-tools=true
+	)
+	meson_src_configure
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index db63b9205d84..373303d88b22 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 8bef01b460a2..aebda179b0de 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -515,6 +515,7 @@ media-libs/libshumate
 >=net-libs/gnome-online-accounts-3.46
 >=net-libs/gssdp-1.6
 >=net-libs/gupnp-1.6
+>=net-misc/gupnp-tools-0.12
 net-libs/libsoup:3.0
 net-libs/phodav:3.0
 net-libs/rest:1.0
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index ef501648e541..9accc94ac409 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 7c84105291f1..d164fb00e371 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-maps-42.3.tar.xz 2317328 BLAKE2B 365eb5cb8f7b20e2069338249418f5fad1abd47a1ab7ecda2d671dc97dfa45fb9f5687ae01fd605613c7ecf6eb9048aef6ab121cac0f455a42df9156581c87e2 SHA512 e52509603914de8f345a874f931beb68d11f718827b956a48464fe804c42559d977eacb0bbd5d4346b6329ab3f9169ac9afa8ef681f040c5b6a82b440b9786cb
 DIST gnome-maps-43.0.tar.xz 2330656 BLAKE2B 117a3558e29abe6a1bd29cf347b20a9e33f2b1cabd5310f28e387685e0bde96d1ce371c88616914f298e25ffbbc72b4d29e4fa721994b184e88289c6d0236ea0 SHA512 70966d6a092a67eb6a3a62627666376a71767d9296e00489a5aff281793425d9edd5e978deaf47bbd7d6b0ce37b53cf724b73487e101554c7984456661e193fc
 EBUILD gnome-maps-42.3-r3.ebuild 1571 BLAKE2B d89dd8060f01ab68fc9c33d84d1a4c320389f8a06621379bbc41dfcfbdfaedd018fbcd18c8de9204e08a8a732e5913f236ecce1050923fffca5bc69b1364983e SHA512 f2d232245df8b3cd350c448a2312e17eda7a509652124cf6b6aed4ebf9b4834a2478bfdcfc200060e5b0370e89b0ac7fb9c8cbf42b9688007937c65d56f59e5f
-EBUILD gnome-maps-43.0.ebuild 975 BLAKE2B c8aaf1f94a89693e0cff83f37314586c63002827cab0635322a6c71337fd67d5804ed3ceeab5576fab9bf7912fc2ebd15e8ab540e6494df5bd802cc079af0d8d SHA512 5ee90e7d3d63013f76c9a8799f67c0b16388af6b95f7f3f417d84d7efdf87249007dc1c9a3ef7bd7e4b4c0353b35c45a7dc00298e64a2ed2baad31af58d073a9
+EBUILD gnome-maps-43.0.ebuild 1214 BLAKE2B dae6bf86bb7024b419cc575409378b28ef9b445f70237413e679d7ca0ef69a9e526590be6df9225f5720bcc69bf2da95f3b19401b365c9d047459eaca4acbe33 SHA512 d5cfd0d485e26d399ee291e5e9cdf8214bfd396268631e26c367be3ad5a052aba6bc7c36e725054e78c0bcd653467ea4b8db2d8fb54466712dce273f690d6205
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/gnome-maps-43.0.ebuild b/sci-geosciences/gnome-maps/gnome-maps-43.0.ebuild
index 641eb6b58db7..60b7b5097144 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-43.0.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-43.0.ebuild
@@ -12,18 +12,24 @@ LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
+# Pure introspection dependencies found by grepping imports in ${S}
 RDEPEND="
 	>=dev-libs/glib-2.66.0:2
 	>=dev-libs/gjs-1.69.2
 	>=dev-libs/gobject-introspection-0.10.1:=
 	gui-libs/gtk:4[introspection]
 	>=app-misc/geoclue-0.12.99:2.0[introspection]
-	>=gui-libs/libadwaita-1.0:1
+	>=gui-libs/libadwaita-1.0:1[introspection]
 	>=dev-libs/libgweather-4.2.0:4=[introspection]
 	>=sci-geosciences/geocode-glib-3.15.2:2[introspection]
-	>=media-libs/libshumate-1.0:1.0=
+	>=media-libs/libshumate-1.0:1.0=[introspection]
 	dev-libs/libxml2:2
 	>=net-libs/rest-0.9.1:1.0[introspection]
+
+	app-crypt/libsecret[introspection]
+	media-libs/graphene[introspection]
+	net-libs/libsoup:3.0[introspection]
+	x11-libs/pango[introspection]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index eb76c4926abd..9e605ac9b4f9 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 32cbdbea3a88..d5e1bcf09b0d 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,11 +1,5 @@
 DIST flatpak-1.12.3.tar.xz 1555340 BLAKE2B 512b3f6abfb06d242aedad2c27c9870750254a9d0a3769999739f8885bbf1740b649e2a41f2c079532b049fcce8b58529572ea35e930437ed6b62194a73bcbb6 SHA512 2f39665457b4c3b99e32ebc88cf5b70202dba6118887617d3d7faa20f688f3f3fc14e343b70c0d11eb15ee743a68d07078e6cda14fd91aa10ca375797cfc95bc
-DIST flatpak-1.12.7.tar.xz 1562920 BLAKE2B e0bd3fcf8e0bc329c237ba409f82d6bfad1734101068966c11f03c9e45302680f590162b04e2314b5ed93324e61b4c06c33496dba7ba59778c885f50dd00d9db SHA512 425f9d330c649de1079f3286cb6ad8cf7b6e5838921effa4fd6f51020b9bf7991ded9071566ec7032b9868ef3f7e14d1fb7c2be96f903e3af23a075592b78f50
-DIST flatpak-1.13.2.tar.xz 1626616 BLAKE2B a896c1ef5166be9085c7b66bde3df510e4d592f920795706c7d0b68f717ccfd0694b306797a862d3db35c71ced5dcdb71438119d95ff5455b4b6a6b6adfa0d0e SHA512 d7e1d0a9965332220f829caa5724d7547280db10f7428b4e9add87152da1d7dad97edcde85668501d5a50e6a7c1031bfd15e8f4cbc7196e1c0f7cc3d2e333fe1
-DIST flatpak-1.13.3.tar.xz 1679196 BLAKE2B bae60931eabdf61ae7de057dcd99014c65a7eccc9ed91aa75358ee058a22c2f55bd004355e0b2c52f3668d17404dcc7083339fcce35f3920fa3953e22e0a2417 SHA512 8aeef0b0c00a958b04d3d40b9bc6fa6afd3b4875fea6aa4a64ed1fe4e5e67a6e17543fa42e20d7e0e99e22d26821fb392849206f27f1ee7c6cf4c78f8aed2cfe
 DIST flatpak-1.14.0.tar.xz 1636864 BLAKE2B f7f211480577eb5bd422c49790ebfb84da5e5a03cc6dee3815af786bfcd347bd7b01e853c027a42a1510fba68d667c4a25f6b9f998753466baae61a765c73864 SHA512 88f011534a8da6c2421d7d24043756bfe6c46957b6d09ba96b269002a5f0d0372b51f4a8643af2020ef4ed8c5b5f102994ddab54a7052cfba15f8e3b160e8a83
 EBUILD flatpak-1.12.3.ebuild 2355 BLAKE2B f9ebfea4165e01d8dec3a1a1b951e54faa716cf60d3fabc620f81f768117e3e71afd50b3d3da92f4fef2bce0445b4a378642d5c6ffad07430286f6a609ffba48 SHA512 50a22836eaa9db267ca87d4cb9c3df095013623182abbae65dc917def226f19419960e2d78317f053dfb3b3742d2773cbb66d79fd84d41cdc4f2b78a016705f8
-EBUILD flatpak-1.12.7.ebuild 2358 BLAKE2B ed0db5c59539c85be5a111a723aadbd4882b83452d2f4d17ac9b3eae2c8b4402ce57acc5c8d0d2adaf611504b9259a99944ba7a932951a019f8be5cef5632881 SHA512 a05185ba209ac0a96101dcf6483250e8b61fe6286dd7c81757f57c91c093228d38bf461e234031c83f5860f2ea8e2eac99381be27a55b1335c83cd621b09054b
-EBUILD flatpak-1.13.2.ebuild 2532 BLAKE2B dc2d7fafbf83738f1be4bafb06d4979810c3f963df9364f24ed6d455b0f22f46db2ef28a048c0f26ee48ef81a2d52d972571fe1f00fdd6696c2e5e899145afe4 SHA512 151d99f03271e17f01b2b3966d80a136d1ecfdd7a1e2611f04d0ab0f86e10b32847f3385e07919fe9584f1deaa88b5f775d0496f3380e9dedc72799c526534d1
-EBUILD flatpak-1.13.3.ebuild 2532 BLAKE2B dc2d7fafbf83738f1be4bafb06d4979810c3f963df9364f24ed6d455b0f22f46db2ef28a048c0f26ee48ef81a2d52d972571fe1f00fdd6696c2e5e899145afe4 SHA512 151d99f03271e17f01b2b3966d80a136d1ecfdd7a1e2611f04d0ab0f86e10b32847f3385e07919fe9584f1deaa88b5f775d0496f3380e9dedc72799c526534d1
-EBUILD flatpak-1.14.0.ebuild 2528 BLAKE2B b255d4c498b1fe0fd5b879bf4543227167ec627ad33220505e999e62013139e99860f04a67f3b5ff409062cd8647a5fca911e3bbf7bb01ff0e3c9e9a25a9713f SHA512 5c367fb85fb1cb18b6672f148fd911a58579b81608fd1c750286ddd41c7df6528564fe2d0618a92370314b414013a794fd5e7a2125230373a2bc80f520e3d679
+EBUILD flatpak-1.14.0-r1.ebuild 2485 BLAKE2B f067a7008a6af638fa5edfa147951b1cbd70aff96dc2e7ac50bf112043cc76a10a638a647ddc29cd8542450eb82e64342885c88221c79f821ff15ef7f927d049 SHA512 2355f7a9db06fc03d5dde8a8a9b9de87f9f36fbb8ed13caa8a367513cdb83c52e2a822d1e410f20bcd8c6e4ed02255659381c1cedbdcbac194f05cbd10066419
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.12.7.ebuild b/sys-apps/flatpak/flatpak-1.12.7.ebuild
deleted file mode 100644
index a440306275f6..000000000000
--- a/sys-apps/flatpak/flatpak-1.12.7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc introspection policykit seccomp systemd X"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	>=net-libs/libsoup-2.4:=
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	X? (
-		x11-apps/xauth
-		x11-libs/libXau:=
-	)
-	x11-libs/gdk-pixbuf:2=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-# pyparsing version pinned for https://bugs.gentoo.org/825230
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="sys-apps/xdg-desktop-portal"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable X xauth)
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.13.2.ebuild b/sys-apps/flatpak/flatpak-1.13.2.ebuild
deleted file mode 100644
index c542d3a34349..000000000000
--- a/sys-apps/flatpak/flatpak-1.13.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc introspection policykit seccomp systemd X"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-0.12:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	>=net-libs/libsoup-2.4:=
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	X? (
-		x11-apps/xauth
-		x11-libs/libXau:=
-	)
-	x11-libs/gdk-pixbuf:2=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-# pyparsing version pinned for https://bugs.gentoo.org/825230
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="sys-apps/xdg-desktop-portal"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable X xauth)
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/flatpak/flatpak-1.13.3.ebuild b/sys-apps/flatpak/flatpak-1.13.3.ebuild
deleted file mode 100644
index c542d3a34349..000000000000
--- a/sys-apps/flatpak/flatpak-1.13.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc introspection policykit seccomp systemd X"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-0.12:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	>=net-libs/libsoup-2.4:=
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	X? (
-		x11-apps/xauth
-		x11-libs/libXau:=
-	)
-	x11-libs/gdk-pixbuf:2=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-# pyparsing version pinned for https://bugs.gentoo.org/825230
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="sys-apps/xdg-desktop-portal"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable X xauth)
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/flatpak/flatpak-1.14.0.ebuild b/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild
index 601af539a594..cc9a529caedf 100644
--- a/sys-apps/flatpak/flatpak-1.14.0.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild
@@ -29,12 +29,9 @@ RDEPEND="
 	dev-libs/json-glib:=
 	dev-libs/libassuan:=
 	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
+	dev-util/ostree[curl]
 	>=gnome-base/dconf-0.26:=
-	>=net-libs/libsoup-2.4:=
+	net-misc/curl:=
 	sys-apps/bubblewrap
 	sys-apps/dbus
 	>=sys-fs/fuse-2.9.9:0=
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 10b7e24f7d9f..5c3893cbfe6b 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index d6f6c00caee1..fe7b94da207a 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -2,14 +2,13 @@ AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede5
 AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f29854eeb442179a415b5b3cab554b3aa4e2e3b06dabaa3e78ab506bb3b88b55a3fe4d53f1e43718bc6935a84dd477320c9349b70 SHA512 a15e8c415facd7b36761a747da9a0dfc47588d253a84b693c7f1f6e6334c6db5350af41f4c6c1dd83ae61695b2f761cc3b24339d7bb8f4dce972a672312ad942
 AUX gettext-0.21-CVE-2020-12825.patch 14074 BLAKE2B 67da10f81edf92004b8d1f4099c73c14b0e18471033eca17f63fffd05ee2a46d4cdd3bf165b6b7228f4dc9c475985ba69f7ba13e1a03eb84c7a8b74e003223e8 SHA512 92e9a6eeb1c9a697c1724785a9996da27ca2c08db69becb592eb1d42d9ec0e261591a5c6a2a04e010f8b6f5df7ef4cd94b2d0d4fcc0e98d2433519c1875be191
 AUX gettext-0.21-musl-omit_setlocale_lock.patch 1598 BLAKE2B 6b27ad4db1fcaed8b88345f47f75eb36580eb848ed3e914f2625c8136d34c1a13cd67ca043b2d42ee352d1214b3db0e3684b1be470072640bfc7c6892b78e2cb SHA512 04bf3d840c3687255f8333ae6de1af1774b80611fbfd69a9eff0b49bed74510a0e6c40768e1c1e52853221c2ee19ccad78a211500f0b1c05763670a1dbebbf70
-AUX gettext-0.21.1-java-autoconf.patch 1590 BLAKE2B cbe575a7f76665ae0d547ddcc66a0f35b61ee0d2deec428f8303840d292769edebd07555cb57b69d507ff746305ec0ab6b8f97f6c8335fb14cf6e7285a9b701d SHA512 8b13d86e28ddd7c8416099f45677d2574dddd5906dee0c7bb71e18ef719122ed03381f57b944267b9edf0de2357d6f21f01769b009ad45bd89e0e4d2e873f863
+AUX gettext-0.21.1-java-autoconf.patch 2280 BLAKE2B 79605c0ea6c5a56be1a6d586210ed40d913e30fd56c955c49a796a78e2f7d068ccdfdeb2b13ee68458612a40e6a7130e4e8d30661136cee888e7319cecce6899 SHA512 60948e0e45ea8628d6041448d4152696e3026e9d8d7dd4441977a0f8496976fb16cb8578d549287ab9d1a783cc764c9d7c3041d1e47bf1c789b5ff9a34a66dc1
 AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956
-DIST gettext-0.21.1-java-autoconf-regenerate.patch.xz 156632 BLAKE2B d1177ec194525019a3a95ae279983c652346549705cba429bb3ce62e73acab9d6c6d5ebcc100d00e1aa9598a54ac7bc4edb17fa416e5c8ad873caead8280f92e SHA512 d46e2a90000831857164e002c01b93094aa8b99a9fde0b21b9bed0747f35c239da70b0dd58227b9559f756fbf8f5a66bf84c8e2f44e7e53c68964cbe033c29b2
 DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9
 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
 DIST gettext-0.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf
 DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703
 EBUILD gettext-0.21-r3.ebuild 4676 BLAKE2B 44a27f8c9ca8b7093cbb6c53dfea6ad562da229c0c00ba2420a06cfa1e52e5fff178c1ac4ae1516f855e1aeef05b5aefc61add22f1ca3a12b6371090b07f41a9 SHA512 c11ef2bd673318196170021a272595a916b136524aa1ccc1450bdd66cec8a757d020a4cd8a4ed4ecbff5343ce482ded80485c80990b10d97749ce732c2f559fd
 EBUILD gettext-0.21-r4.ebuild 4885 BLAKE2B f59da97b1d94144305ed1783933510fd81a87e64ff2bb09ac5f2ece0dbf43123dcf70637c910c854b1946b232946acad6d012f7b2236f9a7e97e681fc96c322e SHA512 0b7d2469ef9733978bc42cd67cdc096e37cad952385309fbca8a9d32d5e5c5e528648aced7af144da5052b2c005be7a379165879bb8a93b9586b5b2d5b6f2862
-EBUILD gettext-0.21.1.ebuild 5180 BLAKE2B 913d564514c5b8667c50a46f291f0b0ee61407a0c3777211895ad57aee029d7c27d0d3a34225374a4201df266afefb9f425e2791b31f7869e8191fe0a89d4b44 SHA512 08a9332a93af7430991d3d2ee8cd959f49d8db86b824bc0cae8b406972ce480c1e63c0927ad4394e86d26487cd9c5505989302acb297a2ed07b365453294d3b6
+EBUILD gettext-0.21.1.ebuild 5164 BLAKE2B dbcc23d25da92e5aa5746efc6747f3ca9015f0751b1613b618684c29e9f269d4f21746cc5bc7749b3ef7734c3c18957ffb36263a8bf76681a723a8a7be0b69d0 SHA512 54cd2edf7560c6102b874ef5fd76b6a504195a25a478f153ebb06bfb311d752fbd6fb02164ea7b6f13dee2d92e2d79728c7b7ceb9c556baf06cbb97908c71446
 MISC metadata.xml 708 BLAKE2B 851174e455d052a1c3a4e0a5dbfeac2feb10781a54fa0bfb52b3934ed88a3f8a2437a922f3ce5b56e21aa6aaec3488539e151362e3441344f97c246b79e2c2e2 SHA512 9dbd43e82384160c392bcfa94a271951a754c2cbf116cf61659642660e93b4a82a7636d600cc8a83b68fcd2d92669e4b5b009334039ff66c58b92baa24961aac
diff --git a/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch b/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch
index 4ba6f48efccd..a7471ac724c9 100644
--- a/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch
+++ b/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch
@@ -63,3 +63,38 @@ gt_JAVACOMP_DISABLED inline.
    JAR=
    BUILDJAVA=no
  ])
+diff --git a/gettext-runtime/configure b/gettext-runtime/configure
+index 5e2d593..cf579ff 100755
+--- a/gettext-runtime/configure
++++ b/gettext-runtime/configure
+@@ -7070,7 +7070,11 @@ fi
+ 
+ else $as_nop
+ 
+-  gt_JAVACOMP_DISABLED
++  CONF_JAVAC=
++  HAVE_JAVAC_ENVVAR=
++  HAVE_GCJ_C=
++  HAVE_JAVAC=
++  HAVE_JIKES=
+   JAR=
+   BUILDJAVA=no
+ 
+diff --git a/gettext-tools/configure b/gettext-tools/configure
+index f897bc3..3af54cd 100755
+--- a/gettext-tools/configure
++++ b/gettext-tools/configure
+@@ -8718,8 +8718,11 @@ fi
+ 
+ else $as_nop
+ 
+-  gt_JAVAEXEC_DISABLED
+-  gt_JAVACOMP_DISABLED
++  CONF_JAVAC=
++  HAVE_JAVAC_ENVVAR=
++  HAVE_GCJ_C=
++  HAVE_JAVAC=
++  HAVE_JIKES=
+   JAR=
+   BUILDJAVA=no
+ 
diff --git a/sys-devel/gettext/gettext-0.21.1.ebuild b/sys-devel/gettext/gettext-0.21.1.ebuild
index 2783e6d936d3..56ec58f12489 100644
--- a/sys-devel/gettext/gettext-0.21.1.ebuild
+++ b/sys-devel/gettext/gettext-0.21.1.ebuild
@@ -5,12 +5,8 @@
 
 EAPI=8
 
-if [[ ${PV} != 0.21.1 ]] ; then
-	die "Restore elibtoolize in src_prepare and delete src_unpack."
-fi
-
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc
-inherit java-pkg-opt-2 multilib-minimal verify-sig
+inherit java-pkg-opt-2 libtool multilib-minimal verify-sig
 
 DESCRIPTION="GNU locale utilities"
 HOMEPAGE="https://www.gnu.org/software/gettext/"
@@ -20,9 +16,8 @@ if [[ ${PV} == *_rc* ]] ; then
 	S="${WORKDIR}/${P/_/-}"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-java-autoconf-regenerate.patch.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
 # so put that license behind USE=cxx.
@@ -71,7 +66,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch
 	"${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch
 	"${FILESDIR}"/${P}-java-autoconf.patch
-	"${WORKDIR}"/${P}-java-autoconf-regenerate.patch
 )
 
 QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
@@ -80,19 +74,20 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
-src_unpack() {
-	if use verify-sig ; then
-		verify-sig_verify_detached "${DISTDIR}"/gettext-0.21.1.tar.xz{,.sig}
-	fi
-
-	default
-}
-
 src_prepare() {
 	java-pkg-opt-2_src_prepare
 
 	default
-	#elibtoolize
+
+	# gettext-0.21.1-java-autoconf.patch changes
+	# gettext-{runtime,tools}/configure.ac and the corresponding
+	# configure scripts. Avoid regenerating other autotools output.
+	touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die
+
+	# Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac
+	touch -c configure || die
+
+	elibtoolize
 
 	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch
 }
author	V3n3RiX <venerix@koprulu.sector>	2022-10-12 07:39:50 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-12 07:39:50 +0100
commit	9f3ff9d79a788d420003387392ec40fd0548efae (patch)
tree	9dde8e6738d63f629a7879a0fd5949b1e7916b40
parent	c07955fffc8c82b9d37211c3f7f38455d7ef0599 (diff)