gentoo auto-resync : 16:02:2023 - 20:05:28

author: V3n3RiX <venerix@koprulu.sector> 2023-02-16 20:05:28 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-02-16 20:05:28 +0000
commit: 41e056b08e4c5c8d6e78407a5586afa52867fd5f (patch)
tree: 5c065bb2a5c9eb0386762c79e910ad74512def88
parent: b18dbdc69b2be6f0ac0db668b0bc57fb6f766afc (diff)
494 files changed, 3209 insertions, 2619 deletions
diff --git a/Manifest b/Manifest
index c1a9825afcc4..358c15fa78a3 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29437 BLAKE2B f0172b0d591df785e9b370e5053ca2fe1bd4632b80e736840ebf24446917e2bbfc100b3d49b3289f9fff571d6967a50605b4e579f81034257834b1f245f426b5 SHA512 f1a0897ecdc5bd279c125e51583c2bb14f58887cc321bd8a9914e588c79c364e4ef139fccd85e68e94532da876ed02db239b10fa7b63103121001f701221b04f
-TIMESTAMP 2023-02-16T13:40:01Z
+MANIFEST Manifest.files.gz 29442 BLAKE2B 83021e91dfd7a7229426562e83e60554a9882d6519460b0e13dbadd3e9bff3793882724b8d1ec94cec2e92f7118768ffa8c7c9e610ff45091055776c3ecd76e2 SHA512 ba65feb9c13189b202aaf6342d2016a4e67295ceec435890a9badf84b9d892e80421a2491250f014b8d154576811df8cb2093fd302942dc6ade68f3d4f870245
+TIMESTAMP 2023-02-16T19:40:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPuMjFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPuhplfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDpUhAAjLjLGipRvKPaQ3Y/HhnKDDV0S37/QlR6bEITFuCqA1xZ3qCmZcivwIv1
-9tJxGji4V5+YHQ1WHUOkDiNxfAYbZydE9b6tFruHY0c4wMPSPu6VV/SeJfllKUlu
-7jC1dgGV7+gSRa/POZMZTW4fkT0Htcaw2XwepnoiplKdUtztBobPIvf+DiNMFJ7W
-C6MHBv19SU3RlulLt+zpuaLhUggHtRsKf2iyfqPd52XzQyGBy5BchjXYX/Br1BUv
-790y12uGK7iST92y2KI1YkdGrXm3UdQc+FkieDK1HZMlSODlBXXnLr702CJCWxt2
-AohXUd4lhQyg/CLMpBA8o/fFEIqL7MbleXIPEt8ldiOPIRkNEIA/wkhNLqorPT2/
-ehyomc7UwtbXYfzgg51RNGKgfjET9jb6d718oHFVrSWcG4iGXT+alkwbkxwrnflZ
-/MErg25hUvUMhoQcQkXQsJZhEUcjKgzOqNDoFnWszQSXA4IEet8KltDu2GNmPsGv
-OxFH436h/xuQ0QbAQSAdbYNhHmo7BKOyXcdpv/1cnvj5Qgu7GHeETt9yf5C0QQrV
-13kIaXRAA+tzULo2h4oWu8e4Gfqh+nco3DVvA1tmrMf9SnDizq72c7gEGO+yqjUg
-51wGU+0RjZXlJ/c24UovEWUQNseo8HzZu1jR+R0/onhqZUeHd88=
-=4gvk
+klDAmw/+N2d/9bVjlbbDHDYceZl2uyHKhh7Y9iXFFRNtr9COcCXQd59YATIhFqdn
+8YJkVEh/w/ylSEiuKu9VTVJKgTZCmZAo/UlAFM1UerT0jmK70+NYtYI/fGUibG9R
+2Gp50krhVje0aDvmcXOpQ5hQGUFUShr3z/PPepXjRefEuhpUxynoxJbgX1XzfY6V
+ejHnqQ4MCbRTKX1/teO7ouJFDd/Bv15SjXxT3AQhp4aqsw29SRMggJLNgEPjaf3B
+/P2UapU6SzkTIkd+Xa+HK1vkB4jGwXiQAnxIO5A9On/m5LKfwIbl/a1XnNGJBHYC
+YX7yms7r6nXq7p6zobPzCewsS2jBsD9hZNUHS9sMitAPnOtal7GFiZjBH8z1SpGd
+OzHHjPc8G3Nnj0EZ0xH6TB9P+HRLSHvSU3N4aJiXUtNpNslyBlOLk7hbpRc/h1XN
+nKX3Hcge5vN12r00gphe5D4ivKPUD2jxMuFOJLAYX+OZ55FO+RXhdkha6Ny62ifY
+rkiZrDc61gwXkCLpq2BB3dvyGCw3u2WJR3nPjmczBsQOQTRAy85nRjlakz7V7pB/
+zB8i8+H8fRXqt6BFD6V3U91BAFtGsuyb37yeVIdCxHXekmF2Ex2FnKLjIg/ujoxB
+ImUlWDcpeoAkVgkMnjFpzWLJkgxKMDx5EMj74yInnplYYDn0K7s=
+=DEFJ
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e9e83eb2d166..62fbe2671f4d 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index f3632a22cd98..04390691651c 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 8af23a5602b2..d7490456c807 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -6,5 +6,5 @@ EBUILD borgbackup-1.1.17-r1.ebuild 938 BLAKE2B f01a5f702298718b07d23473eaa0047f4
 EBUILD borgbackup-1.2.1-r2.ebuild 1124 BLAKE2B beb6271de271d12bc2a02fd7372ab053e63f7606495651c1ea36f5477b610371497a16db8eef8b162c137de8160e4b0c5604d2490a5bf83f1b959bd4dd4f82ba SHA512 0dff31336f638500eacf32589f9dc10f41bad357bd1a3bf15ce847f73beaa25db87e7e28d86eaa101f94cef47dfa59b50645bd9da2f2d028a00f60e58a4b4471
 EBUILD borgbackup-1.2.2-r1.ebuild 1402 BLAKE2B ac246576effe0f9316671aa58ed9a52f5943158511c9bf116829b94f3d3bd2bc160e59d181e2a8c118dec926f3d0923617e1d729541d9de30d9b044c0c4bddeb SHA512 f91918aad8e2ac23b85213c1c7a00c2fc7ea6774e3bd4981c180bb6c351b5696d896d87627d14ec73b0b2d7d8d6679970361c4b9a36c72b8265bd5edf48cfc7c
 EBUILD borgbackup-1.2.3.ebuild 1404 BLAKE2B d8f78182fc7b99cf40a0e0661e521e3a0c4d3afab3a52946a70e4c102dc67bf3c1a7026118903882e17f18afccf5b3d6d0ae8c5e3ab7aa28d9dbc0347245b673 SHA512 be5160ef31474fe2a485ddf87ff0e8bb8ae5d2186b6da7f4a2a2d8d63237f8922e856a8d067ba537768aa961f5ee8fdb0bea5a2bd1f975aeacffd6e302f78fa2
-EBUILD borgbackup-9999.ebuild 1126 BLAKE2B 545c43a4e76190f2c981c336c940a29f10a13ed2af2a1453c5a6aa6c59a9358f2063a3a113db329360a26abbb7ee668ce85fb317ee7b6eebba038528398dc768 SHA512 943174448ca0cb31c714b215fc839847b54ce2b10d1bb03462db51362ae82227a3574d5e223b4d96a99891f2bddd369057e2dcf07f0fd3d3027b3eea16d28047
+EBUILD borgbackup-9999.ebuild 1126 BLAKE2B 279781d2c60340bf4a64050bb496592353d4d25ca60c49525d69d8f4c4adc627d85459c9f90fae12b4e7943a45cd54d52ba89cb2792d712b3c7682c4ef372509 SHA512 f002485e33775dc08a0c812006ea783dcc312f0b82ea748bc41e26b1ecd9a681e2d1ec7f0f3457d5f7af153a23b325ddaa5edb2c1864d53bd3150058a7f61b23
 MISC metadata.xml 381 BLAKE2B 7d88d921d297d20ca4340b7592601ca13c6fbb1bf6117c922d992f18ca94c4007af6083e652ee9df39331d5ce759ee4b10bfb0624f15ca3c424c8b7531b9eb93 SHA512 66382cf5e3c189410fd97bb4b19e24b8302aa25a15db9b47191a19cf5a27f7ca3be80e053e49ae8f8e6b85b4151e1219b87f0ed1b23b4ce302ad05d41f306797
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index 0371f36ba38e..be1e1d114458 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 401d923eff02..26206fc8e114 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index c7beab68f4c0..aa0df585d027 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,12 @@
 DIST certbot-2.1.0.tar.gz 1327451 BLAKE2B c4694622648427146574aa7c056d5d76dc3c4f6b8487a506d1c4996239f979d89ca26980b2ffbaab975458d0691acaa07a46a75098b6146e6e3c51e6eaa64be0 SHA512 83c3a6abeffb135cebd0d0f4561f3814039962e3b895aaf7bef6570641fccda2da04f1a6110c5e90d6ed3346402cbb3ff543b0a096e8e18f6345edd22da643cc
+DIST certbot-2.1.1.gh.tar.gz 1327548 BLAKE2B 21ce7d88bc101147be237201d472f43ea71adafe37789b0a46d7d87b0bc0f1270044386507bc516beb658633cbaebcade06e0f7f6f833848e10660a6b0a09279 SHA512 9bd5d3259954fbf09287a74532ad73a6271ed07bac0e3593edc08662d562e8939982a92daca3eb5d6e6516ab530e15e0594124465e6f6608b004594418e34042
+DIST certbot-2.2.0.gh.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
 DIST certbot-2.2.0.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
+DIST certbot-2.3.0.gh.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb
 EBUILD acme-2.1.0.ebuild 1140 BLAKE2B 4f646f46a985e09549e659f696b781eb69e2b2773bdddbcc3a7f1f71ea4e2b77b56ef1df933ced67bc351208066d4695351fb8ffc19cc8f6333b96fdfeacd5e0 SHA512 da095bc1131b61c20638116953cd267bb63c47cc321039cde25cd69ef7c9090009a2f0f236029c4871bb7112f0db02bf5645516f5f812accb5498b53fe2b757c
+EBUILD acme-2.1.1.ebuild 1404 BLAKE2B 84c2396d7abc854ab81ad63158e61063e718615887dd2b5e9952dd1c4f233c9ea8ee05753ae2c9287f6374afa06f8a69bd2784ea5ef2c7acf322e696723212b3 SHA512 12addf2938ec2473276b0b307e0acef15876fd50e51dc746913b287a65fa24d50c4d869a020482a86672725cb268618ef8671b5ecfcbacfc9aec0346da31132a
+EBUILD acme-2.2.0-r1.ebuild 1404 BLAKE2B 84c2396d7abc854ab81ad63158e61063e718615887dd2b5e9952dd1c4f233c9ea8ee05753ae2c9287f6374afa06f8a69bd2784ea5ef2c7acf322e696723212b3 SHA512 12addf2938ec2473276b0b307e0acef15876fd50e51dc746913b287a65fa24d50c4d869a020482a86672725cb268618ef8671b5ecfcbacfc9aec0346da31132a
 EBUILD acme-2.2.0.ebuild 1140 BLAKE2B 4f646f46a985e09549e659f696b781eb69e2b2773bdddbcc3a7f1f71ea4e2b77b56ef1df933ced67bc351208066d4695351fb8ffc19cc8f6333b96fdfeacd5e0 SHA512 da095bc1131b61c20638116953cd267bb63c47cc321039cde25cd69ef7c9090009a2f0f236029c4871bb7112f0db02bf5645516f5f812accb5498b53fe2b757c
-EBUILD acme-9999.ebuild 1142 BLAKE2B 05a872a349c4de0d24143753f15e3c715f8ad7910560176aebc850e2ecb84b46e2985b656615f81cc7161cdddcafa61529624646a58a56d3252c28d11b8678d7 SHA512 a74dd190c1257303f504a2532d83c9b6113cccadcfde58414b0fcfde0dc6bc009ac54bb1a8004e3d38ef23df88d29d753f9226c3faf6bb8a7fdc61765f192923
+EBUILD acme-2.3.0.ebuild 1404 BLAKE2B 84c2396d7abc854ab81ad63158e61063e718615887dd2b5e9952dd1c4f233c9ea8ee05753ae2c9287f6374afa06f8a69bd2784ea5ef2c7acf322e696723212b3 SHA512 12addf2938ec2473276b0b307e0acef15876fd50e51dc746913b287a65fa24d50c4d869a020482a86672725cb268618ef8671b5ecfcbacfc9aec0346da31132a
+EBUILD acme-9999.ebuild 1404 BLAKE2B 84c2396d7abc854ab81ad63158e61063e718615887dd2b5e9952dd1c4f233c9ea8ee05753ae2c9287f6374afa06f8a69bd2784ea5ef2c7acf322e696723212b3 SHA512 12addf2938ec2473276b0b307e0acef15876fd50e51dc746913b287a65fa24d50c4d869a020482a86672725cb268618ef8671b5ecfcbacfc9aec0346da31132a
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-2.1.1.ebuild b/app-crypt/acme/acme-2.1.1.ebuild
new file mode 100644
index 000000000000..75bfed79eb0c
--- /dev/null
+++ b/app-crypt/acme/acme-2.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+PARENT_PN="certbot"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
diff --git a/app-crypt/acme/acme-2.2.0-r1.ebuild b/app-crypt/acme/acme-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..75bfed79eb0c
--- /dev/null
+++ b/app-crypt/acme/acme-2.2.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+PARENT_PN="certbot"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
diff --git a/app-crypt/acme/acme-2.3.0.ebuild b/app-crypt/acme/acme-2.3.0.ebuild
new file mode 100644
index 000000000000..75bfed79eb0c
--- /dev/null
+++ b/app-crypt/acme/acme-2.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+PARENT_PN="certbot"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 3c6be147f57c..75bfed79eb0c 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -4,26 +4,46 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
 
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+PARENT_PN="certbot"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
 else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
 DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index e2e99c8a2eca..cc88f5979fe1 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,4 +1,10 @@
 DIST certbot-2.1.0.tar.gz 1327451 BLAKE2B c4694622648427146574aa7c056d5d76dc3c4f6b8487a506d1c4996239f979d89ca26980b2ffbaab975458d0691acaa07a46a75098b6146e6e3c51e6eaa64be0 SHA512 83c3a6abeffb135cebd0d0f4561f3814039962e3b895aaf7bef6570641fccda2da04f1a6110c5e90d6ed3346402cbb3ff543b0a096e8e18f6345edd22da643cc
+DIST certbot-2.1.1.gh.tar.gz 1327548 BLAKE2B 21ce7d88bc101147be237201d472f43ea71adafe37789b0a46d7d87b0bc0f1270044386507bc516beb658633cbaebcade06e0f7f6f833848e10660a6b0a09279 SHA512 9bd5d3259954fbf09287a74532ad73a6271ed07bac0e3593edc08662d562e8939982a92daca3eb5d6e6516ab530e15e0594124465e6f6608b004594418e34042
+DIST certbot-2.2.0.gh.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
+DIST certbot-2.3.0.gh.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb
 EBUILD certbot-apache-2.1.0.ebuild 945 BLAKE2B b15e840664c92ca2a64b290bdb3ab38242fffa7bb8029a559d99121e145112755b6f7924b058dbb112fe35fc612c49707853e9ad39b5ab93ec694e749c94715f SHA512 2cad3714bc92d1285297f7210332b5d2b700fe1414eb52ad36e1f8f083b92219c683cf2df51c4a0daaabd1bd31d10eaf72f0a7c03d61054b0ad55d94b55247eb
-EBUILD certbot-apache-9999.ebuild 947 BLAKE2B 669bf36bb3ad913d1b1abac0f2c1b064bf95d9c0d3e903cb20b288f9eacab4b0c195fb8174ed35fc91504dd0d1d9f7d78d6fa3d8bd53ab1e3857226634a8f9a4 SHA512 033e2c49ae2df344961aad0ce5dbb86ef4657aaa5956b5c898d2215ae4a1a630ef48d1dbf42551c32bea120d774aacdec7fea7be7dbaccf1a1b05ce14579d138
+EBUILD certbot-apache-2.1.1.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
+EBUILD certbot-apache-2.2.0.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
+EBUILD certbot-apache-2.3.0.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
+EBUILD certbot-apache-9999.ebuild 1078 BLAKE2B 4c6a746c517a83b34a69b3501317ccf29a341c5c5e02e8a0129992e53c757af939582566694a3c927801bfdc0d8a743a83b81ac76a523a0a7be0bc283eb0e747 SHA512 776da4da5cee6e6840e323aab45f741e16821ed5231f600fe7454016de55c040863bdaa70f5f4f8cb4f88e8d8d5f123d51487268dc15770e4496267990a41992
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot-apache/certbot-apache-2.1.1.ebuild b/app-crypt/certbot-apache/certbot-apache-2.1.1.ebuild
new file mode 100644
index 000000000000..4d1707d36f00
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-2.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+PARENT_PN="${PN%-apache}"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	# Only for amd64, arm64 and x86 because of dev-python/python-augeas
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-apache/certbot-apache-2.2.0.ebuild b/app-crypt/certbot-apache/certbot-apache-2.2.0.ebuild
new file mode 100644
index 000000000000..4d1707d36f00
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-2.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+PARENT_PN="${PN%-apache}"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	# Only for amd64, arm64 and x86 because of dev-python/python-augeas
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-apache/certbot-apache-2.3.0.ebuild b/app-crypt/certbot-apache/certbot-apache-2.3.0.ebuild
new file mode 100644
index 000000000000..4d1707d36f00
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-2.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+PARENT_PN="${PN%-apache}"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	# Only for amd64, arm64 and x86 because of dev-python/python-augeas
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index dc57dfbcdc28..4d1707d36f00 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -4,30 +4,47 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+inherit distutils-r1
+
+PARENT_PN="${PN%-apache}"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
 else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	# Only for amd64, arm64 and x86 because of dev-python/python-augeas
 	KEYWORDS="~amd64 ~arm64 ~x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 
-RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
+"
 
 distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index f96d82a79965..b5177178a3a6 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,4 +1,10 @@
 DIST certbot-2.1.0.tar.gz 1327451 BLAKE2B c4694622648427146574aa7c056d5d76dc3c4f6b8487a506d1c4996239f979d89ca26980b2ffbaab975458d0691acaa07a46a75098b6146e6e3c51e6eaa64be0 SHA512 83c3a6abeffb135cebd0d0f4561f3814039962e3b895aaf7bef6570641fccda2da04f1a6110c5e90d6ed3346402cbb3ff543b0a096e8e18f6345edd22da643cc
+DIST certbot-2.1.1.gh.tar.gz 1327548 BLAKE2B 21ce7d88bc101147be237201d472f43ea71adafe37789b0a46d7d87b0bc0f1270044386507bc516beb658633cbaebcade06e0f7f6f833848e10660a6b0a09279 SHA512 9bd5d3259954fbf09287a74532ad73a6271ed07bac0e3593edc08662d562e8939982a92daca3eb5d6e6516ab530e15e0594124465e6f6608b004594418e34042
+DIST certbot-2.2.0.gh.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
+DIST certbot-2.3.0.gh.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb
 EBUILD certbot-nginx-2.1.0.ebuild 963 BLAKE2B 0fad597f96072a9abe43c8d858fc4ba07919c86a9114d4ba6b5d43c9550764069da6269033e18599cbaab07b7116cf562ecf42cabd558542c5ac57e36f6d147e SHA512 e8193522bb6a126e8631cdc78573f8575d32e2b1b8ca75090be54345e182cd1c85a1b5c6570ffa38e913a582e6d04ea02d3cd8d4fb397d9efc20c61034857f13
-EBUILD certbot-nginx-9999.ebuild 965 BLAKE2B 18a5fafbffe91b6784013eab28e65cdb79fe117aa7ba323ee7339645ee3a03ea88d5e0f4f82e4281c6f797349ce143b76915b1318c6d319b82aa31f9e2077cc5 SHA512 33807633b467962032715453b2fd1bf7f861f5c2553e5d1acb25c78aad98a66c6ad5c2f42cd11e8a044dbe6f32b67e23cfc07ba6823e9008e664b6a6f8f65fdb
+EBUILD certbot-nginx-2.1.1.ebuild 1079 BLAKE2B 25f25630c9d658a0bc7cb6dabc1242e80c8d0eaeb17d878709193bcf1960a9c60684fb75f47a4e4dea4a67d862450761fa3e0d1101d88cb2d0ba46d3ed34b78a SHA512 47e43d89b84cf7b73c75df5ae02bc580effc1246556ce86fc2b9683f9ef871da8ca8f0620da19d39a87c71fec75e102e8924a005957c5ecf683404082d80a227
+EBUILD certbot-nginx-2.2.0.ebuild 1079 BLAKE2B 25f25630c9d658a0bc7cb6dabc1242e80c8d0eaeb17d878709193bcf1960a9c60684fb75f47a4e4dea4a67d862450761fa3e0d1101d88cb2d0ba46d3ed34b78a SHA512 47e43d89b84cf7b73c75df5ae02bc580effc1246556ce86fc2b9683f9ef871da8ca8f0620da19d39a87c71fec75e102e8924a005957c5ecf683404082d80a227
+EBUILD certbot-nginx-2.3.0.ebuild 1079 BLAKE2B 25f25630c9d658a0bc7cb6dabc1242e80c8d0eaeb17d878709193bcf1960a9c60684fb75f47a4e4dea4a67d862450761fa3e0d1101d88cb2d0ba46d3ed34b78a SHA512 47e43d89b84cf7b73c75df5ae02bc580effc1246556ce86fc2b9683f9ef871da8ca8f0620da19d39a87c71fec75e102e8924a005957c5ecf683404082d80a227
+EBUILD certbot-nginx-9999.ebuild 1079 BLAKE2B 25f25630c9d658a0bc7cb6dabc1242e80c8d0eaeb17d878709193bcf1960a9c60684fb75f47a4e4dea4a67d862450761fa3e0d1101d88cb2d0ba46d3ed34b78a SHA512 47e43d89b84cf7b73c75df5ae02bc580effc1246556ce86fc2b9683f9ef871da8ca8f0620da19d39a87c71fec75e102e8924a005957c5ecf683404082d80a227
 MISC metadata.xml 335 BLAKE2B 048854ec6bc919f9bf9b0bc74e7c291841cbfea0e571f43437937c5dd78cc65f9df53463adcf313441e01323491709b462bd9bc364876eb1508a83b3426b6b78 SHA512 25ac45574a568e362c419dfbeade4a977afa2885e7b32fb4c3d4c765450b09aa98cf419df1a39ab194518ad6f2b582e162d4dd4eec14f278635d63bf66352523
diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.1.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.1.1.ebuild
new file mode 100644
index 000000000000..8d6ad2deaa37
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-2.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+PARENT_PN="${PN%-nginx}"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Nginx plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.2.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.2.0.ebuild
new file mode 100644
index 000000000000..8d6ad2deaa37
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-2.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+PARENT_PN="${PN%-nginx}"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Nginx plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.3.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.3.0.ebuild
new file mode 100644
index 000000000000..8d6ad2deaa37
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-2.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+PARENT_PN="${PN%-nginx}"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Nginx plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index fcd983ae8be0..8d6ad2deaa37 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -4,32 +4,47 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+inherit distutils-r1
+
+PARENT_PN="${PN%-nginx}"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
 else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+DESCRIPTION="Nginx plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
 
 RDEPEND="
 	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
+"
 
 distutils_enable_tests pytest
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index da91ddca5f72..6f0637328bad 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,12 @@
 DIST certbot-2.1.0.tar.gz 1327451 BLAKE2B c4694622648427146574aa7c056d5d76dc3c4f6b8487a506d1c4996239f979d89ca26980b2ffbaab975458d0691acaa07a46a75098b6146e6e3c51e6eaa64be0 SHA512 83c3a6abeffb135cebd0d0f4561f3814039962e3b895aaf7bef6570641fccda2da04f1a6110c5e90d6ed3346402cbb3ff543b0a096e8e18f6345edd22da643cc
+DIST certbot-2.1.1.gh.tar.gz 1327548 BLAKE2B 21ce7d88bc101147be237201d472f43ea71adafe37789b0a46d7d87b0bc0f1270044386507bc516beb658633cbaebcade06e0f7f6f833848e10660a6b0a09279 SHA512 9bd5d3259954fbf09287a74532ad73a6271ed07bac0e3593edc08662d562e8939982a92daca3eb5d6e6516ab530e15e0594124465e6f6608b004594418e34042
+DIST certbot-2.2.0.gh.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
 DIST certbot-2.2.0.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
+DIST certbot-2.3.0.gh.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb
 EBUILD certbot-2.1.0.ebuild 1256 BLAKE2B 29b895745e82d4016d9f55023bbaeeefa6e2e17b013a1b4fb25071016f40cadf3c60053e45f7cc8bc39d2b221292e7093ff35dc13b1775173171cbfb21e325eb SHA512 e24f48e4fb40ad6c4a61ad062eb1a7395c7c8134c15d563d3abf04122446626d6b1fcc92d8b55409301894372abf56e8f4765bbd3c900b9c2542baa79d97dc5e
+EBUILD certbot-2.1.1.ebuild 1507 BLAKE2B c9a7711e88642b0b80f8a9749b4ea3f4a53faa7229ba0e8028aec505ee1aff3218c2ae643eec94a024a1ad52a7385fba850a64020fc7069e71d41396a4046b50 SHA512 14a3e03c705d015fe60e60474ef1262e31b81646a3162f8e1319d70c4e039c5d0c316fd61c7f36f01daa2f60751fe046c63274b53e2ed01262a0ed1f7add5c8b
 EBUILD certbot-2.2.0-r1.ebuild 1295 BLAKE2B 49f0a54230986180a3a2e321a2ae3a561de3a5df005a8de32bfdeb45a5d9c9b11d9b32bcb08111cff06e921b60022a979d335d0677809e01f7765b9a848078db SHA512 b533a875ec16a7e5a19ed1742c241491eefce0f796192ca142464a396da57334006e34721128fecfd4217d8b92da2e5b86c4ed8f16078151903b240922c86e83
-EBUILD certbot-9999.ebuild 1297 BLAKE2B e526694dfd08eef69c76a3b367d420c7d6f8e8fcea83db12cbccd32dae932f70022cf645c91ded5d1eb2bd73f2958b151fe2074ac447f90c0ee8f69395425a4c SHA512 6ed2b0768844adb8ca55fff541aa6a9c051ca99b9986def77190304841800e278847e4f03002e266cd51529d5211e39661bed7d9a2e37003a4a2d4536402148c
+EBUILD certbot-2.2.0-r2.ebuild 1546 BLAKE2B b26f23c78d58387d48f22151be2a06a3fb746c061b6860fbc65c23edc9a348afa1e20adcec4570041a517c8d0ec51bdee833e8214ab8183b137920eb66355e6c SHA512 e208f49c909a75bf1cbecf9c8d8c987cdef255252d39e6a03a1c801b0a5939cbf819ef1424ddfa75acc5b91c9477351bd74d80956cb7277d88b4a7ad22fb34a8
+EBUILD certbot-2.3.0.ebuild 1546 BLAKE2B b26f23c78d58387d48f22151be2a06a3fb746c061b6860fbc65c23edc9a348afa1e20adcec4570041a517c8d0ec51bdee833e8214ab8183b137920eb66355e6c SHA512 e208f49c909a75bf1cbecf9c8d8c987cdef255252d39e6a03a1c801b0a5939cbf819ef1424ddfa75acc5b91c9477351bd74d80956cb7277d88b4a7ad22fb34a8
+EBUILD certbot-9999.ebuild 1546 BLAKE2B b26f23c78d58387d48f22151be2a06a3fb746c061b6860fbc65c23edc9a348afa1e20adcec4570041a517c8d0ec51bdee833e8214ab8183b137920eb66355e6c SHA512 e208f49c909a75bf1cbecf9c8d8c987cdef255252d39e6a03a1c801b0a5939cbf819ef1424ddfa75acc5b91c9477351bd74d80956cb7277d88b4a7ad22fb34a8
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot/certbot-2.1.1.ebuild b/app-crypt/certbot/certbot-2.1.1.ebuild
new file mode 100644
index 000000000000..4155b78a684e
--- /dev/null
+++ b/app-crypt/certbot/certbot-2.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="selinux"
+
+S="${WORKDIR}/${P}/${PN}"
+
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/ConfigArgParse-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	selinux? ( sec-policy/selinux-certbot )
+"
+
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-2.2.0-r2.ebuild b/app-crypt/certbot/certbot-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..a8c222abcae4
--- /dev/null
+++ b/app-crypt/certbot/certbot-2.2.0-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="selinux"
+
+S="${WORKDIR}/${P}/${PN}"
+
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+# See certbot/setup.py for acme >= dep
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/ConfigArgParse-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	selinux? ( sec-policy/selinux-certbot )
+"
+
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-2.3.0.ebuild b/app-crypt/certbot/certbot-2.3.0.ebuild
new file mode 100644
index 000000000000..a8c222abcae4
--- /dev/null
+++ b/app-crypt/certbot/certbot-2.3.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="selinux"
+
+S="${WORKDIR}/${P}/${PN}"
+
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+# See certbot/setup.py for acme >= dep
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/ConfigArgParse-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	selinux? ( sec-policy/selinux-certbot )
+"
+
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 729204440566..a8c222abcae4 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -4,27 +4,46 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+inherit distutils-r1
+
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
-S=${WORKDIR}/${P}/${PN}
 
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="selinux"
 
+S="${WORKDIR}/${P}/${PN}"
+
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
 # See certbot/setup.py for acme >= dep
 RDEPEND="
 	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
@@ -36,8 +55,8 @@ RDEPEND="
 	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	selinux? ( sec-policy/selinux-certbot )"
+	selinux? ( sec-policy/selinux-certbot )
+"
 
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 8101913bc437..f3c4974ea8b3 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index 8f45be638e88..7dcd2b362839 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -4,5 +4,5 @@ DIST spice-0.15.0.tar.bz2 1537970 BLAKE2B 98e8f55de81a86c6370e4a74c0fd90db78a9a8
 DIST spice-0.15.1.tar.bz2 1623290 BLAKE2B 19ddb3cac91be07a4a358ed89a5e4d1a5c406a9831b8c8a518764055354ecf6e09d129ae03ba65d876669da72f2cbf0c307261564097f60951711e9852eebb69 SHA512 362ab2f0b483911830693834515e1d331a6b929c5c63fd4522e843c42bbb7d8a52510d60f5f17d175dd2617c9621630f6a81f3ff7dce11dc28e6fb135e60fa86
 EBUILD spice-0.15.0.ebuild 2604 BLAKE2B 40d0d68bfd8232c0374cfa5dc008b2517a2b29d18adf1f1586a01476e267005aedeaae3e4bd73aba253bf745d6f4f21a84d02b37f58bd9ded36495bb0188c407 SHA512 33ede49338fd89cd78b8e8ee1729cf41bd643f64499581a3db4544dbb869f4d01cef213e5f160a6b45db6161e7116591fbd6028569e1aff55f3624831c9e829f
 EBUILD spice-0.15.1-r1.ebuild 2485 BLAKE2B 8d38cc6c6fe738024815ebeec08b1b0c1b6141b3252b50c3347d0c00a6945caead8899a5271ef64b0797c8791a714a480bc61b86353bb879ac2e77e73058b7ea SHA512 5857b8bb593e4c13117db7d7a89aec38625330febef51ad452a35fa70ca4e547bd80bcba68831b02fea95b66225e8c4d7898df4a23919a13e8e7bb48a44c4c01
-EBUILD spice-9999.ebuild 2324 BLAKE2B 7af71e8dad3a90bccdb1f7d12115bee9268782d05c3da69b5a6d1f948a9e0d1816ea45d070fef7a5239923ddb0c1b381a512e96f27251cfbe484d3d8e579e0f5 SHA512 5672dd484b296f7fa11fea1409361a2c7d5691affe135afbc0503ee155c9f9142df36812ca663a0ea80d7f84feda2bca36f53e113763705208404ce19ea0eabc
+EBUILD spice-9999.ebuild 2325 BLAKE2B 1a54f0320352d0df4a840b2b08c493e931dd4dcd28fdd7765c76b8c57e4cf8ca5b436bb8985a0450805156e7705db15a67ecf9bc91d7faf342f1f0afae88ec27 SHA512 f519394f922373f99be2615bc438e3b4a2d42f92afb4c64e608445328ca7897e05ab60e9192c6174f690f770cc090f081ca153a5c1761efc6be7aca678d312e3
 MISC metadata.xml 386 BLAKE2B 0f119a27a56d18c4229d807d0a8ed56816ff5d85ff3366b763f25ded218cfabd823cb7ca7fb695cf1c079d75bc0e02df13daef5186c61937db8a572489a4a055 SHA512 b977a2ffba331a37f0c26e01558b8d12beb586f24904cc5f26687973547021caf6c377479de86bc27405346f4dcd49130c5281d7c9d1b37b7809a70354eac37f
diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index a2202f928bd9..8b1ec904e164 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit git-r3 meson python-any-r1 readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="SPICE server"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 0670df49a450..37ed83a8b10f 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index 8446622ca386..d25268b12177 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -2,6 +2,6 @@ DIST libxml++-2.40.1.tar.xz 955220 BLAKE2B 44c55ab0e9018af859097e1a753c1457f5694
 DIST libxml++-2.42.2.tar.xz 848924 BLAKE2B 75c28447b41e50f1484a8670042af819f90619acd36eaea3bf68ed197745836c3ede38c208a851e59a345cb2657989f569fd0129724916f87d90105ec3c0fc2c SHA512 214da4c8120fedc96adf6ad965b65be9f4deb53d86f41667c236c52e1e3aace819fc61b096815879cc38aaf12ac77fbccb050088ce6bc3ff03030dcc81e4a8c9
 DIST libxml++-5.0.2.tar.xz 796484 BLAKE2B 57809c52ab38c359b453515805fff9631c1c7614f313fe8234384fa485c08a166dad66dad0c3caabc8c8698111c6702e568f73472269855c5290956e9d130bdb SHA512 f0fc0d2e2bc14eeefb9d4a6bec661a2377a60874c877cdddaadadce1d22e5186516a37587fc67ed570858e1871164e30535b779fd2fac12475ef6fdfcc2e3469
 EBUILD libxmlpp-2.40.1-r2.ebuild 823 BLAKE2B 6ec040a8204a91bfc25ec328ac5faee112c5ea8c5d9e817fc1672750d622ae1080790279a75301b64c843dde7d055e32e05551ceac7be709c44f8bed682dc583 SHA512 ea6684a160055b6ae5b9cfe8ec6f38ac7f06098c8e081acc636c597f0d1011f8b0fe905800393b525e6cd8136b6aa7f5d650f5030f038cc511e109a5d0d78202
-EBUILD libxmlpp-2.42.2.ebuild 1304 BLAKE2B 632d5e29153f6961c256e6be0bac7e358d70ee71946a4a97813116881bedf34486e8787085108efc951bca5f7723649771bf152d27858b163df07c4d1d3dd0d5 SHA512 ff4c94627c091a6a494b07e1f720a36084f941b5f73afec7de46b50fefffa8294041b533c764bba4c0321c9d23529fb70bb4de731ba292b3707b8a6865f00df9
+EBUILD libxmlpp-2.42.2.ebuild 1302 BLAKE2B d926d736ed41d51725a30b2c868d61af49631086ff9882fd0b80d7a7d0b90b81a2b35b8cc61886cb9171f8f0ffbe770402dcec78c75e70d86ebef482a67a4cd8 SHA512 498c485d3fa6bd6263ae853faf47a800e261bd52530d2702212ba848f33e4db14bf80617e2c16edac268f8c8550e05a66bcd4594ce532086ce0598f9cc69812b
 EBUILD libxmlpp-5.0.2.ebuild 1207 BLAKE2B 8f62b05523c0db5d8005a984e5b07a3712ea9f2dfd9511df69aee2e8da896d77b5ac2a1be87f9cd3b6ed7511126af64bb7b6aab95e108d3912b2dd9f9bda2149 SHA512 c514eb12d2c1c0480a9e775b751f1d235a3adf452217b2b82c188a127e0a0a11b92b27a95ae1671609e339952cd813b5a9750485bbda92b995647f431da8a959
 MISC metadata.xml 358 BLAKE2B 8b582150db49d0c4ac43268c59fa182078c0c2d8e4b7db6f4a0008cc4bc0376038024de6adbbd438528025419d480c456d1eca6e4b27bf7cd610730ba2af5940 SHA512 fc5f35fa1bab9635e576db3cff7b5151ca60a74401cbe182dc2aa923717a10ca87002773339c2fbf234feddd8f16a7c7a2f6b47ea8fd14424cbf7f900effca57
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.42.2.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.42.2.ebuild
index f373c399cec4..08d8164c6c9d 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.42.2.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.42.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index edfd6d2fa8cf..df932f0b7f6b 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index 715c34508dcf..c9c49ac88dda 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -3,5 +3,5 @@ AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107b
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 AUX openscenegraph-3.6.5-cmake_lua_version.patch 440 BLAKE2B 51a35309b01a096f9423ff64e66d62f99d3e26bd898db0b53c135dc99318b236a1b129211f51de9b1a29d054e0810aa4ff2a7c307dc4b4a606eb4075a60748d9 SHA512 a41c7a65b1cfd0dabc080f509cf288f575b3ec5d7666a4a889a8c3156e9d32559e1f802e23783c5c70376c82a24dd87813e9bfde0876085e0e3967b47852059a
 DIST openscenegraph-openmw-3.6_p20221115.tar.gz 5789008 BLAKE2B 312544e8cb06146f1ba4f2ba87cbb7abcea166bfb88fb0252ab003eb35f6b84e96f85ca9d9f07a78a9b8fe692b43a976f57c2f4b326fc8612f564f8fa2baadd6 SHA512 0f54d98069674d016bfca08512d8322f3a744eb21c6ab7c798dc11896aba85270a64404e24f217217f5fd5e191b106aff645dbaec4f7828e8cc5f94328574977
-EBUILD openscenegraph-openmw-3.6_p20221115.ebuild 4414 BLAKE2B 1e86c25bd6d615981cf861da4e7ec41eccbac969d92a3ae76dd194154829208c3d6f1184ad9f1f14863e992151d2b35aa0836afbe3e81fa415bc897580840882 SHA512 74212d767184988853f1089b7aba4df7b84b8f050b2f902d50e036f9611fae889f5a805d207f3232d7bb369f4d318c6836a20d1cac51afe32313f97eaef858a5
+EBUILD openscenegraph-openmw-3.6_p20221115.ebuild 4419 BLAKE2B 225ab6b3efc0dc48cde7f5d4c124f3ca528c3d4d19616343165f7365c7bc61625184a60e2799a09d03cf7e2c025dfa03a6b37a49423c42a124f924d27a23a92c SHA512 9d1e0d67b4da57c87baab791a57978e398a15d6c58dec814eaf7fa4abbb7a614335ac9695f17c48837e96045a76dba15b2b084bd85081619d356eef3b60b9839
 MISC metadata.xml 2088 BLAKE2B 8a6d83cb201e765310d776e4fae427d16f611cd2800c1d9bb3a315cbf3e37f21eea39604730405f18732203b509ab6f9ccde4c9ae54349c0f1be7b228fd8c44f SHA512 8e0b6cc0489b1651c7e0d67af7cf8e31da2916b3df6e27253beddb5cf0a8bb94224611b559c6ef3a52297964b9258de8f2fac72690aa7894c797cedab28031cd
diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
index 3bdc5cfee08a..ac82aac62f2f 100644
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="
 BDEPEND="
 	app-arch/unzip
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[dot] )
 "
 RDEPEND="
 	!dev-games/openscenegraph
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index c2d758bee5db..e67da5d9ca4e 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -4,5 +4,5 @@ AUX openscenegraph-3.6.5-cmake_lua_version.patch 440 BLAKE2B 51a35309b01a096f942
 AUX openscenegraph-3.6.5-openexr3.patch 2014 BLAKE2B ea9d75986ea68519ca9d5dab066273cb8a5eb8a492c96131240d023660c939d948276c459a617413ba55b80767a945bfec038ac4ada7ca6f46185aeccdc949a4 SHA512 6cd446c69d99b68da6bf39862cdc81d51be534ed35cea9f2858dc7771dd189a9ee5f5c1f76ea1247680b03eff5b7ec3f2331c2e9505c17d5a6a3f3cac4d2ed1e
 AUX openscenegraph-3.6.5-use_boost_asio.patch 6995 BLAKE2B 0b0c0af9980b59e1cfd4cc5256720d0e69d5e3a65173c9364036e42efa34377beb00811fc4a0aee0cead870abe0c33feaaebe57c22cbefac43d4dcf65a1d19e1 SHA512 fa7c702eaf69c7b7890cf44e5293f9c8ea73ac441af1e4573dadd62f3ca797ccbbc2fbafd8c946a936192f7331fa16d8d4247de8b657db77791d5137207c23b6
 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
-EBUILD openscenegraph-3.6.5-r114.ebuild 4482 BLAKE2B a630a160213b79a326394ca6a25d09f7c32df078203c53337060e4ce37092405cea712a9805090798572f8ac7b8013b290b4b89575ab2d8b3344c49562b04b59 SHA512 c1ca9a36ef82690a518ed4f611bbe8967c4b79226eb32b3f729380b0429f564bd7fdf3b5048edfc0248189b1e0cf1efd6211f3abf175f00c0ccb4f623c636373
+EBUILD openscenegraph-3.6.5-r114.ebuild 4487 BLAKE2B f6d9af8d8cab9e487cbea9b96edee96c4d76b171848d544a7c73b70b2432ff69dc48fcba7fbc2b6348354423642efd55f28348a169989aa6dbb00c12861fe015 SHA512 d872eea848d0a018eb824ae62c7f4dd6c4436f0b19300c40e76304ccd6c7e85c1aa1738fd99656f4df50ef07a5e8f3cd73a3ae059c583b6adcd3f6f7e6859761
 MISC metadata.xml 1866 BLAKE2B 9165a16faa78d3298365ca0d0814f7e4f1a1f8d514d7dfb1dbe613f7ab2212e30ae7e8518dc430d2626967be779330179023f445d9214ac4b2062a08df1298b2 SHA512 7b9abb010e2021656bb4e48c84bd8d0879606f05ce9213323159e6f415cea1226cd6a3c2b7290dcb68c1a99dafce5295fd18b4ad542e2d888ac8d06ed0c4f03e
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild
index e90b3b6cd444..1cac5f1fd407 100644
--- a/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild
@@ -36,7 +36,7 @@ REQUIRED_USE="
 BDEPEND="
 	app-arch/unzip
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[dot] )
 "
 # <ffmpeg-5 for bug #831486 / bug #834425 and
 # https://github.com/openscenegraph/OpenSceneGraph/issues/1111
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6510216c3df8..24bba97eb828 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index b1e18dbe871b..8e7d030a236e 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,4 +1,5 @@
 AUX eisl-2.63-Makefile.patch 996 BLAKE2B 972f8fd7d0005a97d9390be4957a46b2f36881e95447d6d71fb46a1c704ae0554d8e98d78cb64234b72e23f9846aebbccf086472722a42235e69b6784bc323d3 SHA512 6ae9bdde343bcd2050ea47cbed5278d16b41cf73f98606e3e1936713d28cb4264002fcbfede4108097f198ded9a7065120911f5242ee1999957481ab66184e29
+AUX eisl-2.65-implicit.patch 270 BLAKE2B 3c3e8b9474d7eb4647b9982b27a0bb34f316abbf780ca8bdd78445a4401e96743e8e299d518deeb5ce0903f892684bc9b96f36888a3663b5bb54d221735bc279 SHA512 fd69358726a1226dfc9197dd6e861ee36ee974050ba2455c6d29ecb82efd8128cc7b787dd18c2f686431ba5d8161ae5f8242675f2c66e10725a4985e5c52c181
 AUX eisl-2.67-Makefile.patch 981 BLAKE2B f237f8757f527e8d2e3fb9a207cb0ccbc94427c77b0c0a0df12cea5f32ea8975277a427a017e32071c3dd050596fa3c4719068bebd00a16080ba01199b750537 SHA512 eedc5921f166093d48ed62718028bfca76962b6525d17c9cf2e392942b313bcd5b07a6ceb2782cfaa7e0065e37c68a0d21f546586fa61cb53b0f6b5d56d96502
 DIST eisl-2.63.tar.gz 2004974 BLAKE2B f563c28ebfa6f45b1d5ace1087646fa63e99b98a6f44f42ed74f2bc4d7e29083bc1ad6c4e5234b5cdaf391fd07900fb309c153107a12e553b7636f978084a776 SHA512 fb2cead1cddb98ce63d471ef04f31cda3a8426d627f7d333fa5dc74401a075d923060dfb98ee9d399116535632983e649f2a99440157825f0528da03dae5d051
 DIST eisl-2.65.tar.gz 2025074 BLAKE2B d4703b696ea28dd5113dba199ccaf6a37955ca27297efaff4fc7c575fb94d0adfca1a3ae3b2f2baa8fc17ab04cc1b0a5ee0eb2059743a0828b81d6a324a574ce SHA512 7e2f64b37211b119e8a12975403ceec7b0861826a5de0c5e776f1140323f5ee73c75443f2e3438dda4d4cf7e1a8738c6883b1ab6d579558813fa5ddbc6be7898
@@ -6,8 +7,8 @@ DIST eisl-2.69.tar.gz 2124476 BLAKE2B 8aa1c63f669f7fc04ca9d3f751cb298d3499d52007
 DIST eisl-2.70.tar.gz 2126647 BLAKE2B f9bebd32a45cf73d3b58598e2f7683611426dc97c4e6411549e49f19c9e843dd24d90e9bdaf9ca97bc70fea970068bf2dfd532a861fd444b9f8b17f76666bf07 SHA512 9aaf75244515d74d40d5534e20d108f7723e0fb9cf01ecc618d32a4cd2fdd2f7132445ed9ce020e0c9ea3a05bee614e78853ac0554ee189946ee3d220ba082ec
 DIST eisl-2.72.tar.gz 2124119 BLAKE2B e0a1216b4e9c301ec965d0dc7a6fcaa5acd91fd611193959fee698a27523c0c4832e7960652af14af3e7f5846131d81f0ae9db7030511e051d5384ba573241ae SHA512 80998239b9cc421f42323f24ffbc5f518a2675c314580284309d127523bab328db21d294d8d32dca413abd63d279a2c857ea34ec35548da15459235eb0f3da2b
 EBUILD eisl-2.63.ebuild 873 BLAKE2B 7438f1e9c6324f10b90b6189136f0ca049870ee2f475fdd451b0e3abc679c8d528ffdbe2021715a002beb0cb21e302622ae0586e4eae9b6172db144f8c457977 SHA512 242c39416e07b29855c84e9607cebfba81ee36c0d4fcc035a26371d84bc0a934c32fa8f6a11d76c5e06aea74011149e7907db4f35baec3ea5ba51c9ef7ddd2b4
-EBUILD eisl-2.65.ebuild 879 BLAKE2B 91ed3a8de726588e457df61127a5b7411f31c74cff812820200b373b19d2f93f1dfc9d93698c6e0d9c86af4baa2ca39608535c86a35f68a8a433490425f5364a SHA512 20780fabb322a2c3f096d44df59980ee65bbdb267442e396ab615413ffce491010b0a5da7f5a887b208ac93a36b14c26b350ca30d4faf3617b8a9df1e0959f8b
-EBUILD eisl-2.69.ebuild 879 BLAKE2B 3536c88b75345112c12a3140726d629163bdcd1c41be5db5c1bde0efcae7ab5b9acfa249cc488f6301207d3ca24627b1e9058d649de8081df0a37f8a36f03331 SHA512 873d50ef36af6d93e747e7440a3a14253e471310b16dd480f4378309c8e4f47f64abe10e3e13b35ddcaea7e1587f2e39825b7959d2391c3321674e3e5102ac37
-EBUILD eisl-2.70.ebuild 880 BLAKE2B 6b593c8a07e1959a701ac46d2f8458d6ef95286e5cd69e4108cf8f05c2dd1eafa4b632b3af250f4bb4d24813ce94bf48b9623064238766b2bd653d76e5a0514f SHA512 c5e6c7bf69fc643edc8a1917d98054b960983a4f53397e9d02da2447dfda0471ff250cda650b3623cf5dd6d9da32e5bcb628b84e911fbb4c837d3abf9dbd9c27
-EBUILD eisl-2.72.ebuild 880 BLAKE2B 6b593c8a07e1959a701ac46d2f8458d6ef95286e5cd69e4108cf8f05c2dd1eafa4b632b3af250f4bb4d24813ce94bf48b9623064238766b2bd653d76e5a0514f SHA512 c5e6c7bf69fc643edc8a1917d98054b960983a4f53397e9d02da2447dfda0471ff250cda650b3623cf5dd6d9da32e5bcb628b84e911fbb4c837d3abf9dbd9c27
+EBUILD eisl-2.65.ebuild 921 BLAKE2B 284338cf256ad5fba4e3adba1b2a5b57b170be4bb14bbb687e093e7542147f1fefe04e6240291c487b25268941aba8635c5612c46ec2ec4397249acf60694889 SHA512 1222fa6d06550da7ccb45999f3cc339023f844db81404abaa38ca90de5bd64beefa8c90598bc57f89ad8e90c2fac185bc75d7c2a4d072e80c42e84e04b8e1a9f
+EBUILD eisl-2.69.ebuild 921 BLAKE2B bbaa420166c20be9151fc3ba5f3d2896001b0bf701d66e6066a61e2d14028c54a2fe217c4ad2dc176aaf3e18daad61ec41c600c180fa915af6c1cb89bc49f80e SHA512 f4dbfd02ad131befc7730ade32eb76ab66820b530a53a1a6eb1ad3124ff9fde6494373cb93441d223a0a0e2044058b3159904e693f5b93ea7fd73f9af816d164
+EBUILD eisl-2.70.ebuild 922 BLAKE2B 609337bad49c86c37ffbb0822540de1a9d338989a061701ee9da461667b0358cedb6f2c58db3ff16fba47063a88d41234ee1821bb3d5d0ac669b8ad371cbaf4e SHA512 a983fb011d2f7f0ed850b1561b138e6309a77c3d186a9bc7da486de22643b2489e0b3dd2a00269d5064590acf75d159faed878f5a893ee9ebc7a103082acae4e
+EBUILD eisl-2.72.ebuild 922 BLAKE2B 609337bad49c86c37ffbb0822540de1a9d338989a061701ee9da461667b0358cedb6f2c58db3ff16fba47063a88d41234ee1821bb3d5d0ac669b8ad371cbaf4e SHA512 a983fb011d2f7f0ed850b1561b138e6309a77c3d186a9bc7da486de22643b2489e0b3dd2a00269d5064590acf75d159faed878f5a893ee9ebc7a103082acae4e
 MISC metadata.xml 631 BLAKE2B fd171b07cf1f7beae7be774a5da360d466c83f01a6bd52dc69af436926ae5aebec27a2723c11498be21c4f96f6b82c6aa3571f4b84e763459ef78086450252f2 SHA512 dd9e329f24ce6d3922e92e81d36234b93151f71c88d6ba4b38557565a7c1c3bc4b7172d4d55f1d2d5bd6c5cada449691067cc71abd4d456941f6a8b78fe0df87
diff --git a/dev-lang/eisl/eisl-2.65.ebuild b/dev-lang/eisl/eisl-2.65.ebuild
index 91c3d9039c48..720552e43dac 100644
--- a/dev-lang/eisl/eisl-2.65.ebuild
+++ b/dev-lang/eisl/eisl-2.65.ebuild
@@ -20,7 +20,10 @@ DOCS=( README{,-ja}.md documents )
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.63-Makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.63-Makefile.patch
+	"${FILESDIR}"/${PN}-2.65-implicit.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)" clean edlis eisl
diff --git a/dev-lang/eisl/eisl-2.69.ebuild b/dev-lang/eisl/eisl-2.69.ebuild
index 737f99d4990a..c79630e56a74 100644
--- a/dev-lang/eisl/eisl-2.69.ebuild
+++ b/dev-lang/eisl/eisl-2.69.ebuild
@@ -20,7 +20,10 @@ DOCS=( README{,-ja}.md documents )
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.67-Makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.67-Makefile.patch
+	"${FILESDIR}"/${PN}-2.65-implicit.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)" clean edlis eisl
diff --git a/dev-lang/eisl/eisl-2.70.ebuild b/dev-lang/eisl/eisl-2.70.ebuild
index 97bd3630d4a3..82b169ce706a 100644
--- a/dev-lang/eisl/eisl-2.70.ebuild
+++ b/dev-lang/eisl/eisl-2.70.ebuild
@@ -20,7 +20,10 @@ DOCS=( README{,-ja}.md documents )
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.67-Makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.67-Makefile.patch
+	"${FILESDIR}"/${PN}-2.65-implicit.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)" clean edlis eisl
diff --git a/dev-lang/eisl/eisl-2.72.ebuild b/dev-lang/eisl/eisl-2.72.ebuild
index 97bd3630d4a3..82b169ce706a 100644
--- a/dev-lang/eisl/eisl-2.72.ebuild
+++ b/dev-lang/eisl/eisl-2.72.ebuild
@@ -20,7 +20,10 @@ DOCS=( README{,-ja}.md documents )
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.67-Makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.67-Makefile.patch
+	"${FILESDIR}"/${PN}-2.65-implicit.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)" clean edlis eisl
diff --git a/dev-lang/eisl/files/eisl-2.65-implicit.patch b/dev-lang/eisl/files/eisl-2.65-implicit.patch
new file mode 100644
index 000000000000..d4bb779e177e
--- /dev/null
+++ b/dev-lang/eisl/files/eisl-2.65-implicit.patch
@@ -0,0 +1,11 @@
+--- a/main.c
++++ b/main.c
+@@ -252,7 +252,7 @@ static inline void maybe_greet(void)
+ 	Fmt_print("Easy-ISLisp Ver%1.2f\n", VERSION);
+ }
+ 
+-static inline disable_repl_flag(void)
++static inline void disable_repl_flag(void)
+ {
+ #ifndef WITHOUT_CURSES
+     repl_flag = false;
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index cf99a6352b96..bc81ef95398a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 56064834b13c..ad88ea3c14bf 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -6,5 +6,5 @@ DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e5564
 DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614
 EBUILD glib-2.74.3-r3.ebuild 10421 BLAKE2B 7f43ab0052a6799e821eca3ce82ad54e375d929696847648beaf15102a776b87649246686086a5724f23ef3087ac4b315f8483e19c27288059ae65f6be2ad70d SHA512 ed7fd984a22942e75d751f89169aced0af4dacbe4c4acfa7278226e38a6ea71710f79f5cae8e713ca4567cbccd1e5f8bd6fa9b3b527aa01bd4e2ba42a91d8dd6
 EBUILD glib-2.74.4.ebuild 10252 BLAKE2B 4100d7f68cda2f0bb8a9c41dc6b705dc41efe248668dc7efe29006bd126afab3a512f236dde2ca60629a71551518ba3dbf0ab5d43b9137480699fbce2b4445a2 SHA512 3b7d29b3220e0dfaca0162d70ec1f6f4eb3728ace856d8a9680d14da5a92c85540f1cd9c4f1ecd159e7ace7e3cb4bbdeaceb02b8efaa70a323ab0cc2f2d439d7
-EBUILD glib-2.74.5.ebuild 10215 BLAKE2B a771708382538aad6fce9c6ff14183e505b3d5c7e2d836dc5491484af9109a723278bc720edc55a76e64ceb57aa947a1020dc7479401accba2fb994b4af76e1a SHA512 a2ed96db33cefa8bad4096b1307ba0fc02e09532010e4263ec7f5786f2468612473870d76aca67bbf49af13d654cd3af860b5cd6559177ed67774a3d4153bf15
+EBUILD glib-2.74.5.ebuild 10210 BLAKE2B 0c8622c09b7d824e458b4deecd71f0a3f322e9eee04181419057ec5f452c6413f7c87055673babc15e0e356bb40f1444890c746736066ecd27eb648b13393081 SHA512 edced07b6fb6cd949934f1eff3f18258fd312481091bd7699df065070f1b420d7923ac98c708e0f4a1744d9686d8ec1016266e6cafd41e25084e8999ce70308c
 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b
diff --git a/dev-libs/glib/glib-2.74.5.ebuild b/dev-libs/glib/glib-2.74.5.ebuild
index 7924f656d5e2..6161efcbe5a8 100644
--- a/dev-libs/glib/glib-2.74.5.ebuild
+++ b/dev-libs/glib/glib-2.74.5.ebuild
@@ -16,7 +16,7 @@ IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test u
 RESTRICT="!test? ( test )"
 #REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 9de9ed710ab1..1833505f4909 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -3,7 +3,7 @@ DIST libgusb-0.4.3.tar.xz 48536 BLAKE2B 64ebe5f30cf7f0c43c12c8208559a698faa6df6e
 DIST libgusb-0.4.4.tar.xz 49096 BLAKE2B 9ea68cd4fc415893cdf1bf34720d99a6eeb67b23403c4de64284b6c9072c68d6431cca842f3be4c5a6997ce3aa8a14f581cdb4d6768e6035d2337326bdd6f44c SHA512 1150315741f99d7ba96cba9eb341709ba1cbd84e59e95dce4d398b795e46b083151262b7ba80d102b7b201aac745a975d6f2549a981339df5e18cf9e0831e1fa
 DIST libgusb-0.4.5.tar.xz 50384 BLAKE2B 3844d0ec189292e4fed4520d818d095255ddaafa9052ec083a5df3171fa36a8261802526483228412fd69f073444ba422cd16c9d07d5f38770cb14a3ffcd23c6 SHA512 8b91ebfd7b6e07f1ab104f78c638bd28875e3ba1e47360307be16af9b2e4fb598e9911f50181590b5e08608a14557d15bc5dfaa6804a6056b6ee6669b2f6f81e
 EBUILD libgusb-0.4.2.ebuild 1743 BLAKE2B 584fcccaccfe7e1be80ab377f5c7ae077f72d80392aa930177e0fc01e9f844a7a98bce435e1d95733ea207a1d83941bc1c0f01ead84b3f9036d883d739fbb475 SHA512 58a59f8841a73c3021d68c2b2239cdba5e13a7800f0c18931e3194d536bef963ffbde6285b432b03479a425815031dbc731e378fb4269f6449d76a662446c35f
-EBUILD libgusb-0.4.3.ebuild 1758 BLAKE2B 863ee7b581567afb1ba0d746b6c4664dec4d39c3e238bf65599d81848d92dc2abb20561428dd32e85d3491368cbbe3f093120da05cddc3df95b270a72c87c168 SHA512 87ef4b62956d0022a62b84b5cc9785413033c28dc308bcb8a6f07595579bcc456487b090c8c7b5b2d690f744f802270e41cdff25fcee1dcf1c0d81bfd75ce1d4
+EBUILD libgusb-0.4.3.ebuild 1754 BLAKE2B 51af89be7cf5aa2f7272c61c93d4e67d19392a1ac95a8e02ddfb3f8cb9624a9262c8c2cbefc0b4ac4f42482e76465ccdebe6a48df424e2b33589543518812374 SHA512 224c4b60fef83d3a107077f590f22e023ac92a93f31e3d94cef1091426cb70d878e2998db56b59b620ed8d9bc9c54cee9812e309cc5f0c3f783b82cb82e40125
 EBUILD libgusb-0.4.4.ebuild 1758 BLAKE2B 863ee7b581567afb1ba0d746b6c4664dec4d39c3e238bf65599d81848d92dc2abb20561428dd32e85d3491368cbbe3f093120da05cddc3df95b270a72c87c168 SHA512 87ef4b62956d0022a62b84b5cc9785413033c28dc308bcb8a6f07595579bcc456487b090c8c7b5b2d690f744f802270e41cdff25fcee1dcf1c0d81bfd75ce1d4
 EBUILD libgusb-0.4.5.ebuild 1758 BLAKE2B 863ee7b581567afb1ba0d746b6c4664dec4d39c3e238bf65599d81848d92dc2abb20561428dd32e85d3491368cbbe3f093120da05cddc3df95b270a72c87c168 SHA512 87ef4b62956d0022a62b84b5cc9785413033c28dc308bcb8a6f07595579bcc456487b090c8c7b5b2d690f744f802270e41cdff25fcee1dcf1c0d81bfd75ce1d4
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.4.3.ebuild b/dev-libs/libgusb/libgusb-0.4.3.ebuild
index 79fdfd6e4237..6994f078d5be 100644
--- a/dev-libs/libgusb/libgusb-0.4.3.ebuild
+++ b/dev-libs/libgusb/libgusb-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/libgusb/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index cc7afbcefa5c..32bc2220ea73 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -3,7 +3,7 @@ DIST libsigc++-2.12.0.tar.xz 5002560 BLAKE2B f4d42dfbac95be974a5e49a7bcfd4c97fb0
 DIST libsigc++-3.2.0.tar.xz 785900 BLAKE2B 6c128a0c426814bde26b092c20f9eca1029712f5130a12088bf7cae10c56105334a12df0b26fe1234ed4c262cac576312d2e72abb926b6422e6fc111ccee8734 SHA512 91315cecc79a1ad6ea165b66a13a5afd4e5bc101842f9d4c58811ea78536c07fc8821c51aa5110a032ed71c09f85790b3a02f2ad7fe8cc3aed6e03b2bafcd70c
 DIST libsigc++-3.4.0.tar.xz 949316 BLAKE2B f12e8199333f5d23827a33718e884835af79ae90f3aa9d71944b5277783f171ed17b81453b46ee9c46e945f3fd6f5152707723dfdc471c992375f0efb6a253ef SHA512 1677d5151db5e74388d8ba4f5cf316f1e5c92aa380c0725ea62ee41f10f549296d528a8998dfa4767ca699782c93f756c072de9e0e07e52307f61ff72c952fe4
 EBUILD libsigc++-2.10.8.ebuild 1102 BLAKE2B a64739d480cd6af3fed44ec6a3feb529592191bef05870204f372ebd2ef7cb8be89a0bf45a3e8dd06be0a7bd0aaa2b2035718453d22fad544551d3c539ecaacc SHA512 ef3fd5e44432208e4aef1cf876f41297a56444840742433ac5e36fe9be246e1b1861470a949bda9b5fa29c16a4fd9c41ae59ce02e1d6dae9c6f7732479c1a228
-EBUILD libsigc++-2.12.0.ebuild 1141 BLAKE2B e8e283265286de3d9fc88b52c12b054fc2ca3bb453ad60622fe966ca0dca820f0219c6f153d222cc826f0463f753cd47349472d99947cd23fc5b634333dca589 SHA512 42a35fc14af63439c03acf0dc3fcf03aee38173d704c53c255836edd0ba65aed2cf48cd4d572447eb08e567d4d53e23133e1865dcaba6298530bd9bf21f81fc6
+EBUILD libsigc++-2.12.0.ebuild 1137 BLAKE2B c9819a3f36c80aedf8f9f9f7b5ddffa3356b73b1d50463c8d9ebd50ff60a93eeb20efb0f0fd6d48cf627c09a927853b07441732c1d949831de3b3759e67fc998 SHA512 40506a82550498032782edfc3dded47c9442a2501c96f0256cfe3462fc59aaa219d96fea2ac163f172eb0deddde8e24b56f343645904c362c002eb53a3f32fb4
 EBUILD libsigc++-3.2.0-r1.ebuild 1149 BLAKE2B 71605522a6a49529b6665b48a90d57af7043da55e1fa9572ea5c3ff03bfa89abb1645c4f85b212ff8ae7fd0b3d25b1f3d9636f75e8fc56dc66de8c27be06c56c SHA512 7367f5984cc6dd8a4e75445db59dd2d93f0fd81d0d1b11aa48dfb0de12aae399190c83eeb1645cefe99b689835903c574b737c5aae7f23a47909fea166d95210
-EBUILD libsigc++-3.4.0.ebuild 1081 BLAKE2B db128339cbd71bd3cb82473f5ae676e6d6b11553d83dcb2ab38df667350eb2becb605a8fba2eb6e6f26b38d01887edd1068d9ae1755756747d7df6abf41a7e4f SHA512 a49acbcbe3be9515f43479abe6a90cee5389d21e807bd423ef3877d7b9b6572aa1c6452d8515d4aa0ab7addcd6e65f9e3c44e3ce1fdafcac767ea0dec95457c1
+EBUILD libsigc++-3.4.0.ebuild 1077 BLAKE2B a1fff91af6e284137d41f9ac04349f2814b3df6b1be8efb9c1f13c5c3c40a18dbd1afc4912aeb369ce33c52e059f35e7e082cc4391a77d565ed0d487dcc87b37 SHA512 d52cb883e3db2a3c20a588d2bfc34efd4c43c97591caf4db8718faffe89feb485c36e689fd96ac094f2cf799ae3573e58bfe293a3685f384f8b0d5734841de05
 MISC metadata.xml 360 BLAKE2B cd5d7f32949df66ccd10d45bccf8d6433a5c0d218356bfd453037e1b0c3ad7e39a1fa1b9354a4f2c68a9340c1bed0c940f77e28ac43fb904a547bae0f4ef5b7e SHA512 0cab4a9537dbf409b15c8bcaba9653d434776292eb65c1bf9708c0ce2cf9134c23ceae09c4384950733928095735f137f51e8ad6d0253b77c9b3fafbc2b75877
diff --git a/dev-libs/libsigc++/libsigc++-2.12.0.ebuild b/dev-libs/libsigc++/libsigc++-2.12.0.ebuild
index 45d13b525a28..e0463a87f101 100644
--- a/dev-libs/libsigc++/libsigc++-2.12.0.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigc++/libsigc++-3.4.0.ebuild b/dev-libs/libsigc++/libsigc++-3.4.0.ebuild
index 962a59792908..3880cec42ca1 100644
--- a/dev-libs/libsigc++/libsigc++-3.4.0.ebuild
+++ b/dev-libs/libsigc++/libsigc++-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6968f041f083..9d0ce07e3b6b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index ff5915fbac6a..a66d104e8db5 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,5 +1,5 @@
 DIST alabaster-0.7.12.tar.gz 11242 BLAKE2B 5690d9c0b8aabfc2c95c4279183d174d6a5768f89732028f7ec6eb790531499a2017b9f3b9896442e298f3189f79070178b3e281b6d0bcfad3741625caa99c48 SHA512 e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac
 DIST alabaster-0.7.13.tar.gz 11454 BLAKE2B b67ab19b3cb4d86bc0f2bc94cbac7de42b6ffc089844d49daa5db40de942dd87555f9ed8ac362ea01904a9e77f8fe995250bd878b39c9a4851041cec8ef6460e SHA512 1cf740c17c669a2a48dba6f6d3b7dde6aa77c6cf1f3d84de0384852ef04f5c03e585f614880099f6466c81f959e290c19db70319caa9b1e2d93e4bf155f80a99
 EBUILD alabaster-0.7.12-r1.ebuild 503 BLAKE2B eb8d72fc8990c4141f81392a2edd3c7918e13615b0d2230f5d8475a89e3bc2b51b5d898d93cdd9ca7810d78db2987fba1b323de7faef3ce97221e6710623ef33 SHA512 a6b0adf7add360b23d9aaf79ca31bcc950a93a2a9f40633611e969a0cecad314d03c9d6095b9e2f9d4417ee8c831c07a2b0c6629b59996cf1db24203999ee20a
-EBUILD alabaster-0.7.13.ebuild 552 BLAKE2B 8f8521175bf10d46ac7c5e2fa40d6c6047472f18538aeb1217badc272e3e75dcdb422c2f959da245d44b7c5925367c23df6e8f9bfa2bf6688a83e00d7f2c9137 SHA512 4126f46b5ab70c1f5257685f7a5649c4d125d0089b158489380f1ec05443337f671331220fbc77d562b1de3f337eae5f63c2ff38578d205d0bbd03b73d7f9f0f
+EBUILD alabaster-0.7.13.ebuild 544 BLAKE2B ba2aa87580860f27512bd1a659bb2aab59cef3228973cf4b1dd48c343b8a44bd3416c199e40a0b4d4ac68149299a5dbc6511ecdbba7dbf3c4d88221ad7363e1f SHA512 2b1e338dbb33ef5708c3bde226606d064e8856aafa25ebb3cdd0630046177fcf1464286ad1590108d8a04d2693d32df07a0e4a502889c4acb4a9c7f3cb28917c
 MISC metadata.xml 410 BLAKE2B 1419bfb66f3dbb231c8f106fd95012bd8a2e1c0c50d7eeac0620519b0e8246117f4c73d704dd55739f0a853e79321a08060299156050ca70b34a66e54447e3e4 SHA512 0265a6729c8c32a6ca98b04dd35fe569d8b800fe2a679b54e4c40cb79b2838e301e5a7edd59aa861aa12a55c525108b8b0f90d31a1d6d8488be88c14ad2f3541
diff --git a/dev-python/alabaster/alabaster-0.7.13.ebuild b/dev-python/alabaster/alabaster-0.7.13.ebuild
index 74fae772fc3f..1fc62d54c4c0 100644
--- a/dev-python/alabaster/alabaster-0.7.13.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.13.ebuild
@@ -17,4 +17,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 9edde97beff6..b42bfadd54db 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,7 +1,5 @@
-DIST alembic-1.8.1.tar.gz 1255927 BLAKE2B dbf40f9ca12171d99ad46bec6bf1841799226887a55a815db5c7a69cbcb7d861ede774aa35e1018e1a57bec26a8ddf7ee311e0b4396ebddd5477c67a4ad11876 SHA512 51f210447172d08eb94c41a962ddecc593a665790aa6f5badb771dccc882e0d653dcf153ebb04b9824dabcaeb1ac08e3747c2e3c74d8584a24b35662778de8dd
 DIST alembic-1.9.2.tar.gz 1136929 BLAKE2B 26c4ad3185bc274aa4321a0860dc357566625abb51c951f2d0151bfd109f0e0bf7a37075d07ad2f0975127bdd327579f2d9a700f3cc130fbdd1c6458127b2e50 SHA512 d878d48d140be68facdaf0ec25f8582c9e10a369b23e9ee035ae63f8f2ad52d50464c5b8e9c666307edd1a797b6a2c495e56fa890f7dc8f46b3d75a726905ded
 DIST alembic-1.9.3.tar.gz 1137492 BLAKE2B 17dbc5513b7e15daa51f623bfa90febf356caad8d13e215c6007fd0330e569ea4ffddd374c1ab9b7954e38a136c27d2e5d0ff5db026a6c2ad04d242b3cfdbe7f SHA512 dcbde51c26a81f88b102979aa000c17d0af065e96c51484c94c138fc08099e229deb06f5934d499058f25ef87eb5a5de765225fb890a76eb030d1ad6649e57a4
-EBUILD alembic-1.8.1-r1.ebuild 816 BLAKE2B 276fcbe1882537e6f676b1389f734160582fe9d57c6426b06a587457c106d7289e0a5fc7f1a14f8907e5d00b46e6b0269742ae6e6150ccec11cde4894f07edaa SHA512 82fe07ae2973f53f913375751be600521c10ea653e88ec6885f59f044ea76d5782e9a9cfa8c2aef7b6f9577d1456fe840dfc2a3ac1b64cb241ac9fad47c09c89
 EBUILD alembic-1.9.2-r1.ebuild 816 BLAKE2B 276fcbe1882537e6f676b1389f734160582fe9d57c6426b06a587457c106d7289e0a5fc7f1a14f8907e5d00b46e6b0269742ae6e6150ccec11cde4894f07edaa SHA512 82fe07ae2973f53f913375751be600521c10ea653e88ec6885f59f044ea76d5782e9a9cfa8c2aef7b6f9577d1456fe840dfc2a3ac1b64cb241ac9fad47c09c89
 EBUILD alembic-1.9.3-r1.ebuild 771 BLAKE2B f904f3e3a70cde89fecab15c35c6ebe09a0e36fbd401294d9cf0dc1e2c6034f8bae6e88603fc58f8a3ae790a5db0116e5c3094171bd3726accb7fe286394a158 SHA512 05328ea27883bd3c8357ee2a4d0ccc21a6d0d8fac6f6b6654860d6f6f5e185482e7c08e50fc07669fbe217f51edc2a3ec4f4451183d3a06aaa79d5e242852334
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.8.1-r1.ebuild b/dev-python/alembic/alembic-1.8.1-r1.ebuild
deleted file mode 100644
index fb2a745913fd..000000000000
--- a/dev-python/alembic/alembic-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="
-	https://github.com/sqlalchemy/alembic/
-	https://pypi.org/project/alembic/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 4ad8403a80d1..fc5dd3021756 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -2,7 +2,9 @@ AUX argh-0.26.2-fix-py3.9-msgs.patch 1135 BLAKE2B 4730066f38371dd5c8c0e7004ffb63
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
 DIST argh-0.27.1.tar.gz 49106 BLAKE2B 48f21d920d97111656cb5b18c956c7fdda94ae242f92ebfb02c47b55d5ccc1b82b0ef8b94a721f97fb3638b15b38ce3293fbe46ab123ed9c968efdb2e881d8f3 SHA512 edddd35b2a90c6286818986945e9ea8484dd06bc263016d8c52b0e29475dbad610d673acc0918d0cf62657b1d965bb0d59e51af4c384ae0610f471c748a90999
 DIST argh-0.27.2.tar.gz 49200 BLAKE2B 4599781854feb0aa1b5251f6361bcf4e5e4f96c391fd8be3e5a3397d2a6130ec9111f36ad87dd553345a0d9d6471d20ecca7cd7462d41012c8117d2a07f18290 SHA512 9bed6d5f4ea6407be675b4b5c015e0bda5015ef78289ba9c08503687dc33d91fcda9aabdb9a94b9e3dc11020edf873e51eb1ef9d7ee0831b4f0eb0e302b83b98
+DIST argh-0.28.1.tar.gz 62511 BLAKE2B fb06ad73c5d8e8508103007a2213285f52f4d245ade288504616d42847c982a27ca94f0850f87052737c17740de705a9f8557fcafbea6f656e30ca1ed99efffb SHA512 c5d4515f5ba94a60dbcc6fa81812c192b51539ceee349129028a3d736ba1b0eac23135b31fa6d350e9fff778250365848e6c2077553849aeebbb9b67be6774dc
 EBUILD argh-0.26.2-r3.ebuild 631 BLAKE2B 8b525c0f1945804b6224a5842f97ee5a338505fe0f5aec6f5f40db4f0297fb359c7e83be5486b08c92f97935f634ca3a4ce8f884dd629c6945f91d3c56b8b7c4 SHA512 eb53253cff22812442819e88c83657440830612bd568ed61ee964edb02de81406e5722648e6581a2b5fa4abf90561354350c6519f4b645d71d77bc1f00bfdc32
 EBUILD argh-0.27.1.ebuild 581 BLAKE2B bb79d37f0223e9f3ca9729898492affef5d06fb6d8dcabcb9e4648a853d9bc3d8e40df577ca59bb18076e2389b6a820204b2b64d9ba05ffbda3f4651851c8ba3 SHA512 db4c75ddc3e883452f5bdd095da0cd25e85e0322b99c7ce1e2f1a9490ae566134ff0b3ff4816eacefa8a1f35818d6b87ab5d1b117bbc7ca85123667c6e2aa726
 EBUILD argh-0.27.2.ebuild 581 BLAKE2B bb79d37f0223e9f3ca9729898492affef5d06fb6d8dcabcb9e4648a853d9bc3d8e40df577ca59bb18076e2389b6a820204b2b64d9ba05ffbda3f4651851c8ba3 SHA512 db4c75ddc3e883452f5bdd095da0cd25e85e0322b99c7ce1e2f1a9490ae566134ff0b3ff4816eacefa8a1f35818d6b87ab5d1b117bbc7ca85123667c6e2aa726
+EBUILD argh-0.28.1.ebuild 575 BLAKE2B 976f53038bec8b093acfadfcc6b9b6fd0d6a29eea69354a50c87e1abf0ec363d485705e0ef2a5d17fbb3354055113c15076c7d91b497db190606beed6c4e8127 SHA512 51786d7146600794b819aa64770bb2207232ee3c9c040bcd21daff89058cc840aa5dd32623c0abf676d045060263c066596bc6117647ecf6320309c09d94add9
 MISC metadata.xml 385 BLAKE2B e1fc25e92c45fbd0183634cc645085fef5223a59975a5000557c1a2ef497c6f9ce017e462a9a881e61b4578c90859f51e5471d197ea884b7dc4ce90786a0987a SHA512 97719df6c0b48c7348bf25de9016dd1de373d6b9e1fd7f52d87eb6e0935608719c726aa3f4ca4aba8fa1211d1234c2b959dd821d241cd65b6cb47b1a06481df6
diff --git a/dev-python/argh/argh-0.28.1.ebuild b/dev-python/argh/argh-0.28.1.ebuild
new file mode 100644
index 000000000000..a5678353c3de
--- /dev/null
+++ b/dev-python/argh/argh-0.28.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A simple argparse wrapper"
+HOMEPAGE="
+	https://pythonhosted.org/argh/
+	https://github.com/neithere/argh/
+	https://pypi.org/project/argh/
+"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+LICENSE="LGPL-3"
+
+BDEPEND="
+	test? (
+		dev-python/iocapture[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index e60dd0bd8df7..fac7b8a633bf 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,5 +1,5 @@
 DIST asgiref-3.5.2.tar.gz 32352 BLAKE2B 08d148948828cb2bf1f216c827d8fd35f66c88c6eec5ff77af85495fbd40144931d4dc2bf09db32d34be92d8ea9d923c87904d3554422d24f6e23cfcc428bdd8 SHA512 d5ed0275dc748674018b14d58941113c19e1e30c1fed63c40d3069a4a09d81a6cceb186e7a0ef26912a040df082ae71b2ca9198d67f0b786b53d3d4089530fbb
 DIST asgiref-3.6.0.tar.gz 32748 BLAKE2B ce3facb2d026551df31ab28a3d9c4bb22be6828664d3b341369eb5dffaec1f2a519ab84356ec89dcfe112a96430be66c70c53d7e36586a3b2f4ee1db61a9d617 SHA512 b74d71e3a5d129117293512ed93e06a9ac0f681766abfc074be6c8deec7160995dee23947da861715fa47e2b9921669b6b5bf247f8d895ffbea7007ea956b9d6
 EBUILD asgiref-3.5.2.ebuild 649 BLAKE2B b0d480fa0bb903ad40edb55e7ee2456e459f552310277dc34ee344ad095e852e7843eaccf4440db994b389301a645729dc2cd79674f95a3ee0ecd7b229dbac0e SHA512 848d6bed7b11585e88c808f302e6be3bc145a181689704122a28b37c03b0128c7745183ed5e3e5b2c1bbf2f95078c71378435cf5470e85859601ed92b8a295a6
-EBUILD asgiref-3.6.0.ebuild 657 BLAKE2B 3bd9d900708ec3d041e374b668f1957209f0489681a3e4f62171556f17de5501195fea06240fb98070cac830dc9903933eb52b2ceff2b2c2d6172ec9dfea33f0 SHA512 ffc12b6d9ba76aaa906949007bf245e5b0b8abd8fe5a5b866b3fb3bcb24c08ae370cbb9c78f85bce8fee341cdbcd9571b6d64d5ab5575607ff2bd4dd3027acca
+EBUILD asgiref-3.6.0.ebuild 649 BLAKE2B b0d480fa0bb903ad40edb55e7ee2456e459f552310277dc34ee344ad095e852e7843eaccf4440db994b389301a645729dc2cd79674f95a3ee0ecd7b229dbac0e SHA512 848d6bed7b11585e88c808f302e6be3bc145a181689704122a28b37c03b0128c7745183ed5e3e5b2c1bbf2f95078c71378435cf5470e85859601ed92b8a295a6
 MISC metadata.xml 389 BLAKE2B 312af34b9583dc413f5a5d69c9677ebc2d3fb1d10c192f2b537d8cd057122086009d9c6846f9177fa6b1b96b6fa7641a3d833f4db34ef74db93e73f19042eaa2 SHA512 d35649849ab02fc46837b408ef7de3e45057517c472198b86a1619911bdb451ffffadb26f8dae864f194a1e5c6f424cc904ba342a8f8e84c69fe9fe75286e867
diff --git a/dev-python/asgiref/asgiref-3.6.0.ebuild b/dev-python/asgiref/asgiref-3.6.0.ebuild
index 7a3d72de7402..e5322ee0c5bd 100644
--- a/dev-python/asgiref/asgiref-3.6.0.ebuild
+++ b/dev-python/asgiref/asgiref-3.6.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 16347052fb6b..5e1b1bbf1e96 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -3,5 +3,5 @@ DIST attrs-22.1.0.tar.gz 201288 BLAKE2B 5da48b3cbcd99cdcc531a0859be264a4d209778c
 DIST attrs-22.2.0.tar.gz 215900 BLAKE2B 9cb96cec022735ecdd7577f9ee06b2e16b9be05e9df1183c101bef186a66f2c4505224f1047b4b4cdca2a05641279199ab54c7b2e26a9599c3cd8b9ab4543845 SHA512 a7707fb11e21cddd2b25c94c9859dc8306745f0256237493a4ad818ffaf005d1c1e84d55d07fce14eaea18fde4994363227286df2751523e1fe4ef6623562a20
 EBUILD attrs-21.4.0-r1.ebuild 1848 BLAKE2B a33ed35e57e41273a56e61f548448a1a91eb67efdc75c815d5b52799106ad74d76be394f64fc7a957eae190a66f6dc984dfa6b718bf42f4c675afc8f79ee079b SHA512 60ddda7976249403069a4321149ebdd52f219c761e57788edeeabd54adbcef78dc2ec1dac841174b4bc751f75453a4e9655a0f5d4ea9bfeb6f464bc7b8795dcd
 EBUILD attrs-22.1.0.ebuild 978 BLAKE2B 39463f1f7d50b616a186eadf2ca6649cbccf3aaceeb695de2eb543d5346537d15134affe7216c7b5c326a42b6133e1ab55aec8bcf1929488d89a610286638e6e SHA512 310f576da2cd46cf293356608f2c0ac8ac4af46aa62e6f3ed8d5c24888ff75e1ea130e8d509a2156bfd1c197b25628ed71c73eec119fee7c6f3d88045374e823
-EBUILD attrs-22.2.0.ebuild 986 BLAKE2B 2287da4fc1be372db34d5df26c2759fee0c7a5456fac40728005a3ece69885b26af501d227c9669e08947fde156ee795977b94cfd00ef608b74c288267c79359 SHA512 aefd53943ed764074e1d42f75605f2499a79d6f4ed83a70369fbd61027a5d3998d668a4625cd2847ad90b4282f3752c53b1749dbc723a73b7e4091271e719337
+EBUILD attrs-22.2.0.ebuild 978 BLAKE2B 39463f1f7d50b616a186eadf2ca6649cbccf3aaceeb695de2eb543d5346537d15134affe7216c7b5c326a42b6133e1ab55aec8bcf1929488d89a610286638e6e SHA512 310f576da2cd46cf293356608f2c0ac8ac4af46aa62e6f3ed8d5c24888ff75e1ea130e8d509a2156bfd1c197b25628ed71c73eec119fee7c6f3d88045374e823
 MISC metadata.xml 586 BLAKE2B d54794200f471af72d635c0cda12d773ff78f1083a9a6d2b0785b203789b2432b10ee7332f5abcd8f8dda952e10e4f981d51bbbfc4a6d461524570b3c5168f18 SHA512 b1161bb1ad04faea3ca915847d739287bc8bf9695608e49344ac6c9c4c16bb6818313a79b036df0cddde1da2d84740cf2d0b7d0c23d6cf3f22315046a3732f78
diff --git a/dev-python/attrs/attrs-22.2.0.ebuild b/dev-python/attrs/attrs-22.2.0.ebuild
index ce9394591e8d..4405d9fab20b 100644
--- a/dev-python/attrs/attrs-22.2.0.ebuild
+++ b/dev-python/attrs/attrs-22.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 292f87e6b814..583c6a507a22 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -2,6 +2,6 @@ AUX autopep8-1.6.0-lib2to3-deprecation-pytest.patch 1094 BLAKE2B fbca6a4c342f525
 DIST autopep8-2.0.0.tar.gz 117507 BLAKE2B 8722b19454f47d0b960e3cc0e18ff3d6150ead009630047ecd1ce9001ea6f6d68595f80d7ad1087bddd2993e95d0634d63495b1d43dee095d114535bf632d1bf SHA512 883b79f7011a374a2ef88073a45748268a20449a3bc8da519c036c71700352dd8c4accc60fcb592f1a53ceac06984fcbe6ede8a272bc718c2b79873be5f35dd8
 DIST autopep8-2.0.1.tar.gz 115905 BLAKE2B 9dde8d702a0b21fb1457e08120dca805e2b46e3e5284e5d98932ff93afc4c0ac8dbc60215f35b64d4a308d6748df1411c2979d8fa1f4949b1dbe213bf19de9dc SHA512 cc0e8e5b7228ba9b37adaa3b2689a5e1ad04eb84366c5300d7a220b1593a64e4f1dc332750f8ca53935dec6a3ea1d07cae5615373e44da357a980d9763bbc3f1
 EBUILD autopep8-2.0.0.ebuild 989 BLAKE2B bf6244fded9a20943273d4d7d6f04532ca64733641ed4ae5e5f37cf6df41ed6e25424a83f4614be54d6b202d7e8a0a36f09cecc1f239751cd2473e986055d44c SHA512 ebedeeaa6732a9a6bf452ecbcddd7b9c419873075d3c570995ead6c29125cb9a0566ebc622b47fa40f684032970744009915de002ed612639af552c357245cf3
-EBUILD autopep8-2.0.1.ebuild 1177 BLAKE2B e0295a690984b678af3d775668ee523cd7cdd7bbcec81ec38cee60e6c7deb6ff9e1661c567d8a3f22145b6d633875873079a3a1ab2d3b1c0b78d846001be8c65 SHA512 44644f3aa5d2def870a0fa3aab405c18e5886439f389d5c485aa015aa2715d62bcf02bbb8a7d5e558c0da2e9b68242d8ddb0628787500c03a548e10c8ea47972
+EBUILD autopep8-2.0.1.ebuild 1173 BLAKE2B 4b17cbbf0b1dfe7d8561085c0ba0a952ffb6ad994c651a82f39f8c164c2d5924335b1ad4d2cdad7e634d89d75d27289741f554f96a1a0ba0ab9e6f885577f9f8 SHA512 c22d2b89c554009cda96e996ca3af0fd66ea5def0f0ce5923376f1b48568c443cf3f9cb978d6ac20870a5bb7a51c8e6364c29dc95b389a8963828b20e1451f9c
 EBUILD autopep8-9999.ebuild 840 BLAKE2B c0e5ab9fbd3bb4e14c737f882a63b8973049821340fb859b55106dd58802188b05befcda62d9a98099d43c482db7abd7dd9051b5ee099d17af131071aa6478ea SHA512 5f6b7b14583511a5c86bad607465a9e2b6f2999cadd6e2bfebd0082db3eafcb5da36bb9a7f09e244f090d932f3e00542340c6914ed3168aa66aafccee46bb146
 MISC metadata.xml 404 BLAKE2B e9442968d195e1605d55b880cf29f4a2945f67c57c0d7d0325e19c0ccf60cac0ac3e68115a0285f87068482163f537abc1d75bddfdc6ae860c8c52c375147fdc SHA512 3e0b8a6ee869086166bb670a73189ca681729276cc7897666127b7e25b3a252aa2e80da5fd4dbb43d101a439d12f146ba0ba61bebf30a87a97f1030325f1aeab
diff --git a/dev-python/autopep8/autopep8-2.0.1.ebuild b/dev-python/autopep8/autopep8-2.0.1.ebuild
index c80c0617b4eb..e35cb4f06e3c 100644
--- a/dev-python/autopep8/autopep8-2.0.1.ebuild
+++ b/dev-python/autopep8/autopep8-2.0.1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
index 3fbe45c4f6b8..4ed4bf13281a 100644
--- a/dev-python/build/Manifest
+++ b/dev-python/build/Manifest
@@ -1,5 +1,3 @@
 DIST build-0.10.0.gh.tar.gz 41509 BLAKE2B 0b1967af6fd0e47e8de5a6efcab879a37231b399965c4b52d9f952ed4fd64e9606b40f8e34ca18fb634ac5b42e3fa63995e6da292b10424f5ea0bd9fd49a46ca SHA512 e7ab783cc2b228e49c3dd15be7e25150924f26611994367b145cc2d43d7f89597c018cd4ca5cd8b31280d965421d314c80e4b97cf3e00f6cf73d80a3b081e7d1
-DIST build-0.9.0.gh.tar.gz 41012 BLAKE2B 764338ffab3b6ede66542195271b1b07d1cff71685ae88bcef8042ce0a93a3a95a80a8a2273ac6a1534d8416410c8af77fdd3fe52fdacb47b8a56a9857ba60a2 SHA512 d6ef229c8f3b348cc939af6bd9a0a521a25c3a5702a95da8ee36d7a1ad3f3e22e10b5c96495ff08a1328ab73f03feebc64e89ce165862cb295eff4360c79d642
 EBUILD build-0.10.0.ebuild 1940 BLAKE2B 9104f2e9a030356e99fca90736ea8968af880af8f634c060d9aba53682c9a1f0d8538d2398a1ddd07bb73ae4c6b5304f314f15acc8377eb39e2340723ccee6d4 SHA512 3ea72c751c18ff42b49a1a0958f80c1c953506af3e045682e8964aaea54150edc3852c6c9a7552a2efcd469ad158cb79b0ff04f41412fe03c770f8e6a641a7ef
-EBUILD build-0.9.0.ebuild 2106 BLAKE2B eb94af6366a3fb141821b97fabede49935f9ed89b51bf731079058b6e46b27c84df6f3ce25b9e4e6ac3a1cdead01a8d582fe628f0ed760e16314442214dca09c SHA512 6af34f93bb8c18b8b7ab66d8d6701cef6732e035dced2d74e3df4ab8e2bdcacd31f5dc5691799c0e819d94a652984181395b7fd4a07b778f7a4a6ac790128947
 MISC metadata.xml 361 BLAKE2B 1c46e1d83bec4a8aaedd932af700865009735ff75e3af63ef7c08f7c00883d5f658f86aec981cd48c8ef0ab0a287250a3a4fdfad42fb434f6c06d9f33f72f7d6 SHA512 89c86db40833c86e25f387c5bfa8952b62e983714be85af1e8ca2a6ef8a402b94cc32dfc18cda8d8850736aaabdb46c153743af9bcb027e86b2c1f085f6f2369
diff --git a/dev-python/build/build-0.9.0.ebuild b/dev-python/build/build-0.9.0.ebuild
deleted file mode 100644
index 42499f2e7590..000000000000
--- a/dev-python/build/build-0.9.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="A simple, correct PEP517 package builder"
-HOMEPAGE="
-	https://pypi.org/project/build/
-	https://github.com/pypa/build/
-"
-SRC_URI="
-	https://github.com/pypa/build/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-19.0[${PYTHON_USEDEP}]
-	>=dev-python/pep517-0.9.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/filelock-3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-9.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-56.0.0[${PYTHON_USEDEP}]
-		>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by the presence of flit_core
-		tests/test_util.py::test_wheel_metadata_isolation
-		# broken by the presence of virtualenv (it changes the error
-		# messages, sic!)
-		tests/test_env.py::test_isolated_env_log
-		tests/test_main.py::test_output_env_subprocess_error
-		'tests/test_main.py::test_output[via-sdist-isolation]'
-		'tests/test_main.py::test_output[wheel-direct-isolation]'
-		# Internet
-		tests/test_main.py::test_build_package
-		tests/test_main.py::test_build_package_via_sdist
-		tests/test_self_packaging.py::test_build_sdist
-		tests/test_self_packaging.py::test_build_wheel
-		'tests/test_util.py::test_wheel_metadata[True]'
-		tests/test_util.py::test_with_get_requires
-		# we don't really have to test that fallback
-		# (requires dev-python/toml that we'd like to lastrite eventually)
-		tests/test_projectbuilder.py::test_toml_instead_of_tomli
-	)
-
-	epytest -p no:flaky -n "$(makeopts_jobs)" \
-		-W"ignore:path is deprecated.:DeprecationWarning"
-}
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 66013e964cfc..5e340979e6eb 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,7 +1,3 @@
-DIST cachetools-5.2.0.tar.gz 27342 BLAKE2B 905986bca98996fbc74c74bc5710b429ae63b4bf6283a3910e83a92cac461ef4a0271b1691a694fe8ecacf38eeeb921d7345c9e015f1400705662081d5e29dbd SHA512 e12766aef1725091edcdd0ef3687b891242f711de069c0d0642680d61dcca79e645e6ecb5f2e22470f189aba59daa2b5a830dc76791256517368f8912a065eef
-DIST cachetools-5.2.1.tar.gz 27401 BLAKE2B 0923744627c83b3c8d5d657730bcb44efbcb211076edb09d4b93149d7ee6856724a818c84ffcc048184060543dfca45f0c136d126143553d461515adda956e10 SHA512 3d86f1ff07f048576d7f7dc44954a7a469ac982e670f9e2ebec6f2a13ae741c9c06b8334e345d81ef8b69ae069056ab715dbea81c9f6fde7a7ff8b283bd7dca4
 DIST cachetools-5.3.0.tar.gz 27935 BLAKE2B 6ef41ef383aebc1d65e2855c6ce2e62ea38163b44f9dca756482ee8f35bbee033b88a3d7d458ea970fafb062f8b202563d478ff3ccae376f424bc643c9dcbe1a SHA512 5f0be2e95b82de4866718744ba1712354b413441eb8978f0bcb3e32306b6671b8ed7fa238aa31bef4c3b97764347d12a375b058f5df51dc80b277bf2cef23e61
-EBUILD cachetools-5.2.0.ebuild 510 BLAKE2B 04bcd7368ed1f0aaf10effe972f3ac49b19ede3b507b5a957c6f2548e1d0d044f8896e5188a2bdebcee7efcb7a632d2f876f9802b43d6ef39443e9c1cc6b82ae SHA512 0683a3ae438133b653158f4c0a28a215090bc3b740e693c8efa991c772033afc603fdfafee0fc677645843ee4f5e41ebee6c558fa9a4447330a21226d9fca6eb
-EBUILD cachetools-5.2.1.ebuild 519 BLAKE2B 1306122949c5b650437eda87cd3ec9dbfed2d5521cd27e20a25d1e16a9fc4ab5c850118241a8ead8da05d8ea84b812b8be48d47f20cbf6951db9f6c30b1e7796 SHA512 6b979199da22a9b76471f8a1b3745d1f4fd925dca8e0223fc43e21ecc09f83e516c513efc9f8a330877684eb23ddf025630113fbc5c7652b11eebba11c2ddf94
 EBUILD cachetools-5.3.0.ebuild 542 BLAKE2B f59cfcbaa87c1c02840fb695c01cb1ba05839c246ef3e5a070e2885027aa10ecd87788de371f3dda989e6668caff1e5e7da16083a632e2180edb248ecc3f49f0 SHA512 edf03b9442bf3b5a3bfd6ceec329bd911e3d5ee8e6a5834d0dd9780621f10b39c70dcedc8e981040a05835edec6ce4a71d6094170e7840fc1f98d52125bb983d
 MISC metadata.xml 508 BLAKE2B 46dd3d86627746b2b26d9980c2773a25cde3fe6d8ef25bffd88edf1cd2f66a9457f09eea791efc1dab3d354f405bf755992e4a44acd721e4e72f085eabf9b61e SHA512 63d48b1e710965f09538e71b982df8e2fdf5693c6043d5498e4536f76e139584f8783479c1742f91fbe45b4e7bf9eec8d8a54d698734c196bbd8d5a14712b59b
diff --git a/dev-python/cachetools/cachetools-5.2.0.ebuild b/dev-python/cachetools/cachetools-5.2.0.ebuild
deleted file mode 100644
index 9095c525a04e..000000000000
--- a/dev-python/cachetools/cachetools-5.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="
-	https://github.com/tkem/cachetools/
-	https://pypi.org/project/cachetools/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-5.2.1.ebuild b/dev-python/cachetools/cachetools-5.2.1.ebuild
deleted file mode 100644
index b2389ae9952f..000000000000
--- a/dev-python/cachetools/cachetools-5.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="
-	https://github.com/tkem/cachetools/
-	https://pypi.org/project/cachetools/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cloudscraper/Manifest b/dev-python/cloudscraper/Manifest
index a769dda568e3..4a80db91bb81 100644
--- a/dev-python/cloudscraper/Manifest
+++ b/dev-python/cloudscraper/Manifest
@@ -1,3 +1,3 @@
 DIST cloudscraper-1.2.68.gh.tar.gz 111952 BLAKE2B 69e896ad704ce776594fb89714bb75316ebff1b03387cba8575be6d60b496d18556690cfad109c2fa55c72ce3d91dcd21a21467a2d9820c579fea7482b688800 SHA512 42fa90127c6348c52a8327728683719966ae69c7b945cb9b485907e89e3b29b8053d31cd9cd4326e71ffd4c33e0fce20dd3d0e046fab62d89110eb4510535ad9
-EBUILD cloudscraper-1.2.68.ebuild 1522 BLAKE2B 79647b106ec24b637e2ccbe4c136f277f6d542610a6bf856d217dab547df8e59dc28156182148baebddad5af08357a4ef091ab11ee75995c0e695f209a2cb691 SHA512 98622cb750524fa48b490928745c45dae12e65c9c7334e057237a4144028b16c515c43044031d58251fa51587dcbefe720af3ff5d961728fb9142e7c54d09375
+EBUILD cloudscraper-1.2.68.ebuild 1522 BLAKE2B 6114fc4c60872d61d24cf1822f900df5c6c0997572e0489a4edf8748bff71317b264846c8d7ae520fc5798571b79e4b691aace0389d06084fceb8c7f3620615c SHA512 6047e438a99db7e0e6df3301db05644f6f2405898cf81223f57c557f9f018389f7e9c1c260ffcda770e391f81baff9b89fd3f6f78b18cd12446fcb6a0b047bcb
 MISC metadata.xml 749 BLAKE2B dd73d528bd6b2fd50230028ca8877783b315c9f3327ca3173b75a32ca7d1dc6135aa86e765f6d7b9929e6a84e5ce7f99a9c2a0ee4972c01e818f27b83719b5b8 SHA512 b36231ae7509d4ee146c4b0ba97aef6d9ee67db44741ba9f53e201f5f6b0392eaee3ce6e41c988ef9938c5e4b6dbe1fea10505319d40916e6b0bce5597dd790c
diff --git a/dev-python/cloudscraper/cloudscraper-1.2.68.ebuild b/dev-python/cloudscraper/cloudscraper-1.2.68.ebuild
index f252f862824d..de0d08b51d59 100644
--- a/dev-python/cloudscraper/cloudscraper-1.2.68.ebuild
+++ b/dev-python/cloudscraper/cloudscraper-1.2.68.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 optfeature
 
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 14038fb15177..d2ae9d28b408 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,3 +1,3 @@
 DIST dkimpy-1.0.5.tar.gz 59799 BLAKE2B 317e7a9e7ad1efdbbc7f4f1ce7efca70f3be4272ead3761d8bbde14d19e9f3a90af96d7bff5fba5b612cecaa166b58da4617e39a13276d0982ea38809f808b4d SHA512 af72a56a777b23318af8f8014bad03cadb93cc39f0b8c2062e15f3e5ca77a13be6f49664c9745f1fe97c592be5a63c4b0a3942da2c2c6eaa486137fdbb96528f
-EBUILD dkimpy-1.0.5-r1.ebuild 811 BLAKE2B 648d32ad02abf0ee178713d080e16c063b8082e2650775eb73e4c0d965820cb1d52b7a93ee39921c6aed860c2276463a173b295110bbf23654f58323814818df SHA512 7c49caaee39c89e88bf4a95dfd58850251d69e6117d49a52f096423b696f02f3bc899a6dec67d93f751c241024e81403e87d1c91ad49d37644b5bc191a26270a
+EBUILD dkimpy-1.0.5-r1.ebuild 764 BLAKE2B 685f28d69261fddddc280e1cfd415006b4922c0a5d98693db4da248c875af4786aad094cbfad8268d732004b4eff003efadc654b871e5bcc572a54c33d0a09d2 SHA512 c612ba54b0e88755784ccfeaa77a1dddd07a4c97aaa7987133ff42ea482c53a9ee22fea0dbf6c62316df29b7dbcaf819cd15f36dffe252dda67089ac7e4daecf
 MISC metadata.xml 538 BLAKE2B c0b9cb73f84e5f3e6cb6653b0983a0ef5002ad9c1a201b36f6ccbfb150d15990820562b18eef385e571f024b4e44f8572b30eaea57e93df44bbb6105df7abd11 SHA512 1c650532a9c9152eef0803c1c29781095390aca93c036cc097dcf6b16ad0d5ff9938ed48cb12ab092d0df777fbb6f7ca6626be7dc10935ac2563332869e6d511
diff --git a/dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild b/dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild
index 7bcb22efed71..02377b6d1896 100644
--- a/dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild
@@ -4,16 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1 optfeature
+inherit distutils-r1 optfeature pypi
 
 DESCRIPTION="DKIM and ARC email signing and verification library"
 HOMEPAGE="
 	https://launchpad.net/dkimpy/
 	https://pypi.org/project/dkimpy/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 76d4f0d28674..42c5f69cf6e9 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,5 +1,5 @@
 DIST dnspython-2.2.1.tar.gz 304861 BLAKE2B e6446b91579c6ec0a7266a354ceb58e2f881b55b7376648770ebc2c6104fd815214497516d305b75802e9211703d47a70d66745d872a43afb72f41e55a617652 SHA512 ec545468f604d6131f07259ca154c4f71d445d12c336ac1da0d2f025d6478ada76320a7235119312fed85da071ef309d2531e541d3c2340a50deaf3f4dd7b4eb
 DIST dnspython-2.3.0.gh.tar.gz 339222 BLAKE2B 1e1bfd1d716f5afce1ccc2e0f1fbb8e575e91619bc32f2c5067f6da4e01ea927dd0a1ed4c35e6c88d34de320befd833c9c17d060ea71918775c1f5f0121b61a8 SHA512 0bb4b41262a1d97b724e48b4dfb70f1fb544c18824e7d2bc2dcb8ef6c943c6c827ce753ae4ccb2ab37e95c8f5ff5d2f4853f238509f21e6299a445760c41e10e
 EBUILD dnspython-2.2.1-r1.ebuild 1086 BLAKE2B a83956783877012b134c7cb20db4ccf30f603edacc6f8b34aedb56924764f098b5d4ccac5927a167d5fd581f5faaf4aa682283ba50c4a09acadc51cc5e9ff758 SHA512 d827ac2b7f6ff589ea941abcde83d84b577f0229dddc4c99c3cde4af76578eadaf75cfeeebf8559cdcdad2e22aad8ab17216a0098cf75a33ed2f0efe033c2b2b
-EBUILD dnspython-2.3.0.ebuild 1165 BLAKE2B 2eaa432b0b9ec3a6be2ea107511ff92f2eda664c1ff79b6625e6d9dde2bdb3ef95298c2b891dd599643a34dc9def5738c733a40383795123557372dce24e608c SHA512 28b9a3bd007c4263f9ff592accce1d2a2711adfa8d42887d537526d4135853597ced2a773a228f7a8cfd56befeec71bd1a3384faadb1eadac8b0a38cddd4d24f
+EBUILD dnspython-2.3.0.ebuild 1157 BLAKE2B 9b8fadbefe2ceccb4d7d86c97c0350846b6fb16ea9b7efdad51fc96444e5ddd27e2ca971a5abff84ac19dfef977a9bf5619da0ead22d7765a7ac463321264486 SHA512 93b6ed849fc7fd4fe77ead7bd611c512df7fa7c55f3131503b0e32e52061537bcf79a808177095f6b24c44e5a9815b0edd2623e9cf6e7d0f5bf0bdaf0d331db8
 MISC metadata.xml 1709 BLAKE2B abd502753325fedca3f1ca94818258c9d1b82f88766f9e005b35b3e79aff71ca2efaf06188e73ea30830f80ec011cdf5c42df320130c9295e13d3c427a148f8c SHA512 8c25d579a4a2a7c5ff34c21643a1386a434545f6b9b465f4aa8e07f7da3aee203bbc0341e930ddb767af431f64e8024ddd6cc8513cfce862c5900da4637bb1c8
diff --git a/dev-python/dnspython/dnspython-2.3.0.ebuild b/dev-python/dnspython/dnspython-2.3.0.ebuild
index bd524b81f306..01b477ca9965 100644
--- a/dev-python/dnspython/dnspython-2.3.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.3.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="dnssec examples"
 
 RDEPEND="
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 64d449dbd7ee..5feb08517d36 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -5,5 +5,5 @@ DIST dulwich-0.21.2.tar.gz 436949 BLAKE2B 8c3b42e103146c3641292eaaae29b2e53690a8
 EBUILD dulwich-0.20.50.ebuild 1519 BLAKE2B 8a60db99c5074d493c79d9716f3ff59c3a4a58e705689d8accfa990e3bdeeb7c11ecd2d54d9a9012540c706dd7b13076ef9a339393e2c9c7056f4f43dacc42b7 SHA512 db8f6cab8b4604a2b174dbbfec5e107752aa00da05d0a1f6caba2a6b50cccb3fa0ef66a5239d4f21a04fc574643c003b1d1c99f35c825f53deaffe98986d0159
 EBUILD dulwich-0.21.0.ebuild 1523 BLAKE2B e5f55d7476f1c33a42f28e01e8c7470a46fea52cecbe9f72811db981fd7b9abd402637ca5a68a45bd8429aaaad32eae39737c829a4508b0c5045a726ca7de83b SHA512 5d4c37c0d517827b7cd7685b6d53e6f92d20832272e00e0c019172c09c8cfa8166b8a619c6b42d95f3d5b3d04bfb506e57a79baaa49ba97fd3d6b60be93e1bd5
 EBUILD dulwich-0.21.1.ebuild 1523 BLAKE2B e5f55d7476f1c33a42f28e01e8c7470a46fea52cecbe9f72811db981fd7b9abd402637ca5a68a45bd8429aaaad32eae39737c829a4508b0c5045a726ca7de83b SHA512 5d4c37c0d517827b7cd7685b6d53e6f92d20832272e00e0c019172c09c8cfa8166b8a619c6b42d95f3d5b3d04bfb506e57a79baaa49ba97fd3d6b60be93e1bd5
-EBUILD dulwich-0.21.2.ebuild 1523 BLAKE2B e5f55d7476f1c33a42f28e01e8c7470a46fea52cecbe9f72811db981fd7b9abd402637ca5a68a45bd8429aaaad32eae39737c829a4508b0c5045a726ca7de83b SHA512 5d4c37c0d517827b7cd7685b6d53e6f92d20832272e00e0c019172c09c8cfa8166b8a619c6b42d95f3d5b3d04bfb506e57a79baaa49ba97fd3d6b60be93e1bd5
+EBUILD dulwich-0.21.2.ebuild 1522 BLAKE2B affc5b3bae5eaf71dd9c4064bb77ba0a03832b2d8a3be08e22208fd30c82d9c4e758027d86c1197f6511b88d1409734b88c8b589e837702547c480c80203e7c6 SHA512 7635aaacb1bed8553aa2880205823fdf1458e4c21a8de9fcf768687efeae09d405f0cb8a85f939097e32eb2e2ae54bf3acb2bc21801abab1579860240bf8e3ec
 MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.21.2.ebuild b/dev-python/dulwich/dulwich-0.21.2.ebuild
index 2949d3dcec07..48394ebf40fa 100644
--- a/dev-python/dulwich/dulwich-0.21.2.ebuild
+++ b/dev-python/dulwich/dulwich-0.21.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 93e93c7b8410..6cf59d360c8f 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,5 +1,5 @@
 DIST py-filelock-3.8.2.gh.tar.gz 204940 BLAKE2B a83fbea21690f82680ab5d024cbca6e52b5f6490854fa1d14a98191a4e56edea41c0a8bda9dd396f8b9c5b83187d9f976011440ca00987fbe4e96cd1e311a244 SHA512 2d5f7f49cf2d112a060156391eeb600040b9ae8619a9795173b9888ee977ec718432beff68bfefca290791b14f8cefca6d2a92defd78132822dc3596493aaa23
 DIST py-filelock-3.9.0.gh.tar.gz 205047 BLAKE2B 3995f7ad27bb09ca75310c4ada7645f2dd16c09ddb39663394f315443851037f2f9cf08eecb507eba521479696ad1004978d3fdd300a7128ac3354fce2e57d5f SHA512 1235ae9ebdb4c84b0c30e68be91e01eb1acbfcd15c85202fa54a3b91e4e507f221926f8886e1ec91acd4f71d2d88c08f536529b4cebfd2de4fb90118f5dc242e
 EBUILD filelock-3.8.2.ebuild 836 BLAKE2B 07e278d0ee07200c6258df29e8f8b21fa90d409089866d4c0aaea17950c00c19f91382ef8911fcafef7344c6c190c51d353ec8abb0b08d6a34f2bdc29d55ba10 SHA512 7b3b6b0726a63ebd7aa77aebaddbbd5e26bc0e663e05ac825e5da38447679615be7ec7e973a9e70a8badea89b6dccf8a1871c0365cc39662a96e204f0764db2b
-EBUILD filelock-3.9.0.ebuild 830 BLAKE2B 194d4414fd88fd03a51f7b18a6c550dc0bee7bee34a5efd3940e9f7ef058a5eaa6799647e988bfc11bdfef145e719c497cc344796457c34d9bcbf04691fa3e31 SHA512 84654264cdb8f443ef0ffdc6545593bece588a138dfe97290365320681ffb9983d53695c350a3c94f05c038136ad737297572388d6a29f39e830679cb0393e08
+EBUILD filelock-3.9.0.ebuild 822 BLAKE2B 0e0322504b49fe5b908e501962680d1c90f0413dcdb17b37ac0785af85f9308bc805d0daf47b9758af85de08d05e78ce8e001984aa222c7514d65b9aa99e257c SHA512 4f9a65a3dd316af5bc28d9597cf14a04b16fa0f393e49dea59f53c8548c5c8edebdad5b08f6edd47377f2a65212031b980027a14480af847e64ae1d352384c15
 MISC metadata.xml 373 BLAKE2B 8923cea15313a2a4cad1af3e5e6c5623ac9855d3de37b6e43ff5249504d2bf07e1e334ce6ea8d9c397e03e3a05585cec0233e841a0a9f6c30d43eaa26b488933 SHA512 c114595146c326243756d0053476677b8b8c7541a253a0c739827e9b0f93c2a695d7289ee5a17c4a1a79639c02bf1396d2df4d8e20aaac9402c9d80f55be2f7b
diff --git a/dev-python/filelock/filelock-3.9.0.ebuild b/dev-python/filelock/filelock-3.9.0.ebuild
index 290cc76f9164..28f07e4479af 100644
--- a/dev-python/filelock/filelock-3.9.0.ebuild
+++ b/dev-python/filelock/filelock-3.9.0.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index 7f2182258887..d6cb108582c2 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,3 +1,3 @@
 DIST flufl.lock-7.1.1.tar.gz 33017 BLAKE2B 813b4b77fe2b7c9d7125e9d4a5530a77aa4205e1eb0a90852419f29669db97c683fe1d73d221bc7490a7a827da24e23bfac38002c1e6a179289b56b59e2d4dfa SHA512 eb9d8a80013ca07cc3eaab30ced596c0362cfc59d5a1f7cf17aacbf4068d9989b443df7e2d5f5e09d6f60e0ebc784ab1897ca7379fde7eeb57246cb6b5dfef3f
-EBUILD flufl-lock-7.1.1.ebuild 736 BLAKE2B 0234ab03aceaf27adfc141f5561e8f38e11d707b620333d20e7a8e635ac5cf3038604733b695059da42edada1b33a6815aecac408e94a7bb2efc040a354638c5 SHA512 0c201e6e3b65864be49b201dbd95f28de84e4d552f3df7fa156f2409f9031b71161c9640c30fae59b737288e8c74f92ca60952ca122fd854ab504a8aeb952504
-MISC metadata.xml 407 BLAKE2B 351ee456a6b36c54e42f4be026d3fad2aa49e4f2be746b43934e4402f594a2fd4eed5a29eb4a1bd22192a141e220523dad77218ac1b1e8a2db10190df97b83a0 SHA512 aa8fa297cc7b996c495542c23628ece8139117ec1da6b2cd0cf7c72bb90258618f8e2368aa1e5e48689540b11a7df7e16fab4da502f5058c1b6cf6e058c309a8
+EBUILD flufl-lock-7.1.1.ebuild 769 BLAKE2B 4bb090f2d07c88799e6d11f8f671012c240a5c555900a1b2dd19fcbed2ac54212961a675496b5f5144adb8dcbf6c2a69d870af8dbb2aa0f1d7ea5ae31ab72b3f SHA512 7063ed29f4e7ad969b4bb4554fac1f291b8c764d37209a02bdbc170ce37466e3e148cf0abac8fc7949b9301dcc062f57daf27461aac03b2c2a120df999726291
+MISC metadata.xml 464 BLAKE2B 8d37ad69fe6f35790593ff0588261389cd693d9197efc317d7d674dfb940a1dd41e69722542e84f0b6adbe6c10cbd590a047107815bd7f3177dc30557661686e SHA512 713d28869ccf26305a8c5f17855b20f55aa3884ad694096a305fdad67abe75f66ba5b7d9c940b18c414cca448f862bc8fa2705e6f1bbacdfa69672046258ec0f
diff --git a/dev-python/flufl-lock/flufl-lock-7.1.1.ebuild b/dev-python/flufl-lock/flufl-lock-7.1.1.ebuild
index 3233d01bca88..2b57e4e5d469 100644
--- a/dev-python/flufl-lock/flufl-lock-7.1.1.ebuild
+++ b/dev-python/flufl-lock/flufl-lock-7.1.1.ebuild
@@ -4,14 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=pdm
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
 
-MY_P=${P/-/.}
 DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems"
-HOMEPAGE="https://gitlab.com/warsaw/flufl.lock"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+HOMEPAGE="
+	https://gitlab.com/warsaw/flufl.lock/
+	https://pypi.org/project/flufl.lock/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
+S=${WORKDIR}/${P/-/.}
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,7 +22,8 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/atpublic[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.9.0[${PYTHON_USEDEP}]"
+	>=dev-python/psutil-5.9.0[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		dev-python/sybil[${PYTHON_USEDEP}]
diff --git a/dev-python/flufl-lock/metadata.xml b/dev-python/flufl-lock/metadata.xml
index ee916a0ea0d8..6f8ea1241836 100644
--- a/dev-python/flufl-lock/metadata.xml
+++ b/dev-python/flufl-lock/metadata.xml
@@ -9,6 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="gitlab">warsaw/flufl.lock</remote-id>
 		<remote-id type="pypi">flufl.lock</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index e9156e0db3b0..34f860452b75 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,3 @@
-DIST google-auth-2.15.0.tar.gz 221698 BLAKE2B 73decb21ab51889d2f22a2dca9d01f8c7d77a37a5ba186e2fba05bfb7a56f0e5ea0f5c1396c0be527b03e9083e98995e96f0081973e97766fafc6a63946c0015 SHA512 4a564503195e4a96ac2a89bb208c37e434185439533913285ca03a3627f28e641a99224ae285ced84050fdc6073e075b1ba288e9a9c18d3e6adf70509b5ee68b
 DIST google-auth-2.16.0.tar.gz 223336 BLAKE2B 9dbd54bdf072dacdf728f6fc34931f153dd409e3e1b92e37ed652a1db39d5380b7e66bd196cb1192f75234b2317518a443f8f515bc9135f553e6c9f1116fc606 SHA512 dbeff00089a410c6702e2bd704968c7392809dc217b3f511b62429a11649e4b0607a41622d2753bed9e511368b1c32086b23df66ec915e07a1dd4f32471e025d
-EBUILD google-auth-2.15.0-r1.ebuild 1526 BLAKE2B f9b3a2c88eff61debb3027b55a995c2b854f07b7ae1f91b27807d7278a006d7e14b592be18d901b2709e14c6d7c593a76a4e9d74604287d511c55f4852122dfa SHA512 403cbbaec7ca6a52ba6ddcae159921ec4eb10505fc70288f7fd9d7536cd40b5ff0ed78202d2ed153358d84c59f3641c87815121a17c2cd30a842028f28ad6bea
 EBUILD google-auth-2.16.0.ebuild 1526 BLAKE2B f9b3a2c88eff61debb3027b55a995c2b854f07b7ae1f91b27807d7278a006d7e14b592be18d901b2709e14c6d7c593a76a4e9d74604287d511c55f4852122dfa SHA512 403cbbaec7ca6a52ba6ddcae159921ec4eb10505fc70288f7fd9d7536cd40b5ff0ed78202d2ed153358d84c59f3641c87815121a17c2cd30a842028f28ad6bea
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.15.0-r1.ebuild b/dev-python/google-auth/google-auth-2.15.0-r1.ebuild
deleted file mode 100644
index 2dc5b30afbe8..000000000000
--- a/dev-python/google-auth/google-auth-2.15.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 22e88db5cd00..8c387b955c5d 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,5 +1,5 @@
 DIST httpcore-0.16.2.gh.tar.gz 78465 BLAKE2B f028bc524dcf865b5213d4ff21dcfff525ac34d4dfa1301ebc56392f3082b3b76b6ec1da5e50a01c416cd09d53ad5edd5f2a6d6d4f9dd78e8a579812c0cebc36 SHA512 d11fe4f6a59e2dc1bce6724941db5978f0863f73e39786121f775d9c1702a32741de2cb4a0588fc907294d1b244713222cc57ef19a0d66e4075075c621f17d9b
 DIST httpcore-0.16.3.gh.tar.gz 79132 BLAKE2B c06d55ce1390085db6c15d3e96160cfb037a935d1298304856defd1778783ad1954924a48653ce165dae9cde18abec157aa72865f57e97d91a564d1b823c863c SHA512 d889da0a3fee4f190ecc3981b8af34fa9b285d00f4ad92158a085c65f3ad8fa5a97a8c711bd51f8b9518b9d2c90ecd457dee1a3d7bbf853715473f4707cc421a
 EBUILD httpcore-0.16.2.ebuild 1160 BLAKE2B 09e716e63e12d2b9645fd77ed5290537b9f4cf9b146fb017061252176dcd08c3b526699eb2ae991550efbfdd211e2d222cff7fa3023157c8626eb3817dce5fd5 SHA512 c0608503b75126d05b6d11ac93949126c90585e987ed436ea7034604d421d340094db4c2542578db595f681fcb06247d5db945494554964ac2f775bf2416c039
-EBUILD httpcore-0.16.3.ebuild 1175 BLAKE2B ce5f56f450d1fbfecdc4f1c0e719887372d9aae192344feae54b0e272c27af8bf5682a1dbce2041c5744593ed8574f168c58dbb443df9fbfc4f5981aab525a31 SHA512 09cfeec359819b178c64e902d7ba1d4e9c0c592eb7cb833f0eb5660df3aa1f4cfe7544e9b09a655f7dccaa48359057428876cd17e2824cb53ee27d1dda290042
+EBUILD httpcore-0.16.3.ebuild 1167 BLAKE2B dd75bce8acf054670193fa690ea907bde019f17b47b9453cdc915157cce23e2e5f2216ebf9a2c1d97bfacfadc60c8fe4e3917380d48de52f2b4498d0823aa163 SHA512 e57084ca2901ae4dcba6ad4f11bcd9ad7071e7dfab3bc4398d493a8c34a45b298f02d26f916197262a1af5ed4fa5ee58531d6295cbfb0a880c67a30bb2c4bd3e
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.16.3.ebuild b/dev-python/httpcore/httpcore-0.16.3.ebuild
index f5a9e34828ce..a8a924685b79 100644
--- a/dev-python/httpcore/httpcore-0.16.3.ebuild
+++ b/dev-python/httpcore/httpcore-0.16.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
index 140e15a998e5..fdbc78a7ca8c 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -1,3 +1,3 @@
 DIST hvac-1.0.2.gh.tar.gz 309384 BLAKE2B bb492de18a6041b9a478554c1f750540195f8476f74ccf1c9eac3ca04812dfa9c653263b523d0b34efdf1e4cfffebb64ca110023c840abcc97ec7b5534a7d1b1 SHA512 e0f81682be5308a418c2246b03573f0001b9e619e1dc6435b9c9bb608e496a6406b862e28c337afe56cd2d2432d9a0240af5529841d3d6b1b60b662b9b56b668
-EBUILD hvac-1.0.2.ebuild 1096 BLAKE2B 807c02b0b08418a8cde08d35702dd691ec6389cc36a2d18f1db19a71104fb42a733a5affcccb40ec36eecf0ca344f03e7388221da0ec650f7256dafd050db8f3 SHA512 b144bdaf5faedefa64ebe61ada4dc48870996c24281b84668fcdaaeb03107d6501e389375e8aa798b4f90c4cda504690f27313528d529279bd0d884ad00b9a89
+EBUILD hvac-1.0.2.ebuild 1133 BLAKE2B 412b4b1bc771910516f730282026f1fc783f448ce57292d2be34392d2c41534112a7729a6a87db9fafcd00e301f9a4ae064826a1c93eddf3623287ca456d792f SHA512 2812435c83a0393163f4ce46902c7aada384621b300e224362c4caf6905a6d4d9ed10e3cffe630f7bab933711d53aadde80cc840268152c1a355fdd0b566f3c1
 MISC metadata.xml 600 BLAKE2B 476b3248fc61afcdc6e5c2db811f27218a7fe070744226289706412ae895c46224d179fc5dd3883d5ff08b1b5c21c86fb649641d4a7fe5edfcebf7ae58c75c7f SHA512 f2136ab711c25905347a774cb63471f3308267d102cd2dbae0a69ba50ef2728bb3cb3b4d0dfdc5d079d40e712332f4e62ef014eeaac5523cf47ad03133d02f1b
diff --git a/dev-python/hvac/hvac-1.0.2.ebuild b/dev-python/hvac/hvac-1.0.2.ebuild
index d45f728b4f29..b8228fb1bc71 100644
--- a/dev-python/hvac/hvac-1.0.2.ebuild
+++ b/dev-python/hvac/hvac-1.0.2.ebuild
@@ -4,11 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="hashicorp vault client in python"
-HOMEPAGE="https://github.com/hvac/hvac"
+HOMEPAGE="
+	https://github.com/hvac/hvac/
+	https://pypi.org/project/hvac/
+"
 SRC_URI="https://github.com/hvac/hvac/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 769bc36fd45e..c56f527321a5 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,15 +1,5 @@
-DIST identify-2.5.11.gh.tar.gz 101504 BLAKE2B 0415e9ab67c4254f3dd096364f518b131568c2180b8fdc5096405bae11854d5ef953eae01ad13292b6948d76f02adeee4607cd9485b705b1a303c44bc7110409 SHA512 cba8df5abacfc4db4305501eb6566ef3c9b3e0557796c046159f60a88ee3d0e206e13b070a01c3f7da74f8abf7a17e1374c40dc61814b5b580d1f8508034c402
-DIST identify-2.5.12.gh.tar.gz 101331 BLAKE2B 5335d8e4628921ca813c37197adc8802dc64adec021c80a3babfe2a8f9d27d96c00ae6dcfb0b3aaa6c4ffbde4c74fca6113e94abe7a79122605475c0f9f697d8 SHA512 6b2e9818bdce4c8944fed380708edac0f46f5ff481dfe19358aaf19996af5c9631bd1d68c399bef04768e924423a02519bcd28c58b0f83d455151f90afe4b2a6
-DIST identify-2.5.13.gh.tar.gz 101385 BLAKE2B 2425fd7d1283067215eb776a635421e126ce307c6d94c618bfa2397c0a8e857e34a99c70d8d425f55c577158544165ab8d59b65a879bd6ce113416a99c2684d2 SHA512 efdc3e8d5293fac7f51c72408010b86bf0e84258e114bf2130105d1d6c74ed8d969b92b0bd9a06029c373a767f184c9e3006df1284393d95a6f0b386f9fc69da
-DIST identify-2.5.15.gh.tar.gz 101380 BLAKE2B b00d46dbb492464d819abb8c3fb8782c56351c3f61d635bcf40feb4a5aea175e65f3a0ba2b5ecdfc87fe62b7f9c69f36ede9b6d5d02dd4a579286790a8f16f29 SHA512 898a25399589897833b330b2d17814962f644b60ea80327c32de146b7827d548807ca13a5b6737e5bf0a9dc9bc798eb449aed964f62bc552a71c57baabe46e57
-DIST identify-2.5.16.gh.tar.gz 101388 BLAKE2B c1e81bd98533360a2040a8f866cd5f7e6f866473572609a84677bf4666db6b74962e694d8fa2ea1f66f6ff3893d4e10530cf3eee65bcc29c5f181490c88c2497 SHA512 b0d9bd970823c6d5490ce13d372896d758961b68ebc7b30d4cf58f99f77331bb2453bb0b9e4a0b07ac6d5193ebcd6f56ae9b2f26bea7736509837e0af65099fd
 DIST identify-2.5.17.gh.tar.gz 101448 BLAKE2B d9319bbbe67f8c2c7a0ed8b7db8efc64f7c90d5cb3706366a00e24a78afd76c0c5707514d660febf02397f95d02785ea52f65e09c239d83d82ef84488d9dbbd2 SHA512 c9baf22f6893802c83e302fabe3cd4ca46a3b64ae6ef4fd5c939b131545c260e24861e59a617b3e4c4812e1a250692a26e4f8febaa389eaf6958d5c2aa79aeb2
 DIST identify-2.5.18.gh.tar.gz 101457 BLAKE2B 4575b4084dc28678275704f44a02d171d79a02f015e6d2267545b18c4288b55609cc64af2f9eca866bc2d164ed534cac59d69915e23fd3100cb680fcb08ceae0 SHA512 c7c6998340b77ddb13c88df8dbcc9b72efb68bf3cbf8a7ab2b81a4bda1180d04d4bdd9db360b7203235e2ebd252852de2c806b73e6a7236786bffbd3f4d4a672
-EBUILD identify-2.5.11.ebuild 588 BLAKE2B 9c287b22e56d3d592e12009f8f200ef5771765d70f403323aa9ca54480f9d64fd16acafca460c7e30faf84409c105302d825fe0dcd66cc573a5c9ae877ee2038 SHA512 1458fffe14402c083921244f208ad0b8b5b168b96554a5ff33ac60c248307581bfa1df5e05ced73bb677d6d96279ef948d1e9b50d761e3d4e8c95d165091f4b6
-EBUILD identify-2.5.12.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
-EBUILD identify-2.5.13.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
-EBUILD identify-2.5.15.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
-EBUILD identify-2.5.16.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
 EBUILD identify-2.5.17.ebuild 588 BLAKE2B 9c287b22e56d3d592e12009f8f200ef5771765d70f403323aa9ca54480f9d64fd16acafca460c7e30faf84409c105302d825fe0dcd66cc573a5c9ae877ee2038 SHA512 1458fffe14402c083921244f208ad0b8b5b168b96554a5ff33ac60c248307581bfa1df5e05ced73bb677d6d96279ef948d1e9b50d761e3d4e8c95d165091f4b6
 EBUILD identify-2.5.18.ebuild 590 BLAKE2B a3479081b0216a2dfa2f63275db0f7298fb3494dba0d460a01ec3ce36178ad6171f86a104ec7c1db018b7c858f5f9743b1d418007a313934330234c97aeb0d5b SHA512 d53d3e06b9d4c509c8c9f16aaead348b09c744c5f1d81cdfa565c32e7e011bd7bb25e937187f6266a7dd21f554137f7a4bd24190623071b8b2b9e05f385bd1d4
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
diff --git a/dev-python/identify/identify-2.5.11.ebuild b/dev-python/identify/identify-2.5.11.ebuild
deleted file mode 100644
index 5f8200bbe066..000000000000
--- a/dev-python/identify/identify-2.5.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.12.ebuild b/dev-python/identify/identify-2.5.12.ebuild
deleted file mode 100644
index a0d521fdd551..000000000000
--- a/dev-python/identify/identify-2.5.12.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.13.ebuild b/dev-python/identify/identify-2.5.13.ebuild
deleted file mode 100644
index a0d521fdd551..000000000000
--- a/dev-python/identify/identify-2.5.13.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.15.ebuild b/dev-python/identify/identify-2.5.15.ebuild
deleted file mode 100644
index a0d521fdd551..000000000000
--- a/dev-python/identify/identify-2.5.15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.16.ebuild b/dev-python/identify/identify-2.5.16.ebuild
deleted file mode 100644
index a0d521fdd551..000000000000
--- a/dev-python/identify/identify-2.5.16.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 3596a73a7f26..92dfd72a7460 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -2,5 +2,5 @@ AUX iniconfig-1.1.1-py.patch 1152 BLAKE2B 34950c2d5330d2cd40d1bf1cbd5d70d05cd3e8
 DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
 DIST iniconfig-2.0.0.gh.tar.gz 8077 BLAKE2B bb24006bafed64bc28d7a784ed24663dbcea782ef241b9c7ccb5dc0268f6d6ce149882155617d4c021805457c7c5e4775437d267da6905266fb84e877f16e09c SHA512 e474aaa904070ed79dbbd2b4b572574ebb591b97a4ca0f9c4e4aef437af01035d2f73c48bb670afcec2cd8b7ea093b92d6b0c0eca7ba42033418a2b0e0ac80ad
 EBUILD iniconfig-1.1.1-r1.ebuild 758 BLAKE2B b4bacaed1fb49e5fdeb914595e9a77a75799a9119f164433618b4c8ec74852b2ad319f938c79ee66c46b4eea4bad7c493a179c5c65e5aee32496cb9e93dabb87 SHA512 e069ff6f16f2e35ce655f512d29cd2651394c0c346832edf0c3065fd5636da5b7417468b5b57fef55646c9357b73ca5e41f250764446982d8c88e7c51bb1ed7b
-EBUILD iniconfig-2.0.0.ebuild 807 BLAKE2B 7ece4b0e4b7b3af44a8dd169e7e4a97120aedde83a7adc65021efa3c15f3a17562e76f4f9c68a07c82088be1115a3472ee5295ea91a36ce560c2b2ffa831828a SHA512 db58f1a17842f3cad2d3c73860e2b7a4d0d4f9868d1f0ebc99f994f0b9fc5717188c43413f1dbfe7cc6cad19933275322148ebd2aabff2b0d6a1ed524303307b
+EBUILD iniconfig-2.0.0.ebuild 799 BLAKE2B 13500392385b4b87f625a2d0d0773d7f9ef81998d8fbddf1c7fb9d947376a11ea1acb9cc4baeb187930cf86cb2b57a6e085319d86010860b02733239182447cf SHA512 3b5f40153c61ab9b68563267fe2662405458d0484d97c68a27bbb93f0518991ee303782df6de1183f69b0e3b8a33c799e8260f474f25ad2438174bea7b46f736
 MISC metadata.xml 375 BLAKE2B 07a0e2560e140c553289626437b1fbc46653a33cf9937775d60e6324361387d8399dfa3298ed8702a9532e55e4383e7493e7530be6586abbd2c5804372206627 SHA512 24e5acfeedf11f59184106a7b09169222761ffcd960ef398bce23acc3e63291b4c30230804a7da6b96a9799dadea5032d7fda7e7705577e1c6e9f8728ed601d2
diff --git a/dev-python/iniconfig/iniconfig-2.0.0.ebuild b/dev-python/iniconfig/iniconfig-2.0.0.ebuild
index 4526776c3862..1e412b78c879 100644
--- a/dev-python/iniconfig/iniconfig-2.0.0.ebuild
+++ b/dev-python/iniconfig/iniconfig-2.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 679beb332b39..523825e29156 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -5,7 +5,7 @@ DIST ipykernel-6.21.1.tar.gz 150412 BLAKE2B e77567230deb4b7a7af986e1465daa91d827
 DIST ipykernel-6.21.2.tar.gz 150365 BLAKE2B e1bc29018459738a3358af2d4225397028013c1ef9ceb571cb225fafb1a1570c349759caf723e03c6a67a9c354c83d178ae777f7ea4222f5c2ed35e41e22638d SHA512 e4d3aa102d83f9c9b16f392c5b37d55a9cd987ca6a58ce1c4b59d282ec945dcc8803539bf54d7b3bb71c11058fc20a3947fd875bebc5efa5f629015b544fe819
 EBUILD ipykernel-6.19.4.ebuild 2070 BLAKE2B 0d0c02013a91fa10d33adc52d02e9cb6cd6fd6bf7743819f006facdfc2987333f00ef398a6a2014281d0aa4ef68bb7eea0b951ac16b8e6a44d61f5f8087489bd SHA512 6acc488cbd2de2fa86c1918df92c0127f0e9464233b277c46f354746c30d76995c14067f1ec2100c16d2a5d3564338e7bbf43fe1d993417d1c5ea0d553b76484
 EBUILD ipykernel-6.20.1.ebuild 2208 BLAKE2B 0c01465ef85bb251b5f367e1f589ff947abd51a7e10b4e2dbf5db2396c0a8be23ee2ee1fe4015389a71ea469092080b330a5404523dc37c95df416fddec4f283 SHA512 0f662fc33c471ee808a45bc0e285cf8cff1f01f4e345f37a952c1e8e42f23379905a1bb529ff1cee531475e6035da37b60502b7db870f3c7cbed54af8d159ab7
-EBUILD ipykernel-6.20.2.ebuild 2208 BLAKE2B 0c01465ef85bb251b5f367e1f589ff947abd51a7e10b4e2dbf5db2396c0a8be23ee2ee1fe4015389a71ea469092080b330a5404523dc37c95df416fddec4f283 SHA512 0f662fc33c471ee808a45bc0e285cf8cff1f01f4e345f37a952c1e8e42f23379905a1bb529ff1cee531475e6035da37b60502b7db870f3c7cbed54af8d159ab7
+EBUILD ipykernel-6.20.2.ebuild 2200 BLAKE2B c19bf30bd6f63deef8ff8fc40b8dc820d54e6a4d920c601390e2594d88d7d4a9eae9d589e2ba770bfe63c183db293cadd665641dc0a13dfc4053b4d1e3bd7072 SHA512 fb6523fef893723dbba507df1de115693b4a51418e8dca28893448644c2e93f7ad34054dce0241bcce250e3ddc6656c3703cdf14f5f2736784444f6af8940f04
 EBUILD ipykernel-6.21.1.ebuild 2334 BLAKE2B 0cc96ac8e4a78aaef83861e88b2f3f58f6e70f2822e857a50e6efebb6863045bd39b725bf70c27c25bd4027500bf951869dd0d145b3e423ef1fc9bfcdd428b92 SHA512 6fabb41b5dd902799176cf488ce6e59e71b944e24717ad9ce54a9d2c63602192eda884b00b3ac07e77d6b2f82c7f60375f0cf9f2521b49a8725c47a91babf7e5
 EBUILD ipykernel-6.21.2.ebuild 2287 BLAKE2B adf04162952873db2818ddaaa7e0f8e657650b09ebbba77d859af2a91f2f432145b36f6cd55506182330d5aa8191748528bdc7484cbffdae2de592e21dbb7c37 SHA512 5e303f11d8a5fe7931e16614e93b01cf10019cd684354ce109dd9670c9be700881a0f076ef87396648cece7cc094e070f4b69f56a332af2b8d8da4edb5c574ce
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.20.2.ebuild b/dev-python/ipykernel/ipykernel-6.20.2.ebuild
index 4b2d1c25e75a..56f087335f41 100644
--- a/dev-python/ipykernel/ipykernel-6.20.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.20.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jq/Manifest b/dev-python/jq/Manifest
index b138b3d8597d..da48145b0f16 100644
--- a/dev-python/jq/Manifest
+++ b/dev-python/jq/Manifest
@@ -1,5 +1,3 @@
-DIST jq-1.3.0.gh.tar.gz 2648187 BLAKE2B 61b6d4dbb2163477d09e69c25e0bec98780f39088d4e689a7e13ed8d64749c2e238f2bf7d1f6c47f3cebe1c94a1e5fa5322a988ce251e8417aac77c789975064 SHA512 cf3c1ac7954d36d808b9f9841ff7f71835e3324f6f8eb09ef3a66b446b47a354d8ff090dc3529b9936ec5d7a33ba5163354d3534f0dfc0cb467222a990e58fb5
 DIST jq.py-1.4.0.gh.tar.gz 2648402 BLAKE2B 5efc35fd9ee52e5c1c87ac46d980d1557121eedb14beb5d534987d81a37b05c5c765ef69cecf65141d7c451623d05d378bdcf9a6e48667c07a9f52e7d0317bbf SHA512 8acd9c4094e0e6f5ffd43303432347448e8cb160f2c33250a386afc75eac53134b15142da3f344b0ea3eac4df838ffa322771580a27349299f32a2c525e09555
-EBUILD jq-1.3.0.ebuild 690 BLAKE2B 03d9761c98964cfb6fd1ef5d8397a60e5e110ebb2bd35d8c3f4d5bb899248b653165869725cc824e9258ac65a7bbd23b23bd4d89fb552345e78d3e92d484b37a SHA512 ce8d23458818016abf8d63d6d56a0bcd6fd4e20c311f28e6fce425e57da846d3d9ccb771866495990eb95beea5d131583e46b552496617416afc5c84121ce183
 EBUILD jq-1.4.0.ebuild 747 BLAKE2B fa210bac9cb288cb10aa870efaca27636423ebd1699ee142b4a581e0460757822bf3175c7741a1cd4875fd9cd273d2719c631f50c99f7525c8381095445c2df0 SHA512 e316c1e53010dc894c6eee06ec21f1761971beca489d143eb01c34a0f7ca366a0db87c5e6a2c855dd2ab7f591fdfa7d123951e1e963457b9b6f0d1d9e7775b0c
 MISC metadata.xml 367 BLAKE2B b17eb2d9c460774d98ba18faf8a09d1c9c711433d0dfcff08df4f769411db66fdb2241d12ebc706664cdef98d9dbeb290614446112f53ecede571f77aa085174 SHA512 399b63613673deaef747fd380d6bdc086a4e4b57c5509b15fd6e031ea613ccf59641c95064fc7dbbf61f8d879fe03faf7e8298e4e8792a8a0b7a2bb3225e77c9
diff --git a/dev-python/jq/jq-1.3.0.ebuild b/dev-python/jq/jq-1.3.0.ebuild
deleted file mode 100644
index aec93a8565ff..000000000000
--- a/dev-python/jq/jq-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for jq"
-HOMEPAGE="https://github.com/mwilliamson/jq.py"
-SRC_URI="
-	https://github.com/mwilliamson/jq.py/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/jq.py-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	# Cython compilation isn't part of setup.py, so do it manually
-	"${EPYTHON}" -m cython -3 jq.pyx -o jq.c || die
-	distutils-r1_python_compile
-}
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 4c4efee6382c..6a6aec638d14 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -4,7 +4,7 @@ DIST jupyter_client-7.4.9.tar.gz 329115 BLAKE2B 8b43b237ac79bc51e40e403cf4a3ada1
 DIST jupyter_client-8.0.1.tar.gz 333329 BLAKE2B 90be4e3d0271d8fb957e2766e523d333ade3811877aabe55f4768c789cab2782ba6594943d040a23efedb266f2f873b51cd37bc48a9e2603618fb074ca2c1d48 SHA512 c7c643f71e25bbd2b6742e20a6609253517704ca15360ad7f4494e8c96155daa331e218d073f83bc75f23f1b242e626313da95fe1766c29d07e10cd65b7046f0
 DIST jupyter_client-8.0.2.tar.gz 333904 BLAKE2B e5a6ba4d2190150bed94b4f6ed80d7b043643341e925851ad073d65d78984ba37bf9ca2563d5fdd6cd79aa104b271ef0585d5e478ae3394b5ef478060ae71d4e SHA512 80944e5727a41299e2e05807460c399f6186409817e53b9385cae15e0f6ea5c5d85b76940157195f5b2bd1fbf4b6a38614ab4efe7aefb13744eb9fde5836d70b
 EBUILD jupyter_client-7.4.8.ebuild 1209 BLAKE2B 8889fec0b7f86f01bae55a528e69c7b04804cf11c7b9782c9ef334c291b0c2adf2750193b47dbdd4fe0295e7ffb78e36825e06411a0f9c2a197e3d33967c7588 SHA512 de28921c90362a4109b783a16dd4a82f965c9e4debd2c6b22b39185e75833c44b15854b32b278de3b6c316458019732dbe0a462d38706061fdc87e75d07137d6
-EBUILD jupyter_client-7.4.9.ebuild 1217 BLAKE2B 0b82ac2503d37e7744c18ba47ba908197cbdb6e42a6d4ca97f520241f65a594ae3324055835e7ddaedd72f4025ba33834ac74c3bd61ec2c50f0c1133be90c1a0 SHA512 bd087d694a4988fda2bb3d1dbf51ea6d34524e2f0ea4fe8e08506141f8bf5e53fc0478a4d2962848e4401ffd1fc10a3c53e509c613b575510e233a885976a950
+EBUILD jupyter_client-7.4.9.ebuild 1209 BLAKE2B 8889fec0b7f86f01bae55a528e69c7b04804cf11c7b9782c9ef334c291b0c2adf2750193b47dbdd4fe0295e7ffb78e36825e06411a0f9c2a197e3d33967c7588 SHA512 de28921c90362a4109b783a16dd4a82f965c9e4debd2c6b22b39185e75833c44b15854b32b278de3b6c316458019732dbe0a462d38706061fdc87e75d07137d6
 EBUILD jupyter_client-8.0.1.ebuild 1332 BLAKE2B 304965d7845ad52631cd0fb43042bea38c6eae5e67cbe3f85997f35dcc6b529036dc753bcbcffc95c58b5ea247d4cfd3ac39ab44cb6fb5e6dece938b1a241b1c SHA512 7bd62e11b740ec4a36798bbddc754305aee7bdfb2974d74d85fda2dfdde3078b008b9a1668332dc62f954ef9371a3d09daa95bbd0cc782c52ceb62232b06c1df
 EBUILD jupyter_client-8.0.2.ebuild 1332 BLAKE2B 304965d7845ad52631cd0fb43042bea38c6eae5e67cbe3f85997f35dcc6b529036dc753bcbcffc95c58b5ea247d4cfd3ac39ab44cb6fb5e6dece938b1a241b1c SHA512 7bd62e11b740ec4a36798bbddc754305aee7bdfb2974d74d85fda2dfdde3078b008b9a1668332dc62f954ef9371a3d09daa95bbd0cc782c52ceb62232b06c1df
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter_client/jupyter_client-7.4.9.ebuild b/dev-python/jupyter_client/jupyter_client-7.4.9.ebuild
index 0335960a6ed6..8afc6536f1c2 100644
--- a/dev-python/jupyter_client/jupyter_client-7.4.9.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.4.9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 1decc738019a..c97d3b5e166a 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -8,6 +8,6 @@ EBUILD jupyter_core-5.1.1.ebuild 860 BLAKE2B 1b76990e6726e811b5ac01f85c31e203cbf
 EBUILD jupyter_core-5.1.2.ebuild 944 BLAKE2B e6eb3c7bf2bd033a5ae942a1d26cc115fb4e9bd79043ce35d470caa123e7364f6359c59e1cdf443299acaa91af6373f8c32b93a0014e2dd67dd00c88446a377a SHA512 f497cd0d0e432f0fe139bbb0ea5fd5ea1318876927c426287f69e5fe4c16fb2fce76406e6831735110e79a0540dba8b9acb689e9639dd5fdbfff472b6919b741
 EBUILD jupyter_core-5.1.3.ebuild 944 BLAKE2B e6eb3c7bf2bd033a5ae942a1d26cc115fb4e9bd79043ce35d470caa123e7364f6359c59e1cdf443299acaa91af6373f8c32b93a0014e2dd67dd00c88446a377a SHA512 f497cd0d0e432f0fe139bbb0ea5fd5ea1318876927c426287f69e5fe4c16fb2fce76406e6831735110e79a0540dba8b9acb689e9639dd5fdbfff472b6919b741
 EBUILD jupyter_core-5.1.4.ebuild 944 BLAKE2B e6eb3c7bf2bd033a5ae942a1d26cc115fb4e9bd79043ce35d470caa123e7364f6359c59e1cdf443299acaa91af6373f8c32b93a0014e2dd67dd00c88446a377a SHA512 f497cd0d0e432f0fe139bbb0ea5fd5ea1318876927c426287f69e5fe4c16fb2fce76406e6831735110e79a0540dba8b9acb689e9639dd5fdbfff472b6919b741
-EBUILD jupyter_core-5.1.5.ebuild 944 BLAKE2B e6eb3c7bf2bd033a5ae942a1d26cc115fb4e9bd79043ce35d470caa123e7364f6359c59e1cdf443299acaa91af6373f8c32b93a0014e2dd67dd00c88446a377a SHA512 f497cd0d0e432f0fe139bbb0ea5fd5ea1318876927c426287f69e5fe4c16fb2fce76406e6831735110e79a0540dba8b9acb689e9639dd5fdbfff472b6919b741
+EBUILD jupyter_core-5.1.5.ebuild 936 BLAKE2B b9448ac9be13ac40e9b67b118be94f90d4bc2dd46be503da8d4fe6eb4ad18f58e68627ac0a1f4a3398b651c3304a20a8e40775312e08bd08a3332151204f4e37 SHA512 b8c8a5a8ccc37e2fa844a9b445fdfb39d4654cda96642c697b85161aadfd2ee151ce8144e58b2d43e4f89e751b239bf6bd2765bf53d5c3d2894222404b4750ba
 EBUILD jupyter_core-5.2.0.ebuild 944 BLAKE2B e6eb3c7bf2bd033a5ae942a1d26cc115fb4e9bd79043ce35d470caa123e7364f6359c59e1cdf443299acaa91af6373f8c32b93a0014e2dd67dd00c88446a377a SHA512 f497cd0d0e432f0fe139bbb0ea5fd5ea1318876927c426287f69e5fe4c16fb2fce76406e6831735110e79a0540dba8b9acb689e9639dd5fdbfff472b6919b741
 MISC metadata.xml 759 BLAKE2B 4ef6a95640943d1b082bb65ae17515300089c6d78c0aa81410f4c7e57e1447787ad15373f314f8ea5c980459f4e5f74ee54edace2eb9421991e2425793040adc SHA512 d9769460a005d11961ebabc81636065aec545166820e923ab7abd58782e0832592a58611ccb4485164ef7c1c646812e8f608fafb9639525663732dec730542f5
diff --git a/dev-python/jupyter_core/jupyter_core-5.1.5.ebuild b/dev-python/jupyter_core/jupyter_core-5.1.5.ebuild
index 632659336271..1d407a0069d8 100644
--- a/dev-python/jupyter_core/jupyter_core-5.1.5.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-5.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/platformdirs-2.5[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab_server/Manifest b/dev-python/jupyterlab_server/Manifest
index f6e44fdab5a5..8ccd3ba66010 100644
--- a/dev-python/jupyterlab_server/Manifest
+++ b/dev-python/jupyterlab_server/Manifest
@@ -1,5 +1,3 @@
-DIST jupyterlab_server-2.16.5.tar.gz 67949 BLAKE2B 0e2e1ad3ca9163d34762893b3af2e675a8474fdb129e8735e567f111549ecaf1c23693064b757d68aeec63469f071428d827e361b253bcf241474f5386934bba SHA512 b125c3283d42ea813b12f891144665ec5c4a5827cbb01e9f80cd7826ba2647016344f939807c7095021293eb01e5ec3e151ce206272d0dca3eba3d7423fc4a6b
 DIST jupyterlab_server-2.19.0.tar.gz 69979 BLAKE2B f44eea3aa2a19c0f2e548b33e1677a8daf4b6098bfb682f3ebae816d38c6cd24769aea35053f2a9e656e5b2bba2a032d4bd75ba976d30238fa4d27c9a1a69867 SHA512 058a1663ca1d6663be9de1243b178637a61e2ff156ca00163d9f30301d8527ca26235f1d3183bc2b48b6b4b82dbea595a4c7f0a989736b603851f5d78f8da078
-EBUILD jupyterlab_server-2.16.5.ebuild 1845 BLAKE2B 8f166d32de70f24e4f3299cb0847dbb10601fa478e1b4ce5ee07ae14a8c5e60195f52efa63e49c73e846716d405be8ff9218ec13c5098aab9a4953581f1c1d61 SHA512 2204d43736fe922e273cd3a3efea1020c470c8898ed03c1d368772482282f0967d365eb6f56e203d4831bde98a637fb4b6421f66ba1b08b0029f030daee3c0e9
 EBUILD jupyterlab_server-2.19.0.ebuild 1904 BLAKE2B 73bb22aaee2e678110fc24b3801b43296083e338bf2bf7d0beb2b761ed7d578ac073c947c4a3ab9ab0964275cbdb2c609b4367e13a86c86d8039eb3b2bfb3b3b SHA512 5b66676f6a5c217ada9f44cf4032bbc10aacb5750d0be42205ea36294a1156a25c6e2bf2f372603ee6ecc633a541eeb094a7fedf373f7c1f146c88fd8736f358
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.16.5.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.16.5.ebuild
deleted file mode 100644
index b50d8e7a7cb8..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.16.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=hatchling
-
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab_server/
-	https://pypi.org/project/jupyterlab-server/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.10[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/json5-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.28[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.21[${PYTHON_USEDEP}]
-	<dev-python/jupyter_server-3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyter_server[${PYTHON_USEDEP}]
-		>=dev-python/openapi-core-0.14.2[${PYTHON_USEDEP}]
-		<dev-python/openapi-core-0.15[${PYTHON_USEDEP}]
-		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/test_translation_api.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_tornasync.plugin
-}
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 5ad06613dae3..4c58de06d73f 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,5 +1,5 @@
 DIST lazy-object-proxy-1.8.0.tar.gz 41884 BLAKE2B a2869137ccedc2971bd341dea954fecf87ab1829c85fadb3128abc296df000d4015e6a210067327a7f5606b9e4c56c6ff3a1110e2a2ae998951f9d141be1c556 SHA512 a682e7d1ef405939f5f75f598618d6c7de482decf8027abcf4c7c2b684b3442ca3b1a666d1913e9c7f63c086753e0d79b8c1b03c0cafe8cbea3d7c70893be57f
 DIST lazy-object-proxy-1.9.0.tar.gz 42830 BLAKE2B 565315a3e855bc5335af717d1edc947fef57514c06036280d1f4666ab9642cf7e7b4bb145da87cbca14d9efa9f4869d7ad256031983a773580dc398fb7ce25e0 SHA512 2168254a71cf52ef406e5edf4653b9c8ae05392d4ad3c2e5e8e9f8db56152d968a77d14226acdf7d962f66d460c40add335615442f6f176d697c071f9cb137f5
 EBUILD lazy-object-proxy-1.8.0.ebuild 917 BLAKE2B 9ea20c51dca8b0d6e8dc4ba8104b5186515791ddd5a0882deac2f688f115e78bcd1b110e9124532e4bd9122e1caf66340578c9024616a8e1b4e0208c19c6de17 SHA512 76cdca141341828a49be01539db1a188e63f85d36cdc07c43941ce3fcc57ebdf7545f8a9c484f658379f587f2dbec8e34ab41e1a3f3726a05c329234c243858f
-EBUILD lazy-object-proxy-1.9.0.ebuild 927 BLAKE2B ddde456d6565fdcf4ff1591fd82c8464bc4a300132c1c7b0c4eb5376f3edc36ed47251582c76ff3846b1ea4f1554306b76ab2bbeedc9b233d947daa678d27c6b SHA512 ac77fffb6a80ef934ca199a08f323d0eafd55e88fe838dc5e2b5f1e1990e182df35289e500f37c8d7cfbbb34e9fce32d95273f2cae7c455910e69f44f232dd95
+EBUILD lazy-object-proxy-1.9.0.ebuild 924 BLAKE2B 54087869e1fb23d1e8551e33a2c09776ea44d86870f25a60006321a98b01993fe673f2a84d9ca38678aa664e341b06949ec9d176c91ea78a82cd97ef6306175c SHA512 bc312cf3ec2f4c1d4ab45adc2d6b25f3799cd82429229c5d91be74ab209d6022c9649a46b9640393e3c6dfef9b22114a4ccd978153bd70cc5207801af05de1f3
 MISC metadata.xml 540 BLAKE2B daf53065c3af28ec7316bab786a7ebfa6890de83bd6434d39052797a1d08d9e7e05fc437fd9994bc437ba0d38dc6ab1cb2e073c2c053fdf55817302800e97b19 SHA512 e66e27df4757f7d13912934551b7fb346d734789f1b0b17e5c875dd5261babf65188bd31966f502be19e953fd9bfd87a64d49ce8e1849b2122a30905d3639e9d
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
index 8d971245c59b..f3407c3a12a0 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index cc773f26c1a7..c03cf8fe1eef 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -4,5 +4,5 @@ DIST mock-5.0.0.gh.tar.gz 83866 BLAKE2B 7c0718f8d43325b293b070f37c39ccf539a80460
 DIST mock-5.0.1.gh.tar.gz 84539 BLAKE2B ac50d187974a671db096222af0d0f27add771959553387ca8402951c17ed8e2b9669fff7b147fbc7aca25abc4b5006f5f9d3c2b13f6626a9bea140f6738b3f78 SHA512 b387137632237fa9079a0f70d8724e28bc1833c49d6e14f8fbc357064cf495f6177c783db9448343c0bea98936fc5c3667ce625f5dcdaca851a2f9cc7e3e5639
 EBUILD mock-4.0.3-r1.ebuild 867 BLAKE2B 13ec3348c2d91f5383bf0a88d606df7898e9c51ce5b0700dfd87657c84eb48c5ec3118534e8358bc5f614c420de2d5baa24456ce0cc685aa1f0e9dfadbc808f3 SHA512 d33230b9fac1881bd15b0c3e3aa673ef44750b599e93dd413a2d2af959531f5bb588a78604f0008dfc7856303ce9915de119a84505480e8a676b170a2bb8789e
 EBUILD mock-5.0.0-r1.ebuild 758 BLAKE2B dae2058b31b3d25ac172325c6070845aa5cca2318c7fc5f460bae2291f2b63a3cd415f1eb9cdaf2db634363ca3fef8040989ff06a74712ef0b2b55b2796e5767 SHA512 0bc40407f5290efbea8d1c0b0982676c039e6c46cfbcc48a604405d4f3c38c1576199da44dcfee30fd333104f6919b97f19f04c91a2951bf39dbeca055383013
-EBUILD mock-5.0.1.ebuild 758 BLAKE2B dae2058b31b3d25ac172325c6070845aa5cca2318c7fc5f460bae2291f2b63a3cd415f1eb9cdaf2db634363ca3fef8040989ff06a74712ef0b2b55b2796e5767 SHA512 0bc40407f5290efbea8d1c0b0982676c039e6c46cfbcc48a604405d4f3c38c1576199da44dcfee30fd333104f6919b97f19f04c91a2951bf39dbeca055383013
+EBUILD mock-5.0.1.ebuild 750 BLAKE2B a3d8d3acb1bc03577f8590f38bb0891ecece22241acc063201c803fc9ccaa93d9833006baaee6f0cfc5cf894956db94a630ea0f89eecf08a35f7c156910cfd82 SHA512 2d1f5d281594e5a18ec9b195655bf95270dfb7e181eeda573ab302f1b21c35803c3c044b00ee1d4dd9b71fd73006b364151f5857f24ce5ab5322006654a4d44a
 MISC metadata.xml 390 BLAKE2B ab0f000e11ee427d56fa28e307764a2c1864ce74bc679a491ab005a70d2bf8502d9a82b5d1941fcc268438880f8f950587aa090de9e611a520f89a49c78c0cbc SHA512 8456ad417374be30c038abce5a232d1075b8685e6432be93f49a74f327239354e14edfddf5e4a473264fb09bc0e4e6059489c1d0d651e8391ab0678d22987aeb
diff --git a/dev-python/mock/mock-5.0.1.ebuild b/dev-python/mock/mock-5.0.1.ebuild
index dad28b20c195..c7c8278b7646 100644
--- a/dev-python/mock/mock-5.0.1.ebuild
+++ b/dev-python/mock/mock-5.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index c42384850881..42234d53ddf0 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,5 +1,3 @@
-DIST openapi-core-0.14.5.gh.tar.gz 57645 BLAKE2B c5c9c308b93a37e32708677cc7c7a2ccb9ec3f018390e56a251224b6b8776943ccd0ddfb560cdc3f1182cb32a9b2817878a0d4dda3906c179db9841853caf7ac SHA512 69d9fb2cc21dfdb939beae45b1c681faf9f8e3366b36e5907b00be65ac669ec40e3ae3fe910fb2c4f6c70d1412e6a67e4e4e47e3cf2c424716da4c813223295e
 DIST openapi-core-0.16.5.gh.tar.gz 104046 BLAKE2B 7dcda69b6d548a0df8c7727b184c7f7ec6d645e14ab4b4a256f188c6cc4ae9e351bc06ae03770782d81a11dfb5ebc08c20daabbd2151cfe62f84b05f80a47a16 SHA512 59db6d39a950079739b2df4114f26d85be55dc1f42d1661e8e6c17cf878cd8167f29ba4d3b6f40e06e85bb144c68286cb50adf4403091461798144cac05d5bc0
-EBUILD openapi-core-0.14.5.ebuild 1790 BLAKE2B ca3d801d30edc10f0a4f8eec63c7b8f5fcb657f884dd8bef2d06357e8db264b51a2ef11730f98240968bc0586ac08caa8a232d03111c92dff2919710ca21ce4e SHA512 25c8f3b0f9a5c026d98f5b95d1fdf7c77d3b2e6596777aeda1319e442b143630101795c71906cf0b89fd05bcbc78897cd18b53df1b025912169463bfbae96db8
 EBUILD openapi-core-0.16.5.ebuild 1828 BLAKE2B 01098a654afb770ece9c121af506d42053169d6ee173547175c47a4f11d17e618ba3eae45b7e07719fe946aee3d6102f90e93f3f642fc47bdd29d66c453fe357 SHA512 11c04c4ffb99871884fa70ca1f8d7087a4418731c9a46b49236446f764f1e1da0470cb24eb91f71a34ed6e97885d4daf3a25fa8ad50765690039d610b235a418
 MISC metadata.xml 376 BLAKE2B bf1f9cf9377b172dfb5f916332dbf9d1e485f3ca1f31f754afac41931598c1780c474989edbfcf39bbfd4ceb8e8030280cf0997514dfb8e02bf3294176fc3dfd SHA512 c7fbdc21a2ea86abe5bcf4a3e8ba97634a447926ce999aff761965ff411fb05b09fab5e5338da5f8a8486a6b024cfeb27cfb9d9fbbfc9bad6f9dabaca1c82799
diff --git a/dev-python/openapi-core/openapi-core-0.14.5.ebuild b/dev-python/openapi-core/openapi-core-0.14.5.ebuild
deleted file mode 100644
index 1f9a309918f0..000000000000
--- a/dev-python/openapi-core/openapi-core-0.14.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/dictpath[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.3[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# falcon is not packaged
-	tests/integration/contrib/falcon
-
-	# TODO: these tests fail to collect
-	tests/integration/validation/test_security_override.py
-	tests/integration/validation/test_read_only_write_only.py
-
-	# unhappy about modern django
-	tests/integration/contrib/test_django.py
-	tests/integration/contrib/django
-)
-
-EPYTEST_DESELECT=(
-	# too new pytest?
-	tests/unit/unmarshalling/test_unmarshal.py::TestSchemaUnmarshallerCall::test_string_format_invalid_value
-)
-
-src_prepare() {
-	sed -i -e '/addopts/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index e916f04fcb8b..e3c35912d2eb 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,13 +1,5 @@
-DIST openapi-schema-validator-0.2.3.gh.tar.gz 25501 BLAKE2B d961cabca647f59d4d4188f1941ce5b2475e02520bcc10e7cd29817c8ea8ebaaac5af1ffb0e3d5079ed2d1493414cdaf55336744b142385754585e748af8ac98 SHA512 e6dfe3d6cc99fa9723102ced42040203157639be68b0438d7bfae4499e51cdb6257a36dca10425a5d5e692cebb958468ebeee722116b99d800a6fcf972400c66
-DIST openapi-schema-validator-0.3.4.gh.tar.gz 16593 BLAKE2B 17882dff25d1bed05efa74792930a357d82cb404bbf746a6f348e9813b4af86842da1523a8e3dfaec1426c82efff6b0bddbfca89c8569ba36a4324ab4e5a418b SHA512 714f93594c875a04194a6980dc5e092866609787e424ef480d42da93c114e3b658a5efef13f78ed3db35f6e7399d7dda8adbc1d3bb8606512aa4f135edeaeb75
-DIST openapi-schema-validator-0.4.0.gh.tar.gz 17070 BLAKE2B 199476dd660ab3493fe9805dc915c42f05b2bc5ca0f1f9728aa1e5afe5a923e3f84d82511572e353ab19c15b3094460dcfbde5ef1d96ca834c1da24314223046 SHA512 ce61c112c528bac022e3feb959bfe5adbac000ec0b4956f678bf61f66efdbf3a5cf912a4dfa1512858b497fdadaf533532f5a580f28f6ceea831e6b5ac98d85e
 DIST openapi-schema-validator-0.4.1.gh.tar.gz 17478 BLAKE2B 0c215589eb72f97205c565bf7cfc77096dd9cf2a7d05d2ea7946fcbc3c8c9acb5702635f6cfe520993139ce9713c426f01b98d34b3c962ac918989f7d87f22c9 SHA512 e437309a6e741eaefa6b49bb038bd5976288bd6559fc6957d7029d9c0fed36ee368ac5fb26133a0fe54366da77ec649b5e44eb6a7926d9d5c49573afdfa3309b
-DIST openapi-schema-validator-0.4.2.gh.tar.gz 16785 BLAKE2B 9b1a301711087c8ff1d04ed3988ed8c7004088f8404ff103fee849b2f6f40e7492dd2daf0f6e009dcb5245cf33553bcfa4c441b66f0cbe98a7046f8bf4573ed9 SHA512 494c420d973dbe6b2b21181143f6bb16f7d4de4934eaae046fbe3bd625ab99bb4860e5c4806e01290ea701970bde741ccb6a506ddff1775b2f1b3364f4cad06e
 DIST openapi-schema-validator-0.4.3.gh.tar.gz 30639 BLAKE2B 370e3cc4e6c9892912dc77114ca867752f46afd1555f91a3721f41a9c4516fdffc0416f2f1028f4717ca8cc1a1ef2ec47607b7ef2b6578a0b01afb8ddb6660c8 SHA512 a930ecafe2e4c1d4d021a71fe9b8f35c496320e5c5198e2ccb57d82e01570430c4904cae7bc44578bc95be63cf5c709c5bef1d96014c3a66fca3b4495c5e455c
-EBUILD openapi-schema-validator-0.2.3.ebuild 862 BLAKE2B c520f27c8885a8165e4d284aef68a1c1d0b0ad1c725625ea6bd4786c76a6896d7d880e36c52424aaa2c89f226cb9f638f17127c8de8b299be84f5decdd41e3ac SHA512 8009125bfc96927b452fcc074a803470a08d46ed66e0cc0411f798758c610ef8b08e2b6d689eb970ef48fbf05d5314bc39c595adbd0c0f57f441b175015c9dec
-EBUILD openapi-schema-validator-0.3.4.ebuild 905 BLAKE2B 2c4fe86f292ca66d3cb665fb35735ac2f0aa9e46cf647ce7fdd22999721d4d0fe30ed29a07e8b438158611a80792721aafbe91a333a5649d38edbb8ad1e7247e SHA512 f1184409ca5040d0e27dfb27e6e7d85760b44ab4efc4eee9fe2268dd35e8301eb2051ee3b2f6291ecae75f05be131a0a09c05c18e7965889ceabfdc3e7a99bcd
-EBUILD openapi-schema-validator-0.4.0.ebuild 862 BLAKE2B 93e9d9156b46dfe40a72b5cdcbc3cfb04970ba04b2494c184417b1dcd7eac6452e9faa826edcda1388f4aef524c27d5ea6aa7381b1d4d72dead71ed8eaffca0b SHA512 778c15e219fcdf27f556d0ed198de15cb9f3ab070ff82616f49302b430ff03cec0d23fc9da6e639f7556cb7b8372fc021b0362895f8154aeb47eb1b9423a6309
 EBUILD openapi-schema-validator-0.4.1.ebuild 860 BLAKE2B 6352f65fd378928d265ae4b793252d13c0dd838ad1951bfac8a4705e13b806f9beffb44d7ae8b1b65bffa8db3d87113f97994419963b721a1b411ccbcbb47dbc SHA512 5604b99a9be0358e315081a31304c371e96486a07fe5299f7ebf722e73f2377c533b8682fe65cb27c885e8706bb0a14383f715d01392bf5733ab0e63953e1f14
-EBUILD openapi-schema-validator-0.4.2.ebuild 1024 BLAKE2B e85834b67425de56784e99fdff1f5f0db1cdb5bbc6598180c1fc743550dda6201b0fc49a564a9cf027123be16457ff38b6ed495a060ad42aaf3bbdd5969e7208 SHA512 f1c328d8b70dc96d02cc241f83b7f3117c9d49a300fb6b2e4ba1547a8e3cbdd392f2664c782aba439cee2524353092e753e12d2430385f97c1ac9afd88b59528
 EBUILD openapi-schema-validator-0.4.3.ebuild 779 BLAKE2B abfabf3f40fb31b3d5d2e79b3fa84360d9598eec180e70fa3182848ce1480a602b9753fba6b405a2f9ff6a4d6bf433c63bd6dcdd34b0e5dc8aed64d6927a7ce6 SHA512 45aa6a8ec59f6a2a00f6b7c7908efda8ccf815589675180539d388f7a4f13a0e299d5cc03719ffc994f6d0765d372c0f970feec03789f51ad66eee71caab9f0c
 MISC metadata.xml 400 BLAKE2B 7869b5ce26c516d7e8ac441229cc5e749dfe6ee5fea478a0d5a0574bfbb863434d03f5c16332376337c33f4215877b985251cd5a2e71caf445a16f52283a63fc SHA512 071df32bb4ad2c941aafb9232ff890ec9e1150ee789eb9e335a94024ceb7bf6b7b79cd8f9f0ca16fc08c6e19383616253d391710b4d1e2796d57d12ff00436e0
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild
deleted file mode 100644
index 2514d008fa60..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/isodate[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild
deleted file mode 100644
index 9509287c8c3b..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.0.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.0.ebuild
deleted file mode 100644
index 6782957e8e3f..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/isodate[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.2.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.2.ebuild
deleted file mode 100644
index eb3b0947748b..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# https://github.com/p1c2u/openapi-schema-validator/issues/61
-	tests/integration/test_validators.py::TestOAS30Validator::test_format_checkers
-	tests/integration/test_validators.py::TestOAS31Validator::test_format_checkers
-)
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index f13a114a5232..17caef2f4433 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,3 @@
 DIST openstackdocstheme-3.0.1.tar.gz 1256111 BLAKE2B c0a1a68e8e0e423bc704503dc2214d9cb51aa236daf39ba6788ef95240c25c05d1bd8b7ce2cb3d7c7290e574f3c78b276a28afe5a92645dce6f1b3ad54109158 SHA512 3643e5fc7a6e7090e766d8e0c71f6f3dfe32ac2529b3f70a7b0e825765be92dad58a2f399d8993716c9c87f0781a117b602f090abc0f3905e0586a26c87fe449
-EBUILD openstackdocstheme-3.0.1.ebuild 757 BLAKE2B 1d559f0a9e8924f4b5cee36e24cdcb4b6a4ca0c7c752679d440eaa1207694d41f0843d38af781dcc5301e4b719f3f8380e0f65541353536de1501095c4d385d0 SHA512 5d376cd223d3ec683fdb541b019d1e349f73b0b5dfd159118cdb85b707f04793bb3be8f25026b66bee9e53eee684101c0b3a9d47fe80cc22cb8521beef9b8274
+EBUILD openstackdocstheme-3.0.1.ebuild 757 BLAKE2B 98b0867ad8b0f7b6ca473ae0806964ac17bf9e9621c3e10d9704c760f2fe2c8b05326ee834715cfd10472f5638db3594545c0cf3fe2b1713807bcbdcab83a799 SHA512 e5d71ed6276659adce5a29e79f6792eff8fe6f4109ba34e3885cb6877a29b619eba520f7356e918dd8dc9aab63485665437e86a75d66ccd10f8cc8170171a7ab
 MISC metadata.xml 740 BLAKE2B d720f5054a6752889548dcff3665b0a02d8f55b05ad96e2783fb2d460d8ab9f9eda52b589c18df1aef3c0eb383bb5b94ab0182f41c0e04fb831b5bd023f1807d SHA512 8c2c6ba17eebf016e8c8e45b0181505d152cf099ab59f4d2c2b2e6447af7ce949ff1cef198253d4a70f7a4d37b19eb5ad6b2feb53ed3f83c54ba850a94d8f4e6
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.0.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.0.1.ebuild
index 1e3b09df9224..5971059b5395 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.0.1.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index dfbfdf24f535..8808e51f01c3 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,5 +1,5 @@
 DIST pallets-sphinx-themes-2.0.2.tar.gz 20655 BLAKE2B a5e2d3a02a5996df6e648b8cf9943260d6e0e475108921493300c7d9437837cc66e83b489ad335596c39eac29f3a6e23b7b4abc3cf1fe3bbb018fd874b44aefd SHA512 a37b0f4fe38c098c0508988faa54ed8b2e1ad9ba41f95f862734cf38fd093e2b7c42d408fc10e529aca810f4cc37d16e6d707ed9affa433adfcb481006cd4577
 DIST pallets-sphinx-themes-2.0.3.gh.tar.gz 20835 BLAKE2B 72cea4f0dd6e6b6e862f187c492b892a6646f4db4b57031ae9c3dbac0aca7fe14df0637d6aa41a6e26bfe493839cd20064f2310c628823a70940e4a57e49ffd2 SHA512 a7c84effe85eb56001dab8b326d0160442aa63397d9ae2d0dff9ec85352ee3896a0cd1423b09b99d764290602ec67e0dc3f4b4aaad186a274d5cd74827c525ce
 EBUILD pallets-sphinx-themes-2.0.2.ebuild 614 BLAKE2B ee95ef7eb26edb0798d2d036cd105873e3192e508388967e7c9a787ccb7a0f2ba3221863aac62d0806ffdfe7a21eeb7d3d000ba82ca46d3c7c99d7b1f6c14601 SHA512 5f1be86dfc5f88651a4dd3d3a60b93225577b27f5896756f16fbaad1e14e9ae9c611fd3e46bdafe93e07bb4b787475649ee3e86a2c7cf428dd7942f87014c168
-EBUILD pallets-sphinx-themes-2.0.3.ebuild 733 BLAKE2B 67c22c2f84d4a190043d214f69d7b9bd1f7d55912cf7e4671b7edd0db89e49e5e3c07355066500d0f5918b7c31dc0a7ed42684760693f68f0b4446923cd6ea93 SHA512 614ec666ba8fe09bddcc90f1d78e513b344bf133362594da3605db7ea17e1abc6846de7a3c7d4d9bf1ce38322f7f8edb0f9eac59278ea24711cc4bb8f94ac1c8
+EBUILD pallets-sphinx-themes-2.0.3.ebuild 725 BLAKE2B 597be4ddf3a454d7f4fbee2cfd71713d070e41cbccebe9982d6334e874ed781448c5fa957be1ef5094119ba6e0dc85f566668095ed58904f1660747bfd3ff034 SHA512 0a24662e8c803a15be9c7e5624ceec696a4085d90f233acc07aa9bf1b0d94ab3fdbb6cbe3076aecbfa7cca7d6a187a2f788524268839841298f2c7bdf03706f7
 MISC metadata.xml 418 BLAKE2B dd644619949598d5675c600fbc5c740dc9882042bd04c8ead4b81de2ebc2f3a3e88d79d1e4cbd710b953cae7b116b1cb09012af913914db5a652a1ba2b5f4970 SHA512 537261ae9194a004752e90e3b4972763f9e22c27d18a7655f4ca4005d2999402b46ca7408d0811e44d3b0a12cb6cac506508c89ae5edd245f15bda13da91f216
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild
index 520cda0a2bff..39528e6d5f11 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 433de7eb1d9f..58f38bfc0ca1 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -7,5 +7,5 @@ EBUILD pkginfo-1.9.2.ebuild 675 BLAKE2B 60206efdfff4c39286fca38da36deda49bde5d3a
 EBUILD pkginfo-1.9.3.ebuild 683 BLAKE2B c5aa9d5114c5fa4c4c8193fce2aa863c9b8add63e3e06f49a9cb6368bedd98b9abcb6ffebe6906a694ffbc76aa794f38c9743e90215d1dc3c49d0718df1c2142 SHA512 1fe3c1951a1b1ff6e55002118e4bc571a35d1b433d270d464b4e1f9f59477e82685091e3cb14fb53f7c0cc387684847510e0e11ab7f8a0c5c866cc86805d4359
 EBUILD pkginfo-1.9.4.ebuild 683 BLAKE2B c5aa9d5114c5fa4c4c8193fce2aa863c9b8add63e3e06f49a9cb6368bedd98b9abcb6ffebe6906a694ffbc76aa794f38c9743e90215d1dc3c49d0718df1c2142 SHA512 1fe3c1951a1b1ff6e55002118e4bc571a35d1b433d270d464b4e1f9f59477e82685091e3cb14fb53f7c0cc387684847510e0e11ab7f8a0c5c866cc86805d4359
 EBUILD pkginfo-1.9.5.ebuild 683 BLAKE2B c5aa9d5114c5fa4c4c8193fce2aa863c9b8add63e3e06f49a9cb6368bedd98b9abcb6ffebe6906a694ffbc76aa794f38c9743e90215d1dc3c49d0718df1c2142 SHA512 1fe3c1951a1b1ff6e55002118e4bc571a35d1b433d270d464b4e1f9f59477e82685091e3cb14fb53f7c0cc387684847510e0e11ab7f8a0c5c866cc86805d4359
-EBUILD pkginfo-1.9.6.ebuild 683 BLAKE2B c5aa9d5114c5fa4c4c8193fce2aa863c9b8add63e3e06f49a9cb6368bedd98b9abcb6ffebe6906a694ffbc76aa794f38c9743e90215d1dc3c49d0718df1c2142 SHA512 1fe3c1951a1b1ff6e55002118e4bc571a35d1b433d270d464b4e1f9f59477e82685091e3cb14fb53f7c0cc387684847510e0e11ab7f8a0c5c866cc86805d4359
+EBUILD pkginfo-1.9.6.ebuild 675 BLAKE2B 60206efdfff4c39286fca38da36deda49bde5d3adee6ff652819e925147e6dbbdaba0446b2be4e7a756e49ccb85983fa31e3a769040e664dd67472a591547bc8 SHA512 17c42f875164535366a954dd4100c859afa0940f8b9b0b0b0a99e1f35563ac34a9cf38907d975f0da686f0c6676015ccf55aba3f60ba458eef8e2fc8a2d2399a
 MISC metadata.xml 385 BLAKE2B da3779a71a7d23a535599d8854c970725b3e6c121642cfabbabccc0e97cc1dab0cf77452da565c9efbd8044cb02cb2fbe00687a0b312948298902e4eb1f4e498 SHA512 fcd65e87146d573c1bc33dc560ed419ae5d4e46e6ba423da1a6dd46ce96683d3ffeef75b640ee671f16865e34293695b48a5fef89ee754a8b6bb797a03c13b08
diff --git a/dev-python/pkginfo/pkginfo-1.9.6.ebuild b/dev-python/pkginfo/pkginfo-1.9.6.ebuild
index 6566999ee981..98e3508b2b93 100644
--- a/dev-python/pkginfo/pkginfo-1.9.6.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.9.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 81117601cec6..20adf29fbfa0 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -3,5 +3,5 @@ DIST prettytable-3.5.0.gh.tar.gz 45387 BLAKE2B 0ddb2c89e80c8f713c01afd4db7d5fcfa
 DIST prettytable-3.6.0.gh.tar.gz 46174 BLAKE2B 2a7e507efdf4ab3282e95e8db14b92477fdd40a06fdb009146ce6a3a52ef49e46a61803ac3cd85d2ec993ad8cc49bd842d438b97fc037e56cb33cd4495b535ef SHA512 b4693a3d30555f598cb955923560d02ce7c757e87ee49bf09c8d50d3ce8bef67ebfad1c780914f488e89852c0e363c2cad098addc058a88864efb8eefa8e9cd8
 EBUILD prettytable-3.3.0.ebuild 782 BLAKE2B 2445de8943693b3766d5e082aa13eaad5fa4dc73be401ef552c54fb354f9e81fbb3e51a13e7de3a02ca5e6ca3f4cdf385461c5dac1b70c4b7d9df284f54ae8b0 SHA512 31721cb9199582facdc04de55d1e9c652b22f381c3afae77fc1f3af10a236e2f9bb485bba3fa1687e0bf351b1e2d2c5b4f8386d14e4a54733c51d8ea557fae26
 EBUILD prettytable-3.5.0.ebuild 863 BLAKE2B f3ae32e2dbd0e6c2b0135bdf45dcefe6e017457c942ebc4d7fc9f298dabed3b570d6a60e406d10183526345754b1a20733a04db691be9bc9a3442493fa06e35b SHA512 063bfd8d85555ebeaa1a5455b3ec8125d72fc3cd6520ff17acea225466884b921c14ddcc6dbf2eb493a7b0a2747e9298e7328cb7568bebe98ba11e61dc039e6c
-EBUILD prettytable-3.6.0.ebuild 868 BLAKE2B 6ab473b622a6ca10f4a8369cc8e1aa49dd4fb92dd7df2532c8d4ef773cac380ca21e27343104f076a48dbb4b39a30d69561bf3489d71498390fe9495c2f170c3 SHA512 c42e9b78383c6abe5c8420156e4cab076a3b45c946aa1c064e3ae038a5ea04d5008bf0101760c4ce3d742dc8b5d3daaaecff91f52f2fa4b325763fb36c0d80f6
+EBUILD prettytable-3.6.0.ebuild 863 BLAKE2B f3ae32e2dbd0e6c2b0135bdf45dcefe6e017457c942ebc4d7fc9f298dabed3b570d6a60e406d10183526345754b1a20733a04db691be9bc9a3442493fa06e35b SHA512 063bfd8d85555ebeaa1a5455b3ec8125d72fc3cd6520ff17acea225466884b921c14ddcc6dbf2eb493a7b0a2747e9298e7328cb7568bebe98ba11e61dc039e6c
 MISC metadata.xml 583 BLAKE2B b82fa13dd76ee47e012c03499081072c737cb63f2d23190dc3622dae1bc50ba054c7cf492a1feda7147c3a8710bd8ad509bc653e5b40f89b93ffd63da69c3f65 SHA512 e7d331df0ec72f98acc9abfc70424a619e67e559e4b02b357658e9e48efd080440a0d890ce5df2cb8cbffc53640b2068f39f803aa180bf2607d02a9df1acb5b3
diff --git a/dev-python/prettytable/prettytable-3.6.0.ebuild b/dev-python/prettytable/prettytable-3.6.0.ebuild
index 60c7957b7724..8f107b22cec0 100644
--- a/dev-python/prettytable/prettytable-3.6.0.ebuild
+++ b/dev-python/prettytable/prettytable-3.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 4f5e5b1154b0..2d80e2a93c24 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -9,5 +9,5 @@ EBUILD psycopg-3.1.4.ebuild 1725 BLAKE2B 307bfbf1da1566c1d31ab70a153485292c8ef50
 EBUILD psycopg-3.1.5-r1.ebuild 1689 BLAKE2B 3f6edd76888c3eaf7a4f81a4480ed7858e5bc6ce6e317de3f959ce15212a71e47a412a6c53ac1cd3e4c0175fe0e548dc9ab04a4147d752bf19d7547df85f8116 SHA512 25be89b45205c765a52d04222c2997d69893dd271c9f0e60bb0c2dfab716a637893d122ce51b104f4da00824c491d30612e7887ac59c07be401488d2fbaf0b4a
 EBUILD psycopg-3.1.6.ebuild 1794 BLAKE2B 7ecfd191b88d9acb11f6c0b95c50863fd728f21e559700d45c86feeb23c847cefd1960ea7ee1b42fd5fb722c943a74a6b4eb2d2c56d9b9a4bfa5761796c64be1 SHA512 a751c9cbccfc953ac5cb520b38e279bc13506a60f5cdfab4cfc4a8a1e06dfdd6f44387f318131a062530bcffb38f41fca6db74468042464c8064c77c9a287b03
 EBUILD psycopg-3.1.7.ebuild 1788 BLAKE2B a7cc967634970cf4979c155fe901622f964f54c2c1da678f13c640dfbb9608bb2d029265b4c7661474d14221cb446732d3629a2574dbc8eb664eada95f60b988 SHA512 fe8826c280129f35c107b3ff94cb0c1774ff7aba80ce1ab7f575a6999b39de68331c932735672acefffbd17f7eff7d3fbd721c2ef2538480662c33f23a486d5e
-EBUILD psycopg-3.1.8.ebuild 1794 BLAKE2B 7ecfd191b88d9acb11f6c0b95c50863fd728f21e559700d45c86feeb23c847cefd1960ea7ee1b42fd5fb722c943a74a6b4eb2d2c56d9b9a4bfa5761796c64be1 SHA512 a751c9cbccfc953ac5cb520b38e279bc13506a60f5cdfab4cfc4a8a1e06dfdd6f44387f318131a062530bcffb38f41fca6db74468042464c8064c77c9a287b03
+EBUILD psycopg-3.1.8.ebuild 1792 BLAKE2B 2d12efcd91c90c372d215cd3df06137cf4f5d76ea9e49c54ef21b5c7cb004b442ff48b437e61d24829252ceb8acaca00b4f80c2df7bad17fc7dca824ebeca0fe SHA512 e9df47c1f973ca3247ce6585d048611756de772416b88258cb0782ce4ae108255eec86a2e3d831e08788e6cd6e53696250d7fa8c2711a2ad876de8c2e31ea663
 MISC metadata.xml 426 BLAKE2B a573dbbef89ba2c3c7e7aa11e87005879fa823daa8d7e2080ce82dab7196429769b5e2ed0c4ffb363443469dfa47524d900fae75c4d7c8c9da901389e746838f SHA512 e3059428d8c00113696bfd232b2ad3fd4efccc304a31ff45801f30bb07c03acd58aafcab187fd85e4d89eff4db6c18a1395744eb1fd5cf8f11e43aca0f4e60cc
diff --git a/dev-python/psycopg/psycopg-3.1.8.ebuild b/dev-python/psycopg/psycopg-3.1.8.ebuild
index 6353cc7eda22..f50e103a72e6 100644
--- a/dev-python/psycopg/psycopg-3.1.8.ebuild
+++ b/dev-python/psycopg/psycopg-3.1.8.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P}/psycopg
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 DEPEND="
 	>=dev-db/postgresql-8.1:*
diff --git a/dev-python/pulsectl/Manifest b/dev-python/pulsectl/Manifest
index e4d7afaa2145..a2090868723a 100644
--- a/dev-python/pulsectl/Manifest
+++ b/dev-python/pulsectl/Manifest
@@ -1,3 +1,3 @@
 DIST pulsectl-22.3.2.tar.gz 40901 BLAKE2B 5b3eb752865e95cfbb70a7228409fea70b4c55c7297d652b4614df7ea4764dcb446f7a3e25bb89f6a55badbf6b300381c7c28c56f0a47e7faf1e63003f39d02c SHA512 7fc11c792a9e586d191a32831e0ef8896c40da1fdeddfd4467d7ec352e5e0ef0c910d7a2e8e82e1a381b16afefa17c9c9db4821be74d4694c934337b2a862f0c
-EBUILD pulsectl-22.3.2.ebuild 525 BLAKE2B fb7a0522e8c93735b4744ebe17d2e954436b998f71e418fa56c79510b9edf98454de0c635df464dff2e7a8f7fc1f0f078407fc56f222a1e79f4ef015272aa61d SHA512 4261f61dd5301db6da739239b046ed1475de4dd44bdfe3c5f4e8af15eeaf3745aa43208fa8d48f33d56017d3b554ab13808961274ca2da74e7d17d77be2ebaa9
+EBUILD pulsectl-22.3.2.ebuild 518 BLAKE2B 675ce3f9b59fdb114c27d3d33a3b6b18286f5a6c69655439f0b3c160534dcb90f5da93954b94c79f68d550898528a10a4b42c982ccb9af2e565d92321d4143f2 SHA512 50563d8d36bdbbba4227368ab91d1e12dc54dcc93220d5bd594811c97a23b5e6b222f93f4ea3c85ec12ae1a1c1331e2ee1ce2bae07daa6263f8f4a01977377a4
 MISC metadata.xml 558 BLAKE2B 6cdebbc1f507bbab92256bbac867a86468b733b40dacfdb71090738f5505ea6ac33b24cbeb06835e10d9845e3fd9189a6c34625176f12c9dc7f4a1511069e8fe SHA512 b15eaa0564bc6dadf8d46eab154d028b4cbde26fa099793aa23df8f82eba86a4125d173eca8a8d2d73359dc67171dca9d8716e1495168c7b6c8ff5c701a21577
diff --git a/dev-python/pulsectl/pulsectl-22.3.2.ebuild b/dev-python/pulsectl/pulsectl-22.3.2.ebuild
index ad1d1b92e68a..248a823fd025 100644
--- a/dev-python/pulsectl/pulsectl-22.3.2.ebuild
+++ b/dev-python/pulsectl/pulsectl-22.3.2.ebuild
@@ -6,11 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( pypy3 python3_{9..10} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
-HOMEPAGE="https://github.com/mk-fg/python-pulse-control"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/mk-fg/python-pulse-control/
+	https://pypi.org/project/pulsectl/
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index d1682e755772..fd77aff85859 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -2,5 +2,5 @@ AUX 7.44-fix-tests.patch 1679 BLAKE2B ca0126a6dc12203ba8409c70ffa5142288bc94fd07
 DIST pycurl-7.45.1.tar.gz 233879 BLAKE2B 8a6fe72f00cfd172b4f5e257f4526c4115047aa911d7fb3802d3bf105ac70dc866b27fa4878aae9f92229a5dd5108a2b5e1c9acfe93e1a94dac60d9405c5d5e6 SHA512 05639d484aac6d6688677589e391975158c5ef778456a47df575ad13fb8bd0db67ff8f5a39bdd99d82a67926aca421c01e687eec9d4fd87f32822b492b429635
 DIST pycurl-7.45.2.tar.gz 234245 BLAKE2B 16257a967d2867de08d83478f602d00b54316d37b6a544804e606a814f61507530fb7e1ef3247be824dfa22b9487a69bbfc9b1038b2b776ebc556b18ed2d93ca SHA512 8a82346395acfc0bd37a8c4d8d2b17e5ab4602710308ed50f9ed88c223c73f15f5b1c95fc6191708e3bd9d647e4bc5ec91f740de433dd87e2ae0796ac79879ac
 EBUILD pycurl-7.45.1.ebuild 2568 BLAKE2B fb2282cc2d5ae1acad393b4d3bf91ac0b4559f0b1a49c7c5b5227865ccdf3a776b954bed3f55ed92711b99d6fd6cf0d0a499d74e24a89049cc98e29c0eef98e3 SHA512 f6b0d9b3c1a06f98c172da93eb373f63d8e138e77a36b6d52d1ceb2e0c20db7dea48a52765f0b74dd27dbb6a12750d92e86d3c031712c698659bdb7e1e1ec7bb
-EBUILD pycurl-7.45.2.ebuild 2527 BLAKE2B 6e75b023238ebe61cb5552893008d1deccb27d0fa534d49db2643c959b1f40a893eb61aaf47c19e89b57f134ba10c2b4457158716329b30e9340791a22ae93a5 SHA512 d4aaa625661123da4b54cd1cc9e65840719d6620db148509805aa5f4b571f1b8c7e02ef88707f2e08693a1077d0705c915f0254538642e97f3c8f69dd2ddd40a
+EBUILD pycurl-7.45.2.ebuild 2524 BLAKE2B 1a2f64ac08bd9725af3e75d8a2a0b6739463fc9d6e980037865abd9edb2c1fd7367f121a4029c793facc1a2292ae9963a919f8f6c364b8b0410331d29f594006 SHA512 097988a389dd654e23c66194f51b9d3c764f77d5d458f480f5a5a6cc66ba05a859f546b1a3f5c6bd569af16bd94658956ee626d46d71b0e8357a27d5ccac6c28
 MISC metadata.xml 1100 BLAKE2B dfc7fe054c7cc34c61bf58fef0378df304a539c28cbc0dff4ffff65ccc8892c38aaf1e275885fc54d2854d9acc6b382947038041f815b5941859be7cfe75523f SHA512 f1de0dccd625ae0b02ff9a55cbc1bbf7944faa24dba28ffd711c728001f180afa598a255132aea860ad616637325cdc653577af531b1a954a3994e8902c774aa
diff --git a/dev-python/pycurl/pycurl-7.45.2.ebuild b/dev-python/pycurl/pycurl-7.45.2.ebuild
index c8e1d418bdf6..22bb949d0817 100644
--- a/dev-python/pycurl/pycurl-7.45.2.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 91c92aac2c86..09d0fd38b32e 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -10,5 +10,5 @@ EBUILD pydocstyle-6.1.1-r2.ebuild 989 BLAKE2B 0acd5c9f401b014438e19fd2d2059bc404
 EBUILD pydocstyle-6.2.0.ebuild 1119 BLAKE2B a56d1600f7a770c23ece51a1803d78189a85ac5e6a8e6a4db31fa017da3bca19a437d0fc85ed43828471f0b6cf482e81c8f4ecfd0461445ac2b149ff8755f748 SHA512 c3ac2de5441e79a322c492a16017dc10643e6d51f37cefd939fff15f06c11e956f13e0d83a5323178ff63be574534712522f3edd71519da66fa68ff206811dd0
 EBUILD pydocstyle-6.2.2.ebuild 1087 BLAKE2B 0b70fb61c53ab7b1a7af999af064deb329c4be12642aac145906c1d935a6de406b17e0e357c74918c3bbc7a1d7503eeb8beef7805c9986cb11308bbd11c49c29 SHA512 9311463686c5a3b4a3a1b0a10190b28741a2fa36b3350be54b3eae34981a58b9fbc02f5353a1c154215c4be26ad207815e71f2425ad94840515184cdc5698473
 EBUILD pydocstyle-6.2.3.ebuild 1087 BLAKE2B 0b70fb61c53ab7b1a7af999af064deb329c4be12642aac145906c1d935a6de406b17e0e357c74918c3bbc7a1d7503eeb8beef7805c9986cb11308bbd11c49c29 SHA512 9311463686c5a3b4a3a1b0a10190b28741a2fa36b3350be54b3eae34981a58b9fbc02f5353a1c154215c4be26ad207815e71f2425ad94840515184cdc5698473
-EBUILD pydocstyle-6.3.0.ebuild 1087 BLAKE2B 0b70fb61c53ab7b1a7af999af064deb329c4be12642aac145906c1d935a6de406b17e0e357c74918c3bbc7a1d7503eeb8beef7805c9986cb11308bbd11c49c29 SHA512 9311463686c5a3b4a3a1b0a10190b28741a2fa36b3350be54b3eae34981a58b9fbc02f5353a1c154215c4be26ad207815e71f2425ad94840515184cdc5698473
+EBUILD pydocstyle-6.3.0.ebuild 1079 BLAKE2B 0ca1232e6a9bbc2013cfc1347048f82102e8de91c08928f2d2ef2a4019880b2c9ba686fa0c3f39b6d2a711e8cb8126d06280dc7602b592a92220a34bc84121fb SHA512 70f882a88360e2ae12111dfaa474f8286a075f188f2bad3e7009d2865082d57c42bcc2d89d18df57482854c8ce5fef833afddbb15866c1e02b176e6aeaee6721
 MISC metadata.xml 665 BLAKE2B ac358d1ac5d68d11710048ccd4050f45cee96788829ee806bc5f4364c0f6b03707dcf15dd0cb9e7e3870cd9feebcead3c44b8f6bbff6738aa593079685c2a3c0 SHA512 7642d1384de3ec4bd55f7afc69ce67ad018eb9294f104234c5f3eb23a2c7a5ab36bda890a440fb5a7af8045d215048caf4b15bb3d965f414b755b51a269337cc
diff --git a/dev-python/pydocstyle/pydocstyle-6.3.0.ebuild b/dev-python/pydocstyle/pydocstyle-6.3.0.ebuild
index 8fda4e7cbe2b..a27b5e10bdbb 100644
--- a/dev-python/pydocstyle/pydocstyle-6.3.0.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-6.3.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/snowballstemmer-2.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index fa1371a43137..332308594c02 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,5 +1,5 @@
 DIST pyfakefs-5.0.0.gh.tar.gz 211213 BLAKE2B 79b83e0a07b094727a0e8d869c99ca64e132f1b7e81202fccad2b4a34871e86630defb87bb5bcfd638a59908c5fdf230aa0cc1e2e3b8393259374a6c5087db90 SHA512 e7125d3b9b186d121bc0b0dba5acf27afe405a6e2a4d8152008450f83a65918b1f612e479ab56c065542dd070b84aeb97cd281123636c062981873d94e4d935a
 DIST pyfakefs-5.1.0.gh.tar.gz 212507 BLAKE2B b9607ff2af71d6697bb5ea5ceae0bb1b92b9aa2e91bafdf24d3dab6f5412a6fd8ff590983085079e9a7b1569b839f4fc5b443d5904decf2de5511ab856e8de7d SHA512 40d4e3fb422c2d9515c00bfa9940a8799d5e102a5775ac34d45e99286759451d1287df1e32f45956a84c1052cc02eed98a8f9789a628ac253771042b011ddd3e
 EBUILD pyfakefs-5.0.0.ebuild 734 BLAKE2B 0dff21e1a038069b56f9088e97fc85ee5f34d42cd4a63fbb6f8791a15fcb895734c9093e2b2dc131e8927c6121860f278ecea21ee51724d6a19db002e217050e SHA512 c9b6a23913f610c7afaea2d3471043e9598a017c2376e9f48a646c7fe94e3cb2bf4dcd3a57122fa9f272c94ff36c94d735b66d47eef43f1c4d995ae5ba3a9274
-EBUILD pyfakefs-5.1.0.ebuild 742 BLAKE2B 66bf0ebda428800e18ba6b557337045245343b67faf87e360525582e0ec3a0bff8cfb84905b480eb64c5a954bbae0606490cd0a6e303ba29a6314d4826ce9589 SHA512 2e0c58959234755a3ba31430ff0baf84bd997f530df7b6c133761eb8aa37e8ee4d198ece1e89a49a53a88310e94d610148840999c12a6baf13ecfff2fcc3d206
+EBUILD pyfakefs-5.1.0.ebuild 734 BLAKE2B 0dff21e1a038069b56f9088e97fc85ee5f34d42cd4a63fbb6f8791a15fcb895734c9093e2b2dc131e8927c6121860f278ecea21ee51724d6a19db002e217050e SHA512 c9b6a23913f610c7afaea2d3471043e9598a017c2376e9f48a646c7fe94e3cb2bf4dcd3a57122fa9f272c94ff36c94d735b66d47eef43f1c4d995ae5ba3a9274
 MISC metadata.xml 395 BLAKE2B add696dab9f93cad522087325d7cea08bb0d6905a093c0dd721b8ee0cc5f06a97e8b29663920e5131fd1cfaf38a1fb1c22908daa155025713ffbf18d87a2d5ec SHA512 454f9cf42ae315bb9d4b7c9a2a8b9a690163befc8f738b1fe4a145f1f3a9a5f59693e4cd1ebd4c501005cac1ab81c8b57b2316ac50739dfa96919b6de4850b9a
diff --git a/dev-python/pyfakefs/pyfakefs-5.1.0.ebuild b/dev-python/pyfakefs/pyfakefs-5.1.0.ebuild
index 876026d4079f..bd296d0b3f4b 100644
--- a/dev-python/pyfakefs/pyfakefs-5.1.0.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-5.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyformance/Manifest b/dev-python/pyformance/Manifest
index 174633a3c7e4..3e690ea22cba 100644
--- a/dev-python/pyformance/Manifest
+++ b/dev-python/pyformance/Manifest
@@ -1,4 +1,5 @@
 DIST pyformance-0.4-patches.tar.xz 3500 BLAKE2B 511001e9011db5ef25b802739dca51337d039193a9d3322bbf94bcb120bbbeff2e1a818217970a1a97d77cd8d7da462792248910acbb3ef586704596276b7056 SHA512 858cefd6c8b151db10c63e0d8117cd6c226bd153103993040909e8fd2ab7a41a7770a2ae6de0f395a4f9f6cce3213d7ecabc0bf647657ee04fc10d76f51e07e3
 DIST pyformance-0.4.tar.gz 20683 BLAKE2B d818832b7ff43a7e1db888bdb7dc333a532c7d3365dd472f9dbb3300f676cd3cc8f82f8d1c444aa277404ff8e72843eca35e3905542700ea37b1dad3e05c8b4c SHA512 a03324977b40f5097ae4608dd7c36bdbd2a20b261c9d3e32d1be19e5fca50e17fcc24df781b6c3ab60314534368c5e9cf08bc3863d4d2d7ecc59f9af26f8d20e
 EBUILD pyformance-0.4-r1.ebuild 818 BLAKE2B aa2271885bedeccf71bccee042a038924eb91c83448efcdebfca9baad312c870f4097b82b81250ab9696bef0b5c8c8bc73bfc088fee759c1ed3c45946767c1fb SHA512 12f23a7cbbdf521eda58aa40e359786aafe5b880e143bf9c86b2cff252685c4df0b37f3e93c5654bd58b7bfd61be85cb71abcf8de808532bfd40e0713b94609a
+EBUILD pyformance-0.4-r2.ebuild 850 BLAKE2B 8f47cc2def9b8257b4b72a7ce870df61bfa60e23c3fa43f38e33c167f1108046ce8150890926d8b199d4de3b8f4c1ed3e025f36d4385c3ea0a34249c785c0b5b SHA512 55901edcd1edab213c25d0a85c0d815e9334245f171d4db2a705368e3d7fafe8d30dd55d616821fce78893ffaced07cf926083bb99d84edc74bf7d332a41c048
 MISC metadata.xml 453 BLAKE2B 23c79392fd8ec1e98ef4868885c2227aca607f950a2af79fd1e45701a886c9f0095b631c3b176fcd21c5192336a079437985dd80c5f04e636b445d5288b640eb SHA512 16608a7c69206bec3ff39df854c791d61a8a327a1e10ce5159664dc85250b82d664e827c917548686cea0a90997971eb0b05a05c186dd0bc5385bf7cc1202dc2
diff --git a/dev-python/pyformance/pyformance-0.4-r2.ebuild b/dev-python/pyformance/pyformance-0.4-r2.ebuild
new file mode 100644
index 000000000000..e13cf4ffb999
--- /dev/null
+++ b/dev-python/pyformance/pyformance-0.4-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
+HOMEPAGE="
+	https://pyformance.readthedocs.org/
+	https://github.com/omergertel/pyformance/
+	https://pypi.org/project/pyformance/
+"
+SRC_URI+="
+	https://dev.gentoo.org/~chutzpah/dist/python/${P}-patches.tar.xz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${WORKDIR}/${P}-patches"
+)
+
+src_prepare() {
+	sed -e "s/find_packages()/find_packages(exclude=['tests'])/" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index a67974c20f47..06f1cf7a5eb3 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,3 +1,4 @@
 DIST pyqtgraph-0.13.1.gh.tar.gz 1368154 BLAKE2B cb19ae6564b0fc0a4ec4fb6232f7949bb5130345380a86f0cffdee14e767d306b27c26ae3f7c011d77f21353b511d99148e1acb38e8d33598dde16362475b5a8 SHA512 bcd3d0c9c1d91ad2ea3f85f8e34e68ab999fce636ed336362253f09a7863a62c4b635d71c137c9458532c7d1f76dfc8433d476cd84121cf89488fb0860039b8f
+EBUILD pyqtgraph-0.13.1-r1.ebuild 1798 BLAKE2B a77b7b824be0fa1c4a843948a9110dad83ca57402b613e5e65cc5ffc7099d5a6fe51bbefe4319e3dd634c55010df550c048196fa5f3ea1c70151a646cbed376e SHA512 ba05ae58f42efced97c1fa52d7a447b816897dee9e2e611832bd25bfb9d9bc6cc88601cf19642e5c701e5ed0ba2fd2a4f377ded9d92a08c1820b0bd22e1b85a2
 EBUILD pyqtgraph-0.13.1.ebuild 1796 BLAKE2B a1df2664adc96a7c97014542639da62b1e26ae9b320d5fa564895ec7f101d5c42d63d25bd2418bb89efc9aa8d60dff755be23418bd8a3ab9d31fd47bf8ec413a SHA512 8a078602470f3a707e914cb4ddb77dbb5730bc5add4957c671c5cfa5870e1440b79e25e24174ae9966ddc433bde73416b81f138d134acd3f5a79540d68908d9e
 MISC metadata.xml 775 BLAKE2B 08f1417793ef0b57d978cab5b4c03e43e756a43625d8e6173a8b74d3c9dcce0547934485d192546cf81b8da03bdf21e4c800bb25e0bec452fe092ab3772a518f SHA512 b03a0aa3f6e6183ef2d81b9d0bb22f576661b353986a802f01cb670f9ae0487d84d3e91fd0a4add41e3dd830dbbc0414f4d556bc05bb89a768be9e5c2cee4ce4
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.13.1-r1.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.13.1-r1.ebuild
new file mode 100644
index 000000000000..aaf3b74bd273
--- /dev/null
+++ b/dev-python/pyqtgraph/pyqtgraph-0.13.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
+HOMEPAGE="
+	https://www.pyqtgraph.org/
+	https://github.com/pyqtgraph/pyqtgraph/
+	https://pypi.org/project/pyqtgraph/
+"
+SRC_URI="
+	https://github.com/pyqtgraph/pyqtgraph/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="opengl svg"
+REQUIRED_USE="test? ( opengl svg )"
+
+RDEPEND="
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		dev-python/h5py[${PYTHON_USEDEP}]
+		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use opengl; then
+		rm -r pyqtgraph/opengl || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# apparently fragile
+		tests/test_reload.py::test_reload
+
+		# TODO
+		tests/graphicsItems/test_ROI.py::test_PolyLineROI
+
+		# pyside2 is normally skipped if not installed but these two
+		# fail if it is installed
+		# TODO: this could be due to USE flags, revisit when pyside2
+		# gains py3.9
+		'pyqtgraph/examples/test_examples.py::testExamples[ DateAxisItem_QtDesigner.py - PySide2 ]'
+		'pyqtgraph/examples/test_examples.py::testExamples[ designerExample.py - PySide2 ]'
+	)
+
+	epytest -p xvfb -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 4fd4300c7c4a..52349952c28b 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -3,5 +3,5 @@ AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f
 DIST pyquery-1.4.3.tar.gz 47448 BLAKE2B 32451dfc8f8160207b4be12006ceba3098b8cb344bfa3e80ccf75f8cfca9542614ae78b9bfec773139cbbf12434201f92f8b4738e7d9e6241b3addfeb1bc8dda SHA512 cb61326e38f78763ca15de09e3a56dad776b3d4831b54eabf295db0f9af8bf04599642c73f5db3e3172b86d7b66ba2ef626c8cba2dfb458af6ac432d15ea7cba
 DIST pyquery-2.0.0.tar.gz 45210 BLAKE2B 2c1d052d310541b36f526e72906681ea03e0d55be16202c98ab5d5b9f5fc408b7612a353100937381639a03f8871b8bf691c6b0d5ad09dec8cc6f2e2ced7944d SHA512 316a479acd23e371b6e70550681527b15203e7ab62f4722375335180f13d9b48d9170abf308bb26b6180d954de4f8dfea5f90426cb820c5e888cc56f8a99ba33
 EBUILD pyquery-1.4.3-r1.ebuild 1062 BLAKE2B 0d47c86ff71a8263fafb2d2323cdb7b21ead157709f95dea93cc561bf488d9c228e134db865865f680b0573cb53b6c9e48bcdfbec14e58e804f6310244602dc4 SHA512 5210ac833f31fa1c3ffe29bbe1007fa7727cc11ee37757e29bfc4efdde837ec840bef66dda97c6337bb865330f089683f040a80d170383546bc7720fdaef2dfd
-EBUILD pyquery-2.0.0.ebuild 1096 BLAKE2B b007e1974d1dae01464d3819506585b9a17b22de226f25e8df001d9e82fd6d9a7650d1417e6b17f21a762f06d85549d5e190b299a23153df4692d26b7658dac4 SHA512 21402b0ed2f04ba804d6f1c2f037df2566fe08caa375b9202c3ab22b9480bd13b47e039bacd7146f468718c308c6dd3829beb9b55efd32ab8906ce5a09a53d26
+EBUILD pyquery-2.0.0.ebuild 1088 BLAKE2B 273f71b37b9230d3c09015749e9fe9263edab29381c3546e2d5c8baa83b7a3c02bc6ec15884e286d53f2989c5ac0e929bdea3b53344281cf42b3ee5f3e630240 SHA512 3286e79c3987b33f8af9d4b9a1c9ff2c4db243649b913e78c5a6e1c90a86fc8eca0fcf0b2c3708f0ed617c873188a960808835792a7337d51b3a9b3f28e92344
 MISC metadata.xml 401 BLAKE2B 0b74798cdf7529c934996c257374138a47c2d0e9a2b1b6b14511bf913f092d41c09291ecd9bf878b9aff3bf6e0956b0fbf9a59f721e236090aaa5a81db913c80 SHA512 f056c0982c8e233a79b23e9cdcbfcf6b6221e7cbceed7f5966fead5b9f8b7add936754de95650b2b0b8a5c2f5d9d76642ac861baba7379185acc886f01ee92a0
diff --git a/dev-python/pyquery/pyquery-2.0.0.ebuild b/dev-python/pyquery/pyquery-2.0.0.ebuild
index f4422d827003..0989b3129f2d 100644
--- a/dev-python/pyquery/pyquery-2.0.0.ebuild
+++ b/dev-python/pyquery/pyquery-2.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 0513c1543663..c6e9c6f4eaee 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,5 +1,5 @@
 DIST pyrsistent-0.19.2.tar.gz 102438 BLAKE2B aa231a7c300d2f1501abdf2fc74dfa9672ad8000d87e3fa9beaa51aff4816dad4f142e9a2e609dee402352cf5a0477b6d4dc31460a71e7d98a592604fcaa97d6 SHA512 fdaadb65e72db4f90ecb1526fd68eb2b60b278071978d4b5a1b1379be83c60d30fd653dd7e6527c217d4e50f05c7d641290172aa5d5e4741dfe5e08f0b0c282b
 DIST pyrsistent-0.19.3.tar.gz 102640 BLAKE2B 60c5ef9d3f26c4529d05804df13453c75b6ff70e12fbbbbe22312686da929766fc903b18ca77d626192e1f3fc9fbdfdbbbd4eef102f1504b38feeeedf00450d5 SHA512 6bb70b6fd65b5cd9f961a3199c2d90725aaa66fb869e4eba2143735e2f3a7e4ecdc782b3498acc2d92e263c3bed14cec8cc77324f4ebd08c300ba6735db5ecf7
 EBUILD pyrsistent-0.19.2.ebuild 653 BLAKE2B 7e69362d03de573f1b4deb47e4a48f6b65caf023f7621e69c51e51414d2c0fb2927f842d57c1f63da19b5ff1be0fd803e5c2d58721a0f7f02cffd5473fdaf9fe SHA512 887ab3119e97643ec51b16242a2e0e6fb51670e8d4d4406f58a792c0259aae6af9f0c53645421ba18607982ace96ab6a88773cf4f5ad90d55a864384e77a5cc3
-EBUILD pyrsistent-0.19.3.ebuild 661 BLAKE2B e9706776f60af434dc55cfa76f5bb3fc45e6d52a595beaa96a9f004d64a77c3537d663930f5d15cab567236345a0595cc9a914f33819686a18d61a561b4bc398 SHA512 8d905d3b0952694cb61bb8fade6e23268a96cca81b2b0c91cb6637ed8bd1f6d9086a12141cd42914eac78e777ef04f03afa64b9cb23fbf76e043dcae40f562f9
+EBUILD pyrsistent-0.19.3.ebuild 658 BLAKE2B bd9ab0633c2a2d20f089dbf504c8e7254f9e94dc7f1c232ccfedc7f4bd848f9ba124b9dcb724828e25e47e6b6526f4790497b13658d2bf6336f1857b63a21405 SHA512 91c9a850809334df8ab8138f839be97c4264ea6e01d6fd61104ea64d4a1dcea20643d3ea9cceee22480047ef29dded1d7e63354b74cc20b8b9f470faa5371eef
 MISC metadata.xml 522 BLAKE2B fbf571fd4d833fea0dc9942620655c45bb91b07ca02e2e0fccb23980de26303b9e9c3963453cae3775f7db33dfd485a4a55782a1b1b2b635af0d62e331596b99 SHA512 fe358befc92e29769bc2f84a516da1a26026e4ab84e812326da72ee02b18c79c3d6acdfb71cb6027d2d0f1e559cc00cf39406e335fb8f38d4479353a7dbb4ff2
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
index b55595b08aff..22530128bdeb 100644
--- a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 550aabfd4761..999c29f9947c 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -3,5 +3,5 @@ DIST pytest-rerunfailures-11.0.tar.gz 15836 BLAKE2B 41c3695250e809123c468325d6bb
 DIST pytest-rerunfailures-11.1.tar.gz 16681 BLAKE2B aa1e35659411bc9cc777253982d53b39a969fe1448990008e99903ca3bd2a675f07551ab806a0656b9ed329b519458c02e46dc8fa2f1e0f60be8e3b2457e48d1 SHA512 9a572faab4ee1907e829d38979a87c5eb24dc13edfbbd987801b610f67d0a5ce8743f2bdbe883bd247915e6ede6b73fceae9c4994774e74b1b1a192587829e05
 EBUILD pytest-rerunfailures-10.3.ebuild 803 BLAKE2B e7f612a5e3f185b4e5314df58f07f28f9568768e3e2fae6aeeb6aae3d92ca777e3c6bd908f6fed83a6203ef32f05c9a535239b9acafdcb0e8df883cc8e688bbb SHA512 2baade69cc675482058dcc2b01af8b53c04a48ffb0f4d322844437dd9dd1ebd1704fc8afbd33451207fbe30085ffa7d6010652b1f951e890f45c78f0b3b43bd6
 EBUILD pytest-rerunfailures-11.0.ebuild 811 BLAKE2B ba718b98cbbb0f414d5db06cb6e64a0ac4d3cffacad18c0a1dc77e62758a04c9a83f9564248010513a7c340261a814907a95a1aa1f8c569f62c2f9ed1a1883c0 SHA512 77e570cb2e66821689d22cf41c94476a7eb4c74058a74e24447bf9f9ae0e0cc5d390f348e935e902bcddcc3c052de8f5a645de97b1bfe789e7705d368921929a
-EBUILD pytest-rerunfailures-11.1.ebuild 784 BLAKE2B 1a8cc6ed1bb0d91c5835565a161fb97f7d0a066d661c0e331b2051c27e475d6122c27714367442aaa87c2074c4556ea9ed1e4d9982cf09ddd488e6ab1ae4e4f6 SHA512 34183897eff1f03907e3ac122ad42c1850fe8faee59ce049cb3c189deeca9c0713396185611d2cbd1d5e40f5a59b02b29085b84525e3b3a8c9fa6513d084571a
+EBUILD pytest-rerunfailures-11.1.ebuild 776 BLAKE2B 5c3009563bea9b461848feb3f6499b4dfed6d3cee5ef2c6ae86b13f211c944d847ec69a7361bab663fbb7259bf434d7ee179b1a2deb3a960b1d57839aa1f4b87 SHA512 1377c540c1e5600cd9f01143a10e9eaa4dad917b172bb2a30dcd0dfc085ab4ddf7eefd4c83b85101ba81abd01962fa391041cca1ecb92a5441af919f69a46f26
 MISC metadata.xml 432 BLAKE2B 3bbb0bd303a26d2a336563f187160b3b023e6d7a3a776922dee4853164d7461f395e840b2c0ba1349687d24050ccb5fd18166aeec397c9b21a1aa0e6b536b795 SHA512 f372a1f73a4dc3e60f66bd6049cddb4d8cd8fe53bebff2a6d194eb3d5872adab9b7ac226971696fb24a8d4e4744427c4d4148054fc51a94f63320d428ef80d52
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.ebuild
index 5318792547f3..888ff684a0b7 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index 5afd2b961ac5..18641a28d4a5 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,3 +1,3 @@
-DIST python-mpd2-3.0.5.tar.gz 67224 BLAKE2B a0c78e3a2624247a7ed4228725dcc09457804636b01b09006bcd61800deefac8887fc9f76b9d7bb21c973e2dd9558e934f3864b2f8f5c041a94633a29f9a781e SHA512 521345b905113eaa56e6ec983e4d968d77dca30f839ab52a00e146f311269828ed383bce460ba1daf61b7f98c63ae3b7a3cbcb55cf917b1c5a5a11cf62b6a7d5
-EBUILD python-mpd-3.0.5.ebuild 992 BLAKE2B 416d4ce2d52166aa04304c08d6b0a1c0410ac5f376d1e83f64b74544d7ea6206b864f072d8d3c0d583da8afde75df25fdca182eed1401090635ccb99cee1a342 SHA512 9c9168ff510ab08c77516787cc91354a8f46ba281debd92f70f0b8722dbbe0d0a343abe5148af65b70ffcacff5110c6e9c9cfb0b59e6d47d0256b151fc44d1fe
+DIST python-mpd2-3.0.5.gh.tar.gz 67224 BLAKE2B a0c78e3a2624247a7ed4228725dcc09457804636b01b09006bcd61800deefac8887fc9f76b9d7bb21c973e2dd9558e934f3864b2f8f5c041a94633a29f9a781e SHA512 521345b905113eaa56e6ec983e4d968d77dca30f839ab52a00e146f311269828ed383bce460ba1daf61b7f98c63ae3b7a3cbcb55cf917b1c5a5a11cf62b6a7d5
+EBUILD python-mpd-3.0.5.ebuild 1001 BLAKE2B eabd6c995cbaaf9c8a2baa0d73058d20794485a7a2e4240dddb7578774ca3c42cd285c89adea58a3f94460b67eb15e6f15d2ddecc6650b85a34b012654473208 SHA512 ffdf2e017255fe428c66711556b9425e6e0deb2f05195c257e05757bd3ce09676a9c994068bdf146c7da965ec91547ec7de10854cb14ef545b2806c05bcbb03a
 MISC metadata.xml 464 BLAKE2B d64863a0d0de7bdbb309ea89cf3758d7347ccfb29fd810e3cc99735b6cb096b1dc21857905f04f689865690c170bcc141b2ecc7ac0954f5db748fae52e8754ba SHA512 a37f69491be26d10e30ffedf86582ee8f0cccec30278f2edf24b9018357609ff2b65a68b3e778aa5cd956f16ecb75e490be3305ea1d8e2ded3d1a3d187f644ae
diff --git a/dev-python/python-mpd/python-mpd-3.0.5.ebuild b/dev-python/python-mpd/python-mpd-3.0.5.ebuild
index 0c5c8ec31333..1b8aa7be2faf 100644
--- a/dev-python/python-mpd/python-mpd-3.0.5.ebuild
+++ b/dev-python/python-mpd/python-mpd-3.0.5.ebuild
@@ -4,17 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
+
 inherit distutils-r1
 
 MY_P=python-mpd2-${PV}
 DESCRIPTION="Python MPD client library"
 HOMEPAGE="
 	https://github.com/Mic92/python-mpd2/
-	https://pypi.org/project/python-mpd2/"
+	https://pypi.org/project/python-mpd2/
+"
 SRC_URI="
 	https://github.com/Mic92/python-mpd2/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
+		-> ${MY_P}.gh.tar.gz
+"
 S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
@@ -22,7 +25,9 @@ KEYWORDS="amd64 ppc ppc64 x86"
 SLOT="0"
 IUSE="examples +twisted"
 
-RDEPEND="twisted? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+RDEPEND="
+	twisted? ( dev-python/twisted[${PYTHON_USEDEP}] )
+"
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 050ba635ae54..7baca4bde27a 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-neutronclient-8.2.1.tar.gz 305119 BLAKE2B 75c75594a9050f7d78921eb72a85ab216862c2c00ce622c5392cc089b9611aa7ce48650eabfe71ea14a8329c10cc4922b8de982e79f238663d8f315c7b0e99cb SHA512 dc5e0e0a0d16ece56993b316db5fe93c8c5c9c50407229900fb4f21cd049e1d7d7ddd01f04b5a7b2e9d0c4623c94079a7fa8568068b30768ac3e2a51464a20a5
-EBUILD python-neutronclient-8.2.1.ebuild 2284 BLAKE2B b92bd505480d015f5ffad9cd084d79d0224243169bea0965274137e12ab178583b66a21446417cfcb5b9739c3ad9a3eea473eba504b4295597471ef2f8280227 SHA512 8d0688fee54cae080d4c05c6d4ece4b2464dfca8d3a97cf5c7c3c612d2ebe4f0aecd7c98ff9ae779aa6aab90571a867e71c48aa019ab567a45b006ab8ca72d29
-MISC metadata.xml 645 BLAKE2B 7c6f6fa18789cbd9334a7d611b47f5d2b9b0110a2c15cfcd50b95a4be593e8d5c7fa5d53a2db8a82c68c6e9f75db668cef4b4dfa7aa446f4cada0db80a669acb SHA512 035c9734f11c8b8d1edad8991c527d51060f58a171dbacd26c62a37cf8b061df318fad31ca352c17116e77e7e2338a85cfd8ee8550b10a2f93eb7ca3be3fd192
+EBUILD python-neutronclient-8.2.1.ebuild 2383 BLAKE2B c8d727ea70b42628b7a348513d32c31a5f9a9e8f935538d9ed780e38a0c19c5821f04f2b79708e2f03c76806fbab6caea8bb8afbfd23ce3af9a516e663620564 SHA512 ef4b4330e6b6a96e640818dd1d716eb931abb4fd18b45c078029463131ea53cb484123d37227f5af858228b70dc61e0093bba3d9ae55836deb2c96bf2c7a048b
+MISC metadata.xml 717 BLAKE2B 75f33edaa71a10416b2b714a8cf11293977a15c6f2480b1606836d2dff0a5833e0ae10080acc5da0d665b466b6487f01e9bb911b4099f68c45bd0509eec811ed SHA512 39e07805e8c08291ddee7b569f092bfd2c2b7bad520bb076d724427e939b3e33b0a83007fce2f43a075fb53606bb611bdf2dd56cb5ddf0dcc7a26ad71f086cea
diff --git a/dev-python/python-neutronclient/metadata.xml b/dev-python/python-neutronclient/metadata.xml
index 55d3f4d2d0e9..4c106dc7c1eb 100644
--- a/dev-python/python-neutronclient/metadata.xml
+++ b/dev-python/python-neutronclient/metadata.xml
@@ -16,6 +16,7 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-neutronclient</remote-id>
+    <remote-id type="github">openstack/python-neutronclient</remote-id>
     <remote-id type="launchpad">neutron</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/python-neutronclient/python-neutronclient-8.2.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-8.2.1.ebuild
index 88d5616b7be6..7747f9b4aa9a 100644
--- a/dev-python/python-neutronclient/python-neutronclient-8.2.1.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-8.2.1.ebuild
@@ -4,12 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
+
+inherit distutils-r1 pypi
 
 DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://opendev.org/openstack/python-neutronclient/
+	https://github.com/openstack/python-neutronclient/
+	https://pypi.org/project/python-neutronclient/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 625615173f88..d299488bc1fb 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-novaclient-18.2.0.tar.gz 337940 BLAKE2B 8b019d55089688030696a3407cbc33df09b9857fc63173a4ed4983374a35593612e43e99b0b840e239fccb42b31d97d16502d0284734789acb7b647b001b17a1 SHA512 3321449f143c253a494477296e2b4ccb20ffba877f0257b4f5e39c977946748275018c8b4094b370d2d4727325c9292a5f2c6f3f11478bd13469174de9d19390
-EBUILD python-novaclient-18.2.0.ebuild 1938 BLAKE2B 9c9c0431413f506233432043bd8ac2b49b775ef504c551a8d3f821b804676b11895884db4324f76545fc0da3512b4c2483b461d7d6614a4a17a5e35e38207ebd SHA512 1056d9194e8f9d8bc7ac374ce08bd485f5d59420e222d886ef8f5fe8cc925a96d441a9e0a40cf8729661616bee1a879b40784a71f5fbc6f35b8df4a032703d04
+EBUILD python-novaclient-18.2.0.ebuild 2009 BLAKE2B ad4576a060fe970bf5e60264304d6437d6dd1c3a41586a65f2707a09add5f8eb6d468c0d45362edef988c9ba1ab5ce3bb5a5231b3acbd2b2bdf906ebf10ecffc SHA512 b07ba7a578335b79f3d2cef492e801798e46e6ec319fbfbfc43070b7449004ad7ec4e5bbcb9db4c6d517f5ce326eff497ce873ff395b687b8a188c1544bf324c
 MISC metadata.xml 893 BLAKE2B 42037d5052de72a81e2aac430fd14d107a0fa723c4288cd7f599bef817975ecc6b1dfc82b754ace2a50e4f9e0f5870cc6a43a3f0722d7647a38322e6cfde7eb8 SHA512 f89bf49eddaa5803ab953abc2dac189252095e529071cbd6412c15885e0a890a8e73a71295d3c3f9ebfb16bfe321316693c104d330037d112d03e04eadbf5a4d
diff --git a/dev-python/python-novaclient/python-novaclient-18.2.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.2.0.ebuild
index 054be9bbd1b0..2b1e4b4fdc8e 100644
--- a/dev-python/python-novaclient/python-novaclient-18.2.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-18.2.0.ebuild
@@ -4,13 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://opendev.org/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://opendev.org/openstack/python-novaclient/
+	https://github.com/openstack/python-novaclient/
+	https://pypi.org/project/python-novaclient/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 60dd34d5d36e..23da42b6e00b 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,3 +1,2 @@
-DIST python-openstackclient-6.0.0.tar.gz 838447 BLAKE2B c6b213b022e8c75d3a94752b29cebda4d9ca1d329dc1cb0b470f6e787dd930b379d16bec6c4a0047e63110e01dbf48bee72ed6ccbf54036fa3d1d5de55487e8b SHA512 20bd8da025ee3c69a5e491089edcb42f961c5109563718198ddd22fab8d6928fa08afd6a7db608c70386bd2b61c571c2fadb1c76f84c3d7f1a60c65d4520dfa6
-EBUILD python-openstackclient-6.0.0.ebuild 1720 BLAKE2B fb519306ba4e30f033a3f63f028bf7b59a411c04374a322f34e6440e5cefdb6d56e58f410a75790bb9a8d13f5cacadc636ee208614f3cbb1a797c43da7aaeec1 SHA512 fd0e3007089d831adc1d7afa3c56ddb0b6825dc79a2fe1a47545350bb60f2a56de53276a49ac85a2721efc4e0ada3cfbc5934557070ccb40fd1e87a6ea8df105
+EBUILD python-openstackclient-6.0.0.ebuild 1797 BLAKE2B 5754f0c0176e09d039d19dd16d492e67abdc95f13e6023d0860533883eb5223e86b7c95be097eeb277747741eef32c9fc247ce5e06c03542f1f1cbd2b8123e17 SHA512 9580ef5610adadf7f32757639ca9f0e6654d7acfa2d9a5c1ddb6ff58c00ede17f36013c5d22920ef2f63ec26a0d8aa24a31627439ed1fad8c0f977598cdeae58
 MISC metadata.xml 562 BLAKE2B e4f7a3fccc9c2c798962efb6dda973ad71c19e5db8efd57869b6a8cd565784d5f4a6c581bf11a28eed826bb8c3451b5938e43974b91291609d177050fc654603 SHA512 3fdb3a9300dcaa310ec02266127a998ac4587fa9fde5e381342a5c18d0435442dfdafd0b326730e1cee26f72b43fccb6a15df7d5d1fd8f5a9bb3783983b0dcca
diff --git a/dev-python/python-openstackclient/python-openstackclient-6.0.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-6.0.0.ebuild
index e14693d16693..61f6ab7ab7ed 100644
--- a/dev-python/python-openstackclient/python-openstackclient-6.0.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-6.0.0.ebuild
@@ -4,13 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="A client for the OpenStack APIs"
-HOMEPAGE="https://github.com/openstack/python-openstackclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://opendev.org/openstack/python-openstackclient/
+	https://github.com/openstack/python-openstackclient/
+	https://pypi.org/project/python-openstackclient/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 25799a6043a9..bc9ecf4e0481 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -2,6 +2,6 @@ DIST pytz-2022.6.tar.gz 313766 BLAKE2B db52c5dab06c90f6cacda590682a8011e59a2f115
 DIST pytz-2022.7.1.tar.gz 313522 BLAKE2B f0e787438f56bb33e0681f28392ddcb8dde41e51437caf34de8c9891af468a1b60f845d393d300c408af598aa93463f2a66848a8d20754bd7980d44cac0f4216 SHA512 c70b9ef9c6e6a7dd50fc80a58bf068af33dbcdc83c3f2f44b0726e696927e17d843f2f0438392b6f34738a63aa51c5025e6aa4bcbb9e43400b9d68334ff05c18
 DIST pytz-2022.7.tar.gz 313499 BLAKE2B 357ef0107856e02e6c7cf028661d23a36cf3997dd5399f5a89e850b1b2e5330da08c60e10c8a7126d47d1d7e52e95bd29a8d63cdefaf4fced1332602ce0bd0d0 SHA512 48bad8a88e124c0935bf307713659228100c5c38230b3ee7f0aa92e46a1a305c4cebef388208dc7090ba59f51c4816f78789a091d69541615e885a9ad61c475b
 EBUILD pytz-2022.6.ebuild 826 BLAKE2B 5855e41ee85afdff3a1fedb4d1456266fd53e4f139f0fc0f0a4a9a3d16ccac3c26826889c863bfdc93a449c0677e3cac02df7e75189240695a26cc2ec668e5f8 SHA512 b321e578554ce467eb550f7415021d68678a4422807789143f09e655c3f288731ccdf67abb990913865369b7fb376013d07ef8116aed7dae31f4c9cb411c2153
-EBUILD pytz-2022.7.1.ebuild 834 BLAKE2B 31ba873fadd837c52ddf0ccf02a686dd6b8ba01e7bcc1f7e98996f889b9589a1fc9ca50981a2b158f73950e00ddc63d80735bcff869a894bd9a3729a0686f01f SHA512 0ddcb61f49b05f27566b79fb6e60b78a08d30863ec31f3e2b4b06819df58c5109e59c779d776214899a002ece8dd12ba283b8774e433f4a856296d2053fa9fa7
+EBUILD pytz-2022.7.1.ebuild 826 BLAKE2B 5855e41ee85afdff3a1fedb4d1456266fd53e4f139f0fc0f0a4a9a3d16ccac3c26826889c863bfdc93a449c0677e3cac02df7e75189240695a26cc2ec668e5f8 SHA512 b321e578554ce467eb550f7415021d68678a4422807789143f09e655c3f288731ccdf67abb990913865369b7fb376013d07ef8116aed7dae31f4c9cb411c2153
 EBUILD pytz-2022.7.ebuild 834 BLAKE2B 31ba873fadd837c52ddf0ccf02a686dd6b8ba01e7bcc1f7e98996f889b9589a1fc9ca50981a2b158f73950e00ddc63d80735bcff869a894bd9a3729a0686f01f SHA512 0ddcb61f49b05f27566b79fb6e60b78a08d30863ec31f3e2b4b06819df58c5109e59c779d776214899a002ece8dd12ba283b8774e433f4a856296d2053fa9fa7
 MISC metadata.xml 816 BLAKE2B fbebba08fc9a0eac3a94dff015dea77b57f01559bd703b906d7f922aa88b8aff3a43ca2391210533742d2ac6c16e6bf3e31b1a6bd5dd2ebf47ce7a29edf5040f SHA512 2614764bcffed71e746257b6cce2bb68de1205292001acbcff5bd69e3564ecabce55970967394ee3900e21dcf29d25150fa579bf39bffb189fd3b4e509d7b412
diff --git a/dev-python/pytz/pytz-2022.7.1.ebuild b/dev-python/pytz/pytz-2022.7.1.ebuild
index cc252ff26618..90addad6269b 100644
--- a/dev-python/pytz/pytz-2022.7.1.ebuild
+++ b/dev-python/pytz/pytz-2022.7.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	|| (
diff --git a/dev-python/reedsolomon/Manifest b/dev-python/reedsolomon/Manifest
index 80b970ef4242..69cbbfce0add 100644
--- a/dev-python/reedsolomon/Manifest
+++ b/dev-python/reedsolomon/Manifest
@@ -1,7 +1,3 @@
-DIST reedsolomon-1.6.0.gh.tar.gz 62527 BLAKE2B 100e0152ca8d05605f961dbddcc41552941356a72b488375cb1237cf45938382abf6bfd439b572a9aed11a12068258027fae0bc867e7577280829779d21f53a3 SHA512 ddf73b0bdc78856d9aa76e7bf3fcb9715b9b7f922c2d72dc4bd13a4d5a233844757e2946ef96c545ab7979bc6b62a1f33286711f927871a6689a269d20a81b44
-DIST reedsolomon-1.6.1.gh.tar.gz 63944 BLAKE2B 58845e726fdf2096af280bf14feb981d883b2368a47904d33a2386db0fb5d94091ecdc22e48bfa415e2abd9c4b3c99446b3b51bca9cce510961172697a273a0d SHA512 323f91e3e43847023f23087e1038ae240572b87c29ee26be1a05a6ee49824aa86cb706d1856b27e28841fbb14efaf897d1b8e0cb626529fe7cdeaa7fbda6ce27
 DIST reedsolomon-1.7.0.gh.tar.gz 64279 BLAKE2B 304abdf3709dff52c4c515598c511b8e3080475c0755ab68eb9468652f12d2cdb2763bdf88f5fe5e69813928646a8b8378fee9cb2b24d54ce9a6f2b5fb985ac9 SHA512 c7d2ae8444c9e3d6646587f85fe0085a7579cc58d2f4bca3fb89632df4873e2664c81f06ee2e75e928248bb558a7fd8d101a043187ce05e70a079b031981c374
-EBUILD reedsolomon-1.6.0.ebuild 787 BLAKE2B 8b37342f33df0641b42c8a5f386894f49a3a8abe3406da01d40679a37c97ff460d151a922c47f0d21ad558c5784a2ac8fff1b7a5d02ceb6e8acd2009da377fce SHA512 c3fac02b6158e38a29bd944f3851373a3ab9947defd4d80dfa2213a7fecc4de60fa98058267b2f1d4c7be2a20437c2e6cba7996ef1881bfdfedcd96fe62e786e
-EBUILD reedsolomon-1.6.1.ebuild 798 BLAKE2B 3683c2c308da03ea5725f76058641bf64a24f242608b0e424684e3ba232e4f8b3e8802b81c0c6387aeccbd18ab1a44e4ec8170fa41ef1f318931330ccd912e65 SHA512 a9b826d53beea8f619a76508842d1f321e1e9702acc531f780562b16bc084a660a0b08edb6b3b80df5a46a423030985ff9e9a3a5f05b560b5678cf1512408d9b
 EBUILD reedsolomon-1.7.0.ebuild 849 BLAKE2B 612081742da92a9b267f67f330d5168601a9ff5ab476682e0dc483d20afe09c708d07fa2c248d93a90532df4975fa4e9ee069f57cf67a8078fe0826a1ec311f9 SHA512 b7939ad28c13aec6ae9b6ce6bc94202733cd18a5313589afbb604ed77f3aec1f589e207527e4aeb56b7f03c6b935e4565fcdab437ab14246b5046a18e820e832
 MISC metadata.xml 532 BLAKE2B 90e7740e649abc65ccee0b33c6515689b33c33199bbaad9b30ebe8bcd4e86467526d8a85e50af308c69b82930506a942a57a8b50580c892cb9e6fa902b19a3b1 SHA512 76556763e4d00a4796435298017646c45f26c7bc913adc444dc97300cad75a91609fed422ed0f9dd6bca9f0e193d43ab8efea22d321e59e110f0e523be971eb2
diff --git a/dev-python/reedsolomon/reedsolomon-1.6.0.ebuild b/dev-python/reedsolomon/reedsolomon-1.6.0.ebuild
deleted file mode 100644
index f47e9661b9e1..000000000000
--- a/dev-python/reedsolomon/reedsolomon-1.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Reed Solomon encoder/decoder"
-HOMEPAGE="
-	https://github.com/tomerfiliba/reedsolomon/
-	https://pypi.org/project/reedsolo/
-"
-SRC_URI="
-	https://github.com/tomerfiliba/reedsolomon/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_creedsolo.py || die "creedsolo test failed with ${EPYTHON}"
-	"${EPYTHON}" tests/test_reedsolo.py || die "reedsolo test failed with ${EPYTHON}"
-}
diff --git a/dev-python/reedsolomon/reedsolomon-1.6.1.ebuild b/dev-python/reedsolomon/reedsolomon-1.6.1.ebuild
deleted file mode 100644
index 9c603f62875f..000000000000
--- a/dev-python/reedsolomon/reedsolomon-1.6.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Reed Solomon encoder/decoder"
-HOMEPAGE="
-	https://github.com/tomerfiliba/reedsolomon/
-	https://pypi.org/project/reedsolo/
-"
-SRC_URI="
-	https://github.com/tomerfiliba/reedsolomon/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="|| ( Unlicense MIT-0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_creedsolo.py || die "creedsolo test failed with ${EPYTHON}"
-	"${EPYTHON}" tests/test_reedsolo.py || die "reedsolo test failed with ${EPYTHON}"
-}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index f6384e422daa..3c9c524e2026 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -3,5 +3,5 @@ AUX requests-2.28.1-fix-charsetnormalizer-assert.patch 1345 BLAKE2B ebec5128a84f
 DIST requests-2.28.1.tar.gz 109805 BLAKE2B 2106be5f9e1d9f1a22de5522b5d72084f91c2849e60e33b89b2411b76cae9b1f7faac34947f69c49480d001e9b77e4dce723ee939d51591882854d510db49b59 SHA512 c123ec07171c2c7c34e4173b97750adfa313b4312d91c0d58e4eb8750361604017e5b370c23ec886d2cbf704f9074ec5ad0fa9c2cd8e6f9521532adafff39d41
 DIST requests-2.28.2.tar.gz 108206 BLAKE2B fe6c5d78e6abd36b7134c6e424b5a1c4052eba62b55a01b5842f289b94df3af039a5beba71374db563dd52ce42471d5e3650763b9324533ea6ab3bfd8013379b SHA512 3c4ba19a2bb6ba38a4118cf246db3855401869d54ee7ebd9bee40b435420381fb737d4c69768f2bd97914a30d66233c7058cec51aa629af0dff3b04e6f997a3d
 EBUILD requests-2.28.1-r1.ebuild 2007 BLAKE2B 7181fc8be0a42c2ad8084a05cd54a3b92cae0bb459ad29c586bdee07200a33c0e09d84794db3aa28b62f3ce6463611e47d7b35307b34dd0feca8dc872601e780 SHA512 fafd90190e0c52d0a46a434c91eded7fa0ff769309170c1a176cfff1d261983724d0be1bc6f561abb10f03b8e2ba376024e6517dfbf6da1e893b65a03e404a92
-EBUILD requests-2.28.2.ebuild 1910 BLAKE2B 44fc7a48f77938317ae6473b38e2744d9954d245693e5faa77387eb4daf8ffa087c01ef2b2d3c906b0755c5be290e402c9f30e5e6a2e7c22a1aab6bb8f74a7c9 SHA512 7a0157ca891dd884b92cf6b632e665c88fb545fe74c11bc8f630f1206598aff0ccebf9dd48f91d54773fb0ecea3bf9a49719f8d983549dcfbc04622a9b3aa344
+EBUILD requests-2.28.2.ebuild 1902 BLAKE2B 5e4eab011a33bf7f71fdbe7fb57a9ce068f77616277c9a5740f8e278c89174a7218243b10d4c05502993ab31400ff64980abb66e042a38bf3e020e100077316d SHA512 43aa4d58590234c569e2bcd6fac77094611380a0a8120df0f3731aef65f055a920917de61e3a4f420ead5434e4f032f9cc13b6c52f501dd594c03031b64e3f0b
 MISC metadata.xml 824 BLAKE2B 5b803e4eedabb0a90d22d2a96aed0a1e0580e5ee3b0a28b5b93b4e71fd90a85ab72a8de015127a066a584f002d4ea759a168d5fcc4e633e980b08f1bc6dac179 SHA512 01e0ee5ca5343eba3b8259d0e81df9a17f3beb690cc452a77991db6844f961809eb6744c53ac6325197874ca7cd0b872bd8157d7fb23a77cc2c00a83f37fb29a
diff --git a/dev-python/requests/requests-2.28.2.ebuild b/dev-python/requests/requests-2.28.2.ebuild
index 15a4f5e91d99..97d5d7219838 100644
--- a/dev-python/requests/requests-2.28.2.ebuild
+++ b/dev-python/requests/requests-2.28.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="socks5 test-rust"
 
 RDEPEND="
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index 15b1cec08232..7875955d9925 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,3 +1,5 @@
+DIST rply-0.7.8.gh.tar.gz 26697 BLAKE2B 95c4be3bbbd7aea7f278dbe0c37fd43d012df768169d0363d1a938f762c2f9ad69d596cbbaaafee3c93f3d615ea5cd1509e9b642188320f8acd09c12d6b7c780 SHA512 b43e6425f046561cfca616801d37d7151f015aeb2ea2365abc00f97fd6b41f1a01a17e330aed5a81537065e4b29d49cd0824b5a5cb8b2d11da2ff1f8de952fce
 DIST rply-0.7.8.tar.gz 26697 BLAKE2B 95c4be3bbbd7aea7f278dbe0c37fd43d012df768169d0363d1a938f762c2f9ad69d596cbbaaafee3c93f3d615ea5cd1509e9b642188320f8acd09c12d6b7c780 SHA512 b43e6425f046561cfca616801d37d7151f015aeb2ea2365abc00f97fd6b41f1a01a17e330aed5a81537065e4b29d49cd0824b5a5cb8b2d11da2ff1f8de952fce
+EBUILD rply-0.7.8-r1.ebuild 650 BLAKE2B 96e00fa168954ecfa853bb32c019c46fc0b0f58293bb05a6b49427d60db63cd8ef5f05365138d7a7716dc1547df638d7671e64744270c504bea57d11ec50d7b6 SHA512 5a1f551914c5ebcb48c495ec94bed09b45fef78c4da5dee7e501d7aa680b9ce03f57d683707ae7b287673366fc8340534937d76f7fa768f43a9b18c9b4f507ff
 EBUILD rply-0.7.8.ebuild 564 BLAKE2B b6ae346ccb77c1b922ecbf3d4f84bf84887e2ee9c2557b73ce7cba38207a7f5edc2fab5f52045e8e9223ca48ebac930500445d1f1eeaf1f2d6631253056fb076 SHA512 260ffcf0482dee814129829c9fe14991fa7bd89ef6fbdbbc6496d17d942c1a079a2c833fc9e98f672e8d724501898e9b4d1d78a1d330505595227d78d3128cc6
 MISC metadata.xml 381 BLAKE2B c233b1194075832eb94c1ae3c39dc71b282d7551b0d5b1c20c1e4745ffeaaab47ff176230c23681af6a3026559de34fb81947bdfea2d2f09bbbd2f78ba7d8414 SHA512 0b3390ab61c410c72cb6eb0adfa150dc6c1dce38af55655a42222d6d5b77231e589529dc71fd2d2edf75c1446464a2ebba89bf9ee1e3d1cf6d0e9c7b8f40871d
diff --git a/dev-python/rply/rply-0.7.8-r1.ebuild b/dev-python/rply/rply-0.7.8-r1.ebuild
new file mode 100644
index 000000000000..8564db9983de
--- /dev/null
+++ b/dev-python/rply/rply-0.7.8-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python parser generator that also works with RPython"
+HOMEPAGE="
+	https://github.com/alex/rply/
+	https://pypi.org/project/rply/
+"
+SRC_URI="
+	https://github.com/alex/rply/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/py[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index d77b7e22f128..2206c14195fb 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,9 +1,5 @@
-DIST simplejson-3.18.0.tar.gz 83533 BLAKE2B 83c6f7f3734507f5a96b51d52dd39b0bd8ff772d51ce1f12ff2ee68f83747f519f418f78247727af7c408da4e7818d1b0d1f7b54b7780e3bc427add1eeaebb06 SHA512 952177fc707e5b1fb6450093876f9a7af1026271cb792bb8dc0418b83906ae32e7f2251b96f531101197d0b3204a97124bff02f7abc4cf700da4edf1320b6b08
 DIST simplejson-3.18.1.tar.gz 83603 BLAKE2B 5f51d06238210b0bdd3dbb2338979023324e1056c2278f7eef7b929cc0bf9f9178d032829a3ce49c0b630f3367268d68753f250968962159e9a9aafcd3105d20 SHA512 3a18d02f42624e27c536582cf9b6ceb8559d54dd97224294a6f6ee8173ee37c0cc9cd21bad777c29ab432ac41b1495fca9d45da300b5040c175980d236d3b9d6
-DIST simplejson-3.18.2.gh.tar.gz 81518 BLAKE2B 317ea52890a1bd48fe2a647eeffc9f8a9366c62a6e40fb91a2c154bd49fc3ec9d29c18aaaa4866962cf40d86e256abc090a19d891885171d32faac8344f2e17b SHA512 ef19e513bc45afacd746bf7018165e90a001dc6a91b7f749d8a0b0272283885bcaf6fa77d8e05e18805310e0ee26529dd83cb947bb25fbc3890898ccafe68a8e
 DIST simplejson-3.18.3.gh.tar.gz 81540 BLAKE2B bf6a162499b28a362638e19735f668571f88943ae396fb7f813d51ab0684caa8cb996a35deaf1d68adee2a812d685058e9e80d6f6e66604bbb7c704051b0b37f SHA512 54223e08775ab6277722342084bf56684588dd9dda574428cb73b791d37d0b74decef6082268c0389cc4586a534a19e62ec5738fa9ffffaee63f68e27fb465c8
-EBUILD simplejson-3.18.0.ebuild 673 BLAKE2B 92bed311cf874ccc1dedcf67ff7846caf625b0dfb54440d605c725d4afed0424750ea2aa4203cb87d4679b8c0b624ab19a88c53026a74c22c1a882438d5b0e48 SHA512 5522bc25807604aac47eba679ea2486b268ace629963ab4ace68228a0fee72a878752a2214f9425a4870f8135756f3a836a809870972f6d70c6a7180a22f967e
 EBUILD simplejson-3.18.1.ebuild 673 BLAKE2B 92bed311cf874ccc1dedcf67ff7846caf625b0dfb54440d605c725d4afed0424750ea2aa4203cb87d4679b8c0b624ab19a88c53026a74c22c1a882438d5b0e48 SHA512 5522bc25807604aac47eba679ea2486b268ace629963ab4ace68228a0fee72a878752a2214f9425a4870f8135756f3a836a809870972f6d70c6a7180a22f967e
-EBUILD simplejson-3.18.2.ebuild 964 BLAKE2B 4d3455a1725c06da1fe7c9738bcc9aacbe14d7027e8a1691720412ad7f21a99aea1e1e8cd08ce88e151087d9923c12192e94bc44c0fc62ec732cdb9225730236 SHA512 2efa867ff8fc47c962c0ddcec15bd9cf46e76f6505b0e77f5c471aa428e8b125b1bd246522356e2065c9a4b5e48fc4670434eb9be7b89911be22ca52d9f406b4
 EBUILD simplejson-3.18.3.ebuild 964 BLAKE2B 4d3455a1725c06da1fe7c9738bcc9aacbe14d7027e8a1691720412ad7f21a99aea1e1e8cd08ce88e151087d9923c12192e94bc44c0fc62ec732cdb9225730236 SHA512 2efa867ff8fc47c962c0ddcec15bd9cf46e76f6505b0e77f5c471aa428e8b125b1bd246522356e2065c9a4b5e48fc4670434eb9be7b89911be22ca52d9f406b4
 MISC metadata.xml 522 BLAKE2B b8b8fdade498ef65f4d5d6e30bc9f0708390f3d064a332d04f0b33346224c59252ef3d512a5a7187c637348201829ccc83254cd898e8df06dff314e857debb58 SHA512 1a1b53900ef62d4d40977504378dce3ce15f1c56ae5a73263127f5919674b1f9b13964128550e0c0e274d4bf50f2c2b438626e3ba1a5f8436071e1eb2f4c30af
diff --git a/dev-python/simplejson/simplejson-3.18.0.ebuild b/dev-python/simplejson/simplejson-3.18.0.ebuild
deleted file mode 100644
index d555e3c59226..000000000000
--- a/dev-python/simplejson/simplejson-3.18.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="
-	https://github.com/simplejson/simplejson/
-	https://pypi.org/project/simplejson/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DOCS=( README.rst CHANGES.txt )
-
-distutils_enable_tests unittest
diff --git a/dev-python/simplejson/simplejson-3.18.2.ebuild b/dev-python/simplejson/simplejson-3.18.2.ebuild
deleted file mode 100644
index e517c93ea2be..000000000000
--- a/dev-python/simplejson/simplejson-3.18.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="
-	https://github.com/simplejson/simplejson/
-	https://pypi.org/project/simplejson/
-"
-SRC_URI="
-	https://github.com/simplejson/simplejson/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+native-extensions"
-
-DOCS=( README.rst CHANGES.txt )
-
-distutils_enable_tests unittest
-
-src_configure() {
-	export DISABLE_SPEEDUPS=$(usex native-extensions 0 1)
-	use native-extensions && export REQUIRE_SPEEDUPS=1
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index 0f9a2d420e0a..b60d078e3e36 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -3,5 +3,5 @@ DIST sphinxcontrib-applehelp-1.0.3.gh.tar.gz 20624 BLAKE2B d9dbd5974527044ecf2d5
 DIST sphinxcontrib-applehelp-1.0.4.gh.tar.gz 20710 BLAKE2B 9aa6af5b263e6d9603fb01c5ab659bf0cc117341a2c0a6b2946cbd6cdaff0274d17d833d7703711c52e65e8363175e129e452a151fbaab186b8361809bb1a72d SHA512 f281748468a9f5d9a8b71213632d55850b8642b79f33e1e0fb3c6825b0f9b392e0b17b879a8ed0d44d5bea3f076e16f01285d9f41b587af3cf194985e61e92c6
 EBUILD sphinxcontrib-applehelp-1.0.2-r1.ebuild 974 BLAKE2B b905df848cc5505f472fd3f3bf41e28dd78d7eaa78983ca3db923e455f18dff94b18d3309a6f68ec66d920dd116fe2977160b5756b0fe6f7b55c358276a12329 SHA512 3dca75278dd8bcb6ee844c8171d1d6afbfb8fdeb66dc78428f73ab0a17f171db7833dd02f2bd3d537e533164824ea8c1791b0ed42438dc5e8d20e1840fa92d1f
 EBUILD sphinxcontrib-applehelp-1.0.3.ebuild 1032 BLAKE2B fcdda04fa6b20928bd68e53e36046d5b44b5bec6d543e6c80a9c5368bd5322d12d61239e1874bbeeb60623e415ebbe715f843f554452e19786bea001b079d1d5 SHA512 fe993313075b0101b23fc3b4bb118036bf12390b377f80f81605575295510dd3ffdf7e32cded1c2f4ecd20a86b5c51156aa1607c0b12f1c8f2cdc334aac55f3c
-EBUILD sphinxcontrib-applehelp-1.0.4.ebuild 1038 BLAKE2B 21f2e2fe0b2582bfe0e0a6b30c6d84cbcd2c8b65467fa73397dc2e7ea7b629596d70a4f34a6bd1710c0355c578f909b3193e3b984c8eaa4946d5f697a34a490c SHA512 29a393fd67bc01d4dd57b74b012179ecad6cfe1e95659c6abae6893794ad7a1fe734b04ffadc13e277ec098de74883ae2b3b6288d0ea1678ea025fe2a0d8223a
+EBUILD sphinxcontrib-applehelp-1.0.4.ebuild 1030 BLAKE2B 57aa3fd4426ae83ebe5bc316b0ca9d4bcfa59fe777016524ac33bd95f57066e42892d0e797efecea69df358845ca32aadc5e0e86159d7bc2aa45569867caaa66 SHA512 2e4890bb649c20cb96a805b5f935e2b59a05a8104ab788bf82232247852d8d3d8d8647a76565f04d2ab794bdedf99b7f8973844767305299275845d14c340143
 MISC metadata.xml 425 BLAKE2B 69f933f9bbb268736b6d99ac9256c9b2a5eb53259e117a2e02dd5b2d284d83b947c9e58fee62f4b2bbf1446829f337319fdd4c1f703d6f6c84a4ca5799d141cf SHA512 76f9a4483e7899eff96173738d4c116988fbb64852a306359649dd882abbc6b574e685a7947e4636f517aeb4b4ff56a9f8f84d9aab8da63c45fcaced3ce1aa15
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.4.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.4.ebuild
index 6bfea123328c..e86612eceefb 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.4.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index 7f0a27dfc5bb..30cb52ce14ec 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-httpdomain-1.8.0.gh.tar.gz 38228 BLAKE2B 46cbe5ef0689777ef560c167c49af5830e38c7efa3a536dd36702114eb87f3c0f2f1c0c9de808738ef081e09c7d47754bc49a039b04184696ee4389acbf18454 SHA512 64d916d58282e94a4fa2b2d0e8abad5c50106b739e6e15015d347af339f517c2c7457c9bc8dc74258cfc371910d1a02b582a2c94f6f98c195a366f68c5b108c4
 DIST sphinxcontrib-httpdomain-1.8.1.gh.tar.gz 41281 BLAKE2B 9ba157b1ed9494426226a8231d5a3cea420121722e5b4891049b76da567a917aebd8f2eac2c7a3ea899517fb4c64a6d0f1c50eb872fbd24418c464433a795c69 SHA512 ba0ba8d695302acedb3d51c3218748dfe25b756e8ba2eed4d8bbe012f16d09aaf822bbc93e0d6a32d3836b20345df2df7d675317aa96a802e7daef7fee792475
 EBUILD sphinxcontrib-httpdomain-1.8.0-r1.ebuild 1048 BLAKE2B cb55c512d3a880862cf5de095de03ffb8074f560dcb9756d2de9dcfdbd74896af1e0b4cf6d12fff2f7fa4b6fc062f2660550fa855710cfb65cd38124be9ad593 SHA512 5f406f66941d723051bc96aca41a985c6ac76b4a19873a42573c51219701bf8571e04a0fc1761b850d115fa46075cbfd8a106abc02a1765e7d80f58e4efe4ebd
-EBUILD sphinxcontrib-httpdomain-1.8.1.ebuild 1055 BLAKE2B 8b632bf308ecca804a750f24879c02a6cb6bcbd48d6cdda3518662fa81291033faa5cf7ae58492613cc332a691793f2d676cd9cc5c4e64385fa35f2d6a133e0e SHA512 64a63f2fc32736143565f8e52d5c07123b73b241828ebddc1be2110031e57d3e20f9beef15145948187f9b695614fc9eadab2c36b5110170bd22e37a2f7d08cd
+EBUILD sphinxcontrib-httpdomain-1.8.1.ebuild 1048 BLAKE2B b3006755d99688771cbee98668f545e47bacd51727c9c780100bd5fc95169d69868525576505d0f35256b36b37f34d94f967bc28845add8c7431c0a478afc883 SHA512 ae053be013d47617f6256b8619bcca635f12eb37a143d58b7c47b3feb3360fb843ee512732f9a09800ba3f7a30f0724aa170ebad87126a893b99e6dd800a3a2a
 MISC metadata.xml 417 BLAKE2B ecd20ec2d0b0f8dd3cc1ada969a171268f068f60dc698d644de42e2088f58cc66da59a73c735371d95a22d65a5699a9082e452605ab4d7e4a793d9311aed4a82 SHA512 b92a4542db033a1291b2983539597e651853a4faac6f8144796f59d13a7d75186f96a31c17dda30e280d246cd754a7696c1d1e6b330bbded25a23bb901ed3870
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.1.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.1.ebuild
index 405b8b85bcd3..4555db506a1d 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.1.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/httpdomain-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/tagpy/Manifest b/dev-python/tagpy/Manifest
index 03a7b3c71c9a..46d87e2ff5f8 100644
--- a/dev-python/tagpy/Manifest
+++ b/dev-python/tagpy/Manifest
@@ -1,7 +1,3 @@
-AUX tagpy-2018.1-readme.rst 725 BLAKE2B f40dbe6ab4f03fe0a6141a03ae6f504d202a5c97d605cb22dfa0b9695374260658f8dde0d49e84de0e7d289bff705beed1244215e70cc7f9d8d587d505322a20 SHA512 0d9cd79986a16ad78e76911f9d3c1b36fb706c74c58e9d29dce817bcf4bbd8b29c9596f1228a0524fdf6538f2c685901a159fd9bd0b629d0dd1d60c75c2820b0
-AUX tagpy-2018.1-taglib-1.8.patch 642 BLAKE2B 45c190b621dda7368583c1ab92a01f08fb84d83666953caa5f05c89803db16dc8cd1668e3b891c757c916d27439c4c3143a8a8a2115ad89a8b2f1806dc4a80c9 SHA512 6a3af752fdfd12f6c5f6e52019f3d4f322b9dc3595e810e93ed43e680c1a2f7728efeb8d1180473ca3dfaa7f548d437c32f0a306882ad7f7072388f57ea42caf
-DIST tagpy-2018.1.tar.gz 145501 BLAKE2B acdda6789dae000ba2f664e4a5582f6218f312bed20ec81c4ea54f358bec70d41aceed6704f392a7a32c39d263da81f9c832922942fa179e1865e423dcf28bcf SHA512 2010baa919adadc9fc231deeb093953622ec54c8b6011e2d6a3489b086032de0a71cc26f42439435f26bd7a1ff069e3944dafc61217abe6ea5e81b01b9d18c50
 DIST tagpy-2022.1.gh.tar.gz 198744 BLAKE2B 1a0722017ae532444cf97171c04964453bdb6c427a49bace4ad9fe3a3be9be7f0903a9ae3fb8dbf0c8450112ed5f83677044c6b2546dddec3550d8251cef4cff SHA512 d740bf17abe6a2a7cd7fe037c024c8361d49d2ec4e8d03dbdc27c9ec273696b0a41d087a7159692e9b849e807af493f68239562da01d5191bee95060b32aabda
-EBUILD tagpy-2018.1-r3.ebuild 1083 BLAKE2B 56bf8ad2f240dec1fbda80764f683d533a2bdfee24ad023d1e2886ffbdebc32db435de375df03a8ce49212ad823465dd4f7babfe8e6515e36f7171fb4f84e551 SHA512 3144acdf3a2b297e9e672f0e4aa6b10c49cc6ca88367fefb91aadb74da7debd936262b662a75e08a1f4d86b4a1de26f77489a0c07f87bdcef4ae9e9decc947f2
 EBUILD tagpy-2022.1.ebuild 608 BLAKE2B 92592a9a86c8102f9aec361e784b394a34c3a55d3073ccd262f6424cccd99b07d352c4cdd4b8bdbbd8ca96d22b4de4b630d9bce211600c00ab4ca2d3c0a4f5e3 SHA512 59a9f6869a45bf142b4483d6d8925476fbce61caeeaf507a9e3dc1b2989323a53a4166d97c3f6ff5e66668613ad03d9dac95d29353b1cc0b06e82793079496ee
 MISC metadata.xml 601 BLAKE2B b82a1af702b40b3d3ee0cc0168bced0afca8014a34a59f7012571874ab4d1bbe06fa25229cce7ff419d5e3c662cc82d64b91e70f7d02704e8f760c6dc51a72d5 SHA512 0d28f25be7a89d369b1029ccd2050745e79343e7eed2d7b6d3f5577cc2989558f30e495ec1e489f997a66077bb26fc22f2eec5ae9a381e222e1e2f67a2d80c77
diff --git a/dev-python/tagpy/files/tagpy-2018.1-readme.rst b/dev-python/tagpy/files/tagpy-2018.1-readme.rst
deleted file mode 100644
index 83bb4d2671e3..000000000000
--- a/dev-python/tagpy/files/tagpy-2018.1-readme.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-TagPy is a set of Python bindings for Scott Wheeler's 
-`TagLib <http://developer.kde.org/~wheeler/taglib.html>`_. 
-It builds upon `Boost.Python <http://www.boost.org/libs/python/doc/>`_, 
-a wrapper generation library which is part of the renowned Boost 
-set of C++ libraries.
-
-Just like TagLib, TagPy can:
-
-* read and write ID3 tags of version 1 and 2, with many supported frame types
-  for version 2 (in MPEG Layer 2 and MPEG Layer 3, FLAC and MPC),
-* access Xiph Comments in Ogg Vorbis Files and Ogg Flac Files,
-* access APE tags in Musepack and MP3 files.
-
-All these features have their own specific interfaces, but 
-TagLib's generic tag reading and writing mechanism is also 
-supported. It comes with a bunch of examples.
-\ No newline at end of file
diff --git a/dev-python/tagpy/files/tagpy-2018.1-taglib-1.8.patch b/dev-python/tagpy/files/tagpy-2018.1-taglib-1.8.patch
deleted file mode 100644
index 90c49a29af74..000000000000
--- a/dev-python/tagpy/files/tagpy-2018.1-taglib-1.8.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur a/src/wrapper/id3.cpp b/src/wrapper/id3.cpp
---- a/src/wrapper/id3.cpp	2019-03-23 08:26:04.975722018 -0400
-+++ b/src/wrapper/id3.cpp	2019-03-23 08:26:54.438399217 -0400
-@@ -220,12 +220,7 @@
-       .DEF_SIMPLE_METHOD(removeFrame)
-       .DEF_SIMPLE_METHOD(removeFrames)
- 
--      #if (TAGPY_TAGLIB_HEX_VERSION >= 0x10800)
--        .DEF_OVERLOADED_METHOD(render, ByteVector (cl::*)() const)
--        .DEF_OVERLOADED_METHOD(render, ByteVector (cl::*)(int) const)
--      #else
--        .def("render", (ByteVector (cl::*)() const) &cl::render)
--      #endif
-+      .def("render", (ByteVector (cl::*)() const) &cl::render)
-       ;
-   }
- 
diff --git a/dev-python/tagpy/tagpy-2018.1-r3.ebuild b/dev-python/tagpy/tagpy-2018.1-r3.ebuild
deleted file mode 100644
index c664e846c5f6..000000000000
--- a/dev-python/tagpy/tagpy-2018.1-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit edo distutils-r1
-
-DESCRIPTION="Python Bindings for TagLib"
-HOMEPAGE="
-	https://mathema.tician.de//software/tagpy
-	https://pypi.org/project/tagpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	>=media-libs/taglib-1.8"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-taglib-1.8.patch )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	cp "${FILESDIR}"/${P}-readme.rst README.rst || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local boostpy_ver="${EPYTHON#python}"
-
-	edo "${EPYTHON}" configure.py \
-		--taglib-inc-dir="${ESYSROOT}"/usr/include/taglib \
-		--boost-python-libname="boost_python${boostpy_ver/\.}"
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r test/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 69a194dd22d5..59fa00b30863 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -3,5 +3,5 @@ DIST tempora-5.2.0.tar.gz 20775 BLAKE2B 3348e9899ce2e8867b334bf66e692ab79decd3c3
 DIST tempora-5.2.1.tar.gz 20787 BLAKE2B 67e9bf07e79dca0f31b6558824ab54fe2cab0556e7fddbac0e0e61c863eff0e0f0c4d6162a2856cf05b4ca9bedef1440811330638cb2f94d2c5e140c4b6401e3 SHA512 18e352bfa82ac81dac26907a6bcc5e68c018410a9cfc7a1b4d6d8609c1a6a35fb3be3c374449109ed5c32b679c3835aa31d2ce0dc814d3697e6f7f5c6976eefe
 EBUILD tempora-5.1.0.ebuild 840 BLAKE2B 04c3610068f9739bfd4bf0722181effe3499018b0a45149053b19de1abf256637374fff783ca2dd684a64a1cba89371bc7032760fd76b6932de3c0a17dfae29d SHA512 b4070e0173976450409d26df0a25b35e567918c2c359b620a4fbba15d3da573fed7da3a568fc8ea63c36e5c71f0017d2e5f98d71f78563136ebefd2a3cd36247
 EBUILD tempora-5.2.0.ebuild 794 BLAKE2B 8d85032e2fec62f50c939a594f6be2d40f92b9770c4e4857396c40800f297f6ec36ad0d1f2975edd664d50f94d856200d938e54ad1534940490be2bf76605c91 SHA512 79ddea768854b687b5ab9b67ba87194ff839670964b9e967f64091cf9174be3a4b38aed95c8fc781237c839f6160980b821b61b672a39f30ca1cbd50340c6921
-EBUILD tempora-5.2.1.ebuild 740 BLAKE2B 0c1d7619d2704f0a35ba83b6a39a6a7743f20466a3c64c37b8cb4c721dacb6d8188f7fa29af8a30b06009fc8c177c1ddf45f457f2cd86a49ac4c33c6745b993e SHA512 52ec2a104b9db03f66c80c34f77da34c33d71d8df02eeb2eb78ff1011f3f089c23840aab3575014c349e36975f165a6da02dff2f4c75f1a72040f6d4440d679f
+EBUILD tempora-5.2.1.ebuild 732 BLAKE2B 4d50b588042acded54f363d70ca6866a19ec49102a7e99cc0ed5c3b80a3d27325fdc9556868af9ab4f5a4c49832b8de30899c0474aa6e77dfd224857967326c6 SHA512 311a7fd6d15d7e5013e581a75bd7916c029edb20602e58db413a9688cbdbe04048c729643bf0e4123f11194fe50d5a70d39a8f5132e42b95d067b13310985bd0
 MISC metadata.xml 640 BLAKE2B 322432e820c99b65ad749062afc4536889b21fc7d1dd4fd2dd4d4caec382a90d98db38be3ead24136f8a3049b2d68120be72799361a30a6f788facdbdb4706e7 SHA512 4123ddc1643539c3152c6200860ff19f69164aa22c2f040617e9933d2b75737e8e96b9b617341156a8bbcfee579d40e1f17edf56a2759a06646987dce676c238
diff --git a/dev-python/tempora/tempora-5.2.1.ebuild b/dev-python/tempora/tempora-5.2.1.ebuild
index 71fc4eeac1e4..5f2ef214879e 100644
--- a/dev-python/tempora/tempora-5.2.1.ebuild
+++ b/dev-python/tempora/tempora-5.2.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/jaraco/tempora"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index 2f4a40a2533d..463605f84c80 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,5 +1,5 @@
 DIST python-termcolor-2.1.1.tar.gz 10831 BLAKE2B 0c5537f81234411ddb117266e45ac7ec8ea0af0f62e08883f4893aec21d83d03534200d1ad1633bed4c57cfd7a83305aaff5af7b0574d948854b7762c9e631f4 SHA512 f652d8ce07e192820c57d62fe76495e81e859a709e61b8a1418985da51a92ce8b71865b362d10331d40a914497fa2bf81e95c924c88ae281663a430ef065ca18
 DIST python-termcolor-2.2.0.tar.gz 11340 BLAKE2B c1a7119bf4b6a137784e1b395d65ce2222e78c3747d1198b0c3407a15b02aa2f0343a12ac067696f19e94b4add0f8968164223f77cc79ffb703601003b8ce8fd SHA512 24a686c6589a56d2ae9ef9a974dc2308d23e9dcbc586df2c2e6ce938f4a6d85bcd20e4ecafcdee8b5b859917defd2965804e10ef761ce7929dc44826f0fca402
 EBUILD termcolor-2.1.1.ebuild 722 BLAKE2B 788d0d989e1e2aa2f18521f05eb624c198d5a189773065ab6b8d0f6948344984295eb3e597376fac1c8f0d562e05a68dc38920772c730a096c84cf538e035520 SHA512 3f51f1f133653abff0746fcd5941c04cf8299bdce90fc3c586f44e63b8b958b76e8e7981a0e3a7464bab3398554ac608c8e1a50b4d1b3b8e45f31e5fbfdace9e
-EBUILD termcolor-2.2.0.ebuild 730 BLAKE2B a7cdb1a43c3378d693aa7029cca0fedf97ab0834738b7375ee2f1c7b8eb8fa3a84a16706b0f34a2715831b0de624482e84da486593d90c0f8ad0ec504ab9ebff SHA512 43b504e949c3665f48becfd534622f7f5b356bd5306334a9bf514956ecce823bafed2121fffbc6da23f3334e28a9780f3176f45ea9d6a1e1fe30cb61f3978f51
+EBUILD termcolor-2.2.0.ebuild 722 BLAKE2B 788d0d989e1e2aa2f18521f05eb624c198d5a189773065ab6b8d0f6948344984295eb3e597376fac1c8f0d562e05a68dc38920772c730a096c84cf538e035520 SHA512 3f51f1f133653abff0746fcd5941c04cf8299bdce90fc3c586f44e63b8b958b76e8e7981a0e3a7464bab3398554ac608c8e1a50b4d1b3b8e45f31e5fbfdace9e
 MISC metadata.xml 530 BLAKE2B 6a8fc517eae6f2bbc099ba4e24cfdd48e6baf092baaef4921e9665521eec54c741a7cae9bb4d03cadedb845f5d5cd631c46544709c3efc4d4103408a57f35c26 SHA512 c2bf2f0aa44c39d4c9b2865c7f0a8abea0956bbcaed38485de60b7baedcda0df2f71d34e4a6bb5355eccbaa8dcc21e8c1b47d948d968668e3e55c3e8d7f3efa4
diff --git a/dev-python/termcolor/termcolor-2.2.0.ebuild b/dev-python/termcolor/termcolor-2.2.0.ebuild
index 1486a16ec7dd..e7c6f974d1af 100644
--- a/dev-python/termcolor/termcolor-2.2.0.ebuild
+++ b/dev-python/termcolor/termcolor-2.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> python-${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 7e3e0f0f4438..0f56b181d9ca 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -3,5 +3,5 @@ DIST traitlets-5.8.1.tar.gz 149641 BLAKE2B 8939bee76d317f7fb0fc8ad2ded1bc056262d
 DIST traitlets-5.9.0.tar.gz 150207 BLAKE2B 3717141dd69fb8191ed7735bf732f847004db9349507033a994e37bdfa654974d79d53937a6123f1697814197923615ea452f04afc3495c3139fa32e677bba6e SHA512 4999591d79fa537082307e148ce569beb2a0339ac9a7970ecc31c60dce6761d367e3ba959b4b57930f9fd2478616d031710e64a0afe13c6bc382477812fdc8ac
 EBUILD traitlets-5.8.0.ebuild 834 BLAKE2B 4170d25ec4f1488583ce0179c3caec2c1891e2cf51b623eb3e9a44ed9ce95a223a3f6b067f8f5a66113d7676e839300ed399b9a9f116a7d260536d1b670b6449 SHA512 e47ed8a23fa37b7005459bd5b0e623ff2b196b68c8f20b21f62a3714657a94112a630fb895e9cc48fd9ae3a3339ddc870bb9a798dc97b8db3e844abae93f8250
 EBUILD traitlets-5.8.1.ebuild 842 BLAKE2B 8137b8e42b11ee4aad17085622b360d13d295e07b355ab07842069d9a4b9e45783f749759606237a7f85e1d2476602762a7d320152dd45038c4c73492423ed4b SHA512 9ec2a5f81523f743d369e71bf48a3b352a5d106139a5c4e3c85deb188f9da617fb5827591a9709bad93189165cbcd812078544f50526c1c981a7d7b51005728a
-EBUILD traitlets-5.9.0.ebuild 842 BLAKE2B 8137b8e42b11ee4aad17085622b360d13d295e07b355ab07842069d9a4b9e45783f749759606237a7f85e1d2476602762a7d320152dd45038c4c73492423ed4b SHA512 9ec2a5f81523f743d369e71bf48a3b352a5d106139a5c4e3c85deb188f9da617fb5827591a9709bad93189165cbcd812078544f50526c1c981a7d7b51005728a
+EBUILD traitlets-5.9.0.ebuild 834 BLAKE2B 4170d25ec4f1488583ce0179c3caec2c1891e2cf51b623eb3e9a44ed9ce95a223a3f6b067f8f5a66113d7676e839300ed399b9a9f116a7d260536d1b670b6449 SHA512 e47ed8a23fa37b7005459bd5b0e623ff2b196b68c8f20b21f62a3714657a94112a630fb895e9cc48fd9ae3a3339ddc870bb9a798dc97b8db3e844abae93f8250
 MISC metadata.xml 737 BLAKE2B dadf9c19ed06cc70940023c180cb2256534ccba2881b4a0b5d7673ae9959838c129f82b1a5d2b9c13e408442ef2f9ec906484b01baa4408417143a712f4bfa56 SHA512 3a9e54cabaac875c27747642794f54b90216ee103e5de336d6e4e76d3a08c045ec08eabebe59c47b6fab2dabdeb43f16a8579a9448cbc19ab169ceb08740508d
diff --git a/dev-python/traitlets/traitlets-5.9.0.ebuild b/dev-python/traitlets/traitlets-5.9.0.ebuild
index 771e0b78c3ba..4917b48cf534 100644
--- a/dev-python/traitlets/traitlets-5.9.0.ebuild
+++ b/dev-python/traitlets/traitlets-5.9.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index dbd76811eb8b..4c4eb4e377e6 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -3,6 +3,6 @@ DIST typing_extensions-4.3.0.gh.tar.gz 47842 BLAKE2B 23a600dcded95a1109da46537ba
 DIST typing_extensions-4.4.0.gh.tar.gz 50027 BLAKE2B 4cb757eadcfce85842dc5625e620f01f8fda00fe3712d5895d8b0aa07a9e649cd20f9f820cb2801e3b34c84c1d3b79d5e71fc49cd37014924825b6cdef0152c7 SHA512 1c046e6dab22fb399acf7ab8771d035aa24c88b09cbd023e80a41cd04851c5f8b1d297275012e933658e963e008b073b8d3815f5703042545b57130daa38f143
 DIST typing_extensions-4.5.0.gh.tar.gz 52431 BLAKE2B 3d905e4f1146d23d00b695044daf653722fce9ade8f44730116bab0b8fb15c3e8d2124a6b0d395fad078878e0e4b7888e19660ca2491ccc9ec01dc11ce318fc8 SHA512 29369da83cdca57aba7d8c2089c77ad265eeb614fd34056f678e6dc9374558d1059ff2c514326115734fadbcad27ec98e1e5fcec087022a9d838cc2bfd1fe825
 EBUILD typing-extensions-4.3.0.ebuild 805 BLAKE2B 179cd93954aecd824fc7215695ea4a5b05c4b1cdd3b0cf55be3d08eaf167d278541421b7be0ac0309912043f2c13388d278789329e7fa8134ffa0dcc56272921 SHA512 8e70e2a8fb39d7d01aec814f66a5dd4b3a34b9bd9d54b28a010f95a82a096ea0546387502c2b0e8fde04958efe1635734e1ed120593aab4cf2f03ce2f481accd
-EBUILD typing-extensions-4.4.0.ebuild 818 BLAKE2B 7ef77bb89f99a1292ba95466d9137247ef5bdb470ccb94a59d975fde166920aaadd99b79f5e86b651a95afe39c5eab50f7aabea7b96b8553326a41e624da3f24 SHA512 d9a56ee5f38eba0a63a29b6d9e74f809d4a35fcdbddf311e88b7eb87c21bf0c41125a2b4ec4e649b44fa7526822cc2e3d9b1db7ac4f7b577b4ac4e99c6d7321c
+EBUILD typing-extensions-4.4.0.ebuild 810 BLAKE2B f1975b1389f2b0a25afc27581b9c4dd0088102fcc4ceea056b1ca9a1e3ae3f5810184b161bd27baa652f5c3b73c418bfc6701f8ed43a8ed5bd005e17b5a8e3be SHA512 54946feaff692afa3d10aed3018621803d1db50da969813cae313aa42784d1878148b4eb51a83f3481015e78c162d5adeb78d9ae600f665db3f9d3088f8eb6e6
 EBUILD typing-extensions-4.5.0.ebuild 768 BLAKE2B 312628569b40389a3b453a7343d1155a8860c53dc946299ea6c34a38bd2fe0ba7ef9568ae87def02dced6c5f5ee6139730aa7b165c26c5f54a683d55d18f91fd SHA512 227c6f71e876bd4817ba9c372c44c325819260f7303355ab138fd658ecd2f00f117e4e44cb284ce45d76a30a52f1182eedf80a20a4077646be56b79e315cf139
 MISC metadata.xml 409 BLAKE2B f2defedc04bc50fcdccb536be53f5148d2630bc235437d9c2ab32d579585e27c108f87d22cc9b458151e742d2f6c0788ae993fcbefe247295f2a572d8648ffaa SHA512 be8e74d9c73f2e4dfce9728cb06c3bc56ae35120e3388fc232da3f4cff17367775401805f63fecb74397ecc7ae8340d68dfa271cd06ed2fb03def8d155262d02
diff --git a/dev-python/typing-extensions/typing-extensions-4.4.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.4.0.ebuild
index 3187222251f7..8a7b2b50c029 100644
--- a/dev-python/typing-extensions/typing-extensions-4.4.0.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-4.4.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 6398e9e3f57f..a525cfaf0746 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,5 @@
 DIST urllib3-1.26.13.tar.gz 300476 BLAKE2B 495b6077d8a18347d731dcc69989688c2fed325a5ff89a7faa6eb1c17255d5748c54036292080e0e86842536f0d518da011a5bd64bd7f1064702d34985621af6 SHA512 022cbd10d91aa95d21293743dc1c36d4ed2dd3f95e60cab53b0aa3c1be489c7eafbc90c4cc7f6b67011ef4752fedb18c33d64a063542fdc525888b39e127b775
 DIST urllib3-1.26.14.tar.gz 300665 BLAKE2B d9373c6f88eae86bd74cbc1c20b352064135a5e3686cf594a3fc2375afa881696751a4e318970ce15adb8fadb60e334117e4d4e431eaa591ce7b13b7ce2ab606 SHA512 0a2dffcb4d3b199e1d82c2bb0d8f4e6b57466bdc43e31dbed62b392ef32e021f6d31cb53ebedef9e1a62b1113f7a370e9f0baa36e3fba942a2543473e4df0828
 EBUILD urllib3-1.26.13.ebuild 2306 BLAKE2B cba511b14221ad58d48f3f9d4ae0548a6efa31e08d98ce93a0196b8045954c94052b8adbaff384035aa5646b2843285ae236c263f9520fa4d8d75df717c0875a SHA512 3cf38437f94495b182db0ed0f88095d7abb6b80ddec70ff2f99796d99ebd90c58131cafb64872c9c7ce8c4a76c458b37701d39b0f04d33db00c2eca963784444
-EBUILD urllib3-1.26.14.ebuild 2314 BLAKE2B f97ce6d5d690c5d0a8da9f73acc915d372466de5fc2519f8a59348784fdcb59da7d207c8ceb052022d80d31f10660f7dded6308917a06baef1e5f2eedde69d75 SHA512 281291abb75c9952f44e142c2f72e9b449a55f875167629ce3ae63948259a35dd906534badb7be2367211a4269659cbfdf74fa4e47a5fe1fd70333659927216a
+EBUILD urllib3-1.26.14.ebuild 2306 BLAKE2B cba511b14221ad58d48f3f9d4ae0548a6efa31e08d98ce93a0196b8045954c94052b8adbaff384035aa5646b2843285ae236c263f9520fa4d8d75df717c0875a SHA512 3cf38437f94495b182db0ed0f88095d7abb6b80ddec70ff2f99796d99ebd90c58131cafb64872c9c7ce8c4a76c458b37701d39b0f04d33db00c2eca963784444
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-1.26.14.ebuild b/dev-python/urllib3/urllib3-1.26.14.ebuild
index 050cfa3d69a9..41161163613d 100644
--- a/dev-python/urllib3/urllib3-1.26.14.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.14.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index caac828aeeab..ee820eb17813 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,5 @@
 DIST watchdog-2.2.0.gh.tar.gz 101317 BLAKE2B e597b780f26794bfe0462bcb67985d6e38324aac955f8655e657d800039d98473444ff13ea98fbfb6e8a5fd5473c0f3eeda2e542ef030539fc1acc3f86412354 SHA512 95c355da3a97f7eb0ddff02c1801eeafb075aead742d5505254fccef60afd8e5f1ea56760533bb87f520fa60f4f41e4f36c7f02247a170029bace728e83e2780
 DIST watchdog-2.2.1.gh.tar.gz 101485 BLAKE2B 4ec0a2c14d0dcb8d39ed4dea48c1318474768298b4eade4f7c08f811282ffdbf5871c7d55d71681863c38d1f0603c46aaadda73bf38a20ef263fa3b4cf76c354 SHA512 bbd6e3e3fdc7ee5df21b78241922c0050aeb0c01e394fa7d025465f04f3307d190af4cf6e822826975a3b095fb479dfd103be0675f12782e8899f556797baed4
 EBUILD watchdog-2.2.0.ebuild 1094 BLAKE2B c6b0299e9f82284b5baf1319046a21f8887683b97a234897a90424e1c7d5d69676a00b5781d1bc0fb5dd744e223819e8ae5f873b9a92fe6345244e83750ec1cc SHA512 fcd84240f27468fd63fa6f187cf6d45eb5fbd1515b94942073540cc412c25c8382dacfeec8046915ba1fa9ccfd2073ffae809c87e5da07087671812c5655b70c
-EBUILD watchdog-2.2.1.ebuild 1102 BLAKE2B a0736eca26c3af4949387b94d9d03206c4bdef58865343ecd94cc90236590d109eec2671098148a6d638b2175565229d3db1e4daf5defa5ec7e0b4b8169a71bb SHA512 a8281d35542ed64b1141597213e117f6a564a48552d56015295fcb7016a2fa359c8bbd99100a04a190530f8d3719eb81d8139a2dd401dc66df26806e9b83c2e7
+EBUILD watchdog-2.2.1.ebuild 1099 BLAKE2B 79e8f6eda80027c22d29f74c5f57af80f098dd7be96f44aa96cf138b4ddaf6a908dfe88f7e0356a5ba59eb8c2ae6e8dae73892cf2e43c2d18ba695b44616e0c8 SHA512 1c9fde23be147671af93c2c97c7bc2b39fdbbeb936632258032ec6bfc875caf6bc7deca7b4e22be5fb6912cfd5f33179113506b22ec78664615a02771399eeb8
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-2.2.1.ebuild b/dev-python/watchdog/watchdog-2.2.1.ebuild
index 10eca6827871..2d3b9f8b9539 100644
--- a/dev-python/watchdog/watchdog-2.2.1.ebuild
+++ b/dev-python/watchdog/watchdog-2.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index f593d217c464..e673c064b073 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,5 +1,5 @@
 DIST wcwidth-0.2.5.gh.tar.gz 47514 BLAKE2B 0ac5fb08283c23039453408da2edac36e2079fde8fc903002785e2e0f8bed55d1d6a291181097f73e4ec8152b6eaa4f4553b0b39fe1cadc7a99bacb2d7e55d2c SHA512 3f1f1fefd3ee9f06ea2051842e8c3bb09a92501f031124b8514bec444eaa8594ab9649534b4264340d475716d5a6571dbe5ae932f685160defd75c19295e60f9
 DIST wcwidth-0.2.6.gh.tar.gz 51990 BLAKE2B 8561e06aaf92f48246bacfb4012358067d81d4d9eeb33a0406eb012b5c22841ac66ff5760df2d5ea6a5d48a1880b4b9cbbcddf7a5eba5f663f6a559005f657ad SHA512 1f97cb6ef6a804da1d062b8dafb146a3e21261e63a644bad88bed74101be1371c753c2645db5ad25868fe9641fce9b13bd5dc920496b00e1d73d406f69631ac9
 EBUILD wcwidth-0.2.5-r1.ebuild 995 BLAKE2B 8ce789e26ba19903b520089f13de52920b255d2b77202bf0d9b2be6f11e92e6e6c850f991f6b2c1edccad4e66c4f3d462ed608d8b3fc30ed33439e484cf887d1 SHA512 9eb62216d2359d3587a3ccc579e29d1f157397bfc76ab80ca394b80470c24cd9b549719b02d568e064e363feaddfef95865939345d5c130e4767fd8d79ed4f92
-EBUILD wcwidth-0.2.6.ebuild 890 BLAKE2B 299d7e9a1f1bd8f80dfdc356afbc736875341d2bdca66f781b2aaedb259698c3b4142b46c332c1f3a032de55a3fc68f67e3f863329e65725650bbcb135db5785 SHA512 5418fdb39e63d8c166e763d70f07fa1a03d78447be9ce006e671bb9a92349ca31f498ddb200f8e005097ee25f64c197d32c37acdcfd6b4f9cf236f9165485298
+EBUILD wcwidth-0.2.6.ebuild 882 BLAKE2B 50ab3a59fef2e87d3733d88e7161aa74883db9befb8b5ba4aca45cc83ef11bcb69bf4aff2af7bbbffb0381b1e0fb94d67cfa3bac9c715495e9ed268ba1ff0645 SHA512 158c3e6774d15ace921d5e6f4fa15c483e342945e0da4fccd08019d0523c2e17f88717e063183bd0512a7db6a290823ab38091bf000a84d2da4b2c84668abb97
 MISC metadata.xml 402 BLAKE2B 86714d496f80fe46cb313bed026135b2712ddfb47fea5994d0021516aa6ad28eb5fc52d37b37a7a224ec0613681b27ee039f4ac734430d94aafe4ec8946cecc7 SHA512 85c0e684f66a5582ca63d6f72c4e69101e8ec30f8e03c52e972fa36a2e6b6d2a8f019fb33a1e39e73fb37de25c82b906b18ac626afdd0a93d97db2ddcf485063
diff --git a/dev-python/wcwidth/wcwidth-0.2.6.ebuild b/dev-python/wcwidth/wcwidth-0.2.6.ebuild
index a442e366ff6d..87ab66081a57 100644
--- a/dev-python/wcwidth/wcwidth-0.2.6.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.2.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 39ca606d5568..dbd68459f5fc 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,5 +1,5 @@
 DIST widgetsnbextension-4.0.4.tar.gz 1022346 BLAKE2B 29b41d4b61f8af40c5589f19f6b3df7a2093774617b262d1ad7faf22d06a5f81d0aff9db9360c1ad53b11e1377d7e2690d56e06f861d390d676010413a3618a5 SHA512 6eb666e52c575750e591b2976d091f719b92cf741d4e4678d12425c1450fcab1b207f6c0667268c54fb88209d99cbff4432b40c34ffbbf761d82905723d3d095
 DIST widgetsnbextension-4.0.5.tar.gz 1022805 BLAKE2B 1b64a633414b085fbdaee7394d17243b4b0eb3d6d3b7f8766d48eb0066d159a8ed594a0444e0724a876e213582274ac5faccc502349a8ee657ccbfcd047769c0 SHA512 8a25c97baaef32b46254e515676bd6894a025b710e48e374f2490bb1d5de96adb87c3b0673f69bebbb332b0f0ad6d9367c5d64146ae6452bc2090a66e8470a09
 EBUILD widgetsnbextension-4.0.4.ebuild 673 BLAKE2B c3171c8fe64a1ed818a142fec0c2507dc55443ab4ae09c7130e7d8873e74a3a3b35d7edfb42dca80c150755b61b439359e3f274e2591b49e18c98caa66695bbc SHA512 5834e7c9530977d436a1e722aa9ae4509637c1dd3ee82cb5a5edd67267774d6c7bba21d4748039f7beefae4381fffb81ca02a6c0bdef841b8aeb5f044802e9c0
-EBUILD widgetsnbextension-4.0.5.ebuild 681 BLAKE2B b248a7cd56626255df94674954790ed3ff6def5ab96b4a2de2a61a3b688978c4087dc407a9fbb73e024787683b145493225ee54e98023b6f42c0194842b69bc8 SHA512 98373d4b98b2361642c6735603d923476f85a3b69c5e17a81ea40b6d84d8195d6f4e1ece71edc04b9645df9938d8647a7d532651617ee037f8287ca2100572fb
+EBUILD widgetsnbextension-4.0.5.ebuild 673 BLAKE2B c3171c8fe64a1ed818a142fec0c2507dc55443ab4ae09c7130e7d8873e74a3a3b35d7edfb42dca80c150755b61b439359e3f274e2591b49e18c98caa66695bbc SHA512 5834e7c9530977d436a1e722aa9ae4509637c1dd3ee82cb5a5edd67267774d6c7bba21d4748039f7beefae4381fffb81ca02a6c0bdef841b8aeb5f044802e9c0
 MISC metadata.xml 545 BLAKE2B 5127e5910c792643b4594231c8c04ebd2db8bb3f0d12f41d33642126970f8ff36f60503bd0bf7c5863b39a4ea4358f1b0ae786653d2c086a49d5305a879a0f66 SHA512 fa7da731b4f342572c0c284c7e03a521dcf754160223016fa77890e8de0bf05b65fca0bd096ba65e303dc034473654dfe5e9b5d2a556f0e2bdc861e24d462cf1
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.5.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.5.ebuild
index 47d2e816ff69..5d588988de1d 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.5.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/notebook[${PYTHON_USEDEP}]
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 0f3c7833124b..ec22fee37bd9 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,5 +1,5 @@
 DIST xcffib-1.1.2.tar.gz 87303 BLAKE2B 0727c1c4c49692d8daff79d77487cfd2780a4279fa2bd49b45d87f48186e9ba0ee3ea46841dc259e7a3b5e301caacdee764762efe96217e138e6f8cedb2a986f SHA512 21606034bd0be2e1cf87b20904b006f7eb6eecbd835eff778f064ecb2bc16d17f48a6acce0eb1a30ca9bd98d810b4b1674bdadc9f6e42c5effee777f7bd138aa
 DIST xcffib-1.2.0.tar.gz 88972 BLAKE2B a8d9be7c3149f696d06474aab85e9f7605d45e9861151192dbb7b51e48483f75adb721e17531432294d19d8d6498b66ba312702ea011e8470c3ac42ac0cd6e23 SHA512 7012833f2877edea92cdc15030543883e2a848264c034a81222626ad48a69fcdac8a88cec2e07e61a80102640baa7fbdf29bbf25e08e59fc896aada08533bb77
 EBUILD xcffib-1.1.2.ebuild 796 BLAKE2B fe839be5ebb472d0df21a19f36d3873e2bceca0a5e4dc0cdf23497e269b0f0c58dd5f39c5fb250aff222223a4fd8691556c1e8f3b6328a3d2b81004555db4860 SHA512 9ab12f6954417dfde34c8c08f19a6eacae34f6ab1789de3a1e428a73199d7e2b6bd9f17e71622b2618238268ea29eaef27b3e7f57c03eba16e041f1f4b68a63d
-EBUILD xcffib-1.2.0.ebuild 853 BLAKE2B 4b7de928b8efc570a2613613c8c215d9a30ba617982cfb4997541d742aab9223da73e739c78dd5e77bc61b2c0b2912e632ea3b669da656f1cc340219137204e6 SHA512 4ca5f1670ace1407c6fb027b99e42545c9f294b4a2e3879237584717fe5dc023d7ed2f0b5cbba740373ad122e1938d74eb747e8cef7a5740181934df0a6a56de
+EBUILD xcffib-1.2.0.ebuild 850 BLAKE2B ea5586ae9bcbd257652b20a8d8f6c0b6a4de5e50f6cf211fb02863deedcfe4133f95dc2c489d2f05a3ab36b9a88efd0c9ce045d547489be64ad92e703ed4e0cb SHA512 fa61f68d5767e6708227aed644270f5dfb9aba10aa464124e31a98d322e0e1ef75969d2c1c645fc3cde45cee3959a82b6acc7b59ee4c5d7fc68c837f4a96343d
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-1.2.0.ebuild b/dev-python/xcffib/xcffib-1.2.0.ebuild
index 982d8e8a2ab7..eeefb2bb2d5d 100644
--- a/dev-python/xcffib/xcffib-1.2.0.ebuild
+++ b/dev-python/xcffib/xcffib-1.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 DEPEND="
 	x11-libs/libxcb
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index b9f2ce10b8e1..5182fa029edc 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,5 +1,5 @@
 DIST zope.event-4.5.0.tar.gz 18723 BLAKE2B 449ae969709c863681df1a08f016c850242ebe86b9abfa57db62a982c81bba7c496fc19dd2b187284da44d975688b544ee52a5a48a2fb782d4c7210d5773ee2b SHA512 1d82ae316fc75eebc03aadeb78890a19add35490720cd7bd073faeb9dc9ed97511ca4fdafc2228530798384d667c0aa88e3ef47b0be668128556a78bf82c42e5
 DIST zope.event-4.6.tar.gz 17430 BLAKE2B ca0706390a9dc32fa3d855014b94094a1008b1f7d82a325aab6008ca116c5267c8d0def244e25adf4164abcc308367a5916358665bb16fc8a0a24eb40586b30e SHA512 0042ef679ba95f1306d11fa23c0b48c59b018c8630cefb2e245ca77f4979b314d338cf1f6d2b12376d59c0eee172180d217965d54676504530a8af0c6c128547
 EBUILD zope-event-4.5.0-r3.ebuild 1149 BLAKE2B 64849ccb472fdc7b3ab2b9ae3f20df3369a5b53d6794fc11aa006858372be93439e791119c1ef46800bccece3599e20b3159fcef2c0d99a2c5cb7bbd79df3778 SHA512 3275e61e8353c2ba5f79af2d0035358d6eb58b18cd408271f5f4cf65174014cc61bee40d18dba49dca618f43a79bf989746724497026770bc65e886de5d7d1bb
-EBUILD zope-event-4.6.ebuild 1157 BLAKE2B f2521ccca3ee53d801eaba0d02323af00834bb7bdfa8ee4858c910c9b5da048a103c8604a337933e4479da80530506837eb972c0ff409fe6db18b013b6f443e2 SHA512 552e783b5aa47b3552fa22bf54c9a2fee98b20d2ec00c9ab500c7182f9e1677e626137326f36cf62c4eeb3a2062bc903788bab21781fd8105ed2ca36341b5ceb
+EBUILD zope-event-4.6.ebuild 1149 BLAKE2B 64849ccb472fdc7b3ab2b9ae3f20df3369a5b53d6794fc11aa006858372be93439e791119c1ef46800bccece3599e20b3159fcef2c0d99a2c5cb7bbd79df3778 SHA512 3275e61e8353c2ba5f79af2d0035358d6eb58b18cd408271f5f4cf65174014cc61bee40d18dba49dca618f43a79bf989746724497026770bc65e886de5d7d1bb
 MISC metadata.xml 403 BLAKE2B 37821470ec3195c00fca52ec6b7bd13a0bf433746a450b36e6b572da978db6faf908da2b8dd83d2411f24da8a58d65f8cb2e7e75960cf547ba2e9e394e5fcb90 SHA512 8d21846b80d0c0f153103ec237184cd05db306286ffc1a6ed495b90a52737a2346777c4b0713339244f177e89e18f6a051a507a8a7eda2c514c1b7896d7aedb0
diff --git a/dev-python/zope-event/zope-event-4.6.ebuild b/dev-python/zope-event/zope-event-4.6.ebuild
index 401e2c783660..4523bf0ae852 100644
--- a/dev-python/zope-event/zope-event-4.6.ebuild
+++ b/dev-python/zope-event/zope-event-4.6.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!dev-python/namespace-zope
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
index 788f9e1f0620..3d41b6f90462 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1,5 +1,5 @@
 DIST zope.testing-4.10.tar.gz 45359 BLAKE2B 477d28a7d1a76c0a5111f16859d9e3b9b9ac9cc953b0e2c7dd9ba0a39b498d71442d1b5aaf485455c919ad618efb1f9f9b8e1587fd4905c4a823b04ef09ef8b2 SHA512 35fd5114b6de3cb47336185feb8bf8f444b53ef2c32f165e57756a017ec9caba9a29f2ec01844ebcf156fff1c2b7424b3ac126b3e8d4daefe73e1a640d21589a
 DIST zope.testing-5.0.1.tar.gz 41745 BLAKE2B c3ab3ba7a15a050a29e41c26df3426dc3dd48d98b60e55015680c6aa86fccbbf44718d17643189a1978c51605eb774c108e0056a1e21023b99ca633a2abd7788 SHA512 357d1c0eb761dba4e0e964a51dbc4368c00c9133a011467a2bb3629a2c5c28ccb3886caad215288b99cda1de25fd7ead674068f275649d94a32dc42d19d78caf
 EBUILD zope-testing-4.10-r2.ebuild 1105 BLAKE2B a616ea8462fff9a61f03bf39e2654d82adcedd9518146900fdf24926b6fe705fdcf1fc7d2abc5d5ef00367b60dad638b3efa75c36ddbe9daf583395250f6ae57 SHA512 3d6819f0f3b73d011654a84887ab705bdbf91431e78ab90b740daefe1f78ceeda7a4a4acff0d2628b8d413329f80f2fa8901251b30918eacbbc63c4d505e6ef0
-EBUILD zope-testing-5.0.1.ebuild 1345 BLAKE2B b7a3467d6009557826fe04f8b090dbbdd93c995ae4d0a82b772e55d66e3b6fef3b52dca070dcf32eec9898969842a6be16ee898a676ad1019ba09a6721b3b34b SHA512 53630e503b2d3941c352ca6c84af1fd36b4f93b82499178fef1c8cafd6d2bffc81492a59efc8a61ef5be5b24a878f625a93fde6ff886474ab4b724d1f9fc7ec1
+EBUILD zope-testing-5.0.1.ebuild 1337 BLAKE2B b33974e7b118e08dbd53bcbe0424ec3da46967553a6fa49f02e55c1d9a4d8b2d570a53d97950f83a9ad48d6b2869e7eef93bd0ed323a5a5ac29971a7de5065cd SHA512 c2dd9a0f7b4cea08a08ad03b8a53f6ea6c1db06ced30e8378965e9ca46eb7a7f2bfef5d4e2da04412781e807ea2535a7dd9c4e0a2dd99b6ad9248b570752c149
 MISC metadata.xml 407 BLAKE2B a3792d048bb4472d3d22458ced65e08f25a2a0314858ae86a7dc6573989b3f49139f4452d19c073890443fbc5b09c681bc612057637aa548d88e1f0f7501182d SHA512 a61142f2fe381939bd26c4cbd66512df42b42374331fd56c36a4dc9640b634c8c21d5680ed9c621b05b401446415ea145100b2334cffd3f579916a95f3857f47
diff --git a/dev-python/zope-testing/zope-testing-5.0.1.ebuild b/dev-python/zope-testing/zope-testing-5.0.1.ebuild
index 69fb56714ced..19c1cd811d02 100644
--- a/dev-python/zope-testing/zope-testing-5.0.1.ebuild
+++ b/dev-python/zope-testing/zope-testing-5.0.1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!dev-python/namespace-zope
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 764207086f4b..cbbe2ce9e0e6 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/mit-scheme/Manifest b/dev-scheme/mit-scheme/Manifest
index 156bf906f949..c448938d99fe 100644
--- a/dev-scheme/mit-scheme/Manifest
+++ b/dev-scheme/mit-scheme/Manifest
@@ -1,6 +1,7 @@
+AUX mit-scheme-11.2-implicit-int.patch 340 BLAKE2B 7c6fe1be03a8f3fa7e3594f64025f7c44f708583d40644c9946087dbe40b36d74c455787214488a3c0fe95673e676f967f827c9cde2745a89f539806c718dc80 SHA512 53dc1aac2f14a25ad5e32971a2976cb713513d808f6daac962c14f1179b64fd19c42414bbf4b73c9b01989dd89f1a42235a3a5bdac2490513967f2e7376d9a9a
 AUX mit-scheme-11.2-no-Werror.patch 671 BLAKE2B 7bc3a9524f275a1e0435484b9570e26b7ca6a30d0913a691f654f1fd6e51c0a0114daf7393c04f7850bc3a7c3c9c3f953df91ce0d609537069b7bb1c5760ab35 SHA512 7e1c692ed20d78d2747eb8186bc733766d5fa94eac2c45b50541d26a1b44c7393e267ba8da0f6866838af79f8805fcaeea8079bcd4d735db08eec7706ae8093e
 DIST mit-scheme-11.2-svm1-64le.tar.gz 73077951 BLAKE2B 0e6741103c7a96f665e643fe6cab1a52bebcc8549845bf592029f73bbc9518937f45ccbac39e14d29b05b26f602ce810ae3f01030b0afb88560970ad3bb1f6dd SHA512 0bf2e8b1710a87da775b8fca53df808e23e45f6e6310a78b507fa87cd340c051cdf2ffe74268e9f6fc7bf3eaaa9321c2fc016e675fb41e59f648d1e69a1e8458
 DIST mit-scheme-12.1-svm1-64le.tar.gz 88542947 BLAKE2B 07278da41c250924ff833933b7015e865a4dc8feea11a4e1b1647818cacf03fc25878cbe0aca3a8cf08adad5487c0f7aa5e5beb111ed46d09e8473ee01490eca SHA512 07e49b0f3919ad4ed85696766697615dc1720b4278c61d4aa6c3a1a92966d1e6fc7c9c7ca7db395d4e4279c5464639c80503bf4f6a8e51d2e951edc85a453dc9
-EBUILD mit-scheme-11.2.ebuild 1666 BLAKE2B 1578d108536b979a59e8ad46997fc2196f1e8263b0f2d7624275708eb9047c0970ca9e298765ffcf561f368cfcb81d71563968c683f4a3e9657056d4349444ee SHA512 57ae5f22660d71d4dcd0fd5ce2257f2a628b255bcccb513dd16535f2ac19f5923bcb92bc973045c71fd7709e7c55fc0176ee978585a2b8909d632b6599774f8e
-EBUILD mit-scheme-12.1.ebuild 1676 BLAKE2B 19b7488b0874ab6a1fecb41f57ec5aa214f507f39b8241a65a73a32c720d3699bad8b496869ecdedcb6f41ff4d2f634682b47fee174ed02243c58fd386e69dcf SHA512 03821ffab669598c0e2a9c680b223aab63395cc3a4bd3ce52ba3ee99194bd26692880919f253e5420667aafe11096d226744fd8ee2358e361318f58bf98ef398
+EBUILD mit-scheme-11.2.ebuild 1706 BLAKE2B 426d8983e211a76a865cd07ee626210d2cba6f88038c349964820a193e710e81e38f5ea447a41ab87aec3a6bfcb4ea8a3225de320ab915a13f68f791e228d63e SHA512 0965c1ef12858fec3fb215d413c2b6356d900bdb118e048000e33131e028e723d7d9497e96f06c1df8ffe50bd89c4a10840b57c68e2161a29eb976cec6780aaa
+EBUILD mit-scheme-12.1.ebuild 1722 BLAKE2B 920922701a8dc4e99f8ade9545eed32b8a4ab0f9d1d356b9c8074b67d5f7e71269f95f27e035f1e030e44a33656a13cc35ccb426ddbbcbfa891f11e4bc577a23 SHA512 c185dc63dea6ff56b012ff34131deea6adc5e606f56f9fbfa40c4fad7a5e7193f4a4aefec7fac1511f49319b3c6a4fedb6a13157def24ad4919889e680441736
 MISC metadata.xml 848 BLAKE2B ca56dc6d2f4876eb389f05143c784e56d6401b325164533d63f73f56becd224aafb2e9367b045682fa640c24420a0daf8d46aa1b88fbf23979967534be020d6b SHA512 fac1b2044c69935683ef03baa758f78a845231304a60ed09f7af1aeb2e149a47e7f99805d0ac576185afec60b57d97481ce7eeb181eec572a02f10bb13e705a6
diff --git a/dev-scheme/mit-scheme/files/mit-scheme-11.2-implicit-int.patch b/dev-scheme/mit-scheme/files/mit-scheme-11.2-implicit-int.patch
new file mode 100644
index 000000000000..545ec49494f2
--- /dev/null
+++ b/dev-scheme/mit-scheme/files/mit-scheme-11.2-implicit-int.patch
@@ -0,0 +1,19 @@
+--- a/lib/include/termcap.c
++++ b/lib/include/termcap.c
+@@ -144,7 +144,7 @@ int bufsize = 128;
+ #  define NULL 0
+ #endif
+ 
+-static
++static void
+ memory_out ()
+ {
+   write (2, "Virtual memory exhausted\n", 25);
+@@ -328,6 +328,7 @@ tgetst1 (ptr, area)
+ 
+ char PC;
+ 
++void
+ tputs (string, nlines, outfun)
+      char *string;
+      int nlines;
diff --git a/dev-scheme/mit-scheme/mit-scheme-11.2.ebuild b/dev-scheme/mit-scheme/mit-scheme-11.2.ebuild
index f8e69c604756..723378e963db 100644
--- a/dev-scheme/mit-scheme/mit-scheme-11.2.ebuild
+++ b/dev-scheme/mit-scheme/mit-scheme-11.2.ebuild
@@ -24,7 +24,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-no-Werror.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-no-Werror.patch
+	"${FILESDIR}"/${P}-implicit-int.patch
+)
 
 src_configure() {
 	local myconf=(
diff --git a/dev-scheme/mit-scheme/mit-scheme-12.1.ebuild b/dev-scheme/mit-scheme/mit-scheme-12.1.ebuild
index 2043f7859d2e..bae59266c121 100644
--- a/dev-scheme/mit-scheme/mit-scheme-12.1.ebuild
+++ b/dev-scheme/mit-scheme/mit-scheme-12.1.ebuild
@@ -24,7 +24,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-11.2-no-Werror.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.2-no-Werror.patch
+	"${FILESDIR}"/${PN}-11.2-implicit-int.patch
+)
 
 src_configure() {
 	local -a myconf=(
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f4e2b5160aa5..54fdc5ff1a63 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 13cd8346b66c..e20eafb82413 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -5,5 +5,5 @@ DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e5564
 DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614
 EBUILD gdbus-codegen-2.74.3.ebuild 2197 BLAKE2B ac5f5eceed9ee2673b2d8145032615e44b0ccefe23b82abace8b5d54ef8c52d517ff5fd5d3dc4774d5870c54e1bb907d8af22ed1cc9913cdf4d96334853f5c9f SHA512 2632236a58cb71ece53bbecd61622c52ffc15a9fb6a683ab3be1ecd1f12ba8ac860f750b049a05552612a9f10b3006c8111032f607a9643340d2b9d74f448bed
 EBUILD gdbus-codegen-2.74.4.ebuild 2197 BLAKE2B ac5f5eceed9ee2673b2d8145032615e44b0ccefe23b82abace8b5d54ef8c52d517ff5fd5d3dc4774d5870c54e1bb907d8af22ed1cc9913cdf4d96334853f5c9f SHA512 2632236a58cb71ece53bbecd61622c52ffc15a9fb6a683ab3be1ecd1f12ba8ac860f750b049a05552612a9f10b3006c8111032f607a9643340d2b9d74f448bed
-EBUILD gdbus-codegen-2.74.5.ebuild 2205 BLAKE2B a8dfe56fbb23209056025bbb0dc0be5f19e4cd256480e5f17d034ef7d7a408b27259dc32fbf13b959b5ce47339e5f34575131d06335e54248dfe76355ffb18b4 SHA512 a64faee8a9a579ba4706a3e817c9d6cd6d7c8538d592b1665dc47ce47552d47948d8fdccec293208fd40d6052f326fc59f2947ed2fdd75caa4510dba502b8074
+EBUILD gdbus-codegen-2.74.5.ebuild 2200 BLAKE2B 2174237e50a179ccc1a769d685b7a347285d79a12b12ecf0c97f1c1fd9e42912dc9a0048baaf17dd377c9527597516955b586445a45606dd19516cd8502c4fcf SHA512 5681190c3c9ededf88bfd100388ddcf89155cc900f8ba289e4f8345e599d951104bdf92302dc7dd20ad15ec1ef4a111cca8150a80922d8f846c79b81d7793b8f
 MISC metadata.xml 345 BLAKE2B 91a0526be5ce32d4aa4ea0827c78b2d2d45beae9a8d467916448a0a6b5459fd457e44ac900182654826328b34d37999bedb3ade42e80db92312e50f34d940014 SHA512 b11e427345fab56c77cb1f4f96473645b69054012e86840e2ca7dab221cf55041a1add1dfabce155274acf18488ac79de8149d405213daf39b807f679d4ac752
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.74.5.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.74.5.ebuild
index 787dfc5d3dab..b7f48871408f 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.74.5.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.74.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index 35643458d85b..e89fec210591 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,5 +1,5 @@
 DIST gi-docgen-2022.2.tar.gz 2515533 BLAKE2B d624fe287628ca01cb5746a08dc43bb97375ca538524481f5ee068fb3484e4526c875f374e01ffff02345d13b2d966dd54ad01c8f4e692116fac050cf5277d94 SHA512 adbcfecb6cc93785d372fa877e02b1fe08f9965fea52256a63c988a95f100738f564ae64c971a4a7ddded6ef792609d2a8e8e9461d81e982816abe96c2139ee9
 DIST gi-docgen-2023.1.tar.gz 2516453 BLAKE2B d97ca86f1e9c29de3b1500a08b93a1617dddfc6f29314f1d0f1cbd3ec7b367f4de7b8d7d7eba9fbe5af0a8bbcdd4c4bb0786dfd4deda0acd19ac6372dea24d0a SHA512 fb19af318a66ba475e04826d9b61163ec85e6ea4503847ec6685940424bac8108cf385546bad1de80fedd1ddbb21054644083dc4908caf7e2e616c6e0673b0e3
 EBUILD gi-docgen-2022.2.ebuild 987 BLAKE2B 3a0976f791458272005968a30911d31ff02aa2b744f971dd9b470f1fb0438ac9aa2c473cf8bd12eaa50db19cdc42a10d99b954b667eec8c2bee9b61c47ae6590 SHA512 d99801e3005c67785edfda969549760d803efeb7376a484cada638bcdd50c3c98388a620412751937db3f2b8687c6b56d6858d89f4383f17da4acd265a0d40d0
-EBUILD gi-docgen-2023.1-r1.ebuild 1035 BLAKE2B a5716d59d7a9912d16a51b2c0d279f363077d64359b2281d29ea64a206453f6b03b1b1c544fbaa16bc400ea6870c4bfc19a8a6c54e05f60871bb93599fc372d8 SHA512 7910b21663dd74551e4f3fc1560ffff054f75d98a6607481b8f782567dda5e4faba943cd9ef1106c16d1ed58ea2e6d10ae53cf48a6fda24fc82a224b6e8b73f5
+EBUILD gi-docgen-2023.1-r1.ebuild 1030 BLAKE2B 5a9838b663c7b20501eb877d12ca2fd0fe47ac47748f328bc7f631f00760df0d8b3cac52f25b18007ee953b300b48bb11e1e9145861ebc1b00a41a2e35fc925b SHA512 0ae287e0507e69d3f0aab60463363c36db32a0bbf76c36a53ea8b44abd127f7672a8cf02c49978053883034517e507cfe452bd72fda293bf39dfa122e774be49
 MISC metadata.xml 350 BLAKE2B 157af2fde028e5332e19fa28df298bd81e9aa0d61981ed034f4a270cb41de1ed1b8aa96c1537c4ea6e6588811d08456ba65678c47747bc744ceecf45531bdb2a SHA512 6aab61ec8a175dd2d6a1010753d1e70df2e7a030d708acb61ee4158dc0d2afc214aed20f0e01fa565c7b463617305f2a2d3347e5e80259f9b5b2e03383870c80
diff --git a/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild b/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
index 20341c3e90f9..7b8bb9a1184f 100644
--- a/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
+++ b/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 4e463c982433..9b128cdcea8f 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -3,5 +3,5 @@ DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e5564
 DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614
 EBUILD glib-utils-2.74.3.ebuild 2332 BLAKE2B 0732180201fd68ab2775d231ba1eddf10ee8cc5092cecd1a50b2161417fb27c8d299c1908b933711013fc5b8b881d15a298b7ad60f743f39fb82fbcb2f5aa093 SHA512 fe9cac3eaca77c746a09d5ff451e308b8274c986a8dd8dedf974b1536a44235dadb963843b6ad4067b477e5269b668008289b5e8405ede4b03269080926b3d48
 EBUILD glib-utils-2.74.4.ebuild 2332 BLAKE2B 0732180201fd68ab2775d231ba1eddf10ee8cc5092cecd1a50b2161417fb27c8d299c1908b933711013fc5b8b881d15a298b7ad60f743f39fb82fbcb2f5aa093 SHA512 fe9cac3eaca77c746a09d5ff451e308b8274c986a8dd8dedf974b1536a44235dadb963843b6ad4067b477e5269b668008289b5e8405ede4b03269080926b3d48
-EBUILD glib-utils-2.74.5.ebuild 2340 BLAKE2B 9a64c220aa19f3ac6d111cb1b825c926d673d0537331e9d69d5e42693d2e800358be6b83e649af01d3537f5eead7db010f67d9509c3593f6e117ac6a467a0784 SHA512 ecca302d5990aaa0d345b1aba5bdc31fd214243c5df875a1c147d401b0121aa0eb1d76c0bfc3018916078b7b91bd0ca53ad11b67f405611f5004e8e50653540b
+EBUILD glib-utils-2.74.5.ebuild 2335 BLAKE2B aa640e2b8b2d8939a216c87d9ad332600e2bb543c63eb3a65ea311d2632b3de6396b778c2ce343182c4789338aca15dfb94a36f11407b9fc5bebe871400f0a6e SHA512 bc956cca0e3c5921b0db12e176a1e812b08091b0de23926353ef16163c1e356da152094a8d6226f2db8ab81b47ac246ed8660ceda5262b713f70d8d1dd8d141a
 MISC metadata.xml 401 BLAKE2B bdf1884a4dcf8ab8362a86ed6559bb887c026bc315bd8cbfca0b5d8def8102636965da5af0f1871096704309a4a0919028d02f168a91830aa4ed911c6583d103 SHA512 2eaaccd9c6bd6e059b3acf34c964857a9e541f2eedd191c0fa35eca3499242349184ab01becca40791ac1dcdf02ba4a75369ea9c69fa5c21f15d878b1c28c453
diff --git a/dev-util/glib-utils/glib-utils-2.74.5.ebuild b/dev-util/glib-utils/glib-utils-2.74.5.ebuild
index 33bfee268b48..456897a75b03 100644
--- a/dev-util/glib-utils/glib-utils-2.74.5.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.74.5.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 5cfe9d35b66f..4b611b74a580 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,3 +1,5 @@
+AUX lxqt-build-tools-cpp17-standard.patch 1212 BLAKE2B 51ad7ed93abcc9779db3f72d8d24b36999f514cdae9d778d8d4ac174b1d6124cf1e0c3e2e02dff389db67e182c43e96631a3f287cf8e83a88e1edf4ebb11a19a SHA512 3fe5e8c05fe7e301427d47cdd6714f72ada5e1f20b5856f9b2096177a48aa098bdfaa7c37d2745f2979a4c12d761590fcd89d037ce7ed02f0a38a8449e512534
 DIST lxqt-build-tools-0.12.0.tar.xz 25444 BLAKE2B a3e2d942467d1c2affb957052731f4e4edfa03ed7d84e4ff354b4d501a7f79999ff678538f1c90cff55b6f2f80c172820ed93f036f05cd80c6f982c4bf8bbe54 SHA512 6c8f0d8f04a2ba06c1cff935580a88312f18f87b5da99e53f46c053b842f179bf474b3637ddcb0e9a0007f1d03b9e7cfd92a6552e53082ce34348fcfb6436add
+EBUILD lxqt-build-tools-0.12.0-r1.ebuild 686 BLAKE2B 1a166ec55de1aaf26e1a3dcebac3871220bb431514a1c32756aaac39398fdaa6d7792c45ec3f003440f86b0336065c2da5912f12e62a3559cd632a27c4ccf1b1 SHA512 cef5ce54a84bcb35781ccdd2cd0a1572f800e8e00178270253610a5167cda0583d2fe97ff5e7e860859c4a9e32abf43c1815dec0376fd25fffafb83eb363caec
 EBUILD lxqt-build-tools-0.12.0.ebuild 543 BLAKE2B 3fa133e9c6ce3d35602dd4553577e2d40503bc5cec6474d5ed930eddbbb4b659fb551fc2e6ab3addecd53adfca9527bd854b9c15581085babdd7b318fe0e37bf SHA512 94c3c0c8ee861c19d73e1fb0b14bba6a2fa44c48eb3cc3251ed5fbb8c2345d390b86ec7a32ba607c00036def2065e633654e4804a7e220d821e57967e1b3847e
 MISC metadata.xml 323 BLAKE2B 23d737cdebbafa977534a82a3244d697f8d3b55b16715d344ec46da7c71eb68d480e3a4196944e800400c94c900f240f92ffffc092c68aceeeb95c8cdead9a87 SHA512 403f0f0d13ce990a814e653032166c8cab4d3ea8924aec77f46050760d94e26afb42cb1d793ca4eda3a04a402f3817646cc876c35b506d1bff80bc03a020f0f6
diff --git a/dev-util/lxqt-build-tools/files/lxqt-build-tools-cpp17-standard.patch b/dev-util/lxqt-build-tools/files/lxqt-build-tools-cpp17-standard.patch
new file mode 100644
index 000000000000..21009b89c6f4
--- /dev/null
+++ b/dev-util/lxqt-build-tools/files/lxqt-build-tools-cpp17-standard.patch
@@ -0,0 +1,30 @@
+Gentoo Bug: https://bugs.gentoo.org/894468
+Upstream: https://github.com/lxqt/lxqt-build-tools/pull/83
+
+From 4a3a7038b1927dc43942a930db103023efdcbe2c Mon Sep 17 00:00:00 2001
+From: Simon Quigley <simon@tsimonq2.net>
+Date: Wed, 25 Jan 2023 09:39:41 -0600
+Subject: [PATCH] Bump the minimum compatibility level to C++17.
+
+---
+ cmake/modules/LXQtCompilerSettings.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/LXQtCompilerSettings.cmake b/cmake/modules/LXQtCompilerSettings.cmake
+index a8cb16d..acba891 100644
+--- a/cmake/modules/LXQtCompilerSettings.cmake
++++ b/cmake/modules/LXQtCompilerSettings.cmake
+@@ -181,11 +181,11 @@ endif()
+ 
+ 
+ #-----------------------------------------------------------------------------
+-# CXX14 requirements - no checks, we just set it
++# CXX17 requirements - no checks, we just set it
+ #-----------------------------------------------------------------------------
+ set(CMAKE_CXX_STANDARD_REQUIRED True)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+-set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ ISO Standard")
++set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ ISO Standard")
+ 
+ 
+ #-----------------------------------------------------------------------------
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.12.0-r1.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.12.0-r1.ebuild
new file mode 100644
index 000000000000..ecbde452e97b
--- /dev/null
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.12.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="LXQt Build Tools"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0
+	>=dev-qt/qtcore-5.15:5
+"
+RDEPEND="${DEPEND}"
+
+# https://bugs.gentoo.org/894468
+# https://github.com/lxqt/lxqt-build-tools/pull/83
+PATCHES=( "${FILESDIR}"/"${PN}"-cpp17-standard.patch )
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 653b72339a2e..bfd2a6e3ee40 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index b0e9735d3755..efefc4160cbb 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,5 +1,5 @@
 DIST gvfs-1.50.2.tar.xz 1214464 BLAKE2B 3fbd461cd640fcb956158e6fce97cb6cb7c30e444c5955ee197f827273271b876de62469daee994586b2bfe6ab7ab41d8a9eb2f346a0b9ed45289d9d516f5bf5 SHA512 980ff8a857ad4dc820685a9331d875274f893aebf8aca406c8ee06e2a25026fc51572515f3ccaa06062314f7f5f8d1982c5813d235bd7d81b975874e1796ca04
 DIST gvfs-1.50.3.tar.xz 1227548 BLAKE2B 9f16d0dec4b19a6ee5821d1151a0f051239b132a5b081f03b3741eb106b286c24086c780126788dd76fb91848759b6882e006d608cd1dd0ecd7684926a7e1770 SHA512 5ef5f22d3074b088cc0662ca2639667ffc9dc645677e7ba9014edb9d0631d04c113edada162cda272b72844be24ee947edd587b685cc5c31d24527e9061f14f6
 EBUILD gvfs-1.50.2-r1.ebuild 3908 BLAKE2B 8c277a085fbdaf12f7667c8c27079f0da1966e2b6a213f109e5adb974f649a9610287845d89c8b64c9c3405b6d01d8bcdc09715423d2678b8437d230924ff851 SHA512 afbabfd1b5be102d375c372e96db748f9e92cdd7b9177869b0ed4ae832f8ff5dff0451f694c5f973aa44a17d4e61fc06aa6ece18452a0e9a0292ddb302162262
-EBUILD gvfs-1.50.3.ebuild 3915 BLAKE2B 3f8d5dba215f3e816210771752cb1c923f65b794361e80d429bb167272512cc7668fa6e945a653711c4ad8f893f3f20458613fb58d809c841ea1ecbcc9d35271 SHA512 1b6e4125bcc1e6e16f27b43c7933aad73dc066028a8692e8c857c1f0addaaee610380bcd14c69f1d90173ab21a3eec3d3e3f2b6b57b80b33339525f92c214f59
+EBUILD gvfs-1.50.3.ebuild 3911 BLAKE2B 058358a680a0e5df7d36024d6ee18879f27fb63f154f670466783ac211cf05436db99ab01bbfb592c1ea0692baec3e0a0f1001739382ce27c0e8143034f34180 SHA512 60ae839af1cb97a32c1ee94e3661c4d4edd6e28669cc83c4d219a940e08e6417386b449bc839b2084192d5c5593293d404c82e2484d3b1be6136dd8ff8f245ff
 MISC metadata.xml 1857 BLAKE2B ecd1ccd9d258829723b274a45c4d831755032988e60edad0294c2c313addd274f4f9c7b3b3fb6db4e705a9694dd07f5963440b1bed00a51a4266b6f1c638d11b SHA512 8f45e74dbd38fdfbae9bd51734ffdc516f2fd55ed964d03bd3ee8bb809bf0d858d7b93bc17894a446d5e4a4299da4cc65062d52f49cf4cb60c72d26d45d26dc1
diff --git a/gnome-base/gvfs/gvfs-1.50.3.ebuild b/gnome-base/gvfs/gvfs-1.50.3.ebuild
index 01c3977f72b1..7ffaae223de9 100644
--- a/gnome-base/gvfs/gvfs-1.50.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.50.3.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.70.0:2
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 45d94df8c87c..5a7e696153d4 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 11d5cea1627e..5dca3bd091f2 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-4.8.2.tar.xz 20210736 BLAKE2B 0595ee5b497cdf1b0fff3bc468a7e79d9665f5552213b3bd794f9df6354e280f3d4747820bf3cd83ee903b8709e2902f70f6c3721322573b204447017a9c0ebf SHA512 400cdde53a4b76a912f52b1300286b2198d47195902ccfc034fbc518be7bc4c5817fe6df6386d764c95686083eede2e4582cc555fb38b0bce455942ea6c5fcb5
 DIST gtk-4.8.3.tar.xz 20297060 BLAKE2B ad0f9e2998f3748afe4a03317e6d0438bfd9eaf804f202e96724541cce20597b7b6e69d5c50ce319450feed4f4a5653c0d99b949b23ce3a40c46a12da7e2d85f SHA512 56be0f5ce85a9cbbda4a5de53baeeb6b8cc527a5d34723ae5548759ec7c28f03d204b6b6758dffed02a9e226f3bfcd1f15971105c2f2f7be7cef22538be27754
 EBUILD gtk-4.8.2-r1.ebuild 5750 BLAKE2B 20ae0c2f39f614c51c5a6f1e6841c98deaf1043c2e10304b6a03fd45149fb4781ee2c491122829295ab60f9cacafc1c95741fc5e2a6b178e6645d3a86e501c9a SHA512 88166645b1c503fb0621adf2ee6e6eca95e2a9d859d541254443058f1bac1698fb4976cfc6231034544726f39e3ba85b03d06700c9137fa8b02711615ec61bbe
-EBUILD gtk-4.8.3.ebuild 5703 BLAKE2B ce24a412954b255c45a74e95884d6083f81db73a7267ebd9f9fd12de2f05e5604ca3fef7cb5fc0e7d00270d3ed424508cff731ffee915e505723976dbc58be19 SHA512 90eeaaa6e7c2e21bd62a17ade931b421a7d01bc33b20d10c43e81454fe83acd1fe3b77e139a4e09ff5f691ba32f7e6775377294adfb5f8ad802186e6ced33055
+EBUILD gtk-4.8.3.ebuild 5700 BLAKE2B cb6efa0c87b801cacef0c44fa667ff25e65e9cc7faf298bfd8ab8991ae64ed99f7482fbbdcba4f2d636d9bc9f40914a7f721176c2bfb9d6b331a2f319ec06001 SHA512 7ae1c5f060f0c206231ef7c1d180d4edba6bf3eeb79e5884f1f777381a99880dad830ec89ea802d254fafe22e44fed7f0835e90f74d7f914f7d81d91b0f54614
 MISC metadata.xml 761 BLAKE2B 9bfb7757b82761ef2285e2d912376112958df4400ed93bdfc4a3f195cada9caf927cbced29820f6db049b8e5b7f2246d9264290ade62ba3bde8975491fd6331b SHA512 6ba84b2e3eeafceb179339561ac5e9fbd94dc34b71da768d9ca909818cf0c9ec5fe04906ed33aa58bc56929323bc41272223faee908052861fd1c6f8bbad95a5
diff --git a/gui-libs/gtk/gtk-4.8.3.ebuild b/gui-libs/gtk/gtk-4.8.3.ebuild
index 592136afe5bd..7486427b095f 100644
--- a/gui-libs/gtk/gtk-4.8.3.ebuild
+++ b/gui-libs/gtk/gtk-4.8.3.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	test? ( introspection )
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7
diff --git a/gui-libs/libadwaita/Manifest b/gui-libs/libadwaita/Manifest
index 188b010b1de6..0ac54b782aa9 100644
--- a/gui-libs/libadwaita/Manifest
+++ b/gui-libs/libadwaita/Manifest
@@ -2,6 +2,6 @@ DIST libadwaita-1.2.0.tar.xz 2955492 BLAKE2B 3c53ce54132a17ba09b94a93c1e3ab49e8d
 DIST libadwaita-1.2.1.tar.xz 2023892 BLAKE2B 1adb99f360cded03450575206d23d9d9a6e50b2e7afc3b58a7ecee2b35b09896ab03a584a8f21fca0ea95109d3dd4df46269428934bf7563b716aaaa117fc85c SHA512 e7de0a5bcd01cbabf5a25fe5b81ba2488b0a33bfaa78e3aa12b64d6373b7ffe958ef7d7b438633edf38dff52d58efbff0365c9d7c191fc895ec7daf62eff1605
 DIST libadwaita-1.2.2.tar.xz 1938256 BLAKE2B 4ef46d1781e73d18edea75f663d29c6b8570e40f3d0d8987626104e3a49d39f0ca348ae215a8d572acf062a6320750df055efbd70a63ef1403d79e6d70e2b5f6 SHA512 65bf576145a4cae199dd927b27c295a72b6615d549186ec216a8aae3337ebd3d2b102eca75133a4211c4d2841e32d4e4d510bce72c3424eee1e2d4603b5642e1
 EBUILD libadwaita-1.2.0.ebuild 1487 BLAKE2B dab9b1cec346f1b20f34ed1347479a58f9142cdbe534c1f2e32ef38d35d92c2760bc38816bb93597481096016410adbc1f7e40733c08a1721b191da36b09f596 SHA512 414540cd74d85c9163636932801cf5d229c0feccb8544ae0e684cfadb432a4036411252a19114160aececf66c4a4534dd6f85b571750d8642c6462dc6ad7fea5
-EBUILD libadwaita-1.2.1.ebuild 1492 BLAKE2B f8666af672936a976cf4233669b7654ea48b6f1472f5237400a5e8b032b1a2b0b9aa75e5fc13c662c2c6c640edd6ba5bf23d4c97a4fb2df23dbd282f53ae8da7 SHA512 6b5a64d0348d01bc91292be4d9adb7e0c424c9d51d9f540aa2132a3f7eef564b09a25a46ce0153f6434f668989c2946cbb1f7fd175902d1d3a42b4fdcf9b11d7
+EBUILD libadwaita-1.2.1.ebuild 1490 BLAKE2B d113e13d3ba04534be4da80b6a4a7c209272dddd72d63e63215f6316a06c2eae9e37d3f72ede9542212c89456fa22dfbe75b42954ae14dfe1be56afaa5e5a507 SHA512 13fa2abff61c184d17dd5eeb84419f0752cc014a5edc784ea0ed2bf43dad3729d15c81abfd4ba747158f09560aeead2682c8a4247fcaf8f4f50ebf5e9a254ac3
 EBUILD libadwaita-1.2.2.ebuild 1492 BLAKE2B f8666af672936a976cf4233669b7654ea48b6f1472f5237400a5e8b032b1a2b0b9aa75e5fc13c662c2c6c640edd6ba5bf23d4c97a4fb2df23dbd282f53ae8da7 SHA512 6b5a64d0348d01bc91292be4d9adb7e0c424c9d51d9f540aa2132a3f7eef564b09a25a46ce0153f6434f668989c2946cbb1f7fd175902d1d3a42b4fdcf9b11d7
 MISC metadata.xml 351 BLAKE2B ae57c9eb56cb12bf754b28c2e6620c09ad7ccc79396fd0476e99e52b93bf6d3900fc84ab55fdf11d98e59ed9e247cabf6f301d45bc5e4c453c0fcffc49b144cb SHA512 dc1333518d24d60f69a180ee7369c4b783f234bda36cd65ec66d483db86f3123eca5ed10cd8aadc7a183b707d698a159d7917f7ebd1c342c212f15e90cb8d5df
diff --git a/gui-libs/libadwaita/libadwaita-1.2.1.ebuild b/gui-libs/libadwaita/libadwaita-1.2.1.ebuild
index 11c36e9c0796..4d8304f15664 100644
--- a/gui-libs/libadwaita/libadwaita-1.2.1.ebuild
+++ b/gui-libs/libadwaita/libadwaita-1.2.1.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.66:2
diff --git a/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index bdf3d9d3031e..8ac6d96037f9 100644
--- a/lxqt-base/Manifest.gz
+++ b/lxqt-base/Manifest.gz
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
index 243e3407faf2..5887abb389ae 100644
--- a/lxqt-base/lxqt-config/Manifest
+++ b/lxqt-base/lxqt-config/Manifest
@@ -1,5 +1,7 @@
+AUX lxqt-config-kscreen-52690.patch 2956 BLAKE2B d8366b4fba22a7bc2df121bb9501a101924cf5f3519e42416ce9b44d5782fe4508a0edb3f8471113e1dc3fe6dbb6b8f286b87e38f41ebadae2ad834ffa1aad33 SHA512 53316494fce0962696abfd8d9da972b3b3920de1c7587b8b6df480792cd607edcebf2c8c0074f184fb72b5333c1441d8247c58f313e67cc25f3da71cbc85ef6a
 DIST lxqt-config-1.1.0.tar.xz 359900 BLAKE2B 42621ccdd62af82e6d933d71b74fe4f8d27aad4a2c8aab8d04747670d87df2379f5877c0e4aacc29958e273e095c849d261456ef142021857e5da29c3abbd7f8 SHA512 f0272737c5127492f9cd560a831720a7df6ced326109739fcd0f429c45f8d62e4685c438424c5efe4f4927339de7a5f6849560ee5f9901768db5d8511406bb21
 DIST lxqt-config-1.2.0.tar.xz 364972 BLAKE2B 2c4082f8b70284492d02372e03088dbade48a8288cd2e0038dd60fd4a70c4ff434188d795ec75bbd268ea3d75661751230c06a74f1cd65273934f89604c7170d SHA512 ae0f71a6ac85e80bc1d1de890148b908bda21aced0829f5f203442f3a0139dbeec44e7190adc1f5706361f4cf7a00bdead3035c63bf6da2bbba5a16a88d7b469
 EBUILD lxqt-config-1.1.0.ebuild 1445 BLAKE2B b6f7ebd7698443aa35ad9bb6b1ca177ed6cfeda423ae54178248d1c6bb8c196ab55ea74352a8abced40fe0239d24a458303d5c4f612e05c7c87f3946fd394100 SHA512 5898a730df6fc4c5c05d86f493df574ea7a0a517a13f74b40e2c65185013f6aa81c64e0cf9efeb19aaa3e4c9401c8b5a6469c697664b098ea84974a936243dc7
+EBUILD lxqt-config-1.2.0-r1.ebuild 1585 BLAKE2B 301b0cd8e38f2d792e79a46a5b5a4045df739459aab1a46e0c62a0cf71446963ed56a09c1a58d64573ec2e56c0ca45b63ae33a3cd02b374cdf289a4e00e53d6d SHA512 015e25dbf35f89bb691221b57b5499d62016a80a9aa658ea773ac628c26d0b93e4f1008ccf0a243ef3fa406818185bdfcaa36fb1e42665af80bb5073672a735a
 EBUILD lxqt-config-1.2.0.ebuild 1447 BLAKE2B 8de2b43596924f8f22dac0e9be16ccdb3369b6dda107a100f785df2b78cccc491940b24bb1ffe62dd56d4ac8b1e4daa0a5587dda2bbdb899f162d82a40229124 SHA512 cc565c8e852eb2d8d7e2a83aafd86b6af0f68b145be1b3927b7ea10b3ebda0e3b06e18c6d593b29928c3d4cf3e90d4fae7b2302b06fec2bf43d4d1f12797948d
 MISC metadata.xml 451 BLAKE2B 6a32cdd63a8414bf7416ff5cd40c490b703ab115790119e3b2c77ba7fcba9d5b164117a2183f51622a3a2716afaf2440fa66ddef3b5d778a46a5a5e185ef5cb1 SHA512 e181838ee5cefbad064504db84b53db0591eb1bbb476c966f076eeae313f5f94b172c952a7f2d340e4e7ac539bee69884ce583569bad13b4147f8de67adda985
diff --git a/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch b/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch
new file mode 100644
index 000000000000..6ccd4184bbbb
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch
@@ -0,0 +1,83 @@
+Gentoo Bug: https://bugs.gentoo.org/894468
+Upstream: https://github.com/lxqt/lxqt-config/pull/915
+
+From 6add4e4f0040693e7c4242fbae48c9d32007686c Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Fri, 3 Feb 2023 08:11:04 +0900
+Subject: [PATCH] lxqt-config-monitor: add more header file inclusion for
+ libkscreen 5.26.90 (#915)
+
+With https://github.com/KDE/libkscreen/commit/94f330959b0eda775418aef7faee80ce69144e63 ,
+`#include <KScreen/Output>` no longer includes "mode.h" implicitly.
+So in lxqt-config-monitor, files using `class KScreen::Mode` should include
+`#include <KScreen/Mode>` explicitly.
+
+Related: #903 .
+---
+ lxqt-config-monitor/kscreenutils.cpp          | 1 +
+ lxqt-config-monitor/loadsettings.cpp          | 1 +
+ lxqt-config-monitor/monitorpicture.cpp        | 1 +
+ lxqt-config-monitor/monitorsettingsdialog.cpp | 1 +
+ lxqt-config-monitor/monitorwidget.cpp         | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/lxqt-config-monitor/kscreenutils.cpp b/lxqt-config-monitor/kscreenutils.cpp
+index 9515e789..be2634d7 100644
+--- a/lxqt-config-monitor/kscreenutils.cpp
++++ b/lxqt-config-monitor/kscreenutils.cpp
+@@ -2,6 +2,7 @@
+ #include "timeoutdialog.h"
+ 
+ #include <KScreen/Output>
++#include <KScreen/Mode>
+ #include <KScreen/Config>
+ #include <KScreen/GetConfigOperation>
+ #include <KScreen/SetConfigOperation>
+diff --git a/lxqt-config-monitor/loadsettings.cpp b/lxqt-config-monitor/loadsettings.cpp
+index 0c7bd73c..4e9331ba 100644
+--- a/lxqt-config-monitor/loadsettings.cpp
++++ b/lxqt-config-monitor/loadsettings.cpp
+@@ -23,6 +23,7 @@
+ #include "kscreenutils.h"
+ #include <KScreen/Output>
+ #include <KScreen/Config>
++#include <KScreen/Mode>
+ #include <KScreen/GetConfigOperation>
+ #include <KScreen/SetConfigOperation>
+ #include <LXQt/Settings>
+diff --git a/lxqt-config-monitor/monitorpicture.cpp b/lxqt-config-monitor/monitorpicture.cpp
+index 0d06ab82..4cb14894 100644
+--- a/lxqt-config-monitor/monitorpicture.cpp
++++ b/lxqt-config-monitor/monitorpicture.cpp
+@@ -24,6 +24,7 @@
+ #include <QDebug>
+ #include <QVector2D>
+ #include <QRectF>
++#include <KScreen/Mode>
+ #include <QScrollBar>
+ 
+ #include "configure.h"
+diff --git a/lxqt-config-monitor/monitorsettingsdialog.cpp b/lxqt-config-monitor/monitorsettingsdialog.cpp
+index 6172019f..bfd8c1dd 100644
+--- a/lxqt-config-monitor/monitorsettingsdialog.cpp
++++ b/lxqt-config-monitor/monitorsettingsdialog.cpp
+@@ -28,6 +28,7 @@
+ #include "kscreenutils.h"
+ 
+ #include <KScreen/Output>
++#include <KScreen/Mode>
+ #include <QJsonObject>
+ #include <QJsonArray>
+ #include <LXQt/Settings>
+diff --git a/lxqt-config-monitor/monitorwidget.cpp b/lxqt-config-monitor/monitorwidget.cpp
+index e0fcf0a8..41883c25 100644
+--- a/lxqt-config-monitor/monitorwidget.cpp
++++ b/lxqt-config-monitor/monitorwidget.cpp
+@@ -22,6 +22,7 @@
+ #include <QComboBox>
+ #include <QStringBuilder>
+ #include <QDialogButtonBox>
++#include <KScreen/Mode>
+ #include <KScreen/EDID>
+ 
+ #include <algorithm>
diff --git a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..9c844e54daa9
--- /dev/null
+++ b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_cut 1-2)"
+
+inherit cmake xdg-utils
+
+DESCRIPTION="LXQt system configuration control center"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
+SLOT="0"
+IUSE="+monitor +touchpad"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-5.15:5
+"
+DEPEND="
+	>=dev-libs/libqtxdg-3.10.0
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtx11extras-5.15:5
+	>=dev-qt/qtxml-5.15:5
+	=lxqt-base/liblxqt-${MY_PV}*:=
+	sys-libs/zlib:=
+	x11-apps/setxkbmap
+	x11-libs/libxcb:=
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	monitor? ( kde-plasma/libkscreen:5= )
+	touchpad? (
+		virtual/libudev:=
+		x11-drivers/xf86-input-libinput
+		x11-libs/libXi
+	)
+"
+RDEPEND="${DEPEND}"
+
+# https://bugs.gentoo.org/894468
+# https://github.com/lxqt/lxqt-config/pull/915
+PATCHES=( "${FILESDIR}"/"${PN}"-kscreen-52690.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MONITOR=$(usex monitor)
+		-DWITH_TOUCHPAD=$(usex touchpad)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index db940e673f23..f3341f407931 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 34d50553a1cb..fb47edc0b7d8 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,4 @@
 DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be SHA512 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
 EBUILD hugin-2022.0.0.ebuild 2118 BLAKE2B 0705a31e43d14fd120dad9b4c7ab2f38ba5dff1638ef45c147698210236496b72a25ac9f9a7baf3a2e863ec6789ccd12d809c68a2c8507594d3a77c4f2739da4 SHA512 5eb85e50ab7322254e8358c74d96f3b2482c7d2f73dfcc4180d51fcdda769304978cd0bf0e664f6225c4d4f3ab3fa2d945d9d9d456b654c2695e227ef2692684
-EBUILD hugin-9999.ebuild 2058 BLAKE2B 3307d6bb6830c34102c1ad7ee703e0656afccd731fef069d4f1a8ce7a70877fb34c1ad1caa80fba17e4e4bab6634cfce61540b1107639381ff1a5e434e6bc5c7 SHA512 a59db25a089af5cae9226684dc7cf3f22a419b1ccf62cf7449864d330c0d2a2d969a566b969c89e316120954ca0020358284200b9579480c28a9cd5e66721e83
+EBUILD hugin-9999.ebuild 2058 BLAKE2B 13f52f224c492d093c79429cfdc05b81c8a4c5c5297266107c55f20bb4278d4e4664bc183ee0fe8c210d657a0ac5b51bd86ed0fd7d02c3668551753f0c7a5178 SHA512 b6ae419dffb76575973fe91feef2b578a75d5350e935f9a1da73451030878d3ed7eb0945f6745a8467b5f3c9973487d5e08c37d5a0df47b5accb4bcd4a0aa22f
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 26a7d4a3d6bf..9411d0ca3b31 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit mercurial python-single-r1 wxwidgets cmake xdg
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 57243b227f7a..7bf7690d9eb2 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 64cc81a72576..f3c098573e92 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,9 +1,3 @@
-AUX hamlib-4.4-fix-clang-warnings.patch 6673 BLAKE2B 26b0bbbc2c9bb89fe2707b0bbc7ff81c33104670f5bc157fe7063b5150786963fcd379fca620c7a457682f6b1d8bc9a13729ab442ce771500763cf91127a68db SHA512 1cfbff642826281d42226a5c4364b438602dc2022baf7b6bd7cc41d4cb1a0defec511a9c20d06cdf5aca6549e00ec11639899326ac03d4a6604a7440d813f7e9
-AUX hamlib-4.4-slibtool.patch 2414 BLAKE2B 798b95d72e57d1b68a1d26c36f631b084722a32ae3c20238f7cb2495412e200ee7e909d2e614ad27db7016654a6e662834b8c95f86dbec609754fe817a49a1b8 SHA512 743a5be7160e80453810873ea074fd62934524fcf7fc9b8e224c93a2876760c96793ebb13e6e40c32b648065b034a2355935862d540c6620babaeacb7fc2f88c
-DIST hamlib-4.4.tar.gz 2401399 BLAKE2B 4256b5b4374c62ef4fb957d29deda95aa9d15a8b52b81c5db1c07f3ebbf4c8e48c6c082769cef82c8457b3f813ac00ef7a37136615747f2c93e5275a112891e7 SHA512 37366ba180031de34da447c3d4e0086f156b893f57b5ab9bbc38b8e1f4bf9310fa1a9eb2a6d7884f1f11900dbdb811b4071e023aba571ea0ac5d07ddb122bf7b
-DIST hamlib-4.5.3.tar.gz 2590200 BLAKE2B 7c06a20a1185a2e413fee56231f3e0f6aa77a7585b9853896b00abb773e2e23fc5e97a8a3fbb873528282756ee674b1ca5b2b14f0fe8e6b9b8e8f7e8ffa223f2 SHA512 be3b58c7276c1289d85b4dc9054016757200fde06d66116f7a1687442e53bf322f0a3ae974c9b784cbd0bff0c64b901b97fac74184f4b4a0fdf1f5079d0ea509
 DIST hamlib-4.5.4.tar.gz 2598483 BLAKE2B 7f9654d6aa8c241e58dfdcd4d1967cb0d2415f9cd7a06de68f0ec0e837442db4fd373cfcd08406afca6d6c6c71435358bc5d31969fb0569dea5853b4f3d4f38e SHA512 882fb517a3e5854cdaad506520e96c7736214fe27d1ac053f0510e3c5c08e1bf40217442f519d1c4be92e3d05135c7bd90bc0d60f334f52994e69b2ce9d3f442
-EBUILD hamlib-4.4.ebuild 2256 BLAKE2B 4fc3f7416dc3da43c2399b22e7d54944f65f5ab40457337a52f68a68db8d0e3d093a646faee5da6148d53ac8d954766eaaf0367d8466f0aeba45049c849538ab SHA512 283a053b38550700d6025156ca788e5bf500a1353f6d1dcbe5f164d3241cb35d0bf92cb4727c536b7f7a035738739c60cabc5119f2790d130ad0a8f54edd25b7
-EBUILD hamlib-4.5.3.ebuild 2147 BLAKE2B 047c6464904109604d18caa6896d404858b9e55da43accbc2840453466b20cc09b24de875f879e0fd0c859f53c4255e341788e5b860b3a12d25a943f68efbde7 SHA512 587439d878cedeb67c0365e580131ea83061da702c08589c60f9eba015ed468033cd3edb5e0b8fdc4d6b4ccfb64425f0d20cfc5ee718c1d0ae47f7e00bd99040
 EBUILD hamlib-4.5.4.ebuild 2145 BLAKE2B 5d5d3932673d5a10d002fe1c6d8b1af5aac6417eb0b71742b4e25b4685d4559150a3f628fdc6f0fa38e77dd077be523fd935a6085855cc5a8586b2dbe9ff2fd5 SHA512 6056f08cb4156e5465642f7397d1eede36ac0f8343581b5f98f598a74b0c0b4fb2b8c1ad736397425584a061015936744000d74f44b3f9859239e3f6d73ef3c4
 MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f
diff --git a/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch b/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch
deleted file mode 100644
index 832af50e0e6c..000000000000
--- a/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From 1aebee2da9d29ff1d1a16e19f23bbff4e0f319a8 Mon Sep 17 00:00:00 2001
-From: Mike Black W9MDB <mdblack98@yahoo.com>
-Date: Mon, 14 Nov 2022 16:37:20 -0600
-Subject: [PATCH 1/2] Fix clang warning on callback functions
- https://github.com/Hamlib/Hamlib/issues/1149
-
----
- include/hamlib/rig.h |  4 +++-
- rigs/aor/aor.c       |  4 ++--
- src/mem.c            | 15 ++++++++-------
- tests/testcaps.sh    | 12 ++++++++++++
- 4 files changed, 25 insertions(+), 10 deletions(-)
- create mode 100755 tests/testcaps.sh
-
-diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
-index 574c21bd..5dbb5a7b 100644
---- a/include/hamlib/rig.h
-+++ b/include/hamlib/rig.h
-@@ -1675,7 +1675,7 @@ typedef struct cal_table_float cal_table_float_t;
- //! @cond Doxygen_Suppress
- #define EMPTY_FLOAT_CAL { 0, { { 0, 0f }, } }
- 
--typedef int (* chan_cb_t)(RIG *, channel_t **, int, const chan_t *, rig_ptr_t);
-+typedef int (* chan_cb_t)(RIG *, vfo_t vfo, channel_t **, int, const chan_t *, rig_ptr_t);
- typedef int (* confval_cb_t)(RIG *,
-                              const struct confparams *,
-                              value_t *,
-@@ -2024,10 +2024,12 @@ struct rig_caps {
-     int (*get_chan_all_cb)(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t);
- 
-     int (*set_mem_all_cb)(RIG *rig,
-+                          vfo_t vfo,
-                           chan_cb_t chan_cb,
-                           confval_cb_t parm_cb,
-                           rig_ptr_t);
-     int (*get_mem_all_cb)(RIG *rig,
-+                          vfo_t vfo,
-                           chan_cb_t chan_cb,
-                           confval_cb_t parm_cb,
-                           rig_ptr_t);
-diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
-index ad4331d9..3f69d723 100644
---- a/rigs/aor/aor.c
-+++ b/rigs/aor/aor.c
-@@ -1364,7 +1364,7 @@ int aor_get_chan_all_cb(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t arg)
-      * future data for channel channel_num
-      */
-     chan = NULL;
--    retval = chan_cb(rig, &chan, chan_next, chan_list, arg);
-+    retval = chan_cb(rig, vfo, &chan, chan_next, chan_list, arg);
- 
-     if (retval != RIG_OK)
-     {
-@@ -1414,7 +1414,7 @@ int aor_get_chan_all_cb(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t arg)
-              * provide application with channel data,
-              * and ask for a new channel structure
-              */
--            chan_cb(rig, &chan, chan_next, chan_list, arg);
-+            chan_cb(rig, vfo, &chan, chan_next, chan_list, arg);
- 
-             if (j >= LINES_PER_MA - 1)
-             {
-diff --git a/src/mem.c b/src/mem.c
-index 8aa51e57..a6d72e59 100644
---- a/src/mem.c
-+++ b/src/mem.c
-@@ -954,7 +954,7 @@ int get_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t chan_cb,
-          * future data for channel channel_num
-          */
-         chan = NULL;
--        retval = chan_cb(rig, &chan, chan_list[i].startc, chan_list, arg);
-+        retval = chan_cb(rig, vfo, &chan, chan_list[i].startc, chan_list, arg);
- 
-         if (retval != RIG_OK)
-         {
-@@ -995,7 +995,7 @@ int get_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t chan_cb,
- 
-             chan_next = j < chan_list[i].endc ? j + 1 : j;
- 
--            chan_cb(rig, &chan, chan_next, chan_list, arg);
-+            chan_cb(rig, vfo, &chan, chan_next, chan_list, arg);
-         }
-     }
- 
-@@ -1016,7 +1016,7 @@ int set_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t chan_cb,
-         for (j = chan_list[i].startc; j <= chan_list[i].endc; j++)
-         {
- 
--            chan_cb(rig, &chan, j, chan_list, arg);
-+            chan_cb(rig, vfo, &chan, j, chan_list, arg);
-             chan->vfo = RIG_VFO_MEM;
- 
-             retval = rig_set_channel(rig, vfo, chan);
-@@ -1044,6 +1044,7 @@ struct map_all_s
-  * chan_cb_t to be used for non cb get/set_all
-  */
- static int map_chan(RIG *rig,
-+                    vfo_t vfo,
-                     channel_t **chan,
-                     int channel_num,
-                     const chan_t *chan_list,
-@@ -1343,7 +1344,7 @@ int HAMLIB_API rig_set_mem_all_cb(RIG *rig,
- 
-     if (rc->set_mem_all_cb)
-     {
--        return rc->set_mem_all_cb(rig, chan_cb, parm_cb, arg);
-+        return rc->set_mem_all_cb(rig, vfo, chan_cb, parm_cb, arg);
-     }
- 
- 
-@@ -1411,7 +1412,7 @@ int HAMLIB_API rig_get_mem_all_cb(RIG *rig,
- 
-     if (rc->get_mem_all_cb)
-     {
--        return rc->get_mem_all_cb(rig, chan_cb, parm_cb, arg);
-+        return rc->get_mem_all_cb(rig, vfo, chan_cb, parm_cb, arg);
-     }
- 
-     /* if not available, emulate it */
-@@ -1480,7 +1481,7 @@ int HAMLIB_API rig_set_mem_all(RIG *rig,
-     mem_all_arg.vals = (value_t *) vals;
- 
-     if (rc->set_mem_all_cb)
--        return rc->set_mem_all_cb(rig, map_chan, map_parm,
-+        return rc->set_mem_all_cb(rig, vfo, map_chan, map_parm,
-                                   (rig_ptr_t)&mem_all_arg);
- 
-     /* if not available, emulate it */
-@@ -1548,7 +1549,7 @@ int HAMLIB_API rig_get_mem_all(RIG *rig,
-     mem_all_arg.vals = vals;
- 
-     if (rc->get_mem_all_cb)
--        return rc->get_mem_all_cb(rig, map_chan, map_parm,
-+        return rc->get_mem_all_cb(rig, vfo, map_chan, map_parm,
-                                   (rig_ptr_t)&mem_all_arg);
- 
-     /*
-diff --git a/tests/testcaps.sh b/tests/testcaps.sh
-new file mode 100755
-index 00000000..7032a2ce
---- /dev/null
-+++ b/tests/testcaps.sh
-@@ -0,0 +1,12 @@
-+#!/bin/sh
-+model=1
-+riglist=`rigctl -l | cut -c1-8 | grep -v Rig | tr -d '\n'`
-+for model in $riglist
-+do
-+   result=`rigctl -m $model -u 2>/dev/null | grep warnings`
-+#   if [[ "$result" == *"warnings: 0"* ]];then
-+       echo $model " " $result
-+#   fi
-+
-+    model=`expr $model + 1`
-+done
--- 
-2.37.4
-
-
-From d7edd89a12be134a904d0a3d5fc3e4f68f111c16 Mon Sep 17 00:00:00 2001
-From: Mike Black W9MDB <mdblack98@yahoo.com>
-Date: Mon, 14 Nov 2022 17:55:25 -0600
-Subject: [PATCH 2/2] Fix memcsv.c https://github.com/Hamlib/Hamlib/issues/1149
-
----
- tests/memcsv.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/memcsv.c b/tests/memcsv.c
-index 8a107549..82becbf4 100644
---- a/tests/memcsv.c
-+++ b/tests/memcsv.c
-@@ -48,6 +48,7 @@ char csv_sep = ','; /* CSV separator */
-  * Prototypes
-  */
- static int dump_csv_chan(RIG *rig,
-+                         vfo_t vfo,
-                          channel_t **chan,
-                          int channel_num,
-                          const chan_t *chan_list,
-@@ -552,6 +553,7 @@ void dump_csv_name(const channel_cap_t *mem_caps, FILE *f)
- 
- /* Caution! Keep the function consistent with dump_csv_name and set_channel_data! */
- int dump_csv_chan(RIG *rig,
-+                  vfo_t vfo,
-                   channel_t **chan_pp,
-                   int channel_num,
-                   const chan_t *chan_list,
--- 
-2.37.4
-
diff --git a/media-libs/hamlib/files/hamlib-4.4-slibtool.patch b/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
deleted file mode 100644
index 140534e744b0..000000000000
--- a/media-libs/hamlib/files/hamlib-4.4-slibtool.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 4fa9a211adbcb1ae9329db41c27854af70f39d64 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Fri, 6 May 2022 17:13:36 -0700
-Subject: [PATCH] bindings: Fix tcl build with slibtool
-
----
- bindings/Makefile.am |  3 ++-
- configure.ac         | 16 ++++++++++++----
- macros/tcl.m4        |  1 +
- 3 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/bindings/Makefile.am b/bindings/Makefile.am
-index f9f17d567..7e2647945 100644
---- a/bindings/Makefile.am
-+++ b/bindings/Makefile.am
-@@ -149,8 +149,9 @@ PKG_VER = $(ABI_VERSION).$(ABI_REVISION)
- DLL = hamlibtcl-$(PKG_VER)$(TCL_SHLIB_SUFFIX)
- 
- nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
-+hamlibtcl_la_CFLAGS = $(TCL_CFLAGS)
- hamlibtcl_la_LDFLAGS = -no-undefined -module -release $(PKG_VER) -avoid-version
--hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC)
-+hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC) $(TCL_LIBS)
- 
- hamlibtcl_ladir = $(tcldir)
- hamlibtcl_la_DATA = pkgIndex.tcl
-diff --git a/configure.ac b/configure.ac
-index f58eb0925..ab6e120f7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -589,11 +589,16 @@ AC_ARG_WITH([tcl-binding],
-     [build_tcl=no])
- AC_MSG_RESULT([$build_tcl])
- 
--dnl SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG from macros/tcl.m4
-+dnl tcl.pc or SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG from macros/tcl.m4
- AS_IF([test x"${build_tcl}" = "xyes"],[
--    dnl Search for and load tclConfig.sh.
--    SC_PATH_TCLCONFIG
--    SC_LOAD_TCLCONFIG
-+    dnl Search for and load tcl.pc or tclConfig.sh.
-+    PKG_CHECK_MODULES([TCL], [tcl],
-+        [],
-+        [
-+            AC_MSG_WARN([Unable to find Tcl pkgconfig])
-+            SC_PATH_TCLCONFIG
-+            SC_LOAD_TCLCONFIG
-+        ])
- 
-     tcl_save_CPPFLAGS=$CPPFLAGS
-     CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC"
-@@ -617,6 +622,9 @@ AC_SUBST([TCL_VERSION])
- AC_SUBST([TCL_LIB_SPEC])
- AC_SUBST([TCL_INCLUDE_SPEC])
- AC_SUBST([TCL_SHLIB_SUFFIX])
-+dnl These variables are set once tcl.pc is found.
-+AC_SUBST([TCL_LIBS])
-+AC_SUBST([TCL_CFLAGS])
- 
- 
- dnl Check for lua availability, so we can enable HamlibLua
-diff --git a/macros/tcl.m4 b/macros/tcl.m4
-index feed05ce3..c1d308cf4 100644
---- a/macros/tcl.m4
-+++ b/macros/tcl.m4
-@@ -130,6 +130,7 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
- 	. $TCL_BIN_DIR/tclConfig.sh
-     else
-         AC_MSG_RESULT([file not found])
-+        AC_MSG_ERROR([failed to load tclConfig.sh])
-     fi
- 
-     #
diff --git a/media-libs/hamlib/hamlib-4.4.ebuild b/media-libs/hamlib/hamlib-4.4.ebuild
deleted file mode 100644
index 03c7182e96ec..000000000000
--- a/media-libs/hamlib/hamlib-4.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="http://www.hamlib.org"
-SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0/4.2"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen
-		dev-util/source-highlight )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-PATCHES=(
-	"${FILESDIR}/${P}-slibtool.patch" # 798273
-	"${FILESDIR}/${P}-fix-clang-warnings.patch" # 880961
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/hamlib/hamlib-4.5.3.ebuild b/media-libs/hamlib/hamlib-4.5.3.ebuild
deleted file mode 100644
index cc3babe21d69..000000000000
--- a/media-libs/hamlib/hamlib-4.5.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="http://www.hamlib.org"
-SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0/4.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen
-		dev-util/source-highlight )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index e77905a2b367..69fef8277d93 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,5 +1,5 @@
 DIST libchamplain-0.12.20.tar.xz 222168 BLAKE2B 72093eecffca24a5f255269472216f24d0804b7c8daf7cf9dc1273df9afc3fe5664dd2ca7d351bf94065f61bf4a419b3babcf3e9b2ed9a0f67c9947190aaa476 SHA512 514e4bd2803ace0d87a95a318a03bc2f2ccc454129146d76590d1b1f5666c95a4fb7013e2ad0cfafc5844d7d8b732c81a44cd0e7d51c505adcfe55c55abb4f6f
 DIST libchamplain-0.12.21.tar.xz 223748 BLAKE2B afe6b409107d12b8c674d9335d00ca21cf7faf036fd852b48ec371fb76dcd35cc30d4bc3dab555667069d7d41411eea31343240de9bd29dcc2e0f290bc925641 SHA512 8e3b4a292056b1d90be128dab347b1953e6acd00b1abf56fcc496eea15688ef232b81afe39147a9d6059ab248e3ceb7e07683c23501671b93797b0a87faccca9
 EBUILD libchamplain-0.12.20.ebuild 1439 BLAKE2B 2eda03c776f6f66ed777908a77a8772c24c63d03b88a9b9dd15e6bed69f2ad3eccc89b26f2dec520d1fbd6d2287e748a75e4d73fdcace1588ab0f096c624ae84 SHA512 d5bd5193244a61f354510ad8caa177513697d51933a038dcc4a6976b43eb5137f140234022b8a58b9ff6f1164f14e82e88bcc6b9674768aca5b6153361b2ca82
-EBUILD libchamplain-0.12.21.ebuild 1453 BLAKE2B 2c623c4b714b85caa84f9a617275945c13bf2912b0ebb291d9581085dd9bb180f8b3ef0a030f4c207dfae051cf28383bc76178d6ae3cba3db4b37534bed25e6d SHA512 67db82baa1be92efb30b6a0cfd4b04ee30573d9a36c053a8e35f895e9e6454ca94a9f304895fc0cb230b43bf7ee9d587326295b1801116ef4196b34bfb6af0b8
+EBUILD libchamplain-0.12.21.ebuild 1452 BLAKE2B 57195370586b6c847f460e720d2abe71cdc95a4eac75bef6056bdd2e1463fb7437987055acb8ce65cc9feb959838a616e0a024f28bb07c4a3ea2561f7c174972 SHA512 50cb9429fd9a897c2bdf869dd656edebfa265977df06e41d8c738a856f2f3fefcaeffa9857d6b20acecf7b12902b00877c87c545d8ea8dbcba649927f9d175b2
 MISC metadata.xml 731 BLAKE2B 5eebc6658951aa336948a944f02a538988503ce51ec4615a3e40c20b97aef40821b684e3a1421e46cf49bc6151d668f4d16ee655a5a86e7c25f5ace9bc976b71 SHA512 e1fa3a71f9afd87ecc79e751bf23ecb6fa9983d0466a4bc5d10aa8a01eb89d379f8ff3d812823cd3e68cc1b6f75cf4fc49a8b48ac690306a812b0d9c1c7d6f41
diff --git a/media-libs/libchamplain/libchamplain-0.12.21.ebuild b/media-libs/libchamplain/libchamplain-0.12.21.ebuild
index 28d12931004e..8ff83c374d50 100644
--- a/media-libs/libchamplain/libchamplain-0.12.21.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.21.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
 
 SLOT="0.12"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="+gtk gtk-doc +introspection vala"
 REQUIRED_USE="
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 094c32bccc34..69b3bbe9ab7a 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -2,5 +2,5 @@ DIST libsndfile-1.1.0.tar.xz 730604 BLAKE2B ff2d27bff460c4d3c549bdf70c84c6f17a2c
 DIST libsndfile-1.2.0.tar.xz 730268 BLAKE2B cb13fde9b9f44c6279a9ee7741457824eb41fc17261bf9c669d757e9e506eba2c3d4ad259e4625b8a11c82308188cc19f7399e9d1fc0299a3a11794e4b653e47 SHA512 c0dee6b33cd3c619aa13ec2854a5480e826640ca98a438758346194e83752af576a39f9de118824f0d0c61288632d87b489dc5793c025296e0f15564d87ca12a
 EBUILD libsndfile-1.1.0-r1.ebuild 1912 BLAKE2B b20f8339faa259f3f0381480910e24d5fb69d974a9d6ae52273c13891cb914e7a80ce38fde21b74a3135c5d4961efccd0cd3d3e079b128d22dc130c05a9c2aba SHA512 8d4c0d9d01e54df1f5289cc04a856f6ba8c3529a2a11df100ecb35106662feaeb08a962360b1f2282c79284d840d2667ef296c6bbec144cff3cb90cccdce2d85
 EBUILD libsndfile-1.2.0.ebuild 1912 BLAKE2B 35119e10d062bb94d163ac62b274fe97f85525ad872d7a3d0533c0c8fccd7163744e3dd5aad7908d0697d5119fe655d7525631bde0f8d495455835710a700035 SHA512 cd0ed5f8d61f6eaeb7553afbf1ec7a2f899e489e66c48ff1b419e8794d04d05d101777fd3684fb601c0e70ba4621c7712412526b8154df6b1a20877f889fd783
-EBUILD libsndfile-9999.ebuild 1912 BLAKE2B 9f3eb737c48715633a9b3ff701f70813fbc6c60291ccb6d82b2e23fe3798ad5e6862e1fbe7daa80497804eccba4f8895382bdd026e5667e588415bcd7d328f6d SHA512 87b39080034d5f4166b9e73079abe489b3af5b58ff16ca638c79575bd4834c729904ab097e167d7f6adec058418a3fb1d097a3961c6cb66badb9640d4f23d37f
+EBUILD libsndfile-9999.ebuild 1912 BLAKE2B e2f4583eac220f8de637325465c15002de0884d1343b7c2f5ed0ffdd4f9caff25e204a959b4bc4cfd96bcb359005b23153bdaadc3916add055fee6ab3d712c2d SHA512 96f6dd0fe04bb38aacfa0466e32c7d1e14eb6c923d1ccadded7b342911a1aaeeadbfc9014d3b6364a885348cc2e752c40205c7869b4c75a7b1971ba1277fc8ca
 MISC metadata.xml 340 BLAKE2B 26c245d58463cd3d14645b476de30407e51e47777d36dff251f0f68d9e981e8b6d95cf9aacc51d08feb4f1e550152f38b66d8dae23c40fd1b65702d59044b05a SHA512 54f132b485fc720dc0e1c311370dbc5f7ed4d3a1c8271aafeb9f01fef411df95f0cd55d605debcc3477fcc07aab4b298c240084e70df19a10b1b22c33d57b9c2
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index e1920d848d94..0501569610b4 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b81f38088d72..e5f5de2221cf 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 49ff9c279a89..2d791d7c71c2 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,5 @@
 DIST mpg123-1.31.1.tar.bz2 1093324 BLAKE2B 47a845a5909874fe1e41a3a6b0ac57973f7bba69517b4ce6204a68f9f8c93b079062407fd6c1a9db42b8c7b483d3ba95a7257d1a8268b03f858f20d3695979de SHA512 d007ea94a99fde60919a173320e124c9f0079a28452533eeceb9c7bfed43810b46384ae45459ef6ac185e27ec06e153723bb588aaa4955ee2ad1c51dc58eb132
 DIST mpg123-1.31.2.tar.bz2 1093881 BLAKE2B a5c2d0a5df6067322979176498592a429c36fa06000b512e944b1f6ceeeae29fa3efeb0e5d604c8f2930aa51ae75e53be4312abaf74e43504fb1643b66b8b682 SHA512 eca285382ee3e780353834addf1336c4a2f8f11256af22f95e11efa243de669761c083c86ddfc6ac8c02a920a3c4ab4ad767efa2739fb052e9719f35ef407bc3
 EBUILD mpg123-1.31.1.ebuild 3019 BLAKE2B d90a13f1c47e1375b151b43d6ea7c3487e96a2248bc4a5285c5e2aba166df4e64bd7881b5e24878dd3fe1dd6b32e307ae438131feb7ed3c1d9210941f21a932e SHA512 922ba2273f62408348138366e6936496463b9e78ebadf255d49bc7cd258997ec4c79d30ece9306a57defb50debdecddfd9ffa35e0399627a2df64c0b7eb401ae
-EBUILD mpg123-1.31.2.ebuild 3025 BLAKE2B 979fed944dd3f705529f40ebb57d40a1860870dab89e82716c5d466776ba1ea61fd65e3480b7f61fd5ba542f4f531242161bf95bc76ec59cb70418e2cedf3ad0 SHA512 07941f6e8feecd60d157ebdf1d5b95fab2fe315913dc8413f6da459b143ec8084dc4d30bc51fa2cee949967f871747737cb29b32b2855bec34f1ae4c4a9c2cdb
+EBUILD mpg123-1.31.2.ebuild 3021 BLAKE2B 20cd3145c4da93171bf986e7b0aa701ce43f6bd6462bc4482e9ffecbe6c2e00cea9411a71e694ef1e979dfad47ee18e56716e6baf572c4f5b7ac20675e44dcf5 SHA512 a3e7801b2f538f5520768253829a54a4b9fa5c5dc01b8950352c22dd8e069c5abe8f892c1aeb2e62e228f16f7b13ff91c00fc4bf80e041b849aafba39c2ee681
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.31.2.ebuild b/media-sound/mpg123/mpg123-1.31.2.ebuild
index 2b36fafd857d..87acea8c60b7 100644
--- a/media-sound/mpg123/mpg123-1.31.2.ebuild
+++ b/media-sound/mpg123/mpg123-1.31.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index bc22bbd21b71..5a4d96a192d6 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c073187dc60b..a09ff46f2f57 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 16 Feb 2023 13:39:57 +0000
+Thu, 16 Feb 2023 19:40:06 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 866b25d1e133..3a617b820f0c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-02-16T13:40:00Z
+TIMESTAMP 2023-02-16T19:40:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPuMjBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPuhplfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klATkA/+IwmcHUypodrkEjpNP31aPPvApJwWJmIKyMqCC+2QF55GXOVZ4CDAQgNK
-smo9F5iLc7bpJKqQXD/QK38RzpRR8cDkH1MgZAACGDJ34BVL7bv3xrAtk00Wr/n+
-PzyHxPV4gIVK1LPW7SwWyS/CDj1SS9BHOiqn0ivJO0Ydi7rxzJEZhK78V4SBbD73
-GZNpRAKyXjHy/kpo/DAJ/OK02GMpmxqtzUpT4nbHnjOQ1cxIzXvu80Ed0oJLCmAa
-GhSVtNLosPD/G8maBW5/vkpqfsj/ibq8U7hNaOBZ/0HfFq/HEdUh0crLD8FwegPW
-+13sKOfoRAasRqmSxjrwFNnZtCWY0l954q0+Wfavw65acZA69N/v2LACaSG4TFnY
-nCrjqvVo4ckOvrVRv6k+6bvYq0ojbw5YrJyAzRtI7jboRwLTP60qXkXJ1A9iBGRu
-a/rk83DT+rardys/8HIgBs2HuK+Gk7Z+cMQivuNUnobMZWns2fWm4w/5r3qJ9m0H
-d5Mz3bSFHntN+TshMJgMWPGnAzsOXIf77NeX/ydfm9q/LSoEvK6AIiMBAJMZt1ah
-+m6A9S3prWeWr3xZlwD8k/5FwVb0TkHZsvpC7yK6/EKOKqBimQgOTFSEy18Hv8oz
-WAdnbtVBTNPMeTORBSr7fURb8nC28IdcnS87ALhuZcU3jpQ7298=
-=iglr
+klDK2Q//XsJS1hVO6zKbmp5nopQdy/X1bsyKAJiQ24K5hy7+fXyPKdIMF47uFOgF
+DlHygiPQkk1f5nI5Emk6H6CuDaQCIPQj9wDsyA1XMaDm02EnCBQTj1qcP3D7tehS
+MezA7Cjx7Yo7XOH0AoRSg1bjFcFMD0IhxEYlU9UtOcygfa2HJM6u1n6WybPfFQc2
+SeYMDZMDD3ZYr7+FXWeeTSLYVcyGM2pa14W+cOgrRENlchs8uBFmjjTBo3DaQwsF
+3RAR6B3tNvbUZWFBzMljXXyGi9+ariUGxXCZDiiw0Vw7HT0ZrNPIVMZA8I9eHIje
+dN6lRmZu55ql733E/2rzW0M6MXfspUWOgO1So7UzUwWiuBfmgEPZD/H86GrNHtDW
+5T/nyjzC8nHjYzsNTiWwjvnqzjQjJOuA5cidJ3C/sh+cKCxH2I8UIFd+3myEVnTx
+pHY42xca6p8XpMN7K8n/5McNWzwEJpTs6ipgoCcilCKvNfA7QAThflHyBn4hmXEy
+0sAulOx4iLR480joYXvzaHL+WUSpH9yru903MIiDgGGYG33BUt2gwNRaCPMc+dvI
+pG1J1e+XADqRPWo4QSD7airLrLg/LK8UO7NXHLkbuVFLst+xm0d9HGOPQZbDo72J
+yhptNNsRM25VEMlqbUfb6DnRSnLmygJwHPOZq/OEeAA9PO5jXnQ=
+=DTTE
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c073187dc60b..a09ff46f2f57 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 16 Feb 2023 13:39:57 +0000
+Thu, 16 Feb 2023 19:40:06 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 70565525c450..8d43085b38ca 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index b54ce7cb038c..ec15976db58d 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/borgbackup-9999 b/metadata/md5-cache/app-backup/borgbackup-9999
index a6ba5f7caf23..674b1a764965 100644
--- a/metadata/md5-cache/app-backup/borgbackup-9999
+++ b/metadata/md5-cache/app-backup/borgbackup-9999
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cython-0.29.29[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pkgconfig[python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0=
+DEPEND=dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cython-0.29.29[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pkgconfig[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/openssl:0=
 DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
 EAPI=8
 HOMEPAGE=https://borgbackup.readthedocs.io/
 INHERIT=distutils-r1 git-r3
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/pyfuse3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/msgpack-1.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/openssl:0= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=8e4ae6a4c96aaba5d6abfd4357b8b2af
+_md5_=eb7d768af74604dba3da6d0e37bf9207
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index a8bdd8947655..4ada73f8e9a2 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/acme-2.1.1 b/metadata/md5-cache/app-crypt/acme-2.1.1
new file mode 100644
index 000000000000..0e411c9f13cf
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-2.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.1.1.tar.gz -> certbot-2.1.1.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=18fc57ac6e850218160020429a22cdb7
diff --git a/metadata/md5-cache/app-crypt/acme-2.2.0-r1 b/metadata/md5-cache/app-crypt/acme-2.2.0-r1
new file mode 100644
index 000000000000..08afad8778d7
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-2.2.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.2.0.tar.gz -> certbot-2.2.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=18fc57ac6e850218160020429a22cdb7
diff --git a/metadata/md5-cache/app-crypt/acme-2.3.0 b/metadata/md5-cache/app-crypt/acme-2.3.0
new file mode 100644
index 000000000000..27fab3e227e9
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-2.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.3.0.tar.gz -> certbot-2.3.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=18fc57ac6e850218160020429a22cdb7
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index aa4e0693b224..8c8664f98102 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=An implementation of the ACME protocol
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=distutils-r1 git-r3
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=dfe60b3455f9bec865d3e3b4587b42cf
+_md5_=18fc57ac6e850218160020429a22cdb7
diff --git a/metadata/md5-cache/app-crypt/certbot-2.1.1 b/metadata/md5-cache/app-crypt/certbot-2.1.1
new file mode 100644
index 000000000000..c3e177537a25
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-2.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-cov[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( >=app-crypt/acme-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Let’s Encrypt client to automate deployment of X.509 certificates
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=selinux doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.1.1.tar.gz -> certbot-2.1.1.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=edff8cd6d6b61e9e2ef5f38e67142a3d
diff --git a/metadata/md5-cache/app-crypt/certbot-2.2.0-r2 b/metadata/md5-cache/app-crypt/certbot-2.2.0-r2
new file mode 100644
index 000000000000..c966b9165b9f
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-2.2.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-cov[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( >=app-crypt/acme-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Let’s Encrypt client to automate deployment of X.509 certificates
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=selinux doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.2.0.tar.gz -> certbot-2.2.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=aa8a538a86e7cffc75b2db828c3cb2df
diff --git a/metadata/md5-cache/app-crypt/certbot-2.3.0 b/metadata/md5-cache/app-crypt/certbot-2.3.0
new file mode 100644
index 000000000000..1ccadd7d6e13
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-2.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-cov[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( >=app-crypt/acme-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Let’s Encrypt client to automate deployment of X.509 certificates
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=selinux doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.3.0.tar.gz -> certbot-2.3.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=aa8a538a86e7cffc75b2db828c3cb2df
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index 2d95382f3f33..5f2caae8bf75 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-component[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-cov[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( >=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+DESCRIPTION=Let’s Encrypt client to automate deployment of X.509 certificates
 EAPI=8
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-INHERIT=git-r3 distutils-r1
-IUSE=selinux test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+INHERIT=distutils-r1 git-r3
+IUSE=selinux doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-component[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ConfigArgParse-0.9.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distro-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/josepy-1.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] selinux? ( sec-policy/selinux-certbot ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=8328f739b334def6a9405611471083b2
+_md5_=aa8a538a86e7cffc75b2db828c3cb2df
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-2.1.1 b/metadata/md5-cache/app-crypt/certbot-apache-2.1.1
new file mode 100644
index 000000000000..c44104c2500a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-2.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-crypt/acme-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Apache plugin for Certbot (Let’s Encrypt client)
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.1.1.tar.gz -> certbot-2.1.1.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=9fe51301371ef85d5ecb168323cbeab1
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-2.2.0 b/metadata/md5-cache/app-crypt/certbot-apache-2.2.0
new file mode 100644
index 000000000000..0237673c5cc9
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-crypt/acme-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Apache plugin for Certbot (Let’s Encrypt client)
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.2.0.tar.gz -> certbot-2.2.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=9fe51301371ef85d5ecb168323cbeab1
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-2.3.0 b/metadata/md5-cache/app-crypt/certbot-apache-2.3.0
new file mode 100644
index 000000000000..996dfef423e1
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-2.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-crypt/acme-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Apache plugin for Certbot (Let’s Encrypt client)
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.3.0.tar.gz -> certbot-2.3.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=9fe51301371ef85d5ecb168323cbeab1
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-9999 b/metadata/md5-cache/app-crypt/certbot-apache-9999
index 2bc3a23f2e52..5b0992fe1dd0 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-9999
+++ b/metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-component[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+DESCRIPTION=Apache plugin for Certbot (Let’s Encrypt client)
 EAPI=8
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-INHERIT=git-r3 distutils-r1
+INHERIT=distutils-r1 git-r3
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-component[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-augeas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=0fab4028d640bd766cd5ac19ca4721fd
+_md5_=9fe51301371ef85d5ecb168323cbeab1
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-2.1.1 b/metadata/md5-cache/app-crypt/certbot-nginx-2.1.1
new file mode 100644
index 000000000000..2f75802239f4
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-2.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-crypt/acme-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Nginx plugin for Certbot (Let’s Encrypt client)
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.1.1.tar.gz -> certbot-2.1.1.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=556ea841812e4420d93781785c553820
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-2.2.0 b/metadata/md5-cache/app-crypt/certbot-nginx-2.2.0
new file mode 100644
index 000000000000..536e659df34c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-crypt/acme-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Nginx plugin for Certbot (Let’s Encrypt client)
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.2.0.tar.gz -> certbot-2.2.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=556ea841812e4420d93781785c553820
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-2.3.0 b/metadata/md5-cache/app-crypt/certbot-nginx-2.3.0
new file mode 100644
index 000000000000..5380787a0cae
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-2.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-crypt/acme-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Nginx plugin for Certbot (Let’s Encrypt client)
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v2.3.0.tar.gz -> certbot-2.3.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=556ea841812e4420d93781785c553820
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-9999 b/metadata/md5-cache/app-crypt/certbot-nginx-9999
index dc80fbae21b7..78ea3c4f44d2 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-9999
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+DESCRIPTION=Nginx plugin for Certbot (Let’s Encrypt client)
 EAPI=8
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-INHERIT=git-r3 distutils-r1
+INHERIT=distutils-r1 git-r3
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-interface[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=app-crypt/acme-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-crypt/certbot-9999[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-17.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=a01a1ffb85f88062e8784458ab646781
+_md5_=556ea841812e4420d93781785c553820
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 903de34d9129..85600ed3fb51 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/spice-9999 b/metadata/md5-cache/app-emulation/spice-9999
index 31f1b41959c2..8a501d9e2b6a 100644
--- a/metadata/md5-cache/app-emulation/spice-9999
+++ b/metadata/md5-cache/app-emulation/spice-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) sys-devel/autoconf-archive virtual/pkgconfig || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) sys-devel/autoconf-archive virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst setup test unpack
 DEPEND=dev-lang/orc >=dev-libs/glib-2.38:2 sys-libs/zlib virtual/jpeg:0= >=x11-libs/pixman-0.17.7 dev-libs/openssl:0= lz4? ( app-arch/lz4:0= ) opus? ( media-libs/opus ) smartcard? ( >=app-emulation/libcacard-2.5.1 ) sasl? ( dev-libs/cyrus-sasl ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ~app-emulation/spice-protocol-9999 smartcard? ( app-emulation/qemu[smartcard] ) test? ( net-libs/glib-networking )
 DESCRIPTION=SPICE server
@@ -12,4 +12,4 @@ RDEPEND=dev-lang/orc >=dev-libs/glib-2.38:2 sys-libs/zlib virtual/jpeg:0= >=x11-
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=192ba8624104841d316d75f8355cebb2
+_md5_=a71a26e9a3642308c006fb1fd933726e
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 11c417f06879..98367e83d7eb 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/libxmlpp-2.42.2 b/metadata/md5-cache/dev-cpp/libxmlpp-2.42.2
index 7487bcdb248b..0cc3c4321929 100644
--- a/metadata/md5-cache/dev-cpp/libxmlpp-2.42.2
+++ b/metadata/md5-cache/dev-cpp/libxmlpp-2.42.2
@@ -7,11 +7,11 @@ HOMEPAGE=http://libxmlplusplus.sourceforge.net/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2 meson-multilib
 IUSE=doc test 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.7.7[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-cpp/glibmm-2.32.0: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(-)?]
 RESTRICT=!test? ( test )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/libxml++/2.42/libxml++-2.42.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5a3df7152185703db15ef8fbf4586cc0
+_md5_=54baec2f83d5b51177d84e56bdbf8881
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 6a6c39ad4fd0..7ea688ec813b 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r114 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r114
index 5c04771d3e3b..6109312cbc3d 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r114
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r114
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( <media-video/ffmpeg-5:= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( dev-libs/imath:= >=media-libs/openexr-3:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) dev-libs/boost x11-base/xorg-proto
 DESCRIPTION=Open source high performance 3D graphics toolkit
@@ -13,4 +13,4 @@ REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? (
 SLOT=0/161
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e6a516fe546ae02cb92463adf06c9dd0
+_md5_=6778182a87a635c2ba3a18a0c45a6038
diff --git a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20221115 b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20221115
index 3ebf5a62de62..62fd229769cd 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20221115
+++ b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20221115
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=!dev-games/openscenegraph dev-libs/glib:2 media-libs/fontconfig media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( dev-libs/imath:= >=media-libs/openexr-3:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler:=[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) x11-base/xorg-proto
 DESCRIPTION=OpenMW-specific fork of OpenSceneGraph
@@ -13,4 +13,4 @@ REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? (
 SLOT=0/162
 SRC_URI=https://github.com/OpenMW/osg/archive/69cfecebfb6dc703b42e8de39eed750a84a87489.tar.gz -> openscenegraph-openmw-3.6_p20221115.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dce1d76ccee61d91c3c8d0ff30da7039
+_md5_=b68e8d0a2e43c2be965c393afd699041
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 8757840b5084..52727166683e 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/eisl-2.65 b/metadata/md5-cache/dev-lang/eisl-2.65
index 0a1dea3fdc0c..fd05d6386e21 100644
--- a/metadata/md5-cache/dev-lang/eisl-2.65
+++ b/metadata/md5-cache/dev-lang/eisl-2.65
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sasagawa888/eisl/archive/v2.65.tar.gz -> eisl-2.65.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=c983ee12efb640b3470a9c0b8e9685e5
+_md5_=ad59dbb675d575aba7df31050ca61a77
diff --git a/metadata/md5-cache/dev-lang/eisl-2.69 b/metadata/md5-cache/dev-lang/eisl-2.69
index c9e9b7089eea..fb12693d78f4 100644
--- a/metadata/md5-cache/dev-lang/eisl-2.69
+++ b/metadata/md5-cache/dev-lang/eisl-2.69
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sasagawa888/eisl/archive/v2.69.tar.gz -> eisl-2.69.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ea2821707a3ed454b5edf0fe5c254945
+_md5_=f83f238245e8fc7b2f7002d44a858d3b
diff --git a/metadata/md5-cache/dev-lang/eisl-2.70 b/metadata/md5-cache/dev-lang/eisl-2.70
index 5c8e3827c7bd..7ead6772108f 100644
--- a/metadata/md5-cache/dev-lang/eisl-2.70
+++ b/metadata/md5-cache/dev-lang/eisl-2.70
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sasagawa888/eisl/archive/v2.70.tar.gz -> eisl-2.70.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ac2a27153cdb9e0425e32938ded1e8a0
+_md5_=d67a336a0f3a81c78a543c64d0ea59bb
diff --git a/metadata/md5-cache/dev-lang/eisl-2.72 b/metadata/md5-cache/dev-lang/eisl-2.72
index a2c7e2f53f9b..4fa43094eb61 100644
--- a/metadata/md5-cache/dev-lang/eisl-2.72
+++ b/metadata/md5-cache/dev-lang/eisl-2.72
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sasagawa888/eisl/archive/v2.72.tar.gz -> eisl-2.72.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ac2a27153cdb9e0425e32938ded1e8a0
+_md5_=d67a336a0f3a81c78a543c64d0ea59bb
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index c1b60b10a541..52b4a0193820 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/glib-2.74.5 b/metadata/md5-cache/dev-libs/glib-2.74.5
index 654294d7b29b..e3d6db3851cf 100644
--- a/metadata/md5-cache/dev-libs/glib-2.74.5
+++ b/metadata/md5-cache/dev-libs/glib-2.74.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.gtk.org/
 INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 IUSE=dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.74.5 >=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(-)?] >=dev-libs/libpcre2-10.32:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,unicode(+),static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=sys-libs/zlib-1.2.8-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) 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(-)?] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.5.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=33c3aae8f58621b472d2a8d8c4192e6b
+_md5_=95a1cdaf5ef2c912364e86bd34d3a120
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.4.3 b/metadata/md5-cache/dev-libs/libgusb-0.4.3
index e2ad5919b698..102b3314471d 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.4.3
+++ b/metadata/md5-cache/dev-libs/libgusb-0.4.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/hughsie/libgusb
 INHERIT=meson-multilib python-any-r1 vala
 IUSE=gtk-doc +introspection 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 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0: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(-)?] virtual/libusb:1[udev,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/json-glib-1.1.1[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?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata
 REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libgusb/releases/download/0.4.3/libgusb-0.4.3.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=4e36a807550abbf6d9c5ef44f6b5ca8f
+_md5_=cc8eb9e03873aa307591f325af2ad463
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.12.0 b/metadata/md5-cache/dev-libs/libsigc++-2.12.0
index 07b9bebf49d1..f4df854fb3b1 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.12.0
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.12.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
 INHERIT=flag-o-matic gnome.org meson-multilib
 IUSE=gtk-doc test 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.12/libsigc++-2.12.0.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d583afaf6f4d7fc34c63b04dbffd9fda
+_md5_=f1c1d6faa86c21916541b217325506de
diff --git a/metadata/md5-cache/dev-libs/libsigc++-3.4.0 b/metadata/md5-cache/dev-libs/libsigc++-3.4.0
index 0ec3f3924a31..eff0b45b1624 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-3.4.0
+++ b/metadata/md5-cache/dev-libs/libsigc++-3.4.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
 INHERIT=gnome.org flag-o-matic meson-multilib
 IUSE=gtk-doc test 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libsigc++/3.4/libsigc++-3.4.0.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=6c0a2bd742155631bc6d93f0cb4f0d60
+_md5_=a1714c527dafcbffd413dae33b77b64b
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 2c1e2ef6f48b..ac9c4500fa40 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/alabaster-0.7.13 b/metadata/md5-cache/dev-python/alabaster-0.7.13
index 143e41a93777..a1764acbbf34 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.13
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.13
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/bitprophet/alabaster/ https://pypi.org/project/alabaster/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.13.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=9b0c7145a60f0079fa9ca8c5647a691a
+_md5_=af9695ead14ff31032582364ac0229a1
diff --git a/metadata/md5-cache/dev-python/alembic-1.8.1-r1 b/metadata/md5-cache/dev-python/alembic-1.8.1-r1
deleted file mode 100644
index dadcf14c2eaf..000000000000
--- a/metadata/md5-cache/dev-python/alembic-1.8.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Database migrations tool, written by the author of SQLAlchemy
-EAPI=8
-HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/alembic/alembic-1.8.1.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=e3e72ddc2a1443731b691054fe02140c
diff --git a/metadata/md5-cache/dev-python/argh-0.28.1 b/metadata/md5-cache/dev-python/argh-0.28.1
new file mode 100644
index 000000000000..4baccc67173e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/argh-0.28.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/iocapture[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A simple argparse wrapper
+EAPI=8
+HOMEPAGE=https://pythonhosted.org/argh/ https://github.com/neithere/argh/ https://pypi.org/project/argh/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-3
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/argh/argh-0.28.1.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=56314fb3e60305c68b7aa75bf341fefd
diff --git a/metadata/md5-cache/dev-python/asgiref-3.6.0 b/metadata/md5-cache/dev-python/asgiref-3.6.0
index 6942a4196bfc..bdce06063157 100644
--- a/metadata/md5-cache/dev-python/asgiref-3.6.0
+++ b/metadata/md5-cache/dev-python/asgiref-3.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://asgi.readthedocs.io/en/latest/ https://github.com/django/asgiref/ https://pypi.org/project/asgiref/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asgiref/asgiref-3.6.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=a0e505fad0cd72224b407ff624560177
+_md5_=6ca0b94d5db427ca370c103018bcb9dc
diff --git a/metadata/md5-cache/dev-python/attrs-22.2.0 b/metadata/md5-cache/dev-python/attrs-22.2.0
index fe42c23b86ae..5b7a059faae2 100644
--- a/metadata/md5-cache/dev-python/attrs-22.2.0
+++ b/metadata/md5-cache/dev-python/attrs-22.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-attrs/attrs/ https://attrs.readthedocs.io/ https://pypi.org/project/attrs/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-22.2.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=0cbdffffd139d8f68ab84be7479c03c1
+_md5_=111554a9572c80b862efacdb212b6006
diff --git a/metadata/md5-cache/dev-python/autopep8-2.0.1 b/metadata/md5-cache/dev-python/autopep8-2.0.1
index 93fd9007ee3e..e93ce8fea072 100644
--- a/metadata/md5-cache/dev-python/autopep8-2.0.1
+++ b/metadata/md5-cache/dev-python/autopep8-2.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/hhatto/autopep8/ https://pypi.org/project/autopep8/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/pycodestyle-2.10[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-2.0.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=c39deb6b41b85fd4202442e3ca10d86d
+_md5_=aeb1e6ef12d86c4859256efafe249dc3
diff --git a/metadata/md5-cache/dev-python/build-0.9.0 b/metadata/md5-cache/dev-python/build-0.9.0
deleted file mode 100644
index 36237b235c51..000000000000
--- a/metadata/md5-cache/dev-python/build-0.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-rerunfailures-9.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-56.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.36.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-19.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pep517-0.9.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A simple, correct PEP517 package builder
-EAPI=8
-HOMEPAGE=https://pypi.org/project/build/ https://github.com/pypa/build/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/packaging-19.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pep517-0.9.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/build/archive/0.9.0.tar.gz -> build-0.9.0.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=05f03a6d8796ca7dd532ee77896f136c
diff --git a/metadata/md5-cache/dev-python/cachetools-5.2.0 b/metadata/md5-cache/dev-python/cachetools-5.2.0
deleted file mode 100644
index b46d51f26524..000000000000
--- a/metadata/md5-cache/dev-python/cachetools-5.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensible memoizing collections and decorators
-EAPI=8
-HOMEPAGE=https://github.com/tkem/cachetools/ https://pypi.org/project/cachetools/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cachetools/cachetools-5.2.0.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=fa756240cfdf0232d256fc1948eec239
diff --git a/metadata/md5-cache/dev-python/cachetools-5.2.1 b/metadata/md5-cache/dev-python/cachetools-5.2.1
deleted file mode 100644
index 38467e9c9020..000000000000
--- a/metadata/md5-cache/dev-python/cachetools-5.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensible memoizing collections and decorators
-EAPI=8
-HOMEPAGE=https://github.com/tkem/cachetools/ https://pypi.org/project/cachetools/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cachetools/cachetools-5.2.1.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=4d30ecd79808eecd84efb9eb7ae4ceeb
diff --git a/metadata/md5-cache/dev-python/cloudscraper-1.2.68 b/metadata/md5-cache/dev-python/cloudscraper-1.2.68
index 504962ca3cd9..dc6a109b6ac2 100644
--- a/metadata/md5-cache/dev-python/cloudscraper-1.2.68
+++ b/metadata/md5-cache/dev-python/cloudscraper-1.2.68
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/js2py[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/nodejs ) test? ( dev-python/pyparsing[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/js2py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs ) test? ( dev-python/pyparsing[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-toolbelt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A Python module to bypass Cloudflare's anti-bot page
 EAPI=8
 HOMEPAGE=https://github.com/VeNoMouS/cloudscraper/ https://pypi.org/project/cloudscraper/
 INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~ppc64
 LICENSE=AGPL-3
-RDEPEND=dev-python/pyparsing[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/pyparsing[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-toolbelt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/VeNoMouS/cloudscraper/archive/1.2.68.tar.gz -> cloudscraper-1.2.68.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ee308b4dc7173b38a2cf71d2efa97952
+_md5_=58d94a346bfce95d78762f16599b5816
diff --git a/metadata/md5-cache/dev-python/dkimpy-1.0.5-r1 b/metadata/md5-cache/dev-python/dkimpy-1.0.5-r1
index a0a95456ec75..b46fc26a79da 100644
--- a/metadata/md5-cache/dev-python/dkimpy-1.0.5-r1
+++ b/metadata/md5-cache/dev-python/dkimpy-1.0.5-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/authres[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/dnspython[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/authres[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/dnspython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=DKIM and ARC email signing and verification library
 EAPI=8
 HOMEPAGE=https://launchpad.net/dkimpy/ https://pypi.org/project/dkimpy/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm64 x86
 LICENSE=BSD
-RDEPEND=dev-python/dnspython[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/dnspython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/d/dkimpy/dkimpy-1.0.5.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=22602e91ef9a4d8419b061cdc882a267
+SRC_URI=https://files.pythonhosted.org/packages/source/d/dkimpy/dkimpy-1.0.5.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=ea6c015e8c4dd35f602e46b665e92a7e
diff --git a/metadata/md5-cache/dev-python/dnspython-2.3.0 b/metadata/md5-cache/dev-python/dnspython-2.3.0
index f7874535f6e7..740737687aee 100644
--- a/metadata/md5-cache/dev-python/dnspython-2.3.0
+++ b/metadata/md5-cache/dev-python/dnspython-2.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.dnspython.org/ https://github.com/rthalley/dnspython/ https://pypi.org/project/dnspython/
 INHERIT=distutils-r1
 IUSE=dnssec examples test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=dnssec? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) <dev-python/idna-4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rthalley/dnspython/archive/v2.3.0.tar.gz -> dnspython-2.3.0.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=57e5475833b806d4b9f782e8a7af6bea
+_md5_=089ee3e541b7eedf804148b214256799
diff --git a/metadata/md5-cache/dev-python/dulwich-0.21.2 b/metadata/md5-cache/dev-python/dulwich-0.21.2
index 426ab02b8456..76a4793d207e 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.21.2
+++ b/metadata/md5-cache/dev-python/dulwich-0.21.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/
 INHERIT=distutils-r1
 IUSE=doc examples test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ Apache-2.0
 RDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.21.2.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=3b9db2a2aaa19ffeddf407deeecd4a4d
+_md5_=44e40f16fbc0d5b6e3b3d919d7406f77
diff --git a/metadata/md5-cache/dev-python/filelock-3.9.0 b/metadata/md5-cache/dev-python/filelock-3.9.0
index 02fadee1a7d1..3ed7f6fc63e5 100644
--- a/metadata/md5-cache/dev-python/filelock-3.9.0
+++ b/metadata/md5-cache/dev-python/filelock-3.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/py-filelock/ https://pypi.org/project/filelock/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Unlicense
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/py-filelock/archive/3.9.0.tar.gz -> py-filelock-3.9.0.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=97b11c40018bd4a60624c470ccf0affa
+_md5_=566adac8509ea8b638844723a103e7d6
diff --git a/metadata/md5-cache/dev-python/flufl-lock-7.1.1 b/metadata/md5-cache/dev-python/flufl-lock-7.1.1
index 0b8064bf239a..5e9d50d0c140 100644
--- a/metadata/md5-cache/dev-python/flufl-lock-7.1.1
+++ b/metadata/md5-cache/dev-python/flufl-lock-7.1.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/sybil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/atpublic[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/psutil-5.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pdm-pep517-1.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/sybil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/atpublic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pdm-pep517-1.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=NFS-safe file locking with timeouts for POSIX systems
 EAPI=8
-HOMEPAGE=https://gitlab.com/warsaw/flufl.lock
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+HOMEPAGE=https://gitlab.com/warsaw/flufl.lock/ https://pypi.org/project/flufl.lock/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/atpublic[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/psutil-5.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/atpublic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/f/flufl.lock/flufl.lock-7.1.1.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=6825137abc72dba016e1c280761f9d50
+SRC_URI=https://files.pythonhosted.org/packages/source/f/flufl.lock/flufl.lock-7.1.1.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=b4e70f706b070b8330720efceeb99082
diff --git a/metadata/md5-cache/dev-python/google-auth-2.15.0-r1 b/metadata/md5-cache/dev-python/google-auth-2.15.0-r1
deleted file mode 100644
index 8cfc6608a33d..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-2.15.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/grpcio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyu2f[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/cachetools-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-google >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-google python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-auth/google-auth-2.15.0.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=fcda5cfccba5f1b7921c114ca79890a7
diff --git a/metadata/md5-cache/dev-python/httpcore-0.16.3 b/metadata/md5-cache/dev-python/httpcore-0.16.3
index aebaf32cfc2f..82cfe6d8c1f2 100644
--- a/metadata/md5-cache/dev-python/httpcore-0.16.3
+++ b/metadata/md5-cache/dev-python/httpcore-0.16.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.encode.io/httpcore/ https://github.com/encode/httpcore/ https://pypi.org/project/httpcore/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=<dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/h11-0.15[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/h2-5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/sniffio-1*[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpcore/archive/0.16.3.tar.gz -> httpcore-0.16.3.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=84fe6accad59935662185026817853c6
+_md5_=69e25963f3e1b33bc4a43a594dc3a614
diff --git a/metadata/md5-cache/dev-python/hvac-1.0.2 b/metadata/md5-cache/dev-python/hvac-1.0.2
index 2c6591d28090..4e83d36f8100 100644
--- a/metadata/md5-cache/dev-python/hvac-1.0.2
+++ b/metadata/md5-cache/dev-python/hvac-1.0.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/flask-sqlalchemy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jwcrypto[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/semantic_version[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pyhcl-0.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.24.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/flask-sqlalchemy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jwcrypto[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/semantic_version[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pyhcl-0.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.24.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=hashicorp vault client in python
 EAPI=8
-HOMEPAGE=https://github.com/hvac/hvac
+HOMEPAGE=https://github.com/hvac/hvac/ https://pypi.org/project/hvac/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyhcl-0.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.24.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/pyhcl-0.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.24.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hvac/hvac/archive/v1.0.2.tar.gz -> hvac-1.0.2.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=b928d41e9a78ab236ffddb3f98a02150
+_md5_=30c64055326d5744b06766e4d8d444db
diff --git a/metadata/md5-cache/dev-python/identify-2.5.11 b/metadata/md5-cache/dev-python/identify-2.5.11
deleted file mode 100644
index 4d9993d14b71..000000000000
--- a/metadata/md5-cache/dev-python/identify-2.5.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File identification library for Python
-EAPI=8
-HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pre-commit/identify/archive/v2.5.11.tar.gz -> identify-2.5.11.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=eb257d49c6951c65cf483bfd9b531017
diff --git a/metadata/md5-cache/dev-python/identify-2.5.12 b/metadata/md5-cache/dev-python/identify-2.5.12
deleted file mode 100644
index f5a432d2b83e..000000000000
--- a/metadata/md5-cache/dev-python/identify-2.5.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File identification library for Python
-EAPI=8
-HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pre-commit/identify/archive/v2.5.12.tar.gz -> identify-2.5.12.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d67c70bc53580e8d7a5893bb04e378fa
diff --git a/metadata/md5-cache/dev-python/identify-2.5.13 b/metadata/md5-cache/dev-python/identify-2.5.13
deleted file mode 100644
index 6dc29c3dea6f..000000000000
--- a/metadata/md5-cache/dev-python/identify-2.5.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File identification library for Python
-EAPI=8
-HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pre-commit/identify/archive/v2.5.13.tar.gz -> identify-2.5.13.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d67c70bc53580e8d7a5893bb04e378fa
diff --git a/metadata/md5-cache/dev-python/identify-2.5.15 b/metadata/md5-cache/dev-python/identify-2.5.15
deleted file mode 100644
index 3817156d72eb..000000000000
--- a/metadata/md5-cache/dev-python/identify-2.5.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File identification library for Python
-EAPI=8
-HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pre-commit/identify/archive/v2.5.15.tar.gz -> identify-2.5.15.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d67c70bc53580e8d7a5893bb04e378fa
diff --git a/metadata/md5-cache/dev-python/identify-2.5.16 b/metadata/md5-cache/dev-python/identify-2.5.16
deleted file mode 100644
index e49533db178e..000000000000
--- a/metadata/md5-cache/dev-python/identify-2.5.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File identification library for Python
-EAPI=8
-HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/ukkonen[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pre-commit/identify/archive/v2.5.16.tar.gz -> identify-2.5.16.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d67c70bc53580e8d7a5893bb04e378fa
diff --git a/metadata/md5-cache/dev-python/iniconfig-2.0.0 b/metadata/md5-cache/dev-python/iniconfig-2.0.0
index 84b45e9d31b3..3033a446b804 100644
--- a/metadata/md5-cache/dev-python/iniconfig-2.0.0
+++ b/metadata/md5-cache/dev-python/iniconfig-2.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/iniconfig/ https://pypi.org/project/iniconfig/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/iniconfig/archive/v2.0.0.tar.gz -> iniconfig-2.0.0.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=e9866f94a98da6e8ce1a1ab38fa80a12
+_md5_=39cfce9c8c330aa3f0bd32c0e7ecc132
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.20.2 b/metadata/md5-cache/dev-python/ipykernel-6.20.2
index af297458e33d..6fded4adb2ed 100644
--- a/metadata/md5-cache/dev-python/ipykernel-6.20.2
+++ b/metadata/md5-cache/dev-python/ipykernel-6.20.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
 INHERIT=distutils-r1 virtualx
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/comm-0.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.20.2.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=b7feee951f45833c7e430258d3e07a9e
+_md5_=f17298999f45caaa4b201eac983b4cc0
diff --git a/metadata/md5-cache/dev-python/jq-1.3.0 b/metadata/md5-cache/dev-python/jq-1.3.0
deleted file mode 100644
index 36389dabe6e8..000000000000
--- a/metadata/md5-cache/dev-python/jq-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings for jq
-EAPI=8
-HOMEPAGE=https://github.com/mwilliamson/jq.py
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mwilliamson/jq.py/archive/1.3.0.tar.gz -> jq-1.3.0.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=810ec3cbd74cd7803209fa1cd7bdc2dc
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.4.9 b/metadata/md5-cache/dev-python/jupyter_client-7.4.9
index f4a031fdc33d..552e5d57aa4f 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-7.4.9
+++ b/metadata/md5-cache/dev-python/jupyter_client-7.4.9
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/jupyter_client/ https://pypi.org/project/jupyter-client/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/entrypoints[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.9.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.4.9.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=8c3a4ddf65da24e5b33f0908827f377f
+_md5_=3c2339536cedc968ba82b72b4d5eba8c
diff --git a/metadata/md5-cache/dev-python/jupyter_core-5.1.5 b/metadata/md5-cache/dev-python/jupyter_core-5.1.5
index 5f4a5c1d3fac..257821be27bc 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-5.1.5
+++ b/metadata/md5-cache/dev-python/jupyter_core-5.1.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/jupyter_core/ https://pypi.org/project/jupyter-core/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/platformdirs-2.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-5.1.5.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=03b5596a5fc413c3bccfbb3ad980bebe
+_md5_=163cefeb88816c2e4b20592ee4714c6e
diff --git a/metadata/md5-cache/dev-python/jupyterlab_server-2.16.5 b/metadata/md5-cache/dev-python/jupyterlab_server-2.16.5
deleted file mode 100644
index 77dd953ee348..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab_server-2.16.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-core-0.14.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-core-0.15[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openapi-spec-validator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest_jupyter[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-tornasync[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter_server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Server components for JupyterLab and JupyterLab like applications
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab_server/ https://pypi.org/project/jupyterlab-server/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter_server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyterlab_server/jupyterlab_server-2.16.5.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=24b186399248bddf858873a8a68a6eb5
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0
index faf8f38c02ce..b074a3d85dd1 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ionelmc/python-lazy-object-proxy/ https://pypi.org/project/lazy-object-proxy/ https://python-lazy-object-proxy.readthedocs.io/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.9.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=711de5a0e8a983ba444cd8dd33adf14f
+_md5_=e6fe78fe0e5fb3a0e2df6ce113460a71
diff --git a/metadata/md5-cache/dev-python/mock-5.0.1 b/metadata/md5-cache/dev-python/mock-5.0.1
index 2dedfbce79c5..a9a8e36cebdd 100644
--- a/metadata/md5-cache/dev-python/mock-5.0.1
+++ b/metadata/md5-cache/dev-python/mock-5.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/testing-cabal/mock/ https://pypi.org/project/mock/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/testing-cabal/mock/archive/5.0.1.tar.gz -> mock-5.0.1.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=e4db4fa93cc4e86574b6d25fd697e525
+_md5_=c6034d6c5638480efd895249398e6f07
diff --git a/metadata/md5-cache/dev-python/openapi-core-0.14.5 b/metadata/md5-cache/dev-python/openapi-core-0.14.5
deleted file mode 100644
index 91450254eeb1..000000000000
--- a/metadata/md5-cache/dev-python/openapi-core-0.14.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flask[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webob[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/isodate[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dictpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lazy-object-proxy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Client-side and server-side support for the OpenAPI Specification v3
-EAPI=8
-HOMEPAGE=https://github.com/p1c2u/openapi-core/ https://pypi.org/project/openapi-core/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/isodate[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dictpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lazy-object-proxy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/p1c2u/openapi-core/archive/0.14.5.tar.gz -> openapi-core-0.14.5.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=280da4aa3c864d48da09314f519c9b7b
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.2.3 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.2.3
deleted file mode 100644
index c308e7862f02..000000000000
--- a/metadata/md5-cache/dev-python/openapi-schema-validator-0.2.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=OpenAPI schema validation for Python
-EAPI=8
-HOMEPAGE=https://github.com/p1c2u/openapi-schema-validator/ https://pypi.org/project/openapi-schema-validator/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/p1c2u/openapi-schema-validator/archive/0.2.3.tar.gz -> openapi-schema-validator-0.2.3.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2b4df1de3d9384266171cc0c63dae6ed
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.4 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.4
deleted file mode 100644
index c7a8e45b20d8..000000000000
--- a/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=OpenAPI schema validation for Python
-EAPI=8
-HOMEPAGE=https://github.com/p1c2u/openapi-schema-validator/ https://pypi.org/project/openapi-schema-validator/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/p1c2u/openapi-schema-validator/archive/0.3.4.tar.gz -> openapi-schema-validator-0.3.4.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=6fc303f44693f1457a70a81dd46bed91
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.0 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.0
deleted file mode 100644
index 2cedd4405d49..000000000000
--- a/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=OpenAPI schema validation for Python
-EAPI=8
-HOMEPAGE=https://github.com/p1c2u/openapi-schema-validator/ https://pypi.org/project/openapi-schema-validator/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/p1c2u/openapi-schema-validator/archive/0.4.0.tar.gz -> openapi-schema-validator-0.4.0.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=40471ee47e03a7a11b3e4aaac1ac3e22
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.2 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.2
deleted file mode 100644
index bbd45b9607d9..000000000000
--- a/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=OpenAPI schema validation for Python
-EAPI=8
-HOMEPAGE=https://github.com/p1c2u/openapi-schema-validator/ https://pypi.org/project/openapi-schema-validator/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/p1c2u/openapi-schema-validator/archive/0.4.2.tar.gz -> openapi-schema-validator-0.4.2.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=90ec66c704cf3c71f047979210420e5a
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-3.0.1 b/metadata/md5-cache/dev-python/openstackdocstheme-3.0.1
index 56a4ccfb139a..9a4cbc068917 100644
--- a/metadata/md5-cache/dev-python/openstackdocstheme-3.0.1
+++ b/metadata/md5-cache/dev-python/openstackdocstheme-3.0.1
@@ -1,15 +1,15 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Theme and extension support for Sphinx documentation
 EAPI=8
 HOMEPAGE=https://docs.openstack.org/openstackdocstheme/latest/ https://opendev.org/openstack/openstackdocstheme/ https://github.com/openstack/openstackdocstheme/ https://pypi.org/project/openstackdocstheme/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86
 LICENSE=Apache-2.0
-RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dulwich-0.15.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dulwich-0.15.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-3.0.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=c344ac5d373c076e4db16e32e8e973f7
+_md5_=527db94612c54a607cf23ebc7bec005b
diff --git a/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.3 b/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.3
index 88abebd7d0f8..2743c1e7e676 100644
--- a/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.3
+++ b/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/pallets/pallets-sphinx-themes/ https://pypi.org/project/Pallets-Sphinx-Themes/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/pallets/pallets-sphinx-themes/archive/2.0.3.tar.gz -> pallets-sphinx-themes-2.0.3.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=3ce4d890e332282d83b5b58576ed7194
+_md5_=2d6d5f47701af869da8edff954d8da26
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.9.6 b/metadata/md5-cache/dev-python/pkginfo-1.9.6
index 8e074462ec7d..f4a532c4f6c1 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.9.6
+++ b/metadata/md5-cache/dev-python/pkginfo-1.9.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/pkginfo/ https://pypi.org/project/pkginfo/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.9.6.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=7620a734650d7256832c84fe2f0fb4d4
+_md5_=7f20e97970c9ae0e5f9b5fd6b984ee44
diff --git a/metadata/md5-cache/dev-python/prettytable-3.6.0 b/metadata/md5-cache/dev-python/prettytable-3.6.0
index 5221551378c6..84b55ce47469 100644
--- a/metadata/md5-cache/dev-python/prettytable-3.6.0
+++ b/metadata/md5-cache/dev-python/prettytable-3.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jazzband/prettytable/ https://pypi.org/project/prettytable/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jazzband/prettytable/archive/3.6.0.tar.gz -> prettytable-3.6.0.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=b17ba235d4f96de390861f92daecef27
+_md5_=b7c5a9704d275eb2942265aeec0e2982
diff --git a/metadata/md5-cache/dev-python/psycopg-3.1.8 b/metadata/md5-cache/dev-python/psycopg-3.1.8
index 76ba06e7178f..f9ba89f3645b 100644
--- a/metadata/md5-cache/dev-python/psycopg-3.1.8
+++ b/metadata/md5-cache/dev-python/psycopg-3.1.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.psycopg.org/psycopg3/ https://github.com/psycopg/psycopg/ https://pypi.org/project/psycopg/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-3+
 RDEPEND=>=dev-db/postgresql-8.1:* >=dev-python/typing-extensions-4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psycopg/psycopg/archive/3.1.8.tar.gz -> psycopg-3.1.8.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=bc082fc88fadc12db71bc331223965aa
+_md5_=fc083f37c45c33634a1d55240907f650
diff --git a/metadata/md5-cache/dev-python/pulsectl-22.3.2 b/metadata/md5-cache/dev-python/pulsectl-22.3.2
index 541d45b6382c..1e5a8e282da2 100644
--- a/metadata/md5-cache/dev-python/pulsectl-22.3.2
+++ b/metadata/md5-cache/dev-python/pulsectl-22.3.2
@@ -2,8 +2,8 @@ BDEPEND=test? ( media-sound/pulseaudio dev-python/unittest-or-fail[python_target
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)
 EAPI=8
-HOMEPAGE=https://github.com/mk-fg/python-pulse-control
-INHERIT=distutils-r1
+HOMEPAGE=https://github.com/mk-fg/python-pulse-control/ https://pypi.org/project/pulsectl/
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=media-sound/pulseaudio python_targets_pypy3? ( >=dev-python/pypy3-7.3.11
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pulsectl/pulsectl-22.3.2.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=1a7a7b83ab5f0160788596f0f0b12bf3
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pulsectl/pulsectl-22.3.2.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=7492899d357bd3587de8f147ef3d1d45
diff --git a/metadata/md5-cache/dev-python/pycurl-7.45.2 b/metadata/md5-cache/dev-python/pycurl-7.45.2
index 052360d2e766..9ecb827a0265 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.45.2
+++ b/metadata/md5-cache/dev-python/pycurl-7.45.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://pycurl.io/ https://github.com/pycurl/pycurl/ https://pypi.org/project/pycurl/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycurl/pycurl-7.45.2.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=b40bfbb5839aa4f21afc9456b422a766
+_md5_=c8bb52b719cf407ea53d2da5098c23c7
diff --git a/metadata/md5-cache/dev-python/pydocstyle-6.3.0 b/metadata/md5-cache/dev-python/pydocstyle-6.3.0
index 8680983249c2..4268272f9152 100644
--- a/metadata/md5-cache/dev-python/pydocstyle-6.3.0
+++ b/metadata/md5-cache/dev-python/pydocstyle-6.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/PyCQA/pydocstyle/ https://pypi.org/project/pydocstyle/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/snowballstemmer-2.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/pydocstyle/archive/6.3.0.tar.gz -> pydocstyle-6.3.0.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=dfb83b824963f9a64baf90415c3e805a
+_md5_=183e67914ea7959127c24fe85dc96732
diff --git a/metadata/md5-cache/dev-python/pyfakefs-5.1.0 b/metadata/md5-cache/dev-python/pyfakefs-5.1.0
index b6438caabb92..1284e6d0d646 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-5.1.0
+++ b/metadata/md5-cache/dev-python/pyfakefs-5.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pyfakefs/ https://pypi.org/project/pyfakefs/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pyfakefs/archive/v5.1.0.tar.gz -> pyfakefs-5.1.0.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=453b2ae467b4e08844810739e7d032a5
+_md5_=f22053596886d042065b2e0f856a2343
diff --git a/metadata/md5-cache/dev-python/pyformance-0.4-r2 b/metadata/md5-cache/dev-python/pyformance-0.4-r2
new file mode 100644
index 000000000000..e575669db5f9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyformance-0.4-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Performance metrics, based on Coda Hale's Yammer metrics
+EAPI=8
+HOMEPAGE=https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.org/project/pyformance/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyformance/pyformance-0.4.tar.gz https://dev.gentoo.org/~chutzpah/dist/python/pyformance-0.4-patches.tar.xz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=a6738ceab32d7fb86103660f13c0ea2f
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.13.1-r1 b/metadata/md5-cache/dev-python/pyqtgraph-0.13.1-r1
new file mode 100644
index 000000000000..7b5beceded63
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.13.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/h5py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[testlib,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xvfb[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pure-python graphics and GUI library built on PyQt and numpy
+EAPI=8
+HOMEPAGE=https://www.pyqtgraph.org/ https://github.com/pyqtgraph/pyqtgraph/ https://pypi.org/project/pyqtgraph/
+INHERIT=distutils-r1 multiprocessing
+IUSE=opengl svg doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=test? ( opengl svg ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-0.13.1.tar.gz -> pyqtgraph-0.13.1.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=5be1c8273149bc9ed3f201b2c997ed58
diff --git a/metadata/md5-cache/dev-python/pyquery-2.0.0 b/metadata/md5-cache/dev-python/pyquery-2.0.0
index 5f6bc6e97e21..b5996030ee52 100644
--- a/metadata/md5-cache/dev-python/pyquery-2.0.0
+++ b/metadata/md5-cache/dev-python/pyquery-2.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gawel/pyquery/ https://pypi.org/project/pyquery/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cssselect-1.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webob-1.1.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-2.0.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=c9e6407dccc62ad9aa29176c51293179
+_md5_=1f4ae12a6e0dcc621b627947bb37d553
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.19.3 b/metadata/md5-cache/dev-python/pyrsistent-0.19.3
index cf5afef0beb1..f3579d0865e8 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.19.3
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.19.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.19.3.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2a4af490bf6f6f36b082fdbf4a810077
+_md5_=b3db5b7541abbf4c886dc8030c5088b1
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-11.1 b/metadata/md5-cache/dev-python/pytest-rerunfailures-11.1
index 216d44ff0d46..150ef8edeadb 100644
--- a/metadata/md5-cache/dev-python/pytest-rerunfailures-11.1
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-11.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-rerunfailures/ https://pypi.org/project/pytest-rerunfailures/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/packaging-17.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-rerunfailures/pytest-rerunfailures-11.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=1421334547bfa8ae4c8238262b3284aa
+_md5_=f9d0b07a6c9af15ef4528d09359f25a0
diff --git a/metadata/md5-cache/dev-python/python-mpd-3.0.5 b/metadata/md5-cache/dev-python/python-mpd-3.0.5
index a71a8a47fe8a..a0838ac327b3 100644
--- a/metadata/md5-cache/dev-python/python-mpd-3.0.5
+++ b/metadata/md5-cache/dev-python/python-mpd-3.0.5
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/twisted[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( >=dev-python/sphinx-5.3.0 ) test? ( twisted? ( dev-python/twisted[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twisted[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/sphinx-5.3.0 ) test? ( twisted? ( dev-python/twisted[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python MPD client library
 EAPI=8
 HOMEPAGE=https://github.com/Mic92/python-mpd2/ https://pypi.org/project/python-mpd2/
 INHERIT=distutils-r1
-IUSE=examples +twisted doc test python_targets_python3_9 python_targets_python3_10
+IUSE=examples +twisted doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=LGPL-3+
-RDEPEND=twisted? ( dev-python/twisted[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=twisted? ( dev-python/twisted[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/Mic92/python-mpd2/archive/v3.0.5.tar.gz -> python-mpd2-3.0.5.tar.gz
+SRC_URI=https://github.com/Mic92/python-mpd2/archive/v3.0.5.tar.gz -> python-mpd2-3.0.5.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=577d7fd1c043cb807f850b3f6926c367
+_md5_=ae8d663fcb0ce8882d86460cd7719e1d
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-8.2.1 b/metadata/md5-cache/dev-python/python-neutronclient-8.2.1
index 1b0591e31e23..79fd724ca328 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-8.2.1
+++ b/metadata/md5-cache/dev-python/python-neutronclient-8.2.1
@@ -2,8 +2,8 @@ BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A client for the OpenStack Quantum API
 EAPI=8
-HOMEPAGE=https://launchpad.net/neutron
-INHERIT=distutils-r1
+HOMEPAGE=https://opendev.org/openstack/python-neutronclient/ https://github.com/openstack/python-neutronclient/ https://pypi.org/project/python-neutronclient/
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-8.2.1.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=19eaa9d484d1d04a2494043666ec2c28
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-neutronclient/python-neutronclient-8.2.1.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=8f1cfa2ea09cc1055be990d9a5ef34c9
diff --git a/metadata/md5-cache/dev-python/python-novaclient-18.2.0 b/metadata/md5-cache/dev-python/python-novaclient-18.2.0
index 6f8cd365881a..8e99e7cf8c8d 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-18.2.0
+++ b/metadata/md5-cache/dev-python/python-novaclient-18.2.0
@@ -2,8 +2,8 @@ BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A client for the OpenStack Nova API
 EAPI=8
-HOMEPAGE=https://opendev.org/openstack/python-novaclient
-INHERIT=distutils-r1
+HOMEPAGE=https://opendev.org/openstack/python-novaclient/ https://github.com/openstack/python-novaclient/ https://pypi.org/project/python-novaclient/
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-18.2.0.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=a769865208b4a8c17921d15d2b9895e9
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-novaclient/python-novaclient-18.2.0.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=5eb851b7a25d6b3093f0393ffea3475f
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-6.0.0 b/metadata/md5-cache/dev-python/python-openstackclient-6.0.0
index bf5b862ced1a..9c1298bcc6c5 100644
--- a/metadata/md5-cache/dev-python/python-openstackclient-6.0.0
+++ b/metadata/md5-cache/dev-python/python-openstackclient-6.0.0
@@ -2,7 +2,7 @@ BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A client for the OpenStack APIs
 EAPI=8
-HOMEPAGE=https://github.com/openstack/python-openstackclient
+HOMEPAGE=https://opendev.org/openstack/python-openstackclient/ https://github.com/openstack/python-openstackclient/ https://pypi.org/project/python-openstackclient/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
@@ -11,6 +11,5 @@ RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-openstackclient/python-openstackclient-6.0.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d5aa1155f3de8bbb9fccb35972df51a3
+_md5_=e5f28e5fe9b4bf4bc2b4cc9f61d572dd
diff --git a/metadata/md5-cache/dev-python/pytz-2022.7.1 b/metadata/md5-cache/dev-python/pytz-2022.7.1
index bd50dfc3eee2..f788e0222826 100644
--- a/metadata/md5-cache/dev-python/pytz-2022.7.1
+++ b/metadata/md5-cache/dev-python/pytz-2022.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pythonhosted.org/pytz/ https://launchpad.net/pytz/ https://pypi.org/project/pytz/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2022.7.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d4fe703767fad084436dfc6f58bd294b
+_md5_=2d6ad8590cad10f926c5aed892b1ae5c
diff --git a/metadata/md5-cache/dev-python/reedsolomon-1.6.0 b/metadata/md5-cache/dev-python/reedsolomon-1.6.0
deleted file mode 100644
index 73623621ddfe..000000000000
--- a/metadata/md5-cache/dev-python/reedsolomon-1.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Reed Solomon encoder/decoder
-EAPI=8
-HOMEPAGE=https://github.com/tomerfiliba/reedsolomon/ https://pypi.org/project/reedsolo/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=public-domain
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tomerfiliba/reedsolomon/archive/v1.6.0.tar.gz -> reedsolomon-1.6.0.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=b61364cc24ccb0dbdb8857bf1f5cba80
diff --git a/metadata/md5-cache/dev-python/reedsolomon-1.6.1 b/metadata/md5-cache/dev-python/reedsolomon-1.6.1
deleted file mode 100644
index 3041718a0973..000000000000
--- a/metadata/md5-cache/dev-python/reedsolomon-1.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Reed Solomon encoder/decoder
-EAPI=8
-HOMEPAGE=https://github.com/tomerfiliba/reedsolomon/ https://pypi.org/project/reedsolo/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( Unlicense MIT-0 )
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tomerfiliba/reedsolomon/archive/v1.6.1.tar.gz -> reedsolomon-1.6.1.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=e7cb5106c248c8f045883cb23baa6af4
diff --git a/metadata/md5-cache/dev-python/requests-2.28.2 b/metadata/md5-cache/dev-python/requests-2.28.2
index 59cbffe107bb..4397208a53f6 100644
--- a/metadata/md5-cache/dev-python/requests-2.28.2
+++ b/metadata/md5-cache/dev-python/requests-2.28.2
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://requests.readthedocs.io/ https://github.com/psf/requests/ https://pypi.org/project/requests/
 INHERIT=distutils-r1
 IUSE=socks5 test-rust test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/charset_normalizer-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/idna-4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/urllib3-1.27[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.28.2.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=bd0733d93a664ed7ee779f4a07a86348
+_md5_=16d85f378ddb57070aa6900b295079e2
diff --git a/metadata/md5-cache/dev-python/rply-0.7.8-r1 b/metadata/md5-cache/dev-python/rply-0.7.8-r1
new file mode 100644
index 000000000000..72c5907bb4a1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rply-0.7.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/appdirs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure python parser generator that also works with RPython
+EAPI=8
+HOMEPAGE=https://github.com/alex/rply/ https://pypi.org/project/rply/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/appdirs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/alex/rply/archive/v0.7.8.tar.gz -> rply-0.7.8.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=55a724a63fb2250b6ed1ff4f3adaae65
diff --git a/metadata/md5-cache/dev-python/simplejson-3.18.0 b/metadata/md5-cache/dev-python/simplejson-3.18.0
deleted file mode 100644
index ef44071406a5..000000000000
--- a/metadata/md5-cache/dev-python/simplejson-3.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
-EAPI=8
-HOMEPAGE=https://github.com/simplejson/simplejson/ https://pypi.org/project/simplejson/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=|| ( MIT AFL-2.1 )
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/simplejson/simplejson-3.18.0.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=bf658a9b6b2a8efc7baaf0e4f33fae46
diff --git a/metadata/md5-cache/dev-python/simplejson-3.18.2 b/metadata/md5-cache/dev-python/simplejson-3.18.2
deleted file mode 100644
index 6c2b71fa63be..000000000000
--- a/metadata/md5-cache/dev-python/simplejson-3.18.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
-EAPI=8
-HOMEPAGE=https://github.com/simplejson/simplejson/ https://pypi.org/project/simplejson/
-INHERIT=distutils-r1
-IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=|| ( MIT AFL-2.1 )
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/simplejson/simplejson/archive/v3.18.2.tar.gz -> simplejson-3.18.2.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=0c3568f08f12aea703c5c8687848c023
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.4 b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.4
index 1c3e4e584435..b5e12ceb9813 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.4
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-applehelp/ https://pypi.org/project/sphinxcontrib-applehelp/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
 PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-doc/sphinxcontrib-applehelp/archive/1.0.4.tar.gz -> sphinxcontrib-applehelp-1.0.4.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=902132679ce90b51bb4818cbc8d9f02e
+_md5_=61ce43d5457bdd15cc5401f1a3defa3e
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.8.1 b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.8.1
index 963d1475299c..b367e6861698 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.8.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.8.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/sphinxcontrib-httpdomain/ https://github.com/sphinx-contrib/httpdomain/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-contrib/httpdomain/archive/1.8.1.tar.gz -> sphinxcontrib-httpdomain-1.8.1.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=9292d5444cb29255446c5c46925c4213
+_md5_=596802617bf6390d2456ef6875e26a5c
diff --git a/metadata/md5-cache/dev-python/tagpy-2018.1-r3 b/metadata/md5-cache/dev-python/tagpy-2018.1-r3
deleted file mode 100644
index 467f93c97a08..000000000000
--- a/metadata/md5-cache/dev-python/tagpy-2018.1-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-libs/boost:=[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/taglib-1.8 >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/taglib-1.8
-DESCRIPTION=Python Bindings for TagLib
-EAPI=8
-HOMEPAGE=https://mathema.tician.de//software/tagpy https://pypi.org/project/tagpy/
-INHERIT=edo distutils-r1
-IUSE=examples test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ppc ppc64 ~sparc x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/taglib-1.8 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tagpy/tagpy-2018.1.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=a874953057e21c46ed672d8104b768da
diff --git a/metadata/md5-cache/dev-python/tempora-5.2.1 b/metadata/md5-cache/dev-python/tempora-5.2.1
index 15d58cd9328e..dc003f6fa3a3 100644
--- a/metadata/md5-cache/dev-python/tempora-5.2.1
+++ b/metadata/md5-cache/dev-python/tempora-5.2.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaraco/tempora
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/tempora/tempora-5.2.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=1287c54ec7fd218d88b3368d7639a841
+_md5_=00945d9decd688ee3e58baabc7808691
diff --git a/metadata/md5-cache/dev-python/termcolor-2.2.0 b/metadata/md5-cache/dev-python/termcolor-2.2.0
index 82ff3b6453df..de8161dfe585 100644
--- a/metadata/md5-cache/dev-python/termcolor-2.2.0
+++ b/metadata/md5-cache/dev-python/termcolor-2.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/termcolor/termcolor/ https://pypi.org/project/termcolor/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/termcolor/termcolor-2.2.0.tar.gz -> python-termcolor-2.2.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=5a4448ad55c98425186a0f15ae8c3001
+_md5_=978418b205e6e72ab3034353d194eac4
diff --git a/metadata/md5-cache/dev-python/traitlets-5.9.0 b/metadata/md5-cache/dev-python/traitlets-5.9.0
index 03f5f2398c6c..6eea7b47844a 100644
--- a/metadata/md5-cache/dev-python/traitlets-5.9.0
+++ b/metadata/md5-cache/dev-python/traitlets-5.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ipython/traitlets/ https://pypi.org/project/traitlets/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitlets/traitlets-5.9.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=09746b779bb1d910d3b99f3cb1f50524
+_md5_=25bc504d71643010642136fd8429c69b
diff --git a/metadata/md5-cache/dev-python/typing-extensions-4.4.0 b/metadata/md5-cache/dev-python/typing-extensions-4.4.0
index 4006145067c4..3383588acf5e 100644
--- a/metadata/md5-cache/dev-python/typing-extensions-4.4.0
+++ b/metadata/md5-cache/dev-python/typing-extensions-4.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/typing-extensions/ https://github.com/python/typing_extensions/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/typing_extensions/archive/4.4.0.tar.gz -> typing_extensions-4.4.0.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=0dd192df5e71c372ab4d207a8819640e
+_md5_=67856945b0d592cf244cb8921e2d0b15
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.14 b/metadata/md5-cache/dev-python/urllib3-1.26.14
index 10028b8c1d7b..cb26921d38b6 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.14
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.14
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
 INHERIT=distutils-r1
 IUSE=brotli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.14.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=7665e3603dffa6a722fbe67ce45ef590
+_md5_=eeaa71c120fe9938f6841efec012d19a
diff --git a/metadata/md5-cache/dev-python/watchdog-2.2.1 b/metadata/md5-cache/dev-python/watchdog-2.2.1
index cfbc354b0881..8dc1dc1b308b 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.2.1
+++ b/metadata/md5-cache/dev-python/watchdog-2.2.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gorakhargosh/watchdog/ https://pypi.org/project/watchdog/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.2.1.tar.gz -> watchdog-2.2.1.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=61cb21de48f4a1f285dc4fc61c5a8729
+_md5_=303f8987d7a503d33380842a5f472044
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.2.6 b/metadata/md5-cache/dev-python/wcwidth-0.2.6
index 0d8c50c65035..3e19ab60da66 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.2.6
+++ b/metadata/md5-cache/dev-python/wcwidth-0.2.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jquast/wcwidth/archive/0.2.6.tar.gz -> wcwidth-0.2.6.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=9d962f73e1ef4ca3a4afd32e7eb9ac35
+_md5_=41e7cdb6640be37b7745c1c80b28340c
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-4.0.5 b/metadata/md5-cache/dev-python/widgetsnbextension-4.0.5
index 455c82b3714a..a99815cdf1f1 100644
--- a/metadata/md5-cache/dev-python/widgetsnbextension-4.0.5
+++ b/metadata/md5-cache/dev-python/widgetsnbextension-4.0.5
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://ipython.org/ https://pypi.org/project/widgetsnbextension/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/notebook[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/w/widgetsnbextension/widgetsnbextension-4.0.5.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=63617a69313899ed07b95ceecaf7074b
+_md5_=a4472f3519a721f6a503b108b5f93465
diff --git a/metadata/md5-cache/dev-python/xcffib-1.2.0 b/metadata/md5-cache/dev-python/xcffib-1.2.0
index 3be3e96e0ca4..b0f9b4d74952 100644
--- a/metadata/md5-cache/dev-python/xcffib-1.2.0
+++ b/metadata/md5-cache/dev-python/xcffib-1.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tych0/xcffib/ https://pypi.org/project/xcffib/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/libxcb python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-1.2.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2647940b7924223029c2b6b733a2ea0b
+_md5_=c26de76469e395286366fc8dab589758
diff --git a/metadata/md5-cache/dev-python/zope-event-4.6 b/metadata/md5-cache/dev-python/zope-event-4.6
index a5d415d9f78f..baa50671a7de 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.6
+++ b/metadata/md5-cache/dev-python/zope-event-4.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.event/ https://github.com/zopefoundation/zope.event/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZPL
 RDEPEND=!dev-python/namespace-zope python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.event/zope.event-4.6.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=a0aa4485f593d8880e8d03e7f20adead
+_md5_=e53f03bd2ee4444514d76577aa1aed25
diff --git a/metadata/md5-cache/dev-python/zope-testing-5.0.1 b/metadata/md5-cache/dev-python/zope-testing-5.0.1
index 8caba88c136a..4b7ce7de226e 100644
--- a/metadata/md5-cache/dev-python/zope-testing-5.0.1
+++ b/metadata/md5-cache/dev-python/zope-testing-5.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZPL
 RDEPEND=!dev-python/namespace-zope python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.testing/zope.testing-5.0.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=f69e8eb3d546b4f3a0f2968fcee508ec
+_md5_=d994ec29f92940fe234044c26efc7e5b
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 66f953814d68..77247d431c01 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/mit-scheme-11.2 b/metadata/md5-cache/dev-scheme/mit-scheme-11.2
index 00f30359d769..b4b0f69e505c 100644
--- a/metadata/md5-cache/dev-scheme/mit-scheme-11.2
+++ b/metadata/md5-cache/dev-scheme/mit-scheme-11.2
@@ -11,4 +11,4 @@ RDEPEND=blowfish? ( dev-libs/openssl:= ) gdbm? ( sys-libs/gdbm:= ) gui? ( x11-li
 SLOT=0
 SRC_URI=https://ftp.gnu.org/gnu/mit-scheme/stable.pkg/11.2/mit-scheme-11.2-svm1-64le.tar.gz
 _eclasses_=wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e370807da85fb4eb4ce5642f33190020
+_md5_=71e9b143c29a26e7775139d2c086582a
diff --git a/metadata/md5-cache/dev-scheme/mit-scheme-12.1 b/metadata/md5-cache/dev-scheme/mit-scheme-12.1
index 81c691c68ee3..d04d91608e21 100644
--- a/metadata/md5-cache/dev-scheme/mit-scheme-12.1
+++ b/metadata/md5-cache/dev-scheme/mit-scheme-12.1
@@ -11,4 +11,4 @@ RDEPEND=blowfish? ( dev-libs/openssl:= ) gdbm? ( sys-libs/gdbm:= ) gui? ( x11-li
 SLOT=0
 SRC_URI=https://ftp.gnu.org/gnu/mit-scheme/stable.pkg/12.1/mit-scheme-12.1-svm1-64le.tar.gz
 _eclasses_=wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5d1021f4956e3659a730c4b0e16799b3
+_md5_=f3a193f53edb6979dd6d01f282def15b
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e6272ca1e9bd..0da27e4de46f 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.74.5 b/metadata/md5-cache/dev-util/gdbus-codegen-2.74.5
index ce47fb51769f..7a17965e5acf 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.74.5
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.74.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gtk.org/
 INHERIT=gnome.org distutils-r1
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.5.tar.xz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	gnome.org	429073e99d7067d3462e875bf5c6e14a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=6537bd559b91b2d2ac0d457ec0593972
+_md5_=fdfd08c7e4298a021d6f0840f93f3ae9
diff --git a/metadata/md5-cache/dev-util/gi-docgen-2023.1-r1 b/metadata/md5-cache/dev-util/gi-docgen-2023.1-r1
index d063799ed6ef..a21c4a8d856c 100644
--- a/metadata/md5-cache/dev-util/gi-docgen-2023.1-r1
+++ b/metadata/md5-cache/dev-util/gi-docgen-2023.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gi-docgen https://pypi.org/project/gi-docgen/
 INHERIT=distutils-r1
 IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc ~x86
 LICENSE=|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/markdown-3.2[python_targets_python3_9(-)] >=dev-python/markupsafe-1[python_targets_python3_9(-)] >=dev-python/pygments-2[python_targets_python3_9(-)] >=dev-python/jinja-2[python_targets_python3_9(-)] >=dev-python/typogrify-2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/markdown-3.2[python_targets_python3_10(-)] >=dev-python/markupsafe-1[python_targets_python3_10(-)] >=dev-python/pygments-2[python_targets_python3_10(-)] >=dev-python/jinja-2[python_targets_python3_10(-)] >=dev-python/typogrify-2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/markdown-3.2[python_targets_python3_11(-)] >=dev-python/markupsafe-1[python_targets_python3_11(-)] >=dev-python/pygments-2[python_targets_python3_11(-)] >=dev-python/jinja-2[python_targets_python3_11(-)] >=dev-python/typogrify-2[python_targets_python3_11(-)] ) python_single_target_python3_9? ( dev-python/tomli[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/tomli[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gi-docgen/gi-docgen-2023.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=22d56eb35c8ee205ec87ac868a0e0292
+_md5_=a231422968e7fdfbf8792df6b7eb6c6c
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.74.5 b/metadata/md5-cache/dev-util/glib-utils-2.74.5
index 038b83d7e6f5..e378c3ee018f 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.74.5
+++ b/metadata/md5-cache/dev-util/glib-utils-2.74.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gtk.org/
 INHERIT=gnome.org python-single-r1
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-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
 LICENSE=LGPL-2.1+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.5.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=853b3597fe22dea436738318b813a3b2
+_md5_=c54649743f0ec48ba23a74161832af5b
diff --git a/metadata/md5-cache/dev-util/lxqt-build-tools-0.12.0-r1 b/metadata/md5-cache/dev-util/lxqt-build-tools-0.12.0-r1
new file mode 100644
index 000000000000..5bccc915b3d0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lxqt-build-tools-0.12.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.50.0 >=dev-qt/qtcore-5.15:5
+DESCRIPTION=LXQt Build Tools
+EAPI=8
+HOMEPAGE=https://lxqt-project.org/
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/glib-2.50.0 >=dev-qt/qtcore-5.15:5
+SLOT=0
+SRC_URI=https://github.com/lxqt/lxqt-build-tools/releases/download/0.12.0/lxqt-build-tools-0.12.0.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=176ecf54a31cb1ab228efdc809a54a6d
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 68c2cf6405d1..faa6896718f5 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.50.3 b/metadata/md5-cache/gnome-base/gvfs-1.50.3
index 0645e8c61436..34dcaee3b259 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.50.3
+++ b/metadata/md5-cache/gnome-base/gvfs-1.50.3
@@ -7,7 +7,7 @@ HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson systemd tmpfiles xdg
 IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.70.0:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:0= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-3.0.0:3.0 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 virtual/tmpfiles ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8:= ) net-misc/openssh
 REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.50/gvfs-1.50.3.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=61c8aefa307621200c2e8d7c2191bcfe
+_md5_=68d65c5841e020ba919e6ad03d403273
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 8eb55f6a16c8..4697dfda23a7 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/gtk-4.8.3 b/metadata/md5-cache/gui-libs/gtk-4.8.3
index fd11f735868c..b27a3c89b590 100644
--- a/metadata/md5-cache/gui-libs/gtk-4.8.3
+++ b/metadata/md5-cache/gui-libs/gtk-4.8.3
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
 IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
 RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= >=media-libs/harfbuzz-2.6.0:= app-text/iso-codes x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3:1.0 >=media-libs/gst-plugins-base-1.12.3:1.0[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.25 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-core-2.46.0 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
@@ -16,4 +16,4 @@ RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://gnome/sources/gtk/4.8/gtk-4.8.3.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d031744450048a447138163340144bd3
+_md5_=1007205e62035c2901ae1be184643398
diff --git a/metadata/md5-cache/gui-libs/libadwaita-1.2.1 b/metadata/md5-cache/gui-libs/libadwaita-1.2.1
index a7035858adb8..cfd6421e2de3 100644
--- a/metadata/md5-cache/gui-libs/libadwaita-1.2.1
+++ b/metadata/md5-cache/gui-libs/libadwaita-1.2.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita
 INHERIT=gnome.org meson python-any-r1 vala virtualx
 IUSE=+introspection test +vala test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.66:2 >=gui-libs/gtk-4.5.0:4[introspection?] dev-libs/fribidi introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libadwaita/1.2/libadwaita-1.2.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=2cf4bcc48da94bda89158b707b472aed
+_md5_=78c6e80d117d6c7f02052586ca1baebb
diff --git a/metadata/md5-cache/lxqt-base/Manifest.gz b/metadata/md5-cache/lxqt-base/Manifest.gz
index 57be67040ff1..ed5bb41c1911 100644
--- a/metadata/md5-cache/lxqt-base/Manifest.gz
+++ b/metadata/md5-cache/lxqt-base/Manifest.gz
diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r1 b/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r1
new file mode 100644
index 000000000000..af183cab4704
--- /dev/null
+++ b/metadata/md5-cache/lxqt-base/lxqt-config-1.2.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-qt/linguist-tools-5.15:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/libqtxdg-3.10.0 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=dev-qt/qtxml-5.15:5 =lxqt-base/liblxqt-1.2*:= sys-libs/zlib:= x11-apps/setxkbmap x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes monitor? ( kde-plasma/libkscreen:5= ) touchpad? ( virtual/libudev:= x11-drivers/xf86-input-libinput x11-libs/libXi )
+DESCRIPTION=LXQt system configuration control center
+EAPI=8
+HOMEPAGE=https://lxqt-project.org/
+INHERIT=cmake xdg-utils
+IUSE=+monitor +touchpad
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2
+RDEPEND=>=dev-libs/libqtxdg-3.10.0 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtx11extras-5.15:5 >=dev-qt/qtxml-5.15:5 =lxqt-base/liblxqt-1.2*:= sys-libs/zlib:= x11-apps/setxkbmap x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes monitor? ( kde-plasma/libkscreen:5= ) touchpad? ( virtual/libudev:= x11-drivers/xf86-input-libinput x11-libs/libXi )
+SLOT=0
+SRC_URI=https://github.com/lxqt/lxqt-config/releases/download/1.2.0/lxqt-config-1.2.0.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=169a1fb635d19409b00c96c22967195c
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 04b79a2e32b4..a3c7f1d5ca0f 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/hugin-9999 b/metadata/md5-cache/media-gfx/hugin-9999
index 3640dbda3dcd..de68ba7d9289 100644
--- a/metadata/md5-cache/media-gfx/hugin-9999
+++ b/metadata/md5-cache/media-gfx/hugin-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-vcs/mercurial >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GUI for the creation & processing of panoramic images
 EAPI=7
 HOMEPAGE=http://hugin.sf.net
 INHERIT=mercurial python-single-r1 wxwidgets cmake xdg
-IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_9 python_single_target_python3_10
+IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
 PROPERTIES=live
-RDEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
+RDEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2ac6dc33838b9e337d9fdd77fb706b8f
+_md5_=cce6580919b2a15b64dcbb22f24bff52
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index d7333a0d1c3a..3f9630d3c7bf 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/hamlib-4.4 b/metadata/md5-cache/media-libs/hamlib-4.4
deleted file mode 100644
index 3fbc4cecfe9d..000000000000
--- a/metadata/md5-cache/media-libs/hamlib-4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig dev-lang/swig >=sys-devel/libtool-2.2 doc? ( app-doc/doxygen dev-util/source-highlight )
-DESCRIPTION=Ham radio backend rig control libraries
-EAPI=8
-HOMEPAGE=http://www.hamlib.org
-INHERIT=autotools python-single-r1
-IUSE=doc perl python tcl python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test
-SLOT=0/4.2
-SRC_URI=mirror://sourceforge/hamlib/hamlib-4.4.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d3a0081b53b27dee809090e10ba49447
diff --git a/metadata/md5-cache/media-libs/hamlib-4.5.3 b/metadata/md5-cache/media-libs/hamlib-4.5.3
deleted file mode 100644
index 0b2b3b24a0e8..000000000000
--- a/metadata/md5-cache/media-libs/hamlib-4.5.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig dev-lang/swig >=sys-devel/libtool-2.2 doc? ( app-doc/doxygen dev-util/source-highlight )
-DESCRIPTION=Ham radio backend rig control libraries
-EAPI=8
-HOMEPAGE=http://www.hamlib.org
-INHERIT=autotools python-single-r1
-IUSE=doc perl python tcl python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=test
-SLOT=0/4.2
-SRC_URI=mirror://sourceforge/hamlib/hamlib-4.5.3.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=3adf67b1fc7d135204585662bb9ea224
diff --git a/metadata/md5-cache/media-libs/libchamplain-0.12.21 b/metadata/md5-cache/media-libs/libchamplain-0.12.21
index 76dd69bb4614..3cc394f70962 100644
--- a/metadata/md5-cache/media-libs/libchamplain-0.12.21
+++ b/metadata/md5-cache/media-libs/libchamplain-0.12.21
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.gnome.org/Projects/libchamplain
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org meson vala xdg
 IUSE=+gtk gtk-doc +introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.68:2 >=x11-libs/gtk+-3.0:3 >=media-libs/clutter-1.24:1.0[introspection?] gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) >=x11-libs/cairo-1.4 dev-db/sqlite:3 >=net-libs/libsoup-3:3.0 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) media-libs/cogl:=
 REQUIRED_USE=vala? ( introspection ) gtk-doc? ( gtk )
 SLOT=0.12
 SRC_URI=mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.21.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8965622de8718ee1d371a4da86ca61dd
+_md5_=8726df6d02374dc8c5d1d73f29886909
diff --git a/metadata/md5-cache/media-libs/libsndfile-9999 b/metadata/md5-cache/media-libs/libsndfile-9999
index 483c2e39fa21..df0c84af97f7 100644
--- a/metadata/md5-cache/media-libs/libsndfile-9999
+++ b/metadata/md5-cache/media-libs/libsndfile-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/pypy3-7.3.11-r1:0 ) ) || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/pypy3-7.3.11-r1:0 ) sys-devel/autogen sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/pypy3-7.3.11-r1:0 ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/pypy3-7.3.11-r1:0 ) sys-devel/autogen sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=!minimal? ( media-libs/flac:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libogg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libvorbis:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/opus:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-sound/lame:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-sound/mpg123:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib:= ) sqlite? ( dev-db/sqlite )
 DESCRIPTION=C library for reading and writing files containing sampled sound
@@ -12,4 +12,4 @@ RDEPEND=!minimal? ( media-libs/flac:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=6a85cd6e2f3e280e7e0d140e9b2dd768
+_md5_=2366f6f43f0dc569409842ef052a3aa9
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 719e0d70f0c3..0a4af9225b4e 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/mpg123-1.31.2 b/metadata/md5-cache/media-sound/mpg123-1.31.2
index eb7a1349855b..ddeeaa1f3a8b 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.31.2
+++ b/metadata/md5-cache/media-sound/mpg123-1.31.2
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.mpg123.org/
 IDEPEND=app-eselect/eselect-mpg123
 INHERIT=flag-o-matic toolchain-funcs libtool multilib-minimal
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mpg123/mpg123-1.31.2.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=058703770024d956d7658ccebe53d6d1
+_md5_=5ba44db4680205c6f5d374a397089f50
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 39ba4c431519..dc28e3785288 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/gupnp-1.6.3 b/metadata/md5-cache/net-libs/gupnp-1.6.3
index 008ea26e8ff2..01e0684edb75 100644
--- a/metadata/md5-cache/net-libs/gupnp-1.6.3
+++ b/metadata/md5-cache/net-libs/gupnp-1.6.3
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gu
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org meson-multilib python-single-r1 vala xdg
 IUSE=connman gtk-doc +introspection networkmanager +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 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) >=dev-libs/glib-2.70: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(-)?] >=net-libs/gssdp-1.6.2:1.6=[introspection?,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[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/libsoup-2.99.0:3.0[introspection?,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-apps/util-linux-2.24.1-r3[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:= )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ?? ( connman networkmanager ) gtk-doc? ( introspection )
 SLOT=1.6/1.6-0
 SRC_URI=mirror://gnome/sources/gupnp/1.6/gupnp-1.6.3.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=21ab22ae26d214b7da1116ba4ed14732
+_md5_=8dc872968fd52254589d8ce23bf3a15a
diff --git a/metadata/md5-cache/net-libs/libnma-1.10.6 b/metadata/md5-cache/net-libs/libnma-1.10.6
index b7e321e522fb..1d89c4b61206 100644
--- a/metadata/md5-cache/net-libs/libnma-1.10.6
+++ b/metadata/md5-cache/net-libs/libnma-1.10.6
@@ -7,11 +7,11 @@ HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson xdg vala
 IUSE=gtk-doc +introspection +pkcs11 vala
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-4.0.0:4 ) introspection? ( >=dev-libs/gobject-introspection-1.56:= ) !<gnome-extra/nm-applet-1.16.0
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libnma/1.10/libnma-1.10.6.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7509018e779ef4b88b928c25b175cc7b
+_md5_=24f827ecddc22af8fcdc3eb3875615d7
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5
new file mode 100644
index 000000000000..a0ce4997214f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4be6be7754133baa14945971673e1d16
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r410
new file mode 100644
index 000000000000..fd97c656945d
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r410
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4.1/0
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e70857ef669ae84a44963d7a98612731
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r500 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r500
new file mode 100644
index 000000000000..14ff62482e42
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.5-r500
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=5/0
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-single	b9b5d136d97bf37058132e4231da02fa	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=492a4ef4b2bbcdf14b61a2d6c62e77f7
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index ebc558c62db3..98e65737afa3 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/networkmanager-1.40.12 b/metadata/md5-cache/net-misc/networkmanager-1.40.12
index b7c74ecd382a..a75f1283ad1f 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.40.12
+++ b/metadata/md5-cache/net-misc/networkmanager-1.40.12
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 INHERIT=gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
 IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[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-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( dev-libs/nspr[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/nss-3.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
 REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.40/NetworkManager-1.40.12.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	udev	eec0bbab06977f1cfc5597269c1fa152	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=c7bca2fcf3633b151771dbcc4daac372
+_md5_=986be1a3e1c2bc6e004cc0dcf3d35955
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.6.1-r1 b/metadata/md5-cache/net-misc/nextcloud-client-3.6.1-r1
deleted file mode 100644
index 846f70472796..000000000000
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.6.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dolphin? ( kde-frameworks/extra-cmake-modules ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-qt/qtconcurrent:5 dev-qt/qtxml:5 || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) test? ( dev-qt/qttest:5 dev-util/cmocka )
-DESCRIPTION=Desktop Syncing Client for Nextcloud
-EAPI=8
-HOMEPAGE=https://github.com/nextcloud/desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake virtualx xdg
-IUSE=doc dolphin nautilus test webengine test
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nextcloud/desktop/archive/v3.6.1.tar.gz -> nextcloud-client-3.6.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b03917e121e5c422a14800d7a8094fc6
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.6.4-r3 b/metadata/md5-cache/net-misc/nextcloud-client-3.6.4-r3
deleted file mode 100644
index c8efde3d82be..000000000000
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.6.4-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dolphin? ( kde-frameworks/extra-cmake-modules ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtxml:5 || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) test? ( dev-qt/qttest:5 dev-util/cmocka )
-DESCRIPTION=Desktop Syncing Client for Nextcloud
-EAPI=8
-HOMEPAGE=https://github.com/nextcloud/desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake virtualx xdg
-IUSE=doc dolphin nautilus test webengine test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 net-libs/libcloudproviders sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nextcloud/desktop/archive/v3.6.4.tar.gz -> nextcloud-client-3.6.4.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2e58430970b0e6cbc231456612482abb
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.6.6 b/metadata/md5-cache/net-misc/nextcloud-client-3.6.6
index f6a338c1837d..655f36107441 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.6.6
+++ b/metadata/md5-cache/net-misc/nextcloud-client-3.6.6
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/nextcloud/desktop
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake virtualx xdg
 IUSE=doc dolphin nautilus test webengine test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=CC-BY-3.0 GPL-2
 RDEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 net-libs/libcloudproviders sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nextcloud/desktop/archive/v3.6.6.tar.gz -> nextcloud-client-3.6.6.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=80963e84a72e02bda253ede9c574cea7
+_md5_=1ac3bd9347478db7dd2692ed7e78ddd3
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index fec90b6136b6..e91a84ca4aad 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/transmission-3.00-r5 b/metadata/md5-cache/net-p2p/transmission-3.00-r6
index dbef6230d7d7..69779ff168a3 100644
--- a/metadata/md5-cache/net-p2p/transmission-3.00-r5
+++ b/metadata/md5-cache/net-p2p/transmission-3.00-r6
@@ -4,8 +4,8 @@ DEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? (
 DESCRIPTION=A fast, easy, and free BitTorrent client
 EAPI=7
 HOMEPAGE=https://transmissionbt.com/
-INHERIT=cmake systemd xdg-utils
-IUSE=appindicator cli gtk lightweight nls mbedtls qt5 systemd test
+INHERIT=cmake flag-o-matic systemd xdg-utils
+IUSE=appindicator cli debug gtk lightweight nls mbedtls qt5 systemd test
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/transmission-3.00.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e66e86f99672382cbd095bdd001e6954
+_md5_=fe9a4b8f6d6258ba460b77ebf8e22282
diff --git a/metadata/md5-cache/net-p2p/transmission-4.0.0-r3 b/metadata/md5-cache/net-p2p/transmission-4.0.0-r4
index d8e96659a1b2..d41ebda08840 100644
--- a/metadata/md5-cache/net-p2p/transmission-4.0.0-r3
+++ b/metadata/md5-cache/net-p2p/transmission-4.0.0-r4
@@ -4,8 +4,8 @@ DEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= )
 DESCRIPTION=A fast, easy, and free BitTorrent client
 EAPI=8
 HOMEPAGE=https://transmissionbt.com/
-INHERIT=cmake tmpfiles systemd xdg-utils
-IUSE=appindicator cli gtk nls mbedtls qt5 systemd test
+INHERIT=cmake flag-o-matic tmpfiles systemd xdg-utils
+IUSE=appindicator cli debug gtk nls mbedtls qt5 systemd test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission virtual/tmpfiles
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/transmission/transmission/releases/download/4.0.0/transmission-4.0.0.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5dd464144bf977edfaf378f97cab950a
+_md5_=d980a0f5e928a32caec086d5a964e23e
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index d95e3b2d0fe4..22f9a4b06aae 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= )
 DESCRIPTION=A fast, easy, and free BitTorrent client
 EAPI=8
 HOMEPAGE=https://transmissionbt.com/
-INHERIT=cmake tmpfiles systemd xdg-utils git-r3
-IUSE=appindicator cli gtk nls mbedtls qt5 systemd test
+INHERIT=cmake flag-o-matic tmpfiles systemd xdg-utils git-r3
+IUSE=appindicator cli debug gtk nls mbedtls qt5 systemd test
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:3.0 >=dev-cpp/glibmm-2.60.0:2 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission virtual/tmpfiles
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6b790b31812087382f348944cb676b6e
+_md5_=bfaa3960a52ad389c5fceafa6a533e34
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 2caeae61f0b9..f05aae9dc357 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/rtl_433-22.11 b/metadata/md5-cache/net-wireless/rtl_433-22.11
new file mode 100644
index 000000000000..384903b13333
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/rtl_433-22.11
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) soapysdr? ( net-wireless/soapysdr:= )
+DESCRIPTION=Decode OOK modulated signals
+EAPI=8
+HOMEPAGE=https://github.com/merbanan/rtl_433
+INHERIT=cmake
+IUSE=+rtlsdr soapysdr test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) soapysdr? ( net-wireless/soapysdr:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/merbanan/rtl_433/archive/105342a33271bac6837d06aa86c23eec9e9ecb6a.tar.gz -> rtl_433-22.11.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ad31c0620e244cb041d045cb4863cd66
diff --git a/metadata/md5-cache/net-wireless/rtl_433-9999 b/metadata/md5-cache/net-wireless/rtl_433-9999
index 0d1e046944fa..402beb028ec1 100644
--- a/metadata/md5-cache/net-wireless/rtl_433-9999
+++ b/metadata/md5-cache/net-wireless/rtl_433-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) soapysdr? ( net-wireless/soapysdr:= ) dev-libs/openssl:=
+DEPEND=dev-libs/openssl:= rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) soapysdr? ( net-wireless/soapysdr:= )
 DESCRIPTION=Decode OOK modulated signals
 EAPI=8
 HOMEPAGE=https://github.com/merbanan/rtl_433
@@ -8,8 +8,8 @@ INHERIT=cmake git-r3
 IUSE=+rtlsdr soapysdr test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) soapysdr? ( net-wireless/soapysdr:= ) dev-libs/openssl:=
+RDEPEND=dev-libs/openssl:= rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) soapysdr? ( net-wireless/soapysdr:= )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=be3dd97e3603c9cc69682b88d00177e9
+_md5_=0e799d957b7e6d8638067192c8b29e84
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 0829ae334ae1..d5640f19a913 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/os-prober-1.81-r1 b/metadata/md5-cache/sys-boot/os-prober-1.81-r1
new file mode 100644
index 000000000000..c89df0b1b26d
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/os-prober-1.81-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=Utility to detect other OSs on a set of drives
+EAPI=8
+HOMEPAGE=https://salsa.debian.org/installer-team/os-prober
+INHERIT=readme.gentoo-r1 toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-boot/grub:2[mount]
+SLOT=0
+SRC_URI=mirror://debian/pool/main/o/os-prober/os-prober_1.81.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=e2a8aa3eed8288785a0fbdf58bc1e892
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 656ee1a561ab..087a9d387e19 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.305 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.305
index 38ea03b88a79..3bf36957f17c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.305
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.305
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.14.305
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-316.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-316.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-316.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-316.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-316.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-316.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=dfed67a5c919340e139d3495f33c5180
+_md5_=b465a2d2c15bab63768a6336b0ddf13a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.272 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.272
index f6ad770fbc59..00c52969dd14 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.272
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.272
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.19.272
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-271.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-271.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-271.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-271.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-271.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-271.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d3ac1d8feb930514bb96f65af617952f
+_md5_=333189c154f0e1b742b2c87cd86a9d62
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.167 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.167
index 1f5666cff909..cabed2a296a4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.167
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.167
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.10.167
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-176.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-176.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-176.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-176.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-176.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-176.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ed976e42c99c6c2a1a488b0ed2117375
+_md5_=0b85f01dc03c472fc6d445a090ebcbdc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.94 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.94
index e5b7aa8a33c6..4b50da9e1110 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.94
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.94
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.15.94
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-98.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-98.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-98.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-98.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-98.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-98.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=acd7408e4ffa17e6d6d45594596d6529
+_md5_=c1ec12557d987c45f48e469bebc6a217
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.231 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.231
index 0202066abd2f..beaf7b34ceff 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.231
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.231
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.4.231
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-236.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-236.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-236.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-236.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-236.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-236.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=f79b4f308d8bdf5aa09eb7422f772ffb
+_md5_=9e9551aba8fee1e58ecd308cef6e875a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.12
index 370b18af4142..399b8cdd4a7e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.12
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.12
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=6.1.12
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-14.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-14.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-14.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-14.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-14.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=b9f0afc14bde8f26f6cd41c8fd447dd2
+_md5_=50ca7789a9a08f40d21a84a42cd72a83
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 78cd9ae3fdec..9aa34feafb26 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_h2-2.0.12 b/metadata/md5-cache/www-apache/mod_h2-2.0.13
index c4f4f824f35c..80e0db81d4f8 100644
--- a/metadata/md5-cache/www-apache/mod_h2-2.0.12
+++ b/metadata/md5-cache/www-apache/mod_h2-2.0.13
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
 SLOT=0
-SRC_URI=https://github.com/icing/mod_h2/archive/v2.0.12.tar.gz -> mod_h2-2.0.12.tar.gz
+SRC_URI=https://github.com/icing/mod_h2/archive/v2.0.13.tar.gz -> mod_h2-2.0.13.tar.gz
 _eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=d579e35e8ad51a4310380e53b07c1506
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index c77ce89c88c8..9dda9523ba0a 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/google-chrome-109.0.5414.119 b/metadata/md5-cache/www-client/google-chrome-110.0.5481.100
index 8bff25b35778..3aa2eca4fb36 100644
--- a/metadata/md5-cache/www-client/google-chrome-109.0.5414.119
+++ b/metadata/md5-cache/www-client/google-chrome-110.0.5481.100
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_109.0.5414.119-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_110.0.5481.100-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=832f633722d2fe1864b0c2632e551f52
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-110.0.5481.38 b/metadata/md5-cache/www-client/google-chrome-beta-111.0.5563.19
index d5fc86ea9578..401fbc9bd1ba 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-110.0.5481.38
+++ b/metadata/md5-cache/www-client/google-chrome-beta-111.0.5563.19
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_110.0.5481.38-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_111.0.5563.19-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=af0793b63d0070684d513c0045380acb
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-111.0.5545.6 b/metadata/md5-cache/www-client/google-chrome-unstable-112.0.5582.0
index 29fbf91f2cb0..31f134c63c71 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-111.0.5545.6
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-112.0.5582.0
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_111.0.5545.6-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_112.0.5582.0-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=af0793b63d0070684d513c0045380acb
diff --git a/metadata/md5-cache/www-client/microsoft-edge-109.0.1518.61 b/metadata/md5-cache/www-client/microsoft-edge-110.0.1587.41
index 9882f6a29659..9566df83fa9f 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-109.0.1518.61
+++ b/metadata/md5-cache/www-client/microsoft-edge-110.0.1587.41
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_109.0.1518.61-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_110.0.1587.41-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e3faf660236342ed84650dbc4c099195
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-110.0.1587.17 b/metadata/md5-cache/www-client/microsoft-edge-beta-110.0.1587.30
index eefe0adb3b6e..a49f362f6698 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-110.0.1587.17
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-110.0.1587.30
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_110.0.1587.17-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_110.0.1587.30-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c35de9f6a641eab8e5a8a8dc008143f6
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-109.0.1518.52 b/metadata/md5-cache/www-client/microsoft-edge-beta-110.0.1587.35
index d2c3eaec21b7..c421a742799c 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-109.0.1518.52
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-110.0.1587.35
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_109.0.1518.52-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_110.0.1587.35-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c35de9f6a641eab8e5a8a8dc008143f6
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-110.0.1587.22 b/metadata/md5-cache/www-client/microsoft-edge-beta-110.0.1587.40
index 974d1c1a19a6..46044d1122c3 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-110.0.1587.22
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-110.0.1587.40
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_110.0.1587.22-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_110.0.1587.40-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c35de9f6a641eab8e5a8a8dc008143f6
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-110.0.1587.15 b/metadata/md5-cache/www-client/microsoft-edge-dev-111.0.1652.0
index 2e3273ef26b9..26d983c07d0c 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-110.0.1587.15
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-111.0.1652.0
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_110.0.1587.15-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_111.0.1652.0-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c35de9f6a641eab8e5a8a8dc008143f6
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 79c9d09fa000..626ab1bacde0 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-109.0.5414.119 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-110.0.5481.100
index ef90d544b476..d5ddd4bcb833 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-109.0.5414.119
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-110.0.5481.100
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_109.0.5414.119-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_110.0.5481.100-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
 _md5_=56740527e70db7fbbcef87ad68552159
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-110.0.5481.38_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-111.0.5563.19_beta
index 616c0bbb79fc..be6efc870575 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-110.0.5481.38_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-111.0.5563.19_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_110.0.5481.38-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_111.0.5563.19-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
 _md5_=eaa785838d85936e9a01ebeaaf056ec1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-111.0.5545.6_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-112.0.5582.0_alpha
index 3ebc6df93a62..403f239e362a 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-111.0.5545.6_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-112.0.5582.0_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_111.0.5545.6-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_112.0.5582.0-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
 _md5_=eaa785838d85936e9a01ebeaaf056ec1
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ea2fd52ce7c2..2d517d027d74 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-02-16T13:40:00Z
+TIMESTAMP 2023-02-16T19:40:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPuMjBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPuhplfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBWQBAArwKAX3BlPd2NTlVnznNMeE/C6EH3PQs1WUd8mxao8iQQxZ3U0DUOgl+w
-ov0X8KienKf0YZjvjaW3j0kZ/vbXLpPtR75cAbv6cbPx3nBVE8HU1TknAvWTwWzS
-bQFK+SLX6Bw0NYF4N8z3vr/WZgDPiYG7yHOARvxLAwgRohi+0UlXaFKZzwSQStA4
-2sci1/EdVgUDCc1jlJX8ThAt9Zu/sBbXcdLG1qZ9yqfKAapXOU2kkazC6OSkB53J
-Txhk1PuV4RsQnvPv+S7u+wgzDavlMOQrFChIBNcunMGQCHkRD0myBI6sECi6hVA7
-5tr7g3z58KVZSM8e/vjfPHc9O6h4g7vy4vCCMgOKjEKLEEOn1vdbsfvh6tB0NKv0
-ngbElMoOOJINb4PNFuWa6q1sHRcGIwwkwCVCVLTK3hU0hq9EyAx9QUEtGQsvkhQx
-cBUL5r9jIkgrwd9EsqH8XXdjGdwXLyrcLZOs3g7V8MwnJ1Aa+e/BeBNxalbfvMAc
-3QgOM6xMymoMBGrmTcXXQ+jZLVqIZko/LOJTUuJ0dcYvaMwWquXoPW1yIv1u2h5L
-3lFPMNEFJC4vnKtZGeU5VEDcWfJzL3nk/B2qukvZ+KrdqDap24thrBxAAL9lecSZ
-YxXX8lb+e5yKh1z2WZe7RwynZXhsJYUdnfnHSzq9r1PJoYk6Zhc=
-=f6jY
+klCKSBAAjRcEHZXNU87mcHGZR33ABAlXZZJYyYLFp+R0PBrsbQRsr0GNYu17AL1k
+wrBCFsCOTiEaDs2ioEgVnR8vEB62swlqTD23fSGog/m8k50c3dNheQ8zlVy32jPq
+9BRbm2QPe6J3Qrfgp2Uw83nujrtNR7rbDY2MDKOeS8Ri81I/dhJdC1bWM5A0TYPx
+mRoGpyo+153JMoNf+X9Ou0Y1bVTnLj3o5RSFnpJ+/gNks4d6s8tyFfyD1wOQLAVr
+oV6Sy1da71kKFaKHXaC/aw2emkhUwPpa5MshYNhwWXCSDTJ/h9vDfXAOzx4jzmnc
+n8Wau+p3HmqiKF+d1TuLS0cWeBhIOOxyXO1/RFnEf/pnK9cwL3+02LvdF0tIJvWO
+2zHlONkFvA4LPveKGJXXooeVyAxhR+v3wGcln026UA2X5/rRusEn0WrbrDCYXe4H
+X+beuSKDn5rH1DvZz2VZP5wobEyN4A0SgrhyfLAfJmXonhb64j8Mw/H0dfJZTsXL
+iQzPUepG7blr5WARYhktR95YSB7rJS73q7TMytJF+7UqB5UI+LvOU1Ru+91Sx2Ur
+hcvfT2dUGm4PJ9b9BZlP1thyzE2UtXFUb7Mmi4CHjClxengkxALHuXEvc1wHE+LM
+dWt/eIAQptLznbNsjFy/gs9F7FU4qGUpj9SkGCfmfU6xchYlsdY=
+=EZZK
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c073187dc60b..a09ff46f2f57 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 16 Feb 2023 13:39:57 +0000
+Thu, 16 Feb 2023 19:40:06 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 9690e793e647..2c834eb606f3 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -702,6 +702,16 @@
     </member>
   </project>
   <project>
+    <email>dotnet@gentoo.org</email>
+    <name>Dotnet</name>
+    <url>https://wiki.gentoo.org/wiki/Project:Dotnet</url>
+    <description>The Dotnet project handles new .NET related packages in the Gentoo package tree.</description>
+    <member>
+      <email>xgqt@gentoo.org</email>
+      <name>Maciej Barć</name>
+    </member>
+  </project>
+  <project>
     <email>ejabberd@gentoo.org</email>
     <name>ejabberd Project</name>
     <url>https://wiki.gentoo.org/wiki/Project:Ejabberd</url>
@@ -1890,6 +1900,16 @@
     </member>
   </project>
   <project>
+    <email>nim@gentoo.org</email>
+    <name>Nim</name>
+    <url>https://wiki.gentoo.org/wiki/Project:Nim</url>
+    <description>The Nim project handles Nim programming language related packages in the Gentoo package tree.</description>
+    <member>
+      <email>xgqt@gentoo.org</email>
+      <name>Maciej Barć</name>
+    </member>
+  </project>
+  <project>
     <email>office@gentoo.org</email>
     <name>Office project</name>
     <url>https://wiki.gentoo.org/wiki/Project:Office</url>
diff --git a/metadata/timestamp b/metadata/timestamp
index 44a3751b0ddf..e25c275c8d83 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Feb 16 01:39:57 PM UTC 2023
+Thu Feb 16 07:40:06 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a131197de2ae..eb3706b8f8f4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 16 Feb 2023 13:45:01 +0000
+Thu, 16 Feb 2023 19:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 966dbfc4a3d6..d383218e4a01 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-b47432ec8014a0442ab9ae4124e8d6d6294e47e6 1676554377 2023-02-16T13:32:57+00:00
+05b8a0768e6eee3c15d416114fc6c7fd002e8436 1676574981 2023-02-16T19:16:21+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5a3145999b19..ed10c466e88f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1676554801 Thu 16 Feb 2023 01:40:01 PM UTC
+1676576401 Thu 16 Feb 2023 07:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c073187dc60b..a09ff46f2f57 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 16 Feb 2023 13:39:57 +0000
+Thu, 16 Feb 2023 19:40:06 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 370558d9409b..9e9d6118da02 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 9eddf4b4d725..b7854dcf7d04 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -3,5 +3,5 @@ DIST gupnp-1.6.2.tar.xz 2215220 BLAKE2B 457a334a6fe07c8038e83e63472809211751f429
 DIST gupnp-1.6.3.tar.xz 2216496 BLAKE2B 635aafa78f8cb7b9542eab14545864a93d5fe01296444397ddb1d1868d51c9bb8013e17e659dce550581f7ae9cbc31a74fb30563d1961b341c3f672390d08f6a SHA512 423605e15dafb1f3789910289604912212a04595bad174654cce5b7717ab0d307ad7e021fc8f0ce59fb090d285fbcf633de63dc40c5f6cebad6a28553a5d6f17
 EBUILD gupnp-1.4.3.ebuild 2078 BLAKE2B 3d436455a63160bb8e66083c878995d1ae21bedd189fb2fdedb2dbca5293dd455fcfc1a148df4b9e9da079a16412b259fd281dbd4d46d19d0b55b9e14a0d23c3 SHA512 aa6ee6511b88c58f2a6c8a7f3497c39d8ee1fb519e14ca7ea8248444ffd93b7a90bd92588c7865191ace24f54e27f6ac7b0fd097eaefcc043dc0d284b16b6921
 EBUILD gupnp-1.6.2.ebuild 2153 BLAKE2B 38e0cbebe79c2899279c018e0a7e171241a4b823937494d27d3462749f93fce09d99492cfd612a82dc67c772e66a3fb1d067627789fa4e35d100fc51ad2e8357 SHA512 a0ba08541149f21f561fb409eccfc9c9bff79095f31f0718c99fc25c588b7e37815425ce965b27dececaa021555af71caa6fa6b92e9037a8a985a5368b82a4c6
-EBUILD gupnp-1.6.3.ebuild 2157 BLAKE2B 16896540a5a2dcf998d902a38103711e29bb91b60496aee26f3497bb022a9ae45d2429fa90f0d5ac0076d20cee8e696710b88c832144d374579cb5d33952bbcd SHA512 d7fafabc2ca100cc8153b1c1090ac4e624dc0101682b66cfd9ecb2c7dbf3ec81383898fdfd516645cc20368ce1544bf97938820fa8b3728ca3126ee747c08dee
+EBUILD gupnp-1.6.3.ebuild 2156 BLAKE2B 0408f078a013f97d73f296f89472fdce6e1e627f0556fb27c955b68494e217353f85f342ba9e81a0905139332dd3832f54282015cca26f60ed461d2168123bf5 SHA512 3d0840fe116c244ea0b4403a877193879e2b2188a8d519c6d66b7fcde3d0e60eb2834f82db2fd2381611dbbaf0395b1d9295e15d1b668915b30bc140f61bcc1f
 MISC metadata.xml 346 BLAKE2B c0c2d7c5a0f1906cc1789a30daec476919e7332f2a8aed9ec78e824be2776e7a18202b8fe19e519340cc9437d4147e223eb6830460c2a4c499cd483c77524cd5 SHA512 84998e9f5ebf374d1bfea85f7eb4b89f8459ee62ec89dc8b9bd36de354a307ad854cd7521eecd31b410659d5128a4dd9545ab7037eb5b7f8b41efdb8054b9b2c
diff --git a/net-libs/gupnp/gupnp-1.6.3.ebuild b/net-libs/gupnp/gupnp-1.6.3.ebuild
index 266acba7bb17..565ecf3d5840 100644
--- a/net-libs/gupnp/gupnp-1.6.3.ebuild
+++ b/net-libs/gupnp/gupnp-1.6.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/g
 
 LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
 SLOT="1.6/1.6-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="connman gtk-doc +introspection networkmanager +vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 24cfebd3b175..d5eafcaf2499 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -2,5 +2,5 @@ AUX libnma-1.10.4-path-eap-schema.patch 1229 BLAKE2B 50c80e5f5e5bdfbe14e176daa50
 DIST libnma-1.10.4.tar.xz 1351932 BLAKE2B 0178407d04fed680b260ea7e4615f0d939483504209b4bc721e2a4fe49ecbf49d9ffde0476b4352973cda9de4f088ac50d557c12f67d970f21031c1741f692e3 SHA512 4fe0d6b0e5b3c1bd7654e03dce747ee390de76d6641eb317fecb901ed6768bf48785e4a99e6fc8f12864066d06a64e308a8dbb2081a2d57e3f1509ca712deccc
 DIST libnma-1.10.6.tar.xz 702820 BLAKE2B 8f5b62f9522c8e7f16d6847d0e297d32fa8f62c9be2db68af596765dcfaa93c4eb9c3d3e03098ebd024d7f6ad788dd82eedc7b4841738d4278f64e3a1053d2d6 SHA512 4801db35a8d510c651fc91da4f394a665a4ba5c35fbefe0496363c404b49d5f4e103f49084220ee58b995684d2ac93643320b7d1777ebeea555e7657768a1f6a
 EBUILD libnma-1.10.4-r2.ebuild 1889 BLAKE2B 7ebfb7b19c81909881ba542948da4d92217e9f7f215c5009886dd691f7acb512e8a5c6ea2081f943cd2d03a11c1c5e2397a41e112f70e22f217a157f6b63675e SHA512 98e5eab9a2859038fb07e1d9a26726e7a57b331983943c63f340fc923320f4880c3f87769156f13eabf69475e48bcb9ddd885c86f30d3fa31c2ea51491bb4483
-EBUILD libnma-1.10.6.ebuild 1779 BLAKE2B ff38a80667b7168a906d6d893cd2b352768d9332a7cd29b10836af4fc02446d3a9fcc94ef391b13f462bf95e7c379f83b1254758d9bc495cc3c8b0daa614cdc2 SHA512 a2303f764257b15c9590d12bca99a19428f5e1d4adb318b24f7988792411c3e65c15f9fd0418da0e37ef841e0eb01959acfd35d39077249a99d14d9851a352e5
+EBUILD libnma-1.10.6.ebuild 1776 BLAKE2B 770fd876d3884e6ae7f8862492a48932134e3d498f286e01931939750b8d8abf9becce4d58c2913585ade493fdf56228e44188a0629fdddc769b3ed0b1f464af SHA512 d2fa3ed68d4a4954290543eaa0fffa780e678da99eb59a20c5dd6f1dcc6f171a7b06b6b6c474a1f9dc7c0b13dd366aa7388056e5323e714d2d7a5b6e8146b555
 MISC metadata.xml 470 BLAKE2B 634b69ece62b9f3f8aa9e82b1df56009823dffd8dd45a46b6ac58c3580179c7c6c87965c8da5d653188e81bfbe5c26c956d15181d23f23ec17b468ba3b585cbd SHA512 a15b193fd01eda0a1408af3ad93660ed7cf859e3837e8e83c5c76031cf50aa3634e8a4d2a47f8db8c311cb36b1eb2fb8a89f8c7adfb9fd6d596eb6e9e5e8bea6
diff --git a/net-libs/libnma/libnma-1.10.6.ebuild b/net-libs/libnma/libnma-1.10.6.ebuild
index e5e8df6c93a9..bc4ff3e0c201 100644
--- a/net-libs/libnma/libnma-1.10.6.ebuild
+++ b/net-libs/libnma/libnma-1.10.6.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 # pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
 IUSE="gtk-doc +introspection +pkcs11 vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=gui-libs/gtk-4.0:4
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 655d0688b444..c6053441f092 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -3,6 +3,7 @@ AUX 2.38.3-gcc-13.patch 775 BLAKE2B 53d5c23f612ec6d9cb96f5c6d33e1a029120a2ca82d5
 DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
 DIST webkitgtk-2.38.3.tar.xz 33003928 BLAKE2B ae2ab019a765e91110e12277954bea9ae16fd898f854f58e665d273bcbd9ca43ee3219eea7ba0fb5716b17b8efdfeeb395c5976b38848562be95ea372b9b70bc SHA512 1e5f0d73d6b1d64faf20ab909f1765439fab230dd360dd1906962f03a24725cf9f50a375b1987b615c64fb161ab32d29d6b1d49ea75c7b2b32f495e4ad0f38ce
 DIST webkitgtk-2.38.4.tar.xz 32534100 BLAKE2B 766c9d94a283605076f416fb0777a70f8dfc7ed31c5e46ae03a521b2cfcf91dc0713cfd0e527530c441c8c224e81ef663eccbf6bdb95e9ef4fa7c0aad646cc36 SHA512 1d0418d14d3852172cfa7a4c97964b547d17eba17ff5c94b124e21ae85bcebb1dda67338ceb3ba12531a01f8cfe15c21132fd16747bf17df9e726296723b9d82
+DIST webkitgtk-2.38.5.tar.xz 33011600 BLAKE2B 0dba732c18b7f21602b9f834866d137b6be582adc36f91775e838f99a6ee89216773ab641be62a0fd0834bac8adb45d315a2be9caf19551484a8b95c22797d46 SHA512 9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef
 EBUILD webkit-gtk-2.38.2-r410.ebuild 8020 BLAKE2B d501f292c09fd153433f2615b18ee131d9a908f303ead46ccd23a6bcd12269b6d8d5e7c52bbb44fa8637033b4a0aa46ec2e1cc6458a02d3cefed252f4916a0b1 SHA512 ae2d1981acb5c2b64965cdaa6f25f5633876386163750b4f5f5bbbcb7e10efcaf757227b322c7165b4387f85d3eabd4545e87a784154a062d54c5c3660f24799
 EBUILD webkit-gtk-2.38.2-r500.ebuild 7980 BLAKE2B 898a237303d51a90b6d66b5653f1a511670fa54d541ba9c35aa242032171beedec849b0974a722791b7a83bff8ffb3c8c85acb5ae5ff3bd8a4bfc5ee72078ed9 SHA512 573e4ea279ecd661feb14d277061be9e8dc5a0043219be756214a7200cc7f105fc8c5aaa482ec831d7e43b045372061471a5cc9a1c352f43d376f493bcdde8f7
 EBUILD webkit-gtk-2.38.2.ebuild 7746 BLAKE2B 94ead8f00223620396a055c829142fab906fe3f8c37134672374da48c5767c2a337548c0894df52aec7f264752dd6e95195d4293b073e17b1061ff2a88b7902f SHA512 900752472fa63f9927705e9a8a1ec3a88229ff9560255fae0dd507007e771a9b55020a126e675692e9ee41066141728dd1007dc666905c04fe11111f6397051b
@@ -12,4 +13,7 @@ EBUILD webkit-gtk-2.38.3.ebuild 7790 BLAKE2B b6219de3e314fc3384992a6550b1c59d883
 EBUILD webkit-gtk-2.38.4-r410.ebuild 8068 BLAKE2B 3ade4ee7198042166a27620ec2dda28df9dc7de8772ba83faa40d1888f8547effe66b591213d9e157436c65d2351976c4a3f3008d78fc3dd7f5265c5eea4626a SHA512 535d1349d6a87ee637444e5aa2334ef0394ba05a0301c58dee33027bfaada2ac3e27690fdf5e8f29c40db2cfb6c320202578be4ec1c540196d1b67981d8c8705
 EBUILD webkit-gtk-2.38.4-r500.ebuild 7948 BLAKE2B e7f8f3d52962072870cf18ec2e3d4bc08eb926400077dafc048cd9ac1b51acd23470bb05d5bd38fc3db72a4e424bca1fbb342a665c406934011b07b06a59741d SHA512 a170f03f6ae823878f10ce397b9420182de01cdb0c83e6d5141f723d30ba61d5ac27187b3cab6e73ba836f9f3f86750a09a5062f1ab34d91732ab9aeef33c949
 EBUILD webkit-gtk-2.38.4.ebuild 7794 BLAKE2B d24b0f03e0821777eb2e2f20e15aac81b84f6e9cc548e1e1fcaeb71e2c4d4e6f018d1892ef9c638e8ecf26e50b16252826eb78c4aed0bfe881d63047f74f986c SHA512 d396154d3d1ec44d9b5fbd59a5f6eb4e38d27b16289c68fd9534b89c8ea562852aa1feb38d249d39b5c45c2ccc82f8bb04689c3f403f5b234ec85c1f606f716e
+EBUILD webkit-gtk-2.38.5-r410.ebuild 8068 BLAKE2B 3ade4ee7198042166a27620ec2dda28df9dc7de8772ba83faa40d1888f8547effe66b591213d9e157436c65d2351976c4a3f3008d78fc3dd7f5265c5eea4626a SHA512 535d1349d6a87ee637444e5aa2334ef0394ba05a0301c58dee33027bfaada2ac3e27690fdf5e8f29c40db2cfb6c320202578be4ec1c540196d1b67981d8c8705
+EBUILD webkit-gtk-2.38.5-r500.ebuild 7947 BLAKE2B bebed4f63997221610abefef19bd916af5eee39eefdc0372e0203d3e06eb1aef7cf9ee3a7d09afaea74b2ee2c816ecd684aeac203097307ee37dd42012f1e110 SHA512 c8bdc299a12be9fdee3be82ed0fc2e12a5d3c3a9c462ef250f5c369b4a8b2a69d029df3c365b536b486075d836c288f9687d7b047a12fa5e8d59b938e7c3e09a
+EBUILD webkit-gtk-2.38.5.ebuild 7794 BLAKE2B d24b0f03e0821777eb2e2f20e15aac81b84f6e9cc548e1e1fcaeb71e2c4d4e6f018d1892ef9c638e8ecf26e50b16252826eb78c4aed0bfe881d63047f74f986c SHA512 d396154d3d1ec44d9b5fbd59a5f6eb4e38d27b16289c68fd9534b89c8ea562852aa1feb38d249d39b5c45c2ccc82f8bb04689c3f403f5b234ec85c1f606f716e
 MISC metadata.xml 756 BLAKE2B ac278b1ed9ad7d7dcce220e686ef4c67c79f7d4c25e43e0fedaad14925eb03c74140e49a4e86d2146d6d467f14a737fb2ff1e90b506ab4d43b79d3462d58cb24 SHA512 584ce6c8dc66e3e3b3677dbffe8b2a58bb81146f3dc8eaf830597781f03580e0b94620322834b6e558ac9fcb06b3eda02645803f63d78e88104ecc0950c6f369
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
new file mode 100644
index 000000000000..4439d16a0952
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
new file mode 100644
index 000000000000..82a618336e36
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="5/0" # soname version of libwebkit2gtk-5.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=ON # wbkit2gtk-5.0
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
new file mode 100644
index 000000000000..34ce19042566
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b0ed2734d48a..27d4c383b0b2 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index dcd028856f49..e25b214eedd4 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -8,7 +8,7 @@ DIST NetworkManager-1.40.6.tar.xz 6596776 BLAKE2B 32e2a496d68d183a44a15f9ecfef18
 DIST NetworkManager-1.40.8.tar.xz 6518080 BLAKE2B 90a65dde96b3127a5438aa4add47e66887c940a86598109bde74f9bc56d317c41f835858a0b2ea89dca228f7fcc43e811b20e0d4528018ebe95947114f405cb4 SHA512 1c3f986c0f37160fced3cc790f6e569ae2185aec2bb2b5ef9635848ba493d4e920cc7ea83cd34a8df7bc12902d071238f9ae6aeb7721658ac54ba862f7c822ef
 DIST NetworkManager-1.42.0.tar.xz 6720056 BLAKE2B 1bd59c2b7e004437ce47a69d187ed79e426e4e1f16b6e8106bef9afcad0cfd86ebfb9b3189533028f343dd757e6b6c3ca6031751b0c20fb2844d2b5be11079b1 SHA512 d6c57f79e1de669537501855545d0861044f07780fde61cbb643a955e84a3ca4e417cfb1978c277a1bca9002778dafda5387c28da1b4a58f9f320adaa553210c
 EBUILD networkmanager-1.40.10.ebuild 12535 BLAKE2B 0bcde7eda6079bb22c067f245f50b7bc8e9c22f63bb4a288b7d46464cd9de46a057595e5ea74e5cf090ce2bb6b70ea66ac92a73b0fa60c148f0926212a0b90ae SHA512 b30abc99629f71045e6459cf3bb8f2b4bceee7cdb90b61f59e0cc158a8d06bf51a20b84b12460e6e06ed018c27893deca15508671a3055dcb858e983d527825a
-EBUILD networkmanager-1.40.12.ebuild 12535 BLAKE2B 0bcde7eda6079bb22c067f245f50b7bc8e9c22f63bb4a288b7d46464cd9de46a057595e5ea74e5cf090ce2bb6b70ea66ac92a73b0fa60c148f0926212a0b90ae SHA512 b30abc99629f71045e6459cf3bb8f2b4bceee7cdb90b61f59e0cc158a8d06bf51a20b84b12460e6e06ed018c27893deca15508671a3055dcb858e983d527825a
+EBUILD networkmanager-1.40.12.ebuild 12532 BLAKE2B 35594d7803fa5df6a978504f7f744450e205556bafc7f8f6afb344b988f25f58343f5a3a3da37c2749434cdcc919429442ae9b814685a16bca2619f0f0ee0b54 SHA512 2ffe892a5b67667fe3e13a9010d5c3b297e532b80968bc9feba76cf4981cd165f7b28d82b4dd9d68f71ad085bdeb07248b4a3369c765e44b641dcf52ea3f5d7a
 EBUILD networkmanager-1.40.6.ebuild 12529 BLAKE2B 2da7c08c4c1b8096c5fcdf2fb1b64057486bc89606a724fea04b04397860cbbdd88872425c216c92a2aa3f6b08a58f926e05e5d134c4fb52dda0437c533d2ed7 SHA512 f5ec872aa13144a50db211cae322ec3edef98a7fe11cd7099a90002a831b103334543d63df4499f80e2ebdd8814cef983d37f14754bbbbcb6da60886a1f7235f
 EBUILD networkmanager-1.40.8.ebuild 12535 BLAKE2B 0bcde7eda6079bb22c067f245f50b7bc8e9c22f63bb4a288b7d46464cd9de46a057595e5ea74e5cf090ce2bb6b70ea66ac92a73b0fa60c148f0926212a0b90ae SHA512 b30abc99629f71045e6459cf3bb8f2b4bceee7cdb90b61f59e0cc158a8d06bf51a20b84b12460e6e06ed018c27893deca15508671a3055dcb858e983d527825a
 EBUILD networkmanager-1.42.0.ebuild 12535 BLAKE2B 0bcde7eda6079bb22c067f245f50b7bc8e9c22f63bb4a288b7d46464cd9de46a057595e5ea74e5cf090ce2bb6b70ea66ac92a73b0fa60c148f0926212a0b90ae SHA512 b30abc99629f71045e6459cf3bb8f2b4bceee7cdb90b61f59e0cc158a8d06bf51a20b84b12460e6e06ed018c27893deca15508671a3055dcb858e983d527825a
diff --git a/net-misc/networkmanager/networkmanager-1.40.12.ebuild b/net-misc/networkmanager/networkmanager-1.40.12.ebuild
index 3c379b76059d..eb0a82d5b311 100644
--- a/net-misc/networkmanager/networkmanager-1.40.12.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.40.12.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 043d728352fa..e8dd951267d6 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,9 +1,5 @@
 AUX nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch 1640 BLAKE2B de9db48474db68effda44643d102f68435eb907a450a1b674db8059f84c40bb47fd428fc08979ccddec3610a46d907d232da5bd3ad035c2628df6ef8ad9fc46b SHA512 40e40b93b71d9236b325527a63c96a52cc05b10032911faacc3e2c33bd9d990b911a4c783b99b7ba91d95ee54a6945132dd1b93ea7a5d4f041783eecd6accd89
 AUX nextcloud-client-3.6.6-no-redefine-fortify-source.patch 1447 BLAKE2B 14a3a1a1206a0a0027aa9c59e07b6d81174428aaaf90fba5706e9c7a2f076753a4b2f364ffa0f22dabf785d58832dde1aeba61e3cb3cc92feffa8b4b614c5d65 SHA512 808c10f8ea1905d54f62f895b2089c2acb602e838143f6a4268a5ab1e966ffe6ff01f132b8b65e0eebde21435a859cc7fb4f868a2ca81da4dcaa02292a337ed7
-DIST nextcloud-client-3.6.1.tar.gz 15346135 BLAKE2B 116a2632ad1c653bb1dbf184c6156ebc469ed8c0bfe209282e8239d4113c46b761f4049daa6833d23d5179c0b2a3f9dd94f506e63c401775da419c92104a069f SHA512 444062440570efd82b8cd9acf85dcc5826552c86c31edc19ae2f87d9fdf23afa501aac03e4b8135bb037feb523fdcbc230339387acbf56c0ca6e5df3e7bae583
-DIST nextcloud-client-3.6.4.tar.gz 15451930 BLAKE2B 47b379513927d0f7fa20d41be67f75196ffbae6318d947d759f69d9561e27641d71e9a0accd197673f995d4aab90fa30dd1f1faa4dee446545f586ca28599cff SHA512 7a9378e78e1e678e72898d1cca2188ba9f5488f565c72db49d70e9d3d6d8124c8fae7856226fb3b47edcb37cacaadc8f0fbc5ff3b6914e4ebb777a4ebd633513
 DIST nextcloud-client-3.6.6.tar.gz 15497450 BLAKE2B 904f6f2a71a8c556fb4b9cb3710d09fff9888a7ea7c923d6dd7b42bd69bb2900a63525e5331bba893cb92663be7bdeaa228047a7af28bb3cdde7edb64f342c6c SHA512 b9fe96f9f8ac70c4c586b58f1b460e293d73e979d6b849d232112c7601463fd48608e8a093f3a8b0c2dc5a417e20e8aff3c2c3582eb7bce0fcb9f15e3d909327
-EBUILD nextcloud-client-3.6.1-r1.ebuild 2459 BLAKE2B 21080df548cb532e266696205edf08892909d66b4d5c2998f97455d1220189b542260e90598ae890a51db40ea744e1f815d34ac0f854f03cf9ed134c6b43bcc3 SHA512 c613b5733b2d21e9916cb69c76915ed5c29bb65128bf2a010b06227e57d19ea88e3dcaf29a34ecf8f82b3365c060e207f73a23b3a9351883385463e05633cc91
-EBUILD nextcloud-client-3.6.4-r3.ebuild 2511 BLAKE2B a54abc08d7664c5bbdd35de19bc11a5a3207296163c7ac1cfbdbe2bcc807e567878c019503f6c7613cc874b0157c14e95930c5445106ddeb6d7e7d0cbf446e88 SHA512 90800d9c2dc4166a40429506c726fd49dda2130667ce9a4b3ba20b96fefbcae0c5af03238f13b5152e546fa4ec46566229eb2d7be3f43410b06625d3a66abb91
-EBUILD nextcloud-client-3.6.6.ebuild 2449 BLAKE2B 3903c3b5c3347748cdb3c150a7555a00fe243ca1ac1eea9f54bd4db1029a25b2c901298f237cc1bb2538ad98e9d5c5478516bb6cf00cec2af2bfb38800d103be SHA512 45fde1f02621f56962c86346a383d1c41d52cb91cca52b91efe287d3c5b58f9a33c18a41584468e7b66f3d6f884c0c600a0b50ce1af61b46cbd01ff7cd836cea
+EBUILD nextcloud-client-3.6.6.ebuild 2448 BLAKE2B b7a6e52133b641e27967783f2ff9c0904c55e0eb351fd6d623d8b51307c88a0f2539b13293d721f6336ee8b3b1a4902470e7a6253264ec94e36874266532524d SHA512 b62f894bf1a7146cc668978cff338dcbe279336c3b59a2160b2e16216d36fbe8abb33b51fcf202ab6b2623e24f04990c9c3d7af7f9e65f298b8006060b4a8d41
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.6.1-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.6.1-r1.ebuild
deleted file mode 100644
index d16a7bd91993..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-# slot op for qtqui as this package uses private API parts of qtqui
-# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h>
-RDEPEND="
-	>=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	|| ( gnome-base/librsvg media-gfx/inkscape )
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	test? (
-		dev-qt/qttest:5
-		dev-util/cmocka
-	)
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-"
-
-src_prepare() {
-	# We do not package libcloudproviders
-	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
-
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_compile() {
-	local compile_targets=(all)
-	if use doc; then
-		compile_targets+=(doc doc-man)
-	fi
-	cmake_src_compile ${compile_targets[@]}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.6.4-r3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.6.4-r3.ebuild
deleted file mode 100644
index ff3700521620..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.6.4-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-# slot op for qtqui as this package uses private API parts of qtqui
-# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h>
-RDEPEND="
-	>=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	net-libs/libcloudproviders
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="
-	${R_DEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	|| ( gnome-base/librsvg media-gfx/inkscape )
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	test? (
-		dev-qt/qttest:5
-		dev-util/cmocka
-	)
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-"
-
-PATCHES=(
-	# https://github.com/nextcloud/desktop/pull/5309
-	"${FILESDIR}"/${PN}-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch
-)
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_compile() {
-	local compile_targets=(all)
-	if use doc; then
-		compile_targets+=(doc doc-man)
-	fi
-	cmake_src_compile ${compile_targets[@]}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
index 943bb9b77797..557e004fd018 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.6.6.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/desktop-${PV/_/-}"
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 41822e113b01..c453eedecde4 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index fb340b739b03..f43c206429fa 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -9,7 +9,7 @@ AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3a
 AUX transmission-daemon.tmpfiles 55 BLAKE2B 0f7200295e1faa22bc598e080d4c1583c5cca2e71158b94fddc448d9afa9cee2c4781aaf8da7571d30140a4ead25973c6096a46c3c91b9713a0dcde541092cd2 SHA512 e162805c816042145f32c4ef4e9f78354ca610e1680060addf63e52d8b0287427ebdb9568946b45c0b6bce0267cff6877519a1de3a66dee5a44fa859f2a7e417
 DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156edb16f9410b83058c53548f466fb9502c23157756a29e921e4468db1ebac7832b755cfcf98451c663c64401559f5498 SHA512 c8fb96086ba4b18f04d6181a29f6e2af85864840c533f3470a202dfa686e9431caeccd25f12c975a9a8f9b7802ca0bd73c4edc1ca06bdbada682326cad188a76
 DIST transmission-4.0.0.tar.xz 10351556 BLAKE2B d0bb13437da6e6b6a9001eed7e59ce3f7b58151787e9c1057b0c6bf65dfdeaf89c3aedee563f641f6d2d2bd3a84dafa3f68b557b190bd323928578e811fb0183 SHA512 79945af73fe7226dddadba7cc039516f2f878e05a9cf6c6d799b636b8298e2b2fa25c4426789bd41ef4d2b00d75a3c1c115c1676b4d2a9f09a1526456dceb3f8
-EBUILD transmission-3.00-r5.ebuild 3199 BLAKE2B 82eb8401c1c197d5ca96bcf2105a12bd9d5e91e29d030a3b887028dc75cbe7a622d25120477d2424f418664448e49f66782552b373bf433e34f93116600c28a0 SHA512 5dbb34656a2f04d95179bf6702aa09ed34262864172570fa9ccf969d689c5e8b4d0d98d12ad590e8c26849342da99782527e33a2ebb22686a18c875f1ab2fcc7
-EBUILD transmission-4.0.0-r3.ebuild 3398 BLAKE2B 167fe77d006ca818dfe25ffe364ad221116de2d24040be881ee04f9bdb02acf09f439c2c10d4e71ad7ca83784208d0e683296ca8900bd7ad577eb3bf7098aeea SHA512 d3bdf2167ffe63bca63cc015452a1b306f5d422a30ae53eb70d3cff9303cf51485eb2c1f481369795000ecde50f8f0eb3c8d0f3245388eb3fc2d4980aed1d63a
-EBUILD transmission-9999.ebuild 3286 BLAKE2B 18d286e08c72d8824dc85145e8756aaf8a7d09946284ccefc3acb48004d67e6b6b24554dc439fb661654d2d048a33cd9962b217ecbae1a94e150a4612904026e SHA512 3561b44814c1080e9d357e5964857985d46862b159b289edb0fab28a47ae71185961389389b994b9e83170202b5508c81d74d180342bfaa5903aa6cde13313e7
-MISC metadata.xml 611 BLAKE2B 8e223bca4c6b84813f528c477644531eec6d67b432b941b9ceb271e44c06656b290dfce9bb7198861ee8b7948bc374b02d77cf38c07ae60f6d3685bfae1e2396 SHA512 5f2dc464ee0347d3eca3894583ce937066abf3a7098144f45bd5c4dbad5ff8355e1be508c5866a935bf5b2a945eaf93996c623b6ae400971cd6b3e515f0d1a34
+EBUILD transmission-3.00-r6.ebuild 3304 BLAKE2B c28525ca9dcb080356278a957f774042eb2697166aed7a042a1a68d2f103666172a2be54f1f707ea7bf7a777e058ddcda70bd43e9c64662e7204a01d4bb3a715 SHA512 0fc2b5e44abb35d85d5ea1f6d7f36545a6ee1e552449a5d646b340ca16e7e41acb9348fb9df18c1b62451fdf920633cc0ad908aa24a65054c0adec5f85a110e5
+EBUILD transmission-4.0.0-r4.ebuild 3503 BLAKE2B 721e6906ee5a9031dbd2955bb89de7f35fd36454407a477bd5c0e674d82022b6283e736040ee7a8c4d9765d05a6bff1becde71d1d06f594d3779d64b11281693 SHA512 d8aa7a7a5ec114e49a2a51494fc9de30dd93e1ab7ef7d1e97a89e939e292deb6100fdaf383e8b07bfc10d9514294441a478fb4da62b59cac85e7e6f828dd852c
+EBUILD transmission-9999.ebuild 3391 BLAKE2B 0744a7171c81650dc4496bdc4fdd1c78e7e4b18a8af5b3581ee30057217aba2d9c490f3015a9aa32846df44943df763f69313a9de63a6c57a7e8ff9cddc916b4 SHA512 b0cf2054f64bb754303452081b221d99d8b88fe8ac9a3a9f725edb4eac7e457d6c88451b7c59c2d9a428101a9d30af4b43317fa793235d4f5edd9d89582be0d1
+MISC metadata.xml 657 BLAKE2B f2ab9b8d747d0a6d7b6fac8d365179e381d6d6d0b4e4a55e34c29a621b05c97e772cd2b58ea4d53ecdf1c33d4e497f3d121f0e00e51d6ad4babbe1b54e41b4c2 SHA512 2616c47a1721af7ecec252fbb5780be6c6875345be09d86b810ca347f36b3c886b53ef04febfeb9adaaa6e77f4b8d1201814af1b3a3168c8a2689c28fc2e079c
diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index cd3c06fe292c..b53bce5e75af 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -10,6 +10,7 @@
 	</upstream>
 	<use>
 		<flag name="cli">Build command-line client</flag>
+		<flag name="debug">Enable assertions</flag>
 		<flag name="lightweight">Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
 		<flag name="mbedtls">Use mbed TLS instead of OpenSSL</flag>
 	</use>
diff --git a/net-p2p/transmission/transmission-3.00-r5.ebuild b/net-p2p/transmission/transmission-3.00-r6.ebuild
index bcda90af6099..820cbc376d71 100644
--- a/net-p2p/transmission/transmission-3.00-r5.ebuild
+++ b/net-p2p/transmission/transmission-3.00-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2006-2022 Gentoo Authors
+# Copyright 2006-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake systemd xdg-utils
+inherit cmake flag-o-matic systemd xdg-utils
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -21,7 +21,7 @@ HOMEPAGE="https://transmissionbt.com/"
 # MIT is in several libtransmission/ headers
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT="0"
-IUSE="appindicator cli gtk lightweight nls mbedtls qt5 systemd test"
+IUSE="appindicator cli debug gtk lightweight nls mbedtls qt5 systemd test"
 RESTRICT="!test? ( test )"
 
 ACCT_DEPEND="
@@ -95,6 +95,9 @@ src_configure() {
 		-DWITH_SYSTEMD=$(usex systemd ON OFF)
 	)
 
+	# Disable assertions by default, bug 893870.
+	use debug || append-cppflags -DNDEBUG
+
 	cmake_src_configure
 }
 
diff --git a/net-p2p/transmission/transmission-4.0.0-r3.ebuild b/net-p2p/transmission/transmission-4.0.0-r4.ebuild
index 0187206cccdf..98ed72317d7d 100644
--- a/net-p2p/transmission/transmission-4.0.0-r3.ebuild
+++ b/net-p2p/transmission/transmission-4.0.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake tmpfiles systemd xdg-utils
+inherit cmake flag-o-matic tmpfiles systemd xdg-utils
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -24,7 +24,7 @@ HOMEPAGE="https://transmissionbt.com/"
 # MIT is in several libtransmission/ headers
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT="0"
-IUSE="appindicator cli gtk nls mbedtls qt5 systemd test"
+IUSE="appindicator cli debug gtk nls mbedtls qt5 systemd test"
 RESTRICT="!test? ( test )"
 
 ACCT_DEPEND="
@@ -107,6 +107,9 @@ src_configure() {
 		-DWITH_SYSTEMD=$(usex systemd ON OFF)
 	)
 
+	# Disable assertions by default, bug 893870.
+	use debug || append-cppflags -DNDEBUG
+
 	cmake_src_configure
 }
 
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index a4bc807ed3ac..359413eb1aa0 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake tmpfiles systemd xdg-utils
+inherit cmake flag-o-matic tmpfiles systemd xdg-utils
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -24,7 +24,7 @@ HOMEPAGE="https://transmissionbt.com/"
 # MIT is in several libtransmission/ headers
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT="0"
-IUSE="appindicator cli gtk nls mbedtls qt5 systemd test"
+IUSE="appindicator cli debug gtk nls mbedtls qt5 systemd test"
 RESTRICT="!test? ( test )"
 
 ACCT_DEPEND="
@@ -100,6 +100,9 @@ src_configure() {
 		-DWITH_SYSTEMD=$(usex systemd ON OFF)
 	)
 
+	# Disable assertions by default, bug 893870.
+	use debug || append-cppflags -DNDEBUG
+
 	cmake_src_configure
 }
 
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 2696ac602f01..b969d3a3f357 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/rtl_433/Manifest b/net-wireless/rtl_433/Manifest
index d39d4b2c68f2..2f892aac0768 100644
--- a/net-wireless/rtl_433/Manifest
+++ b/net-wireless/rtl_433/Manifest
@@ -1,6 +1,8 @@
 AUX rtl_433-21.12-CVE.patch 2373 BLAKE2B 3856b4ca58eadf32cfc023e7544ad98133a49f358474a60d5e44d9551d0ae3ddc8d5acbba53a350d4bd06719f495fcd3e2e8e35223330ad60f4a4bbc6c6126fd SHA512 26e1fff504c3fa52dc13ccaeb9d5865829fb462363b4a042f6245fdce843aa0f8517463fd05b305a550e298859d56e3a8045937b5de3719d543260f2ea0a8c48
 AUX rtl_433-21.12-test-visibility.patch 6747 BLAKE2B 4f03eb9df44e6a789437190c8c09d63c0f51a5345efea14765314af68c704908d30764d26c0f43b1bfc4145b1f224b6ac5b1476d04c85b217c502e0714b7f0bb SHA512 ba7a3f2d8b4fd057c595ca62c01be53bed37f6c408314f06e02d634ef1e6f465920127622f8ae3c94cbefbc677c25ba69873b0f12229ae48ec7caf37933b166a
 DIST rtl_433-21.12.tar.gz 954628 BLAKE2B 7622cba1ff8d9ed46bcd9d7298b2278437aba3dca65985f27d44d20d3b79082cff04172d4593af07379928d42d5e422ff2857ada427156b16f1ba24a7bca57ed SHA512 8183887c1e09e94bee10b70190555d7fa0fa6675bba6130f78ab111b77428fef90696bc15a8e5abb07ae5ae3e492641a40acd6087d5bc413db5f2944878f03a3
+DIST rtl_433-22.11.tar.gz 841774 BLAKE2B 4a3c060c85233a85e951eff5fb210cc4ec5529a6cc868782fdbf7b3dad7372dcd7d428776c539d25105b9cfdf5f260bc031bbd5435eb2658e73b8b275f2040ee SHA512 fe0a26b14df97c679968536b5b3dfe41e5f8c6e0af00265461b4e1bf6312dd71cc1b1ccf2f5f78bc4d67b5f2effb17a88b743dc38db4a0a73f9f5b756868dba4
 EBUILD rtl_433-21.12.ebuild 991 BLAKE2B 4cf297606caeab8087d247bca4788737992a3e5b60630b98c2341cc1c2bbcbdfa62cbf0c948a860f0a9ae7eec35c7927bf08643e85769fe14662efa0c8777155 SHA512 caf50368acfbc92c1fb13c1711ae2bcc18b937f4d3d51e0f420b2920694f06344654947bdfef9834ed2f12227b313e4be51d184d509daaad7cb7cfb6b3680879
-EBUILD rtl_433-9999.ebuild 1077 BLAKE2B 7afda00ba6855eac323bb9166e601ed07777a6d681eda0bdf8dc96b6198984c723af4728be67a85dc7caee39c33640eeb4708e763e09afbb7698e8ac0b141d72 SHA512 900591a669ca2a892a2981a0f2857cd2fd267805058a651d533589f1b294e19ffb302405cc0d9603ccc4090f3273278ebf0ec6a3e28a980fba8187574efe15af
+EBUILD rtl_433-22.11.ebuild 1165 BLAKE2B 85dd4dac9bd2134eb4ccb04b3d33eb068ce00e958395289c4c35669109759bfaaeedb8f03342433cf40a84ea4fed5bcc9d42fd18145250fdc0e9bf5c95029d0d SHA512 23a761e4dc62616fed87b7494bfa6089f3b354b965fc3650b7d0ed02f4fc3ed65c5cfbb8365a52e7e5d58c31c3ea4a3ca40e7d2c547a25c99e36f3706f8c218d
+EBUILD rtl_433-9999.ebuild 1185 BLAKE2B 8895da7293723584306e4a71e15db3fba4bd24535dc3a83d5aaf645d450b3945b3555058f232443cbfe01213e5a0101f3005774cd68e61407291a5380b4c6afc SHA512 af7b690383db76c2c261adf821b0d67c6d6357b0a88ff0a394de40eb858f9d0cc214fb9958c262fa436dd4b0b50f6c51570dce2b26cb9c43777424c44a8382df
 MISC metadata.xml 484 BLAKE2B 2cdc645038b7fbc5b1af469b4c2d36e9e36b4cb463f17cdb7d6df6cba5ae4f6672396c6fce29e4ba71529a5ffc72c781f1873a7898e81eae466c075010545c8a SHA512 2258949f4ace0afb3a3b4e44222e02919d7bcb5dc376bc4052b834fbe09dc9f6319479e61c80db66c7465de9c32a635de3d68edb19b9f7cedababf00950be76b
diff --git a/net-wireless/rtl_433/rtl_433-22.11.ebuild b/net-wireless/rtl_433/rtl_433-22.11.ebuild
new file mode 100644
index 000000000000..7c0afbe1dac1
--- /dev/null
+++ b/net-wireless/rtl_433/rtl_433-22.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Decode OOK modulated signals"
+HOMEPAGE="https://github.com/merbanan/rtl_433"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/merbanan/rtl_433"
+else
+	COMMIT="105342a33271bac6837d06aa86c23eec9e9ecb6a"
+	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	#SRC_URI="https://github.com/merbanan/rtl_433/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+rtlsdr soapysdr test"
+
+DEPEND="rtlsdr? ( net-wireless/rtl-sdr:=
+			virtual/libusb:1 )
+	soapysdr? ( net-wireless/soapysdr:= )"
+RDEPEND="${DEPEND}"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	sed -i 's#data data.c#data STATIC data.c#' src/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_RTLSDR="$(usex rtlsdr)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	mv "${ED}/usr/etc" "${ED}/" || die
+}
diff --git a/net-wireless/rtl_433/rtl_433-9999.ebuild b/net-wireless/rtl_433/rtl_433-9999.ebuild
index 6ccdde0e72e7..db11fc2febca 100644
--- a/net-wireless/rtl_433/rtl_433-9999.ebuild
+++ b/net-wireless/rtl_433/rtl_433-9999.ebuild
@@ -22,13 +22,18 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="+rtlsdr soapysdr test"
 
-DEPEND="rtlsdr? ( net-wireless/rtl-sdr:=
+DEPEND="dev-libs/openssl:=
+	rtlsdr? ( net-wireless/rtl-sdr:=
 			virtual/libusb:1 )
-	soapysdr? ( net-wireless/soapysdr:= )
-	dev-libs/openssl:="
+	soapysdr? ( net-wireless/soapysdr:= )"
 RDEPEND="${DEPEND}"
 RESTRICT="!test? ( test )"
 
+src_prepare() {
+	sed -i 's#data data.c#data STATIC data.c#' src/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_RTLSDR="$(usex rtlsdr)"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 10345af2c66e..7aaa42b1558c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2821813d8a4a..77660f5ea53c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6717,6 +6717,7 @@ net-p2p/retroshare:webui - Enables Web interface and API support
 net-p2p/retroshare:xapian - Enables GXS content indexing and search via dev-libs/xapian
 net-p2p/syncthing:tools - Install stdiscosrv, strelaysrv and other tools to /usr/libexec/syncthing/.
 net-p2p/transmission:cli - Build command-line client
+net-p2p/transmission:debug - Enable assertions
 net-p2p/transmission:lightweight - Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)
 net-p2p/transmission:mbedtls - Use mbed TLS instead of OpenSSL
 net-p2p/transmission-remote-gtk:libproxy - Use net-libs/libproxy for getting the HTTP/HTTPS/SOCKS proxy configuration.
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 510b62b9dbc7..3845ae5ba931 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 09dd4adf0adb..dc85aae2b8a4 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -4,9 +4,11 @@ AUX os-prober-1.79-fix-busy-umount-message.patch 435 BLAKE2B 547286075651f19518a
 AUX os-prober-1.79-mdraid-detection.patch 848 BLAKE2B 11ec43662f174d7f12f09b9b46f57ea7519d45aa1560ef31fc9c75b2684d1f549b3a679aa3f6dff855fc79c72757f0814ea147e75536f6503fc76f3426f8c648 SHA512 a4d68ea8cb6dcc2fc452a15ed983cb911e6a6097ec48515511b94c7f0096c6f611ffb4bf8af3c373cc5774f94e398ef74e1e2a8fe68669ace31bed134e839697
 AUX os-prober-1.79-mounted-boot-partition-fix.patch 555 BLAKE2B 9b98506f986ceb509271a8a1ce0cc357fb25402ec1059d16411c79e96c727ef40182b5d9f362f16ae4ddab95a45155380cc5742ad1f15ac2cd39fdf273fc9a90 SHA512 fa66356859001d15823c3dbe8143e905e25ee937c236c787965b2a9a50493b55006e0fc9190b076fe106f942ea6074ef7556a443a237d0108b6b936106186061
 AUX os-prober-1.79-use-fstab-name.patch 1101 BLAKE2B 37353efa899fd72e68d297325218be5a81abc2eee50bda5607e87c0eb799924fff0f510b4f13c681213e5e4be864a62fec9d5c98e539a61e9cd4036315eeabc5 SHA512 25236c935559398a4c37cdec04c358787f6178a016a6d0d4780c7dcd9eb7e18f308f4a89a1ddbb37d6c7dd17d334d879961029afb4463cef5e9029eab58fdc5c
+AUX os-prober-1.81-boot-detected-twice.patch 1616 BLAKE2B 9c5b30195733468e4160783cd2d11b61f5c75e07efe10113d71ca4c714a5ba6573de271b5ec34e080b4ca82b09eef60f42352c47dbc5f553419cf80687ed6c96 SHA512 0e7a403d6d2d820fb9567ec54f965b036657b6f96916417955098a5fa8ac5893372896ffd868967fb7cb0df6708fc4987fbcc0e307579598f3f6980c9ddd4e49
 DIST os-prober_1.80.tar.xz 27400 BLAKE2B 56883c7d3f4c5dde2904cffc77fdf6a2c1caf230f9e84197e8d976e446815838448bb42afd18d4c9526efac9907db3d2e77c6f54889011d2d03d284a44ff4cbd SHA512 51b4fefb784d5ecf34f5148157ef233e2979c4a679a54600144be473bb6ccaf263c9121701a1ecc7523c7e3bfc439a4e3a92a5eb92431ead99cbe666b0f0e6f5
 DIST os-prober_1.81.tar.xz 27448 BLAKE2B 0159870612d265c5e610e093a8839129aa9dc111a6f3abee65a6044b4c997ba65a69f70deca246bde53c1cf5314812312178e82c0893093d9f23ced3b0176f9d SHA512 ffb0e618f9e58a7a8e4a265d253bad4e168c220697216684acb38dbfa20680e552eb7c5f3d2186cd750c61a8929bf152527aa85c39318ed8b025a4ffffadde50
 EBUILD os-prober-1.80.ebuild 2458 BLAKE2B 813912653a741bf02a87c1922f01a294c93928b413f1d9e9d669e8e2996d7de606734a40e36a1b322c92e72ef1bfaacb68ceb20b75beed0bd41bc80b3856e60b SHA512 cb98b863f1098efcbe9dfd69d3facd732367e5571cbeb4eeb58e453e3e5086ff1d4534e94668535f80673c22ceef7351c065c3477206facd2df929eb1296b9b4
+EBUILD os-prober-1.81-r1.ebuild 2512 BLAKE2B b9bbb96326a6554602ae82d2d75aef68d5163b737259de1acdc998c4db4f48b1aa774b8390428b70f8f0882303520ba698a0ddec7bb8ef45157384b06be441c4 SHA512 71ead3ed65967614fbcd44716a9c8d29b4c8514e8e9a6cc9cdc43ef8d82288eb88af57d35487eaa88a62775a91a384f4b0b86223ea4a744ba837ae821c712ed4
 EBUILD os-prober-1.81.ebuild 2458 BLAKE2B 813912653a741bf02a87c1922f01a294c93928b413f1d9e9d669e8e2996d7de606734a40e36a1b322c92e72ef1bfaacb68ceb20b75beed0bd41bc80b3856e60b SHA512 cb98b863f1098efcbe9dfd69d3facd732367e5571cbeb4eeb58e453e3e5086ff1d4534e94668535f80673c22ceef7351c065c3477206facd2df929eb1296b9b4
 EBUILD os-prober-9999.ebuild 2460 BLAKE2B cc570bf47b84f1fa39d4873d5ef9fc5bc391eef35e588a695b23f96767e19efc174e835d21a7df4a9459cfcd19e6492b6ffe0962dc4465e37e418319d3622167 SHA512 518a0cb0f0fa09e4966b23969b9d6eeb2a404e913c3fb449dd6ceb62dc2afb4d61f5d1e55f4be81d11c3fc0dcb7a10eea0f5ccca05a2b39ca77c1d08eccb2e58
 MISC metadata.xml 384 BLAKE2B 98bf64680e61d1c0f0c9cbd73ce11be5a98fc7014517d263be8808064b1ab5b7ef200c243c472c3dedfad24176851007d9f4b03399e0970fd351f086b13d355c SHA512 dd391671666f17ce8e45093ff42c898c4bb0c685df9bb631c56089379d0825a15364656dedf4eec13c7652cfdbeb9c4f40f7bae0a8360cadd9b2cff136189bc3
diff --git a/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice.patch b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice.patch
new file mode 100644
index 000000000000..b06b31d0077e
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice.patch
@@ -0,0 +1,46 @@
+diff -urN o/common.sh os-prober-1.81/common.sh
+--- o/common.sh	2023-01-22 13:43:23.333123217 -0800
++++ os-prober-1.81/common.sh	2023-01-22 13:44:49.408153101 -0800
+@@ -326,3 +326,18 @@
+ 	fi
+ }
+ 
++list_mounts() {
++	if [ -f /proc/self/mountinfo ]; then
++		local x dev mount devs found
++		found=:
++		while read -r x x dev x mount x x fs x; do
++			if [ -L "/sys/dev/block/$dev" ]; then
++				devs="/dev/`readlink \"/sys/dev/block/$dev\" | rev | cut -d/ -f1 | rev`"
++				printf '%s %s %s\n' "$(mapdevfs "$devs")" "$mount" "$fs"
++				found="return 0"
++			fi
++		done < /proc/self/mountinfo
++		$found
++	fi
++	grep "^/dev/" /proc/mounts | parse_proc_mounts
++}
+diff -urN o/linux-boot-prober os-prober-1.81/linux-boot-prober
+--- o/linux-boot-prober	2023-01-22 13:43:23.334123229 -0800
++++ os-prober-1.81/linux-boot-prober	2023-01-22 13:43:34.897260733 -0800
+@@ -17,7 +17,7 @@
+ bootsv=
+ bootuuid=
+ 
+-grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map" || true
++list_mounts >"$OS_PROBER_TMP/mounted-map" || true
+ 
+ if [ -z "$1" ]; then
+ 	ERR=y
+diff -urN o/os-prober os-prober-1.81/os-prober
+--- o/os-prober	2023-01-22 13:43:23.334123229 -0800
++++ os-prober-1.81/os-prober	2023-01-22 13:43:34.897260733 -0800
+@@ -128,7 +128,7 @@
+ 
+ # We need to properly canonicalize partitions with mount points and partitions
+ # used in RAID
+-grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map" || true
++list_mounts >"$OS_PROBER_TMP/mounted-map" || true
+ : >"$OS_PROBER_TMP/swaps-map"
+ if [ -f /proc/swaps ]; then
+ 	grep "^/dev/" /proc/swaps | parse_proc_swaps >"$OS_PROBER_TMP/swaps-map" || true
diff --git a/sys-boot/os-prober/os-prober-1.81-r1.ebuild b/sys-boot/os-prober/os-prober-1.81-r1.ebuild
new file mode 100644
index 000000000000..924b7251237a
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.81-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git"
+else
+	SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+	"${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+	"${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+	"${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+	"${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+	"${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+	"${FILESDIR}"/${PN}-1.81-boot-detected-twice.patch
+)
+
+DOC_CONTENTS="
+	If you intend for os-prober to detect versions of Windows installed on
+	NTFS-formatted partitions, your system must be capable of reading the
+	NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+
+	NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by default.
+	To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
+"
+
+src_prepare() {
+	default
+	# use default GNU rules
+	rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+	tc-export CC
+	emake newns
+}
+
+src_install() {
+	dobin os-prober linux-boot-prober
+
+	# Note: as no shared libraries are installed, /usr/lib is correct
+	exeinto /usr/lib/os-prober
+	doexe newns
+
+	insinto /usr/share/os-prober
+	doins common.sh
+
+	keepdir /var/lib/os-prober
+
+	local debarch=${ARCH%-*} dir
+
+	case ${debarch} in
+		amd64)		debarch=x86 ;;
+		ppc|ppc64)	debarch=powerpc ;;
+	esac
+
+	for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+		exeinto /usr/lib/${dir}
+		doexe ${dir}/common/*
+		if [[ -d ${dir}/${debarch} ]]; then
+			for exe in ${dir}/${debarch}/*; do
+				[[ ! -d "${exe}" ]] && doexe "${exe}"
+			done
+		fi
+		if [[ -d ${dir}/${debarch}/efi ]]; then
+			exeinto /usr/lib/${dir}/efi
+			doexe ${dir}/${debarch}/efi/*
+		fi
+	done
+
+	if use amd64 || use x86; then
+		exeinto /usr/lib/os-probes/mounted
+		doexe os-probes/mounted/powerpc/20macosx
+	fi
+
+	einstalldocs
+	dodoc debian/changelog
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 218a763d6699..19ba2fec3c86 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index d25deb55a4b3..49c25815a68d 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -103,16 +103,16 @@ DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b
 EBUILD gentoo-sources-4.14.302.ebuild 734 BLAKE2B 93e44a9d0c97b4b05b310319ffc6df9c3c80c17770075956d1c639a6cea0da9d2a0e594000adf1a31478ebe05302348d7bab98dce26f7f1902e7d8e534180384 SHA512 975fc96360019f0f48c4b6aeeef9e4b789a0e4a25d5c570e3067de36368de07d97e6617b300f629c8c1e15dda3023f5e1ad6fb5d583945fa391a558019a65eeb
 EBUILD gentoo-sources-4.14.303.ebuild 742 BLAKE2B 2e3384bb6c711c6fcfd880a39b4b46511d8a71640e2477c2978fa7782ffebc427067899a9c1ffd471b19d7a1442a481e2b19256fd32d621420c1b42e4a0840e8 SHA512 2972b4d69b151cade7e8d2e4c7d800928d3efe6f9fbbe702f972c3da485df41857a08f9afcba368247ace6ebb30d26a8113db380824ed3cacc94e9b6ef275b3c
 EBUILD gentoo-sources-4.14.304.ebuild 742 BLAKE2B bf3b341e8761bf4a5c97db6a61c220c2d77f82c0ef8446a89ebbe6ca3adbf3ab802dd3de6c98124458b9037a93857a6c4681ca74dbe7acfce8b59afc5773adb4 SHA512 474ade8e28c20b085c62bb9f4805884a1390f3c89ba0d01341bd075eb88cfc88f783c5c50f40bda951ebb50786f27f45fe15d1163817d94058f6d70d097959bf
-EBUILD gentoo-sources-4.14.305.ebuild 738 BLAKE2B d401c049ff5597864970bf062e168949031c9b57c646e8b7491f58ea0a887567132c18044fcdf9a08aa77c9b95cb0b7726387f8b7380778760da94cf2649ae8a SHA512 276d6d646b58594182ffb04d460b9cc64c66ad50e5fa3024a3c4cef53a56706886f4205fd243dff90e91ebadca9daeaa08b065d7922378739ccb5d43612ed3ed
+EBUILD gentoo-sources-4.14.305.ebuild 736 BLAKE2B 5bddebaa42ee5ca838ca4fbc6551fd6ccf95eff596e77ffcc60aa52deb0020b35f9630b015ea4805d4d0ae49f50e337bc53692f11e3d9fa917911d0d9edc1c64 SHA512 3c1844cc06f1182a4771b62af1991851aeda403f508d259a7a3f5fb7f7a4788a9db90501736b4dc22a0f857770d71ac3304d51b09b3c32e9830c7d4ddee1a119
 EBUILD gentoo-sources-4.19.269.ebuild 734 BLAKE2B 3ad586c59e13601b688d6682cad8fa806d906b001c78e9b2acaa5d23064b6be8299453bc2379268a7e88a9b37e4f6355759c0e26ac2e92f7cfc72cd11dddf22c SHA512 51c90b0e39c35765fcaa1934294552a1ae833405011195e6af710cba5c6efb1e9d506bfffcbfeb380c371fe18d82595b24dc7c6872a93180d46cea521d04530e
 EBUILD gentoo-sources-4.19.270.ebuild 742 BLAKE2B 189b0699f14fa77b2b20efe62b8c5674c84971eeadeda3f5c1050853468649f4edbe03591c86c402ca13bdfd1d2e40012f02b8e2fdee13dea6674b2ced7f46c2 SHA512 12a3deb878f58978256ec3581f20e11e49dbeedba5e7b56a8edf2fb3da9e0412896316368a0f2772ad5ca73a93fdc8232e0e3cfc66ba4b9f68182ec9a85a2e93
 EBUILD gentoo-sources-4.19.271.ebuild 742 BLAKE2B 3812998507703a1e5d201890960a018252588693d801ee85cfcf9955a4d12c24ee45418f1b8e0bc9f758bfdaaa2ff4df54d15ab01f0d1f4ddf44b5cf7a7ab9cb SHA512 c95c8da86ed4afd1bce5023a62600aa41d359b6072ba26fb7b8ad035f50956a653f1cae5363ffe489648fd6155d528c42b5fe56b7a5887318472c2bf02755ed1
-EBUILD gentoo-sources-4.19.272.ebuild 738 BLAKE2B 0d0837107c9d38049a29d93a69be6da865ea289a4aa9a771e40ff99d862f826234f79223e5a515292f5b3248806bc677b66e6ea447371eabf39c238028cd2014 SHA512 d0e42ce075b96ee9686da0a13c900446690f3ff3e193808dac7559ce848caa7cabbdfc1bdc9cfc11cb547af532e2f4fed07f8986d6fb358a504a9d37954651f4
+EBUILD gentoo-sources-4.19.272.ebuild 736 BLAKE2B 02df789f5c3da309e30a6350e37dcfcb7ab21f952203f5fc75e7b8d46cdc7078786056ea0434c580b20b9c25dc4d65653c1d6cfe73a057541336fc4ddc181d3b SHA512 782f986787f677852914642f2b7d0bc7628c0aa5e0f04d0489daf5f1c21c1609bc5beb601bb9b24cb9dccd322185c381b2c0fa0b6b4363f3d90e8c71888f07aa
 EBUILD gentoo-sources-5.10.163.ebuild 741 BLAKE2B 2df87a8dd8dc35a50c1187ba7d7571b476a1e87cd564c94c15a3326c64e88ce10c047e82726fdef1afc78ce0a00005feefb415a52fbb667e405d37f6025ed99a SHA512 81454c1f08a171c29d7ec3930ecfdbc07776eb66952f7450d43d398c1a0daf7ac70653612b3dc664460bb9600a0bc231f22bb4b34c98c4641f9a728a7d96e4bb
 EBUILD gentoo-sources-5.10.164.ebuild 749 BLAKE2B 2b0048a82b4b86b4e239250029f59d83eb4e72ccbca7ee582de0cdb803221ca4fc04232d2313ee219f8fe308a75efaf3b0ce9e97a9a00e347c4c0669c7da5f27 SHA512 273c36fcf54b09facab93c487f83f0a38c83bfd3cc110a7e24123db2a6c4bb93574867acbf6507f7dc59a9c132a4f8d3b12136c2bcbfcdbd7703475e7920458e
 EBUILD gentoo-sources-5.10.165.ebuild 749 BLAKE2B 6e155623a889c29d028939f6779c61da69e198a5498b503d2b2c891f5b8273af69ca02e8a54ca5c7b940ece8b75dee47e7c743379944b4838ca9fed8c2a557d6 SHA512 05bf82ddc2fd9bb4790be5bc781a184b0c2a951b42bea01fb624c6a6cd6891f8ab9f0f7e4f47b4f5eb98d803253dc4a2841c192472c361e6110370176155eebd
 EBUILD gentoo-sources-5.10.166.ebuild 749 BLAKE2B 58f81f35e07213499503c68371610c6801ab9e779953b87cb345c8e3f62d5fc3abec3f5d140e6ba9e7e7b465b386bd53c75bc45276813081d9faabd26333adce SHA512 c2ea58388b05f94770b1cefc0a6d49fecab500d8a0957bdc705b71ae8177039354b6237cbd0d0cce8e3deecbd0f21ff9c1f1785613c0f1aad04f985d890e8264
-EBUILD gentoo-sources-5.10.167.ebuild 745 BLAKE2B e611df973737b0ac1d28484efc89259ef9639b88106b8949aa7349b6b207ae7114fd385393d242593b7cdd42c89ec66d3012b9e12c58cbfdc69ca3048e2c17fa SHA512 1e10ead92bfc73f883e02209d0774fdb29eca463fe6fd56181da9dc0455dc08b7e5af5c5263f76bd200aafbe07456cc9785c075cb2bcbaf9a070a4945aa69a59
+EBUILD gentoo-sources-5.10.167.ebuild 743 BLAKE2B e70407deb87ab13a77fde033d72301508eb4d07ec467299bf8679b3fc2da214b0d73ea3ff35f42bfc63e7aff0cd4f5304946bf3dd510e1ae37d77ffc4c9aa822 SHA512 c8fd5fedfa428a3a31a8f81d530dfbc0352c597ce8f6f8ce3eadaa435e823450a3d080e296a73d40774d29d8723db52397605765a52a502417ff6a2e1c3bf236
 EBUILD gentoo-sources-5.10.168.ebuild 749 BLAKE2B b43589ee8c0d4000beb1650c7df1de0b868d35fd08d0a514dd59b860a09d672408f2371a0400aecac55f50c0193f32c11a1aae62eb321878413584e56f98fdec SHA512 68df5e9a379bfcdb1345128a4759b3aa5a06d046462fb50984b7073862b869b90d3dd42e4d71ebc9cf81f66f1bc5e6c00531d7a1ee6ae8dc36a1c4d8ae10be84
 EBUILD gentoo-sources-5.15.88.ebuild 740 BLAKE2B 69367ab9d9a271931b30f4c9e6bdafcda979624e1404eb57c87ff23c1e68236c39e453bd9299f56492193b1517794b0ee702df7cc4fecb95560e5add70fc39fe SHA512 aee20bfde9a97b3b2330ceab754fa82d75340745b9f84f9f2b3e8c91cc676c8a6030dbfc1b69f45222cf022e49b92520e95dd5d68512f181c4df3f8b7e4e5ad3
 EBUILD gentoo-sources-5.15.89.ebuild 748 BLAKE2B d90657e3d6f0723f7b1bee81f7949c27f05d0ce4d68991ecdbd3a9a9b8f2121ca337d20db4746b5d98bd29c864eeea41d94cd8fc7701f45667602d662b44a21d SHA512 6e8b09ff4a2bde84be327925b559675c058ef03f5e253e92f4b6057b21fededd8aa8fcb80693f7c1911e191b39a9ac432412223fdb5a1c08fdca3c69ef16a8e1
@@ -120,14 +120,14 @@ EBUILD gentoo-sources-5.15.90.ebuild 748 BLAKE2B 688f4bc1ec77ffbd0301bda3dd3a50c
 EBUILD gentoo-sources-5.15.91.ebuild 748 BLAKE2B 53be4c2159ced9c7fb5e79879b9f9f811f9a83a771a84400de036065aa05cbfc409d692de1f94a3a3982d73e61e383acd4d7c737df54fe4c989d7ff5a4d7d5f6 SHA512 beafea6eee3f94df2cf3a100b410250969bc1c427c2f6df2d3e57c7470152801e3a745e6d70a4cc3bf162c41e6d899a0adf0ff9a556f6361d3f11f447a16e0a6
 EBUILD gentoo-sources-5.15.92.ebuild 748 BLAKE2B ad073df36c38e7ed17cf9c62ed459d62de6d1afad6fdf76f40f547a73925aaffbea3ce106a805a34503779349b6e99b5388351c450e4be370350980bebed1123 SHA512 f7d59cb6d663150338140b5bbb005fd16dcff534f06463f51961ac1bfce4e7ba607c574168c1ed14c8b96e01f87987d1f59869346c4d2fec94b1c52802a9ea4d
 EBUILD gentoo-sources-5.15.93.ebuild 748 BLAKE2B ffccd5993e24ef141c6212f387d3a11d1c6fc56aa4455c9a2b9dfca379a986bdbb27731c33e9af393e6edd021f405f446bac768752f8a8154c686a253a475367 SHA512 36c4a309bad687721d09bfc959891d53edb97d70b5ca2cf9eb7087c270d4921aa14fa794b02c31b825bdf5f83638a405c86bd010e09be1a93fd57714d08eb79b
-EBUILD gentoo-sources-5.15.94.ebuild 744 BLAKE2B ee6c7118373f556182cb987cf40e31bed1fb653761a7a331dab0f674ba8c53299700a571b2800f82f0512d603a848d772eb3a7802f2d745d9f37b5fc4b38da2b SHA512 fb098e11e31305a042f0fee503d538c9960581fea1b661c175cb895de0f8812b6bff20dc90137e2faa90ae57fccad7dd6d0deda71cddec3f7c4110f53802c549
+EBUILD gentoo-sources-5.15.94.ebuild 742 BLAKE2B ba7248692e7df0bdab0566b0b673146dfcd2109eb024a7cb1baae5e22ac65a5c8e960c6f264c70290c9ad00606396028e27c372ed065e88f12359a660999eb5b SHA512 2c21e3ba35673877a368b43eab390dacb22cdd6201e4347748b91356d9733f1d9c29e2c58e2d6d942d2f6b6567ca035ecb39b082954b7db1e8383c314fbcece1
 EBUILD gentoo-sources-5.4.228.ebuild 734 BLAKE2B 3b0ef6f070d3f669c9fd355550dc38473a92dc7f692538a0a1d89001bfc0ad0a333179614668c69e0a87094c6b2708e15749384a4c182b0403bbb387327f4f51 SHA512 2d3e8c3004449e2df7c43272ba763985103fcbad067127776bfe54ba8eef4ae7d429d26265c2df75158b4c7f38004b49008faa51d8d2d319444ed4a22d2c51dd
 EBUILD gentoo-sources-5.4.229.ebuild 742 BLAKE2B df7f10f861ab6644f338656ffab5b0d363aafe9bdefa9eb68e9db009e7932914092bf7e93b21628edaf2c3d1ee06b6b93fae8faa27a913533b1c6c8447db3376 SHA512 1cb264802c573b2ff5a369d574df4be345f847e2934303b1481ebf29a9d5008184a951f3ff11e76af7a00745f34d0c49f3d0614084e1b91baa9925f7615d0352
 EBUILD gentoo-sources-5.4.230.ebuild 742 BLAKE2B e7e88c8f70df9ddf8a17d34a08e758090289bf292336b834c7dc3da0ffa80dc150a03ff9e70d09a7f8a1ad3b2f31593e8f2b2602028d9e713550d92f7a4d96ac SHA512 86b6cf880a154890277bd5b0236fa5a56ca5ee2c1d58ac909dcafde215d562b406831383ad56bb612a2bd3712712fc0ee5e5cfca577b4ad134118e2c07a2ddba
-EBUILD gentoo-sources-5.4.231.ebuild 738 BLAKE2B e32b196daf8fadbb366507be78b66121fdcfd4dae0cff1cb9d03cfb43b5ecc9fbd537be4059a54a7e3e822538a7855014d58623bba8f8f2eb62884929b5adc1f SHA512 bb10f5e159cd676052bc98c00af86faacc3350e9bee8504ae82ad835be8e06a2072acf5ffcaf46618a6eebd86c3440ab93584afa628c0a6f78cd0227b932531a
+EBUILD gentoo-sources-5.4.231.ebuild 736 BLAKE2B b350d6563a7a0c897f22b666a051a5d7e0216524bf89bd78dd717a1f8f51e03c005ded787db15caefab4bfe3423d661e5b20a5a177387984b84af50913e836d3 SHA512 e6f76767e83e22c8e1f1cf6b10f0aea87828b7375379bcea5d1b44bb56236263a2b4d82f8d8eb5f8fd514e77e025e234a7b04c1c71febd012ea6de6a83230a66
 EBUILD gentoo-sources-6.1.10.ebuild 749 BLAKE2B 444a7a7ecab3f5534ef43ab9c48a72193367b6a4f618fd2e7c435c5340ab3c025587a9242adab8e324bc4619ca43a45d228be064eb36592539be90a47fb28570 SHA512 01ecbdfee9f1a251bac5ba7a80662678692d1e019073e68e7156b43e691f89a29c560ed86f2f78c191fd114072be3ca136c9d751cef80828ce2750c1ffabb411
 EBUILD gentoo-sources-6.1.11.ebuild 749 BLAKE2B 54e9cbc194a86ac81f04d58477fb4e1277e4ce41f0292b8faf56a247438ce84b61d2596bb2d340267b861081ff8fb528f7d5ebdd72f1752232781577d1217bcc SHA512 28cc1cddbcc0e1982bac2fccd9c27a201934494b5d744c042061dea555283aa372000c70810e6117decc689bdde3ff38c4ff5d2d1e9680dba2eed1fe96e3d6c4
-EBUILD gentoo-sources-6.1.12.ebuild 745 BLAKE2B cec6bebb2b76969e3f39ed1baa795e42dbe5ab76a41f9814563d2f52eb3008d0c3bc6a8fdfaffb416a7de5801ea283b953f915acb0e50301f6d7e5a59819696c SHA512 4e08661be96a09490514708decce037498d1cbac39587b426f2359074fab9db0a721f3e676b8844c7800f9a7bc00daf9a184451659a08e407cb97b255d38cdc0
+EBUILD gentoo-sources-6.1.12.ebuild 743 BLAKE2B 39249fb257735f33220ee38d7abf4ba841c4062021cd558b69c46a95812b44d61197f66c9619d42bc50ae2dd6461a074f87c99ebd72441e9ffce996b5506707c SHA512 9dfd91f54984eb0b7019147df57e55b484e8a08b1392aa2542842d918b5da1553f569c1903ee0e5b9d5dbdbdd6d85690f16c553b974151f88733d783cffffdb7
 EBUILD gentoo-sources-6.1.6.ebuild 748 BLAKE2B 45ff6529771b9d2b24b171b239183cd32f769e62fe44ece1dac283487c01dea56a64e2626aa5a3da99b0affd379497c6dd0301612183e287574998f4ec74d6bd SHA512 51c47c3bf6437b5fd58705870a36d639035ea4227d65c87cb282b22d12f741cb51223c4a5fd72c220f89792ef08d3e6dbf1882f5fedaf3ac21f106c303705977
 EBUILD gentoo-sources-6.1.7.ebuild 748 BLAKE2B 55091bf07cbaf57c3d9f5396cebadabe159be9a1d8a12ca9008ee57eb3a4f8a08f9e14c9ab3271fee3b96e073511013c2b38121f79e5fe19e4a56f038d740a7b SHA512 06b4fb058476746c344359a50b32ae2671fc0315b32a813760f4d8d4466e838da9d4a5c057821816ae7ec1dc94806bc7f2906704752750b06a2769645043ff28
 EBUILD gentoo-sources-6.1.8.ebuild 749 BLAKE2B 314baddd6457219fbc1674b105376b3537510537bc5b50a3ca2d044e8589222de20d7ca927e175e584ab0e6390e1f45f0170070302eddae7fa30fa914e542df7 SHA512 e0a4da3730224352eda5f19a79bf4ebe2e543974b88f4bb930b5ff3e77209a1905c076a8e4c0c7354fb5ba9622080c68534c8c5819760032fa882baa8af87f1e
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.305.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.305.ebuild
index 0150645699d3..881befe03e06 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.305.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.305.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.272.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.272.ebuild
index f0a2fb673d44..dff5f3f51f11 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.272.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.272.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.167.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.167.ebuild
index 406cebac8fde..31aa0ffa8c02 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.167.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.167.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.94.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.94.ebuild
index 490dd37af365..a1062e8041f8 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.94.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.94.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.231.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.231.ebuild
index e7072aed2cf3..250883b8b29c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.231.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.231.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.12.ebuild
index 018e2bd53712..dc17347fe45e 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.1.12.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.12.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 7df9887d86a7..552b5d63e8de 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 1b7d195d986d..26f5b377b99d 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,5 +1,5 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
-DIST mod_h2-2.0.12.tar.gz 790232 BLAKE2B da06e41b95e5dae0b9e114e749ef07383c565d3decf26a87d939a8377f7f687d03c7e8bac46b5c3ed85f0e0e0dfe9d4eb03548910c10268042878780981aaca7 SHA512 36c07357cfe3896237fb94e09d6a1f131cfa11de7d7e0fa86aac22197836a988daf200978b0b1541712ad990391418b394266871b86817d45597f4a83f7eddfb
-EBUILD mod_h2-2.0.12.ebuild 935 BLAKE2B ea2fa2f0ebb4ec0c0027d0d8f69550b8a5dcd57d31bd2266f54954318c3f0f387c81e2e8d284d8a4d41bed37900fe5bed6ecb2261afbd972d76bdbef3359aaf3 SHA512 ba5334a50f8e2639b7fe797026457df3ca276704d9eae3d7ff3e47d47224136dcde86e0535442119f983bbef22d103686679cdd6996f747ec66c6c9d0fbb257a
+DIST mod_h2-2.0.13.tar.gz 791279 BLAKE2B fe1b13e60ea064f3c190ecb30d28fc34e594a35f71d86280e573009aa49638ee12ea2fcafbc25b2fe53a25ada4d98a586ede4c89cd296844a763c80284a3239d SHA512 69ffc4910c89be393406161fa75dce27e17e7bd7d8e1658b7eaae68eb877324f2e30d47a268d41995bb4837c6b4aea4bb8e840191e3291b1fafee3d4f1d55baa
+EBUILD mod_h2-2.0.13.ebuild 935 BLAKE2B ea2fa2f0ebb4ec0c0027d0d8f69550b8a5dcd57d31bd2266f54954318c3f0f387c81e2e8d284d8a4d41bed37900fe5bed6ecb2261afbd972d76bdbef3359aaf3 SHA512 ba5334a50f8e2639b7fe797026457df3ca276704d9eae3d7ff3e47d47224136dcde86e0535442119f983bbef22d103686679cdd6996f747ec66c6c9d0fbb257a
 EBUILD mod_h2-9999.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
 MISC metadata.xml 326 BLAKE2B 200b47b41409bd7167132c55b5e77b5efa2ec18859520ea38d61a625a6e68bbb1cb0095dda3fd7d273e17114e7cc0ff2fe5c1bbb66ea3a90b4796490fc04a2e8 SHA512 6d45faf84382555d53dc9f38f8d7a23454d763025bbb345f51bece78b36287372d86e173c894038839092adce210e444389b8c41644f44bce0c912880d788080
diff --git a/www-apache/mod_h2/mod_h2-2.0.12.ebuild b/www-apache/mod_h2/mod_h2-2.0.13.ebuild
index 5ba43634b8e0..5ba43634b8e0 100644
--- a/www-apache/mod_h2/mod_h2-2.0.12.ebuild
+++ b/www-apache/mod_h2/mod_h2-2.0.13.ebuild
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 0aaf32b9f518..bff93d008e06 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index f7e4f7dfd7e6..f449bb72a517 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_110.0.5481.38-1_amd64.deb 93358704 BLAKE2B f4149d15dcad6e90f3d92bdc2fc5f9de468b063c8135eabba7360fbfa6e2fb1fd7e270489197e8440cde9c5e75654ea535b505c134b47a7cde777585d00d1dd7 SHA512 48f9ee9a9a7263ac7a4502a2ef1c9ea0e1c8d848ddca3e9ad2d86f52588f769310a1f8f110d097e82f1cac60431244eade588d47c5308a5afba7b5b197348590
-EBUILD google-chrome-beta-110.0.5481.38.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
+DIST google-chrome-beta_111.0.5563.19-1_amd64.deb 94400852 BLAKE2B 903d88b4f98ee0349b94de76e00631d53864cd9b48c82420e5a8949cb15cd02d43de95236ef4a3d93d40dcb57ef21b04b08397719cce4ce6ea01d3067946efb6 SHA512 6c4d45f9d2bcf16e499859cde6a27dad1550fa5b4c14b7f3977b3bca12eb01a203b9091da21038386fe5db50602fb76cd3eb220e5f00969f21c6cb7edbe68f71
+EBUILD google-chrome-beta-111.0.5563.19.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-110.0.5481.38.ebuild b/www-client/google-chrome-beta/google-chrome-beta-111.0.5563.19.ebuild
index 0989c02308b9..0989c02308b9 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-110.0.5481.38.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-111.0.5563.19.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 19ce3b5e2795..1411b646b186 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_111.0.5545.6-1_amd64.deb 93791740 BLAKE2B 26623c9847c5ee0912919954c70911a97c3d26653f4fd5545fb96c4d79fb82ea5ef306ddc1f25fef51cfc8f7f319c27e7b0a4e7251020ad1ff61bf380a3b6c78 SHA512 329611ed1be8849be68ac9071f72c3568ebc3f9527cc747578f796171163b33a8f424fa1298f519128a1a4cbac87ae7567e2ffe4b2e7e808fadebb4af2528105
-EBUILD google-chrome-unstable-111.0.5545.6.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
+DIST google-chrome-unstable_112.0.5582.0-1_amd64.deb 93446352 BLAKE2B 6e6a57802e190c91bdc16e11cacd982e7c76c1153a4869badf4a963753097afc7dd356ee2615408e33f288376e37f65d2d11e24037e59bb605e6dacc48c31a1a SHA512 296a10d1bfbad31c2620524ce410f89263752f8953ca9c794817608b78a8575f1b5691b648159796864df3d137b37d9608494b969b026c7b6694559266fff107
+EBUILD google-chrome-unstable-112.0.5582.0.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-111.0.5545.6.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-112.0.5582.0.ebuild
index 0989c02308b9..0989c02308b9 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-111.0.5545.6.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-112.0.5582.0.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index cfd6c23e3467..316a30996f40 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_109.0.5414.119-1_amd64.deb 93693916 BLAKE2B 0a745ae0d2e1862101b73cbca4cea305aabef6dfa09cbd24a576549a08b2959ebfec20d88b8c8d33588921f5c70e895a5fe7b5d3b5d2330f02d87c8247e3db5b SHA512 0b6d3ffd6ee5a19a323bdee4010db957aa17651261bce5928c3f6936c7bc6a4de89debf4188058c3c4a65c2739b81a72b17a6cc744aa66666e049d00a041c553
-EBUILD google-chrome-109.0.5414.119.ebuild 2871 BLAKE2B d33eb944632227ca2807d300b1e606fc4bd3e3943b6b0dbc8a0a67e01cc153f81aed8bf2622e6d4289eca3d1f17d9c70a76de09dc87936238c50808c04b787d1 SHA512 5aa0d3739495372ce9b7b5cdf3b6de2befe7953f2e6b982a8e09b809fa1a6f768820676c36bbe08a39ab753439bf382dd779bcb25a6e3ed1231cb6c8ef0eac38
+DIST google-chrome-stable_110.0.5481.100-1_amd64.deb 93814424 BLAKE2B 8dbd23ca49ca4ecbc04600cac5d8f9d3b4904c2d9e05e9ba33d1a003b1a7075b43da2a0f85f6d4dde5af2eb545ff69061ad90a04e38169c090f3accb16fa02f2 SHA512 e775053018227fe94589142a5f939c7badc77066a6cfc4242ef3db7df5884c0b9c68ddbc11b46e8c1fe4bfe6f45536823397abff8e6ccea16a553da7536dcef7
+EBUILD google-chrome-110.0.5481.100.ebuild 2871 BLAKE2B d33eb944632227ca2807d300b1e606fc4bd3e3943b6b0dbc8a0a67e01cc153f81aed8bf2622e6d4289eca3d1f17d9c70a76de09dc87936238c50808c04b787d1 SHA512 5aa0d3739495372ce9b7b5cdf3b6de2befe7953f2e6b982a8e09b809fa1a6f768820676c36bbe08a39ab753439bf382dd779bcb25a6e3ed1231cb6c8ef0eac38
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-109.0.5414.119.ebuild b/www-client/google-chrome/google-chrome-110.0.5481.100.ebuild
index e467ec7ecdbf..e467ec7ecdbf 100644
--- a/www-client/google-chrome/google-chrome-109.0.5414.119.ebuild
+++ b/www-client/google-chrome/google-chrome-110.0.5481.100.ebuild
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index c211eed35626..b962c5ed8d93 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_109.0.1518.52-1_amd64.deb 139585954 BLAKE2B 6fd1f95073dae0d90db2c67dc17f45b01a84b456f59e3b8beb3eb49d2800c683a332bab6c0cac341dcab1ba7913ac8b297361a36d463f82e6233888a3ed1aaaf SHA512 e8e0fa90cd23942f8bf85ad5c9952eb0dab46bc9fc885c240acd4ad9e172c4448bbdb7d59435e4c19b8bc26cbdd690c7f49e6a4068b7b618610bbe8f1feb0f55
-DIST microsoft-edge-beta_110.0.1587.17-1_amd64.deb 139480910 BLAKE2B 76bb26d900bb770495370cfff0c5d9f7042012c00e1554f9bbcd84649b12ff1230bd076f85fa1af9a89be28900224e7afee7932aaf315b103f09b267dfe32f1d SHA512 46695f5ccaa3b70cb08b5f26b0f2d6dc79934a56695c49a571f2151aa56ce26e654e92b420fc4de115727b3a02ec913d9f9794be21cbba8fb112646b1d56ed56
-DIST microsoft-edge-beta_110.0.1587.22-1_amd64.deb 139449598 BLAKE2B 67fa40ad67b3a4c5a3b78de632c804cecd8c9e85be5283911ff57190ff2db1e5bcf263a224d4f0aa0caf9a933b49b346edd9fee5eeeea80879d864594e4cd5bc SHA512 45740e468057b0aa2e1f02fceec7f6859fdb3d720d30726972dd0a6ed6d925ba6b3c3c1ab50683ba7174844cb3f8645dc4518890d580019f20d43ce436c5bc2f
-EBUILD microsoft-edge-beta-109.0.1518.52.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
-EBUILD microsoft-edge-beta-110.0.1587.17.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
-EBUILD microsoft-edge-beta-110.0.1587.22.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+DIST microsoft-edge-beta_110.0.1587.30-1_amd64.deb 139516314 BLAKE2B f9f58b72eca18efa869233a0cb4fdd8fbdeb377a444e7c05157ea88b845d1524fe1f585e69238c4175baee4fffb4b3b185062deb8ff44b853e043d56c6d9f7ac SHA512 4e0926ce9171a29513de776c6a8423f3a0ccb1cfd4b2f9a02034f005e9ef5f4a3085aa449c418cefddc7cf70c9bd73e50d743957e51ccafc5b8756f6adc6d49c
+DIST microsoft-edge-beta_110.0.1587.35-1_amd64.deb 139683858 BLAKE2B 1b4e66c6fae7761e3b553ea58f532e78559ed0f8d8c4434988bf6f1f3dda3cdb99d6c13d11f11862db8469d9d5b106903e5b2a143d0c24b5978ba4f2691cf14b SHA512 a09268af717c1cd259d0175cedd914d2ba99ae9b54fc0bc4ea9fcd797864a9d601f4b48114a08ac344478222efc3425eed19f42afee28da22ce8335276441306
+DIST microsoft-edge-beta_110.0.1587.40-1_amd64.deb 139748058 BLAKE2B a1d103031d16c14ab5964a3dc1dd4a9eb6b29120756a6e62d49f4d0d0c625dd890631065be3699be6ed11b0da20e342e8b3e116e81b71ad0ad3333dbfc9df808 SHA512 0c21dfa99244c2adb6daac860edb0cb942b0f5300c6098852809e8f10fef8a952bebc3d38d6bc7efb1b68431fda8d53ee14141f51050d354db2af4c3ddf61330
+EBUILD microsoft-edge-beta-110.0.1587.30.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+EBUILD microsoft-edge-beta-110.0.1587.35.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+EBUILD microsoft-edge-beta-110.0.1587.40.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.52.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-110.0.1587.30.ebuild
index ebc23fabaa28..ebc23fabaa28 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-109.0.1518.52.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-110.0.1587.30.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-110.0.1587.17.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-110.0.1587.35.ebuild
index ebc23fabaa28..ebc23fabaa28 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-110.0.1587.17.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-110.0.1587.35.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-110.0.1587.22.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-110.0.1587.40.ebuild
index ebc23fabaa28..ebc23fabaa28 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-110.0.1587.22.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-110.0.1587.40.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index f4d0afb398af..cd72c3372e5b 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_110.0.1587.15-1_amd64.deb 139450322 BLAKE2B 17cbfbb97a519a21a83b30163e3591faa7a6e17d0ac083ad17113e3b51625ff1536c6f0b3e7448af0ab652a6df69167773524539e7e0849ded68cd709ab81546 SHA512 cdc0c9f99231157d284a0da015e96f4bc323bfc687e892106fc60aadc6bd419e7c427b5ff040ced45e26665e4a1553fd1e818bc10c2de5d2b3422b3604b27b6c
 DIST microsoft-edge-dev_111.0.1619.2-1_amd64.deb 140315294 BLAKE2B 0a941b21f15a64f0aeeb7f1c882d6bc98daed403c871ec0119c781d096b112223b9deeeec2a5d4453bdd9c442899b126baf055f4d34d0007eb0467d6e52009bf SHA512 ba13cd7758ee3bad913cdb8151f93f3a4a691b517e7f875329f4a8d12b9a960e9b9659db281213763a2f8954444f76c62be78d4963944b1130ddf43858a68f1c
 DIST microsoft-edge-dev_111.0.1633.0-1_amd64.deb 140901094 BLAKE2B 3ecaa4465e676e328ba249874cd854b24b07346575278bf94211005a7f84d8a5a2bbe467e827f98f9902edef512f87f9be4625bb0fb7f848541627855c9fe52a SHA512 000b56bb6a0f7d534cbcc4657122d45df7ca3e9d1255dfdc13447c32732357383c1cd01054330ec6a933672e1043aee257b21342f212238557bd241ee28a90cd
-EBUILD microsoft-edge-dev-110.0.1587.15.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+DIST microsoft-edge-dev_111.0.1652.0-1_amd64.deb 140682218 BLAKE2B ad997b5b599a4ad8ddd35c1eb145798c3253278ef40ee7e90be9b0cdfd878fc941ef9cde1a95c33d23fd7ac0814ef8930b002020e2f8ed0d329831529d237df5 SHA512 7e0daa12e0888cf5ff4b2cc21a3b98f8f79c0230ddb26549e1c48dda3c7c24f508d6e35c2e898f8d407590bd37b57873586c103d2c9bf0cb31db800d1620d311
 EBUILD microsoft-edge-dev-111.0.1619.2.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 EBUILD microsoft-edge-dev-111.0.1633.0.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+EBUILD microsoft-edge-dev-111.0.1652.0.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-110.0.1587.15.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-111.0.1652.0.ebuild
index ebc23fabaa28..ebc23fabaa28 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-110.0.1587.15.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-111.0.1652.0.ebuild
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index e9d5f5258b03..93c9e7ec8492 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-stable_109.0.1518.61-1_amd64.deb 139502458 BLAKE2B 9f23163ee010687d23e64768f5043c3dd8e1e1681b1529832ad0d504ba10ce264a1112a8c8e47a3c11eb475168757a6baf79135fcfab19d845aec3f432c937e0 SHA512 51300034f68bf1ec28e6ecd936127e674187df1614aa38710091778ac0ca7519ba7cd25364348ea4740dcbfcc43459545d78d80c1ad05688f3a6870cb1c64791
-EBUILD microsoft-edge-109.0.1518.61.ebuild 2609 BLAKE2B 90b177b603961701034cce74e7157913a700d5d0e3c656cb920a4dfcd8bcdea12f4233a7e18d5ed5fc8e07eafa559328c8ffbd6f3a601462f6ae2e668484130d SHA512 4ae9b77a6442058170f4b72ed5b953559617a2baa6449497879b9742367dc465b15cf2a4202cee7d073d1a459faa8d984084559f14bcc52a1354929e3047ae49
+DIST microsoft-edge-stable_110.0.1587.41-1_amd64.deb 139680406 BLAKE2B fa1ab49298964451741158e083cd69d8209e8897f2c5856420529b657f014477f936fae97e30573118b84749201c4ce025ccb199afa7161a24600a7b5bc05777 SHA512 ddce9ca07e4fe5fe1a7f1ced71888c3eae720a4eff24bf7bf0feb423e20eda739c2ecfd9578c68047aad41fbff10d0229be2f116f5ef392d71e313e4d0e61d9b
+EBUILD microsoft-edge-110.0.1587.41.ebuild 2609 BLAKE2B 90b177b603961701034cce74e7157913a700d5d0e3c656cb920a4dfcd8bcdea12f4233a7e18d5ed5fc8e07eafa559328c8ffbd6f3a601462f6ae2e668484130d SHA512 4ae9b77a6442058170f4b72ed5b953559617a2baa6449497879b9742367dc465b15cf2a4202cee7d073d1a459faa8d984084559f14bcc52a1354929e3047ae49
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge/microsoft-edge-109.0.1518.61.ebuild b/www-client/microsoft-edge/microsoft-edge-110.0.1587.41.ebuild
index 40e3af0e1470..40e3af0e1470 100644
--- a/www-client/microsoft-edge/microsoft-edge-109.0.1518.61.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-110.0.1587.41.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 2ae98d70a720..446d46cb444f 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index e36d287ffeb8..7e204e75832a 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_110.0.5481.38-1_amd64.deb 93358704 BLAKE2B f4149d15dcad6e90f3d92bdc2fc5f9de468b063c8135eabba7360fbfa6e2fb1fd7e270489197e8440cde9c5e75654ea535b505c134b47a7cde777585d00d1dd7 SHA512 48f9ee9a9a7263ac7a4502a2ef1c9ea0e1c8d848ddca3e9ad2d86f52588f769310a1f8f110d097e82f1cac60431244eade588d47c5308a5afba7b5b197348590
-DIST google-chrome-stable_109.0.5414.119-1_amd64.deb 93693916 BLAKE2B 0a745ae0d2e1862101b73cbca4cea305aabef6dfa09cbd24a576549a08b2959ebfec20d88b8c8d33588921f5c70e895a5fe7b5d3b5d2330f02d87c8247e3db5b SHA512 0b6d3ffd6ee5a19a323bdee4010db957aa17651261bce5928c3f6936c7bc6a4de89debf4188058c3c4a65c2739b81a72b17a6cc744aa66666e049d00a041c553
-DIST google-chrome-unstable_111.0.5545.6-1_amd64.deb 93791740 BLAKE2B 26623c9847c5ee0912919954c70911a97c3d26653f4fd5545fb96c4d79fb82ea5ef306ddc1f25fef51cfc8f7f319c27e7b0a4e7251020ad1ff61bf380a3b6c78 SHA512 329611ed1be8849be68ac9071f72c3568ebc3f9527cc747578f796171163b33a8f424fa1298f519128a1a4cbac87ae7567e2ffe4b2e7e808fadebb4af2528105
-EBUILD chrome-binary-plugins-109.0.5414.119.ebuild 1178 BLAKE2B 4144d89038f8f70136a77d57c3b14e83ed1be4674ab11104bbf41d822fd28325d207b4d8a7543eff856aa943dc11e3a9185683e704640ef626a0c61652e91d84 SHA512 fd6ea3e0a93e2e848c2e4dd23618c37a2b656c6c05f31fc28440888196e02226fdd272887abddf4a6b78d46befc3aa13b81c7df499d693accc04a1d771a4bca3
-EBUILD chrome-binary-plugins-110.0.5481.38_beta.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
-EBUILD chrome-binary-plugins-111.0.5545.6_alpha.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
+DIST google-chrome-beta_111.0.5563.19-1_amd64.deb 94400852 BLAKE2B 903d88b4f98ee0349b94de76e00631d53864cd9b48c82420e5a8949cb15cd02d43de95236ef4a3d93d40dcb57ef21b04b08397719cce4ce6ea01d3067946efb6 SHA512 6c4d45f9d2bcf16e499859cde6a27dad1550fa5b4c14b7f3977b3bca12eb01a203b9091da21038386fe5db50602fb76cd3eb220e5f00969f21c6cb7edbe68f71
+DIST google-chrome-stable_110.0.5481.100-1_amd64.deb 93814424 BLAKE2B 8dbd23ca49ca4ecbc04600cac5d8f9d3b4904c2d9e05e9ba33d1a003b1a7075b43da2a0f85f6d4dde5af2eb545ff69061ad90a04e38169c090f3accb16fa02f2 SHA512 e775053018227fe94589142a5f939c7badc77066a6cfc4242ef3db7df5884c0b9c68ddbc11b46e8c1fe4bfe6f45536823397abff8e6ccea16a553da7536dcef7
+DIST google-chrome-unstable_112.0.5582.0-1_amd64.deb 93446352 BLAKE2B 6e6a57802e190c91bdc16e11cacd982e7c76c1153a4869badf4a963753097afc7dd356ee2615408e33f288376e37f65d2d11e24037e59bb605e6dacc48c31a1a SHA512 296a10d1bfbad31c2620524ce410f89263752f8953ca9c794817608b78a8575f1b5691b648159796864df3d137b37d9608494b969b026c7b6694559266fff107
+EBUILD chrome-binary-plugins-110.0.5481.100.ebuild 1178 BLAKE2B 4144d89038f8f70136a77d57c3b14e83ed1be4674ab11104bbf41d822fd28325d207b4d8a7543eff856aa943dc11e3a9185683e704640ef626a0c61652e91d84 SHA512 fd6ea3e0a93e2e848c2e4dd23618c37a2b656c6c05f31fc28440888196e02226fdd272887abddf4a6b78d46befc3aa13b81c7df499d693accc04a1d771a4bca3
+EBUILD chrome-binary-plugins-111.0.5563.19_beta.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
+EBUILD chrome-binary-plugins-112.0.5582.0_alpha.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-109.0.5414.119.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-110.0.5481.100.ebuild
index d94dd5bfe69b..d94dd5bfe69b 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-109.0.5414.119.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-110.0.5481.100.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-110.0.5481.38_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-111.0.5563.19_beta.ebuild
index 238a410c5c55..238a410c5c55 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-110.0.5481.38_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-111.0.5563.19_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-111.0.5545.6_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-112.0.5582.0_alpha.ebuild
index 238a410c5c55..238a410c5c55 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-111.0.5545.6_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-112.0.5582.0_alpha.ebuild
author	V3n3RiX <venerix@koprulu.sector>	2023-02-16 20:05:28 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-02-16 20:05:28 +0000
commit	41e056b08e4c5c8d6e78407a5586afa52867fd5f (patch)
tree	5c065bb2a5c9eb0386762c79e910ad74512def88
parent	b18dbdc69b2be6f0ac0db668b0bc57fb6f766afc (diff)