gentoo auto-resync : 08:04:2023 - 11:32:01

author: V3n3RiX <venerix@koprulu.sector> 2023-04-08 11:32:01 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-04-08 11:32:01 +0100
commit: 74cd29ea4467291ea2c34971de87d6bdc21233e9 (patch)
tree: d7039021b01e3b7bb7d02edc26d71052836b7832
parent: cb861ca8e611e651d4203590e0a9c3c4c2196bd4 (diff)
584 files changed, 2061 insertions, 5356 deletions
diff --git a/Manifest b/Manifest
index 9f3c6c086c1e..7d6842bd31e7 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29424 BLAKE2B e9e84fc9422bccff46e718a777b81a346131b98fbbccfa58e9fbcd465a373880cbc1be575672d2e1435f30b0a092bd3b15a882829dea2808e917459ddaf73096 SHA512 6fef88bd4ede5a4f870ecd154bd10e829e8aa1fbb548907aa903befea82ae08a8ff451035fb4b8cf897575681093e774b7cebba61708184972fb2b9fb0df8150
-TIMESTAMP 2023-04-08T04:09:52Z
+MANIFEST Manifest.files.gz 29445 BLAKE2B 370ec6b82acc4d87d289708690dc7f0c58702ea929f6d65d35c878a351ef29e3bee82075e144875a7b88490d43a1d1e44f261735dcd6883ae2daa3b23ddb6ae8 SHA512 df472db55bac995a95fdad915dc9f1ea9e5d18f8100d82d009d520c0bdcbfd223c5dba25dd31d9461eb9217c1fbd8788b2fc69ceabd183bb32ef54308e006af8
+TIMESTAMP 2023-04-08T10:09:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQw6RBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQxPXZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klArPhAAohihrkIqk86uNpdgHMfD8KxJ7m44SxOM9D0cAOaHMfAab+EaIS22h4nv
-ufXAyyQRE4TrXyOBSbJRCUAG/W/e1m0sGeshnZRWv5ftWWYiVZ+VMIUWaqqDFovG
-jMiskMeAnesGRmeUgxTv5mpIwCi+gsmJLUA41qpM1YxhfFXzSjNhwN89YavHp45d
-34Dd82PSSE6SQJaXwrO/2O7PL4pOiui2bP6U22Av6cN5SKULYgeKQSrMZTY0g4Ts
-KPJ3LOp8gh422HFT1pWnCSFfOHZB2y89MeQbeqHjZSIXBuGRTTIMkFGIcu3hg3BB
-yH6kJ6haweylmtJi5xDYsXyd3MSOsmLA1kZbH53O/zj1GJf6N4ipU3iv3x2g/b+C
-LhO9TI79MGY4G6K9xpfLQ/Nv8+Q4jTXOVHy5gWbac7pCaeeINm4Sg/WkqODjsjMr
-wgodNO1KOzi0m8GcDH5CZHM31GOkahPfx1OE78nKRMiUUOyK731n9Jr5SN1NR0uo
-p6Wn5LKDWQupgbHd60cfZKTNYQ1XGiQe5C8mPSMr3aNY/L/s5zKHTVuJTBG61ndO
-SCMfnfjfzao8IOo6pFeZ6eeDQsrXMLiuHDoFqFuR3s6sg6vd8zqiSF4AiOQ4anGl
-/MuyRbg+8jTvUsg7y+/w/ZQavHys7D7jP+8M7Fn/uLsotNwwdU4=
-=jHs3
+klDxOw/8DpEfbNui3tgWRQLB8ZSqtUQpgOjlgzpHu9YMZrNlBUCBpaudZc/U+CI+
+L+UclCOux18H12CNDJ9diBbja+iFl4OWfQb/nQkNDhIkdOe1KAEmpXPiNOJWTZwY
+u0OWlWChUFJ7VemQbCH6SVEVMll0QCXDEfBTq7bO9aSuT+6FyNqurnAHkzLPsO/Y
+JSJG555cweltEubuG1/vSqSzWZHFZOnpqi7rNrCghDFnkL4/hdQSqiXes+8QI854
+P8OkTRgTUrthJxzAO7OVsxvoOUCTZr3ucVXqG0kP646BB0dh0gk68vbr+fBniMtg
+8uHIqqhTpJwqyvwFC47kdsoIMGkrx8pIpOSKnB+ksH96Xtd6P58bjTLbjkleHP6u
+9hd/YX5FkGWqzhWvf0dMEp5E/RzrTHIqrTQ5jKe9sRhgM4nCnW4hWMKsHhJHejUp
+npVCH79TXdCvK22BjJKjssVFJcGUTiE/7DlflvSHFhqRKrnXaGF90vXYaqQeQYMo
+f9jTUF+5CyaOkavvjrawKlmt9PQ/ZxykEPpNYoKsMD/iOdcNw6C7nKAcmFYHU6MM
+D5I5+TR2tuBMH30TNGxixddLaN/2BlC/vMRloXcuczILhGefEdS09zAQCMII+CmI
+0wpSCiJ03OuY51XCLQs7ECgYab4GTIHiZtgCTrRy3poui8uTZ/g=
+=T9HC
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 6b34903ad125..e1e8ddbe2e54 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0ee837b821a5..b0d1979aaf76 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 70f9f542c44e..967e660be395 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,10 +2,12 @@ DIST aws-cli-1.27.104.gh.tar.gz 2392876 BLAKE2B 860f0d8ddf4c283d7b4e98ded1c9ca66
 DIST aws-cli-1.27.106.gh.tar.gz 2394080 BLAKE2B a83e50310ba5db667fb999f2f8dc4a32159b3934c7e305d48f09075f8210a298acce56f63827ac22a3686fd4c948fcde3382da005b9989287a09724734718c83 SHA512 8659a92851f0bffc3d92430aa955a319c689783ff907c51ed0b42bc0edd5301293c390269504cfee5833f69c69c372dae3995964460d41adf755966124b22579
 DIST aws-cli-1.27.107.gh.tar.gz 2394636 BLAKE2B f64dec24fbebaf22aa734c54cf54084b036ea627f1c004705f3a630a6efef59b5c826c5ffd4372dffebf86c4cfa507ed465f965a3a200e2a997cde5f166e0b6e SHA512 3e32ab758eba1d7b4bc8b4e5bc6c71bbe72a69d6b50dc5b51c6f8a0eb44cc53a4f91680ca84003f7692c1b1bdc727de41772df03940e0f19bddbc7b40682fd4c
 DIST aws-cli-1.27.108.gh.tar.gz 2394853 BLAKE2B a6b0752b1d87f9df1b284ba4fc3da78e31fb29e19224fff5b970db3584b9927528efb433e93f38070c01ef61ee63743370092ec7da1e8f0eaf0b54d9fe8ddc1f SHA512 9e7f6d9f94bf95b379d32bef40a87b9de4d26cc7a5377614b0cf2f1b861a09ac9014d14c72a64bb89741a653e0956962bd268681b6b4a26b1e5810fd55d77d20
+DIST aws-cli-1.27.109.gh.tar.gz 2396167 BLAKE2B a4221643b05b076fc9304491041e3b1444cde2e7cc6ddbf21cc2cba30cad276f20d8ad4a00d6e7576201e74c1b6b477c6a669c88ef7b5f8760effef27d4a3de1 SHA512 b102b71304454d434450d0e80c2d42b639464e1621a975573ee5c6010232ed67d5b1702c126db9412ef894b3599f757e5e57161ffe87d491b6e10c165c451a82
 DIST aws-cli-1.27.99.gh.tar.gz 2388286 BLAKE2B f9be204722470fdbc5b4a1f7453370033c78800dac6d4ca63480705988e6bd02899f0646c034f39a3e87a2988f79d9d23989ba9f4036e931102ca4c0e46989b1 SHA512 a07ac30eab8cd8f19f35bb7d203b6ef150c585a61df63dfa54d469591e57766f3cbdab3053a155837da82d1c9f702302f4821558c7b7cb9dc985fec7a58dacf1
 EBUILD awscli-1.27.104.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.106.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.107.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.108.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.109.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.99.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.109.ebuild b/app-admin/awscli/awscli-1.27.109.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.109.ebuild
@@ -0,0 +1,80 @@
+# 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 bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 8c3a6cc820d3..0b57acc3c1c1 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,9 +1,7 @@
 DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe48275364c4d0c973da6467ea044303d75f94cc0b963c3b423a7ec61d8eff26da30c102c557ccd5a4e8cf984db4f6 SHA512 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516
 DIST conky-1.17.0.tar.gz 1699311 BLAKE2B 9aead9e1e9bf4bf61c1b3e09c6e319135ccce19c43740c1bb3c6142c936c2a045820078f4684ea037fc26a8b02343e11b5372f74258fdf2c5386459410498cc9 SHA512 4da55ba3835e8ff42747f2bc01c34a94b2819e08eb74ddb913fd34bf4b682d75331119745ee006d842d3d2142fc53eeada16afdf698a60f37b566f55896aa2db
-DIST conky-1.18.1.tar.gz 1703018 BLAKE2B ba3c0f9624bfcf229de4376a9446ad05285db4241d1caf4a7a8ac92971f57d022192504c9831a786e3c02db140d70f10cf34d7e146c8647cb2a2b923e6acc2cc SHA512 e390d2aa8a3f3b570b2e3dc43ef71ff0001e36f3b42ce5a9c01b8dca656a23b1af80ee2ee138f38b12b4581dd03711562445fb53e23ca0f26e8b8af878aa2ba1
-DIST conky-1.18.3.tar.gz 1710600 BLAKE2B 5664c504bab8ddda14e4442fce3c4bda70033b8b1efb0642901f154306adee300673756a776e304a151214fc9a3d7dd8277336ffd13305ff1d86c4d65819cfb4 SHA512 702932bad88265619cb6de60b2fe86e834e7828343f31e966df1838c6742d5da2998aab71704bb22e4b0bdc3d05e3c082c9ab6231124b310e8c14c89bd80ad52
+DIST conky-1.19.0.tar.gz 1713103 BLAKE2B c001e90c51bc3c09a632569092ba74bcbf68a598d052d3992cda39dfb6221ef957830f2b52e3d268b96a4e65976d4b20d30f9edba0d367b985c7f4bed58b13c9 SHA512 6be9ce459cba3f35e6c6ad537afa9fffd9af926d4e190629bcdef1931622aad2220fa75c0ee8640066a101dae492a676e59bac85f21ab587349a6231ebe7e5ac
 EBUILD conky-1.13.1.ebuild 4795 BLAKE2B daff0445b97281fcd8fd737b681b862fae0570c15bbdcd9dd25fbaf5db825e8b6e0eeba771b34d09329ca338e869d341cd83b3ace80f31b28ccc103d59a66829 SHA512 75bd14e46fb12acc2d31b933adcfccf3a25e0202c8a40238bc585c9275c875e145833ae5e9870a9d0697bcf2b04b1ae5bbbb680fcd3c023ca21350fd6ead6e7f
 EBUILD conky-1.17.0.ebuild 5305 BLAKE2B e8e3480f4c13c1eb939154ec9019bd66821d433719accf6bafc3763fb29b8bd8ce1e6ac656010959855f43e32977263a31da19185a6abf0a8b1f6545d9afbc65 SHA512 4ff429e7766ae867daf3a23e962996be1d85a53d8cd5110b9ce07c1245d856f06f981295660b86b23b2d23fc12cce648fdcc75fd370db1ff8b458c82b7ce2947
-EBUILD conky-1.18.1.ebuild 5458 BLAKE2B 37661e86b290cfcc889f0da5bade56c886ae506daa423812d4148fc4ae3836105fbd0c78565d47c7db9bf110dea3015b6bcc2f18cf5908169b395f93169a9cf5 SHA512 44dc89ed780c179e33344ff3907c493614e162bb14305376e158a9a73c023147d94b72e2415595ce612f617e2db0cd2d874928d91f572efe51b1269728c9d21f
-EBUILD conky-1.18.3.ebuild 5446 BLAKE2B a8256a09de877bbcf176775ab65e7a6a9a87a70f3e7eb397a6646fc0dd18828aab778bf2b471c2b95400f9dcacd6e1bcd2ac44b2686351ecec78bce9ca344099 SHA512 b3ffb447b2dbf8de69e7b0a400b6541e41ff64beb237ca15a7493a8ae30c96daa1738166708d0872d202272e71a05edc8b809e218234b9f9c990a7eec012fb62
+EBUILD conky-1.19.0.ebuild 5446 BLAKE2B a8256a09de877bbcf176775ab65e7a6a9a87a70f3e7eb397a6646fc0dd18828aab778bf2b471c2b95400f9dcacd6e1bcd2ac44b2686351ecec78bce9ca344099 SHA512 b3ffb447b2dbf8de69e7b0a400b6541e41ff64beb237ca15a7493a8ae30c96daa1738166708d0872d202272e71a05edc8b809e218234b9f9c990a7eec012fb62
 MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48
diff --git a/app-admin/conky/conky-1.18.1.ebuild b/app-admin/conky/conky-1.18.1.ebuild
deleted file mode 100644
index f60c0ae116e7..000000000000
--- a/app-admin/conky/conky-1.18.1.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-PYTHON_COMPAT=( python{3_9,3_10,3_11} )
-
-inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
-	intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
-	mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
-	wayland webserver wifi X xinerama xmms2"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	ical? ( dev-libs/libical:= )
-	iconv? ( virtual/libiconv )
-	imlib? ( media-libs/imlib2[X] )
-	irc? ( net-libs/libircclient )
-	lua-cairo? ( x11-libs/cairo[X] )
-	lua-imlib? ( media-libs/imlib2[X] )
-	lua-rsvg? ( gnome-base/librsvg )
-	mysql? ( dev-db/mysql-connector-c )
-	ncurses? ( sys-libs/ncurses:= )
-	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	pulseaudio? ( media-libs/libpulse )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-	systemd? ( sys-apps/systemd )
-	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/pango
-	)
-	wifi? ( net-wireless/wireless-tools )
-	webserver? ( net-libs/libmicrohttpd )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-		x11-libs/libXext
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xmms2? ( media-sound/xmms2 )
-	${LUA_DEPS}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	apcupsd? ( sys-power/apcupsd )
-	cmus? ( media-sound/cmus )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-	extras? (
-		app-editors/nano
-		|| ( app-editors/vim app-editors/gvim )
-		)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	wayland? (
-		dev-libs/wayland-protocols
-	)
-"
-BDEPEND="
-	doc? (
-		virtual/pandoc
-		$(python_gen_any_dep '
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-		')
-	)
-	extras? (
-		$(python_gen_any_dep '
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-		')
-	)
-	wayland? ( dev-util/wayland-scanner )
-"
-
-python_check_deps() {
-	use doc || use extras || return 0
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-REQUIRED_USE="
-	imlib? ( X )
-	lua-cairo? ( X  bundled-toluapp )
-	lua-imlib? ( X  bundled-toluapp )
-	lua-rsvg? ( X  bundled-toluapp )
-	nvidia? ( X )
-	truetype? ( X )
-	xinerama? ( X )
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md AUTHORS )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
-
-There are pretty html docs available at https://conky.cc/.
-
-Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	lua-single_pkg_setup
-	if use doc || use extras; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# pin lua 5.4
-	sed -i -e 's|include(FindLua)|find_package(Lua "5.4" EXACT)|g' \
-		cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
-
-	cmake_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	if use X; then
-		mycmakeargs+=(
-			-DBUILD_ARGB=yes
-			-DBUILD_X11=yes
-			-DBUILD_XDAMAGE=yes
-			-DBUILD_XDBE=yes
-			-DBUILD_XSHAPE=yes
-			-DBUILD_MOUSE_EVENTS=yes
-			-DOWN_WINDOW=yes
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_X11=no
-		)
-	fi
-
-	mycmakeargs+=(
-		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_AUDACIOUS=no
-		-DBUILD_BUILTIN_CONFIG=yes
-		-DBUILD_CMUS=$(usex cmus)
-		-DBUILD_CURL=$(usex curl)
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_EXTRAS=$(usex extras)
-		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_I18N=yes
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_ICAL=$(usex ical)
-		-DBUILD_ICONV=$(usex iconv)
-		-DBUILD_IMLIB2=$(usex imlib)
-		-DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
-		-DBUILD_IOSTATS=$(usex iostats)
-		-DBUILD_IPV6=yes
-		-DBUILD_IRC=$(usex irc)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-		-DBUILD_MATH=$(usex math)
-		-DBUILD_MOC=$(usex moc)
-		-DBUILD_MPD=$(usex mpd)
-		-DBUILD_MYSQL=$(usex mysql)
-		-DBUILD_NCURSES=$(usex ncurses)
-		-DBUILD_NVIDIA=$(usex nvidia)
-		-DBUILD_OLD_CONFIG=yes
-		-DBUILD_PORT_MONITORS=$(usex portmon)
-		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_RSS=$(usex rss)
-		-DBUILD_WAYLAND=$(usex wayland)
-		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_XFT=$(usex truetype)
-		-DBUILD_XINERAMA=$(usex xinerama)
-		-DBUILD_XMMS2=$(usex xmms2)
-		-DDOC_PATH=/usr/share/doc/${PF}
-		-DMAINTAINER_MODE=no
-		-DRELEASE=yes
-	)
-
-	if use doc || use extras; then
-		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use extras; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
-
-		insinto /usr/share/nano/
-		doins "${BUILD_DIR}"/extras/nano/conky.nanorc
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	xdg_pkg_postinst
-}
diff --git a/app-admin/conky/conky-1.18.3.ebuild b/app-admin/conky/conky-1.19.0.ebuild
index ff1244c36105..ff1244c36105 100644
--- a/app-admin/conky/conky-1.18.3.ebuild
+++ b/app-admin/conky/conky-1.19.0.ebuild
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index b608bb3578a0..5343010a5bbc 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -3,6 +3,6 @@ DIST sudo-1.9.12p2.tar.gz.sig 566 BLAKE2B fa679038c33d2bf1476b56944872d3a18b66bf
 DIST sudo-1.9.13p3.tar.gz 5100355 BLAKE2B 46218ecf4cf06d2280ccf4c257b12a6f697eda17b96a6b7aa56f6c7f22d847ec2a8036b9f615c3328d985656539c95f37a40c6c72dfa5f65786ab45a28cf353f SHA512 c0c5cd0c6308868afdad2ecf55b86fdcf1f49889b30831c9db3bc56a63dc3a07686c285c20b2500494b2a76653e2ec69196abdc583312609a5db1c81a6e4e737
 DIST sudo-1.9.13p3.tar.gz.sig 566 BLAKE2B 5b59c7178bf157b67500d972fe1b373bc86ab09345f59733cffa85700221ceec0d5be10bce4838f16e9238154c90a972570a7a933f48dbd56bc64b38dbc0043f SHA512 eebf36e86ebd03daca05838bc56d9b1fb7ea8584a83a9f0e03c5ff07e612d36472b23797c628eff1cf4301832d139de0de62ddc8b17e20f1498f769a4db1249a
 EBUILD sudo-1.9.12_p2.ebuild 7413 BLAKE2B 01eccb2c827cced39e5395355448123e0be8e94bd9adbe4ea9abbc1c9bd2e6c14a92069dd445823a8298be6989067f6d24db1bc485708ccf161b27ea8206a8ff SHA512 b31a539c56c0678d5be6040ff6764604de4ebfb021f387c83f497b63d05c81766040d4b552ad47c37be4ba71adfff460d0c5f4787130a7442aff59ad5d3a5ddd
-EBUILD sudo-1.9.13_p3.ebuild 7414 BLAKE2B 82fb6a8d10ad0ba23f4757415f0d60f47684c027fe2aec182757ed66f18be757bd04641dde2b626c11aef2f426686242010f1506af416d2713369adbd95b44f2 SHA512 4e08f9f6677e7f937559356660aadc5572ffebe7e8167f6190cf9b775f4187c591f93edd5aa794b282f8477255ee9d5109a0f26208442a3d0b1ab755429359c7
+EBUILD sudo-1.9.13_p3.ebuild 7413 BLAKE2B 01eccb2c827cced39e5395355448123e0be8e94bd9adbe4ea9abbc1c9bd2e6c14a92069dd445823a8298be6989067f6d24db1bc485708ccf161b27ea8206a8ff SHA512 b31a539c56c0678d5be6040ff6764604de4ebfb021f387c83f497b63d05c81766040d4b552ad47c37be4ba71adfff460d0c5f4787130a7442aff59ad5d3a5ddd
 EBUILD sudo-9999.ebuild 7421 BLAKE2B 9dfa40600141a49f26cfec28051914943fe0efbffd6e4b34d87c3f1e45dca65bca2f9a5d7584805b8411bb2ae4e70a2728525df893dce72af3484763bb9e92b0 SHA512 f392e4fe27f4df3ff162ea9c1d44ab91c03a63b5d65e6d60fceade321cb339395bd3c0cdfa9429e3c32ff90c992bdaa2118ca8b1ff485932dd85851f6d649efe
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.13_p3.ebuild b/app-admin/sudo/sudo-1.9.13_p3.ebuild
index bff5523ffe51..a609ac940882 100644
--- a/app-admin/sudo/sudo-1.9.13_p3.ebuild
+++ b/app-admin/sudo/sudo-1.9.13_p3.ebuild
@@ -33,7 +33,7 @@ else
 	"
 
 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris"
 	fi
 
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 5350af1bf61e..678de3d507dc 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
index a7c7c84eb2bf..c91506516da2 100644
--- a/app-misc/tmate/Manifest
+++ b/app-misc/tmate/Manifest
@@ -1,5 +1,5 @@
 AUX tmate-2.4.0-msgpack-6.patch 638 BLAKE2B 60a4779b292fc62d312ff0109cb86908773748f8c76dbd17286d4d169b86366e331e383a967a433b9e306279ef2adec52c9cdc8842e487040aa9eaa294a97846 SHA512 bcd45b70b7302ed86030e707f719aa645822dd08d22e271f82dbf4f95c1308da6a91562bea6e13f4e16a9d4dfaf1f039c04a2efb5a12ff44cf8a425d7ad910db
 DIST tmate-2.4.0.tar.gz 614179 BLAKE2B 9864f71255ceafb10cfd622346ef7d2db2a124d13599a7c8ae81e83950ba56216193e02633a9becd90fd430c6ddff66df763fe2733d58f45b02c74c8fb8f7fc4 SHA512 92d2ca354b295678bfc2747ca83a45ebafeaec40ebac94bd94c4926af4f820b3f3a087f365147f41c80d1c8ad032f52c697a2421839c39315d84f98f7eccada6
 EBUILD tmate-2.4.0-r1.ebuild 682 BLAKE2B 185aaca5848ee568a47f5b53c4540c193ecfe9de0e305652bc8dadd707b412352562c89e04095b43b333063e571e92c6d8cce3dd2cb351c718d931392039d397 SHA512 4da65cc1f9a8eb57fd93b996ef742784dec3055725f550536252da41fd359097325a98faad3674837d6fe6dfa1fe2c6458e6117c52b78a08475460db2157e24d
-EBUILD tmate-2.4.0-r2.ebuild 720 BLAKE2B b8b1915f8b4111409455a5e2cb9f11f764109c0f96e639b1c88b9403187740a7931bd8a30bdd21c422c1c01c8d2d91900715e41d058a5dfc16599ac6344b6e6a SHA512 82dd58d8988ffcdba78050fb8b719e0654ae93c3d86536a38464299b2c5e41f0b3f89743b36f858955adf74947158f053ea3ed2cf77d7b257cb68ac261125bfc
+EBUILD tmate-2.4.0-r2.ebuild 730 BLAKE2B dcd6d278b6773f81f21837dcd011bad502ff2ec9a0fd8c1d75e5c4c5ae556c93f99ed3ffbf35de33228d7a8627ae068c9100f26bcfbadaf0a474c9eac42c55a1 SHA512 b073e2f867e4752ec30f414334843f6e90318acaa6523a77bcab84cddf280c20455d1dfa4fd8fc99fc266c6d299797f54bcccd395d745d722a6114de9bb26096
 MISC metadata.xml 330 BLAKE2B 70515c3c92cafb3eab48dcfc5a8dd5ab13f672b5d648202ed8c4022867b973c2f26e42cb4b4901bb7797d85c329dd4831804103f26d9ce492f72e6ea171d858a SHA512 b4b51f04cefbde53b8214be6cca9611b20f8caca391433a657c304da3eebc61a8df5e1dc3e1f840ee1667e27c67e1da56969df4055f48b3fbfaa5f90c546d68d
diff --git a/app-misc/tmate/tmate-2.4.0-r2.ebuild b/app-misc/tmate/tmate-2.4.0-r2.ebuild
index 2c24d7966261..43708efa23c3 100644
--- a/app-misc/tmate/tmate-2.4.0-r2.ebuild
+++ b/app-misc/tmate/tmate-2.4.0-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Instant terminal sharing"
 HOMEPAGE="https://tmate.io/"
 SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="ISC"
+LICENSE="ISC BSD BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="debug"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 1bd445a48c05..95930168aaf6 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index eb2a1a740f5a..73c6149b14e1 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -4,8 +4,8 @@ DIST go1.19.8.src.tar.gz 26553006 BLAKE2B db085e575f1bc978502cc5d9e45206542cdf9c
 DIST go1.20.2.src.tar.gz 26178725 BLAKE2B 2c896bab60d301b7a01df48a20e16726c50cd1df528092022a33ab11c543c8c5c7e54c6235ccc776de74ead08aaf7496a016b829fa51f96ae2b32beeafb44cb2 SHA512 ba8f894b1baa6b3c1bdaafa113feff8d16c25d91f8e44bd4e7ffb46d7b329309290f27385804399baa9834691290a209fc7a193b24fd197ea11a16ce4a1b9d39
 DIST go1.20.3.src.tar.gz 26184364 BLAKE2B faa9cf8c141d013955d3582d5cf1a43ac0d89c2a7ceb7ab00e10aeacedc3bf1c324d62cd17dc6299057cc9acd347ec7672c7f9acafc1b926855d953ef2bac8d6 SHA512 47ebb3925956a3facef9e5e6f4efec3058e55632020ea247844c55b160d23e2be3880ea24dec2f73382a7c7858259896cbb7de1bb764c481c176bed479676029
 EBUILD go-1.19.7.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
-EBUILD go-1.19.8.ebuild 5235 BLAKE2B feec7ff92b8e32271235bd796c71f78f52e3c90c754d85496742564b4ff0b37fcf21fdf692f097c4298b36e5a3932349dace9ea3e1e91e4f6e632484ee2fb75c SHA512 63f5f1ae9a0f26e400d847df01ca9dad27dfa937e027b826098b63fc83e89665565e1308e7832eab2bd6e04eacf49d8704d2af2b2624db6b7782784d86957cad
+EBUILD go-1.19.8.ebuild 5234 BLAKE2B d017f18d2b8f2b3f95f5a8a84a294dc6d8779cf701a14e95d010f43027030de9290cbc05f7c92c95dffa938aa06477c92289ef2f76baeabc77dec91a7b5fd795 SHA512 129733230a68c6a019937dcc4601a1c6d1f23c22e2fda8b3ff55e366307e94703c532c0031f87f0585588177af15ad1425777d7e7fbe035414f11d94abec13eb
 EBUILD go-1.20.2.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
-EBUILD go-1.20.3.ebuild 5235 BLAKE2B feec7ff92b8e32271235bd796c71f78f52e3c90c754d85496742564b4ff0b37fcf21fdf692f097c4298b36e5a3932349dace9ea3e1e91e4f6e632484ee2fb75c SHA512 63f5f1ae9a0f26e400d847df01ca9dad27dfa937e027b826098b63fc83e89665565e1308e7832eab2bd6e04eacf49d8704d2af2b2624db6b7782784d86957cad
+EBUILD go-1.20.3.ebuild 5234 BLAKE2B d017f18d2b8f2b3f95f5a8a84a294dc6d8779cf701a14e95d010f43027030de9290cbc05f7c92c95dffa938aa06477c92289ef2f76baeabc77dec91a7b5fd795 SHA512 129733230a68c6a019937dcc4601a1c6d1f23c22e2fda8b3ff55e366307e94703c532c0031f87f0585588177af15ad1425777d7e7fbe035414f11d94abec13eb
 EBUILD go-9999.ebuild 4798 BLAKE2B 50daca174e8bc89f747432e96bc7d66e6c7dd50320d0b4c97754bb90267d62b700d34c250a892fdf60c907fa5eb881dd7adb3e64eba7ceb240740bd90c399f83 SHA512 051671c9a99efe554f9ed66423a20d053546ba68fdbf8a900e4ef0a365622bf8fcc976c678e393ade4a5475e01ccc53668d61d98e1b976e69de030662498273a
 MISC metadata.xml 590 BLAKE2B 56da63bdc350df5c6ef3b511a386627f4020f655027ca88da6a83ecb09581d3c3055c836eb8fe98a383412b3d431a77a9935ad753fe2d8392afa37cd613c15b0 SHA512 5d78adbae30c3a805194567bbb1af2ad59b78487819e7841a040d2a4d5db02f5b5d1d58f7cfc7a37f39e5e9bcf332dda4d336456e33e36c33caef792ac45d48b
diff --git a/dev-lang/go/go-1.19.8.ebuild b/dev-lang/go/go-1.19.8.ebuild
index 5fb93c0e9487..46cdf38c566d 100644
--- a/dev-lang/go/go-1.19.8.ebuild
+++ b/dev-lang/go/go-1.19.8.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.20.3.ebuild b/dev-lang/go/go-1.20.3.ebuild
index 5fb93c0e9487..46cdf38c566d 100644
--- a/dev-lang/go/go-1.20.3.ebuild
+++ b/dev-lang/go/go-1.20.3.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e3d05376d47b..d179067b4290 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index 429216bec90d..e0253f1afb7d 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,5 +1,5 @@
 DIST clhpp-2.0.19.tar.gz 106871 BLAKE2B e8c94f3e242d272a7eedbb13f7ead89cacaffdeca8b837fab29eb023e60efc7eb730b3966702474168071e7c884801fa24f0eedad95f6ea866f27dddb3af4a4e SHA512 f2d37eaee7a46b505844ddf45ae94f5f94241dea0b8f03f6bf4ba7524d7556c9ed19cc2f702cdd9becc469816ffa3d8371ae3561aebff5486cae9b623a10f58b
 DIST clhpp-2023.02.06.tar.gz 106874 BLAKE2B c57cdff048fe80b8fd95f14a77883f0d3eb7a64f7b9fea2661e0127172783ece911f908d7b6597e1b1b2cdfc86c1d841a3047d295a85408ba4c25cb5c8a262f8 SHA512 30252a832287375d550a5e184779881d5b22207a636298c7f52f277c219d3a1ae6983259cfea7bf4f90f0840fec114ee0e7a8c1e6a6fe48c24fd3b5119e7a7f8
 EBUILD clhpp-2.0.19.ebuild 1198 BLAKE2B 70ed65f97b5413e01ac34a7ab9a728f8cf4d81d452879da5e8083dd99099ba8bccb4a0c7b55d293672cca009f8b3b385cd2c7650a5574547efeaad94e11c1a20 SHA512 81b9bea394f9b411266a75aa8ee6068f143e01292ef653464333f83be1fbeef07e5026ac93e3c079ce4303502a73d41d903a9cfeb3a9a7327c735d0620224207
-EBUILD clhpp-2023.02.06.ebuild 1172 BLAKE2B 16fffda4c03bd23c0116682f12f6ae52bc9fc0e252818a8af6eee2a0b6fe26a3134141cfd5dbbb8b6e53e15d16385ba5fff11be8d99674aeb202acdecb0b9073 SHA512 1fa9aec81671dbdb0a8214fc9007ed52482e77ee29bf63ad734609da3dc17e6ce6df66daeeec488d5dbe97e465142fa47fdbebcb7edcbf9827816cb6916201ec
+EBUILD clhpp-2023.02.06.ebuild 1171 BLAKE2B c6d8e2bbfb61f47b1b1171a19485c732b4ce1ed6ddbd83666759788ef86ad84eb75a293f99a99fad34c31170b14dc75f8aba374f96727afc0cd22878fdd76bd7 SHA512 af95b0d5ff85f8019f0294ac1de547679c780c75959e6cd7a8695dfa3e31192a017a693ab0ce27f1edd4fa7584422721e3cebf557e1b6cc6ca503eecb46d61e3
 MISC metadata.xml 346 BLAKE2B acef91691221b9b27c8153b22470984b76fb92c720b9017da5cbae9464839c9625ea1d8902d18bf711ef7fcb435a07e7baf781d998881fe8179780d68e4c505e SHA512 78da9f326b7064b15eaf832bda21362f0a6eb495ed6a63c01cafb961d4ec7791c0806bd5f14d774092783fb55bb57012dc5ed74c04d445fce38cf72bc3998f73
diff --git a/dev-libs/clhpp/clhpp-2023.02.06.ebuild b/dev-libs/clhpp/clhpp-2023.02.06.ebuild
index c87a653da5d2..1b2e513a3a50 100644
--- a/dev-libs/clhpp/clhpp-2023.02.06.ebuild
+++ b/dev-libs/clhpp/clhpp-2023.02.06.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g
 
 LICENSE="Khronos-CLHPP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 # Tests require CMock (NOT cmocka), which is currently unpackaged
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index d0fa75723731..35dc48f993f9 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,5 @@
 DIST opencl-icd-loader-2022.09.30.tar.gz 87782 BLAKE2B 78d4c19d71c212dbe43a22d9e9504f9d22c3c5b5d078b9aa5625462c5591b87fdd472532d80e594b2a4e7dca1f10a5093bd4dbe661a23c3dbe254868b07e7b40 SHA512 0e7161f61c58f4d05f2a5f611560da1e57dfcc95184d25676cdc19f6e2136eca11cad4a87c769f2bff416928efa168220300749dc7607151a0e34a6c1b751295
 DIST opencl-icd-loader-2023.02.06.tar.gz 92484 BLAKE2B f86264a57533e67816711dba86e4f34920d5b1a605a6c0fdb01314b09eb9ced2022b1d25a88dfff58356ec8cdcf8ff8b1c857d49ddf196a4506e4e3420e3ace3 SHA512 e418b8f3cccb4716ed44acd0677afb96705f8b40a7714d483f1efe1a9b835f4a823c5a80f8457e72c8004f76d8a07c45d9cca55b699dd2fdaa6fe9f8cc863cbd
 EBUILD opencl-icd-loader-2022.09.30.ebuild 856 BLAKE2B 8bb3eb90e665678e6a13d08fc2ed9553fdc2d7f08f915da342b02f435074408d3934fb29cc4da4bf5929d75f445fa8c0b8d9cc5d109e09a7cee98452a08468e5 SHA512 debc5c067ba27e3da735ddd6eaf4abcd5db5dc864ab2299c3b9aecaf78cd3abf4926a361bc8fb0e139394f7795675af0d4fbf8220c2041b5c32a512467ed5407
-EBUILD opencl-icd-loader-2023.02.06.ebuild 859 BLAKE2B b316ce715f99d00fc86d52211afb73e8320121f811294962f8a1362617a0838ed696bd2f1d967bf2c74891322acca40d2a69ac0c63f2270693073a0f522df4c5 SHA512 9b18f4658ccec156ee906ed0378677ddd0a732c0ed8105c0a5e0bb1e6bd87628dc3ab89fa91e85493c1b8eff3480806b86a5a5c456683c97e0f7285a98950577
+EBUILD opencl-icd-loader-2023.02.06.ebuild 857 BLAKE2B c173264328874db95241fbdc4afa8e1008062b4d3d1ac948c559d49366c259bcba475a05a5e89ce164c9871efd7c1cf6313f5a43215afa4b6ff15eb9d39645f8 SHA512 04a8f4b29f6bce11021d4ff68f49539929245fc458970edddb513570604e17af9406669995f085471ba2148a4efdb5aa7d5257d85188d42699e7159c0a0545c4
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.02.06.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.02.06.ebuild
index 539868d8a384..938c0d8e779a 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.02.06.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.02.06.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 454c8631de8a..f076ffc05a78 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 56db4050211a..048caf4eda28 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -1,9 +1,3 @@
-DIST Nuitka-1.5.1.tar.gz 4167830 BLAKE2B 751784fac712149ccd180d391333d8431c6492f58a33296fc5f41c00d4908d65760216afefb626ac00b30a29c93acb767abe83a907756cbaa807706c0d9d2ef7 SHA512 ff02439556c193b2e40c6a7edfc42c9178fed4f04c4f1fe01a223f8b2243bc5f66784af5666887c9f07aafcc9428ae785a7174c4c88c73d7b62e56cf2aafde5e
-DIST Nuitka-1.5.3.tar.gz 4168230 BLAKE2B 668ba91a166504a6ed3b7b1b63cd836b7e344fc2fbcc35d4270bc797f18d5e391922a940326a24ae832b892914bf8d7b6c34a7b6f65a640600cb08a82ae40bcc SHA512 b2c478a950846e1492af07c64de835ad2fc56dc6a69ddb95402afcace2634ec5986422bc6af92cac1d833df278286f0b58918227b076fc17c32fc5d342efd7a7
-DIST Nuitka-1.5.4.tar.gz 4169252 BLAKE2B dfa4580219543ced211125b8af59175444b5f6aa1d0054f7fb91e2bb126d9cc30fcb266ef476fa77c7756bde865a22d7a5621fe2f12015d152d0aa8ea7823bd8 SHA512 3c53efebdbc12514e91c5eec2b3de44232e8f152ebc41dfa6f25127e7e59a9e9ec09f212761cd42a7e97249b8cd2cd04dfdb83d3f8906e4ae7e3840f754292fa
 DIST Nuitka-1.5.5.tar.gz 4172962 BLAKE2B 403ea94d2e2311c036359e80a9923f80bdaec9100c6df94aa5843c5734f6a3e9d180fc8a5872831a190fe984d12e5ba7e29b181e2235db55eadf1c4dda93f188 SHA512 4ea3a33e65ea34d72c209fa8ff35befad050ad559cb42e7050a784c0e8894e8e2826397859e3cb151f5b2c7adc7f39c00dd0759dbc039597ddb0f300be36b1d6
-EBUILD Nuitka-1.5.1.ebuild 1171 BLAKE2B 1fcb2c87e62bdafa2e0994d0d655c1bc5ee7590a57523ce52c951baf34ae003636a12388be1ca17b51949020374b23ee93f314b34354b57ae7fd7b4e7778d56a SHA512 4afaa4adafd2aeead9b5e71718bf03069a27977d924b4640f1683fc284fd4591f15703a6c47cd459ce10a3e67a81d6cc6ce9a64179334a06b031906fd151810d
-EBUILD Nuitka-1.5.3.ebuild 1171 BLAKE2B 1fcb2c87e62bdafa2e0994d0d655c1bc5ee7590a57523ce52c951baf34ae003636a12388be1ca17b51949020374b23ee93f314b34354b57ae7fd7b4e7778d56a SHA512 4afaa4adafd2aeead9b5e71718bf03069a27977d924b4640f1683fc284fd4591f15703a6c47cd459ce10a3e67a81d6cc6ce9a64179334a06b031906fd151810d
-EBUILD Nuitka-1.5.4.ebuild 1171 BLAKE2B 1fcb2c87e62bdafa2e0994d0d655c1bc5ee7590a57523ce52c951baf34ae003636a12388be1ca17b51949020374b23ee93f314b34354b57ae7fd7b4e7778d56a SHA512 4afaa4adafd2aeead9b5e71718bf03069a27977d924b4640f1683fc284fd4591f15703a6c47cd459ce10a3e67a81d6cc6ce9a64179334a06b031906fd151810d
 EBUILD Nuitka-1.5.5.ebuild 1171 BLAKE2B 1fcb2c87e62bdafa2e0994d0d655c1bc5ee7590a57523ce52c951baf34ae003636a12388be1ca17b51949020374b23ee93f314b34354b57ae7fd7b4e7778d56a SHA512 4afaa4adafd2aeead9b5e71718bf03069a27977d924b4640f1683fc284fd4591f15703a6c47cd459ce10a3e67a81d6cc6ce9a64179334a06b031906fd151810d
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/Nuitka/Nuitka-1.5.1.ebuild b/dev-python/Nuitka/Nuitka-1.5.1.ebuild
deleted file mode 100644
index f1bec277226a..000000000000
--- a/dev-python/Nuitka/Nuitka-1.5.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 flag-o-matic optfeature pypi
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://www.nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/Nuitka/Nuitka-1.5.3.ebuild b/dev-python/Nuitka/Nuitka-1.5.3.ebuild
deleted file mode 100644
index f1bec277226a..000000000000
--- a/dev-python/Nuitka/Nuitka-1.5.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 flag-o-matic optfeature pypi
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://www.nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/Nuitka/Nuitka-1.5.4.ebuild b/dev-python/Nuitka/Nuitka-1.5.4.ebuild
deleted file mode 100644
index f1bec277226a..000000000000
--- a/dev-python/Nuitka/Nuitka-1.5.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 flag-o-matic optfeature pypi
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://www.nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/accessible-pygments/Manifest b/dev-python/accessible-pygments/Manifest
index 3b8967866adb..ddbad71d7007 100644
--- a/dev-python/accessible-pygments/Manifest
+++ b/dev-python/accessible-pygments/Manifest
@@ -1,6 +1,3 @@
-AUX accessible-pygments-0.0.3-test-install.patch 810 BLAKE2B e4047a022f73b929ab12a3daaf3e91ec1d0ebfccfa6428b75a15654eb4a6095e072defd1ba1a8aa5dd03b0580ace2c4385092d343ff7629c571b63d1c80633ed SHA512 7070ecab79137baa67925fc89624291cac7d3c5e6ecb53488d3783a53dd8cc011f39a4e75cd2b22cefc95a9076d4654be4ee793e526456ea976bed8f39469b55
-DIST accessible-pygments-0.0.3.gh.tar.gz 4540727 BLAKE2B 7b5a4f36a938a2de531227e6dc6b55d3738c61433ae88b3b565b5cc1d4d76526eaf72f90c79362ab5d4818f8483d33e48265e3dea58a273742ecdb0bcc57ca91 SHA512 21803f2f6332c42996de5722cd575b9b6cf544a8a038298d9462a910bce51b63df8cc47077b510b675fee5a4c1250c797627e2f7dca7cfa0d75fcb115067bfa0
 DIST accessible-pygments-0.0.4.gh.tar.gz 4540933 BLAKE2B 1fdd376b9f069590552632a806f161404aeb3ae0c9b522705ea64476bccc97e3f888af270fba5e05680bb87e2d3283f2c93259c687e137efc56a38ca4d71b507 SHA512 b45b3c17bcfb2d66d397ee7e535c35159ab79080163f8ace286d73ea65a08f7e39c757414755d7f59bdae22a52198e26546ae61893bd9cd5c901d2e2b1efb2b1
-EBUILD accessible-pygments-0.0.3.ebuild 923 BLAKE2B 246bb106f187d48740beb847f43cf1429d2802c17da238d8dac633254b51fe518838e01984232e03b462f0335c77a09e477c6e02888421773a4f2adfacae6508 SHA512 1bddaa190bc3606c35b288480a727258d1cf48de0938bc881fe212f689fb673bdeb188b6771cb8c7bb9eb8ff6ad1c41c41659cbe8d5ce62951c203c2ca11853d
 EBUILD accessible-pygments-0.0.4.ebuild 878 BLAKE2B 790fd0099711581d5298a52ba641f7d4dd1546a191a8a133711135c089a8fa504fd637af66b72f106d359307e1a99e894432f732732ecd12d5be0255ba92ed88 SHA512 9ac4ced2e09e446925cf4d2d9bd33824d6304cd589c28067bcf653f8f0a46871eeacf6603e6e15e15f4448a3e9aae66649bc97bfcf09e1355aa70603413f585d
 MISC metadata.xml 421 BLAKE2B ef299c2eec196b50d776375f0bb9f00319649a659524e959f625e7bd9a1e53d994b7b55f7ca121b6b1a7022424f365ec3a739a072c7fab5de0ba689f099ef250 SHA512 683cfa4011320ee1e5437919f7ac05aa5bf1517da3c4427fa216e15f3e6c96b97de598719d1b66f10a4270a7f6b14101c2925af06bb1db186d770028b06f7b0b
diff --git a/dev-python/accessible-pygments/accessible-pygments-0.0.3.ebuild b/dev-python/accessible-pygments/accessible-pygments-0.0.3.ebuild
deleted file mode 100644
index 897f8fa91d7f..000000000000
--- a/dev-python/accessible-pygments/accessible-pygments-0.0.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 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="A collection of accessible pygments styles"
-HOMEPAGE="
-	https://pypi.org/project/accessible-pygments/
-	https://github.com/Quansight-Labs/accessible-pygments/
-"
-SRC_URI="
-	https://github.com/Quansight-Labs/accessible-pygments/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-test-install.patch"
-)
-
-python_test() {
-	# it's more like a demo but at least checks if all themes can
-	# be loaded and run; we can't reasonably compare the results
-	# because they differ by pygments version a lot
-	"${EPYTHON}" test/run_tests.py || die
-}
diff --git a/dev-python/accessible-pygments/files/accessible-pygments-0.0.3-test-install.patch b/dev-python/accessible-pygments/files/accessible-pygments-0.0.3-test-install.patch
deleted file mode 100644
index 3680c8de0f04..000000000000
--- a/dev-python/accessible-pygments/files/accessible-pygments-0.0.3-test-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6c7fe42cb8e67f369d2cba3872a9b45d8380ae07 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 9 Mar 2023 13:27:06 +0100
-Subject: [PATCH] Exclude "test" package from being installed
-
-Add `test` to excludes for `find_packages()`, to prevent the package
-from wrongly installing the `test` directory into site-packages, e.g.:
-
-    /usr/lib/python3.11/site-packages/test
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index a124748..36db5d7 100644
---- a/setup.py
-+++ b/setup.py
-@@ -53,7 +53,7 @@ setup (
- 
-   url='https://github.com/Quansight-Labs/accessible-pygments',
- 
--  packages=find_packages(),
-+  packages=find_packages(exclude=['test']),
-   install_requires=[
-     'pygments >= 1.5'
-   ],
--- 
-2.39.2
-
diff --git a/dev-python/aiosqlite/Manifest b/dev-python/aiosqlite/Manifest
index 296beabf42c7..a0eb80091516 100644
--- a/dev-python/aiosqlite/Manifest
+++ b/dev-python/aiosqlite/Manifest
@@ -1,3 +1,3 @@
 DIST aiosqlite-0.18.0.tar.gz 27066 BLAKE2B 2743db7770b8377a1ab2b11b286684840b1ace9015180fb18590026e4607f78f72068765ea5ab69f9b2fd6ad96007dbbb517d371c2142930f2a587f0b13f81ea SHA512 dcab1bac1b32a86f31957a2f297969ba25cf43cd129afba5810812124964640744cdcbf9764c0037adb9b6cd917cd816a26823578ffb16d864be19f92373d59f
-EBUILD aiosqlite-0.18.0.ebuild 584 BLAKE2B 50cb8eabc08d12c491ca5abd1338c8df6e138f705ef80e65e08fbc4cf7c206c560818ff926b406a2155b192ee991f6b43bb64c437ad245e6cb107b219ae83512 SHA512 00322a546325fe6e84f49a3ea7ce9bd6eced53fbf743fb0dba628480f2d8fb64c28e196b0c9bdc22d9fa701f3d818c7f28215af03079962d0a6d94d05102f8eb
+EBUILD aiosqlite-0.18.0.ebuild 589 BLAKE2B fcebd5cfab90d4b98a35f68b9e111addcc4182bcbc7378358903c70879fde6d3bb2709826110e65c310804ab3f39ee65b44152132d6bba88b2f4ca533ffbf209 SHA512 10aa33117de0fd2940227e9c8e0e45a07e8cdc7ffed02630713cd0810e39e82b909f76d0a1e7456bbdca1caa5eb951a1610fc781a51298e7283c71a6b1639596
 MISC metadata.xml 433 BLAKE2B bff5372449e51d02ca3946ee993b58cf9243bcd7fb13e8403a45e203085e100a3a15b655b1ec75c182106790fe94e0afe20740db5ea214ef12a5d411bb859693 SHA512 32f0a358ac4ee6fb02cecec77e8920a19056538a6ff84f0fbed19e4d2146a1fcbcbd0faa36a07ba16eda9e89ebaf83643127482f00394baaefe90c0bddc69563
diff --git a/dev-python/aiosqlite/aiosqlite-0.18.0.ebuild b/dev-python/aiosqlite/aiosqlite-0.18.0.ebuild
index 84a30e401299..6c7ecd8af57a 100644
--- a/dev-python/aiosqlite/aiosqlite-0.18.0.ebuild
+++ b/dev-python/aiosqlite/aiosqlite-0.18.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index f3b0e55e8555..633e6cdcb2c7 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,7 +1,7 @@
 DIST alembic-1.10.2.tar.gz 1148340 BLAKE2B e6882982d0c7f10aadce3118e0d7ec84de9ecd123b55351922876fedcd5e1debe8aacac57a4db25a0296c585569d6118b95aa5dc601841f5c4247f21fcfd917f SHA512 a0ebff90521a4358257892b840d3e623d35bc2c32408759b7d5ae25839a5314e58ea40457f79e766d1cfad467ebe8b663e073aebd89141e11aee1992b40ee1e9
 DIST alembic-1.10.3.tar.gz 1151146 BLAKE2B 3b84ca71431b0a55c91413f4586f85e5e7c8f8d107755fca7694dca431b96c6e6a9abc9b67a8d86c348cb194e18553761bb8d4a3957a6479cfc57cb92de8b490 SHA512 5665ae9429a6b828b6357bde170e011ef5a18cb5642c5b5ade123046dfbad307c238c0188b4c35db59217c7921f43b2b92192b84b51ee269a39766957ca0be7f
 DIST alembic-1.9.4.tar.gz 1139210 BLAKE2B 5b740803b6bf5b715e9572a91d87d5403d64e665647776d28511704fa17ed81825fe6f5cdab2cec77a0806abb02ef2a7acf5f9702ff87639b90e74d9e22a4b1a SHA512 76e6f86e789cecff78f8e86c34d22a70615158833bc24a26f38fe2d0d5ccd098920e0fe4cbebaadd2c9a4a2e63152720945645000d46a2b6b8b6696ce873f899
-EBUILD alembic-1.10.2.ebuild 823 BLAKE2B 2e117a78be63af85010ec0f507aa0f90129b3fdb92c345b741a8beeadf9c19d634eba9f3072a3013c53dca7bb85d77553c75876460c0e3c8d74b5a6e89ba39fe SHA512 fcc103c9652dd9450d4810f96cfc56dc8462d234ca0d6b88c8814f9948917a8e3d241b331e8bd7ed46cfb3d04b7afb0c00b4241784886e23ce7c7b2eee04c861
+EBUILD alembic-1.10.2.ebuild 821 BLAKE2B 1e242919afebea6135741c1a7d7beebc24345972ad244d68b604071b9e93f6e76721aa6f0973fad9865b30ed8dbf2e1d7dcf392b15f8edf91b47d7c9dd521c9d SHA512 f0e382643b109ef55dbe161d972552f355a4b2474aed88a85258fcfce067ddff956a149ab9cc94dfccceaa66d4b6c47554cbc6777d26f04d579dec0f44d66fb9
 EBUILD alembic-1.10.3.ebuild 823 BLAKE2B 2e117a78be63af85010ec0f507aa0f90129b3fdb92c345b741a8beeadf9c19d634eba9f3072a3013c53dca7bb85d77553c75876460c0e3c8d74b5a6e89ba39fe SHA512 fcc103c9652dd9450d4810f96cfc56dc8462d234ca0d6b88c8814f9948917a8e3d241b331e8bd7ed46cfb3d04b7afb0c00b4241784886e23ce7c7b2eee04c861
 EBUILD alembic-1.9.4.ebuild 769 BLAKE2B ba8c5fd187d28564d6742cf735891fd45b91b75c2aaf46b831263b35e308c682d5bf8811aa15cb8856f8858325e5af10af281cfb79d527c8c6f76f41b7af7998 SHA512 90bc88562d2b8494515a05e08837325ecef9aa0fae03b2427276b16a14e0898b49e2e947699cd995d6e1b90c0d2ee148b415102f21d88fcdec32bf614d4deefd
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.10.2.ebuild b/dev-python/alembic/alembic-1.10.2.ebuild
index 65822a6ad910..12254ece8bc6 100644
--- a/dev-python/alembic/alembic-1.10.2.ebuild
+++ b/dev-python/alembic/alembic-1.10.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
index 11ca72098433..028a34c390f4 100644
--- a/dev-python/asyncstdlib/Manifest
+++ b/dev-python/asyncstdlib/Manifest
@@ -1,5 +1,3 @@
-DIST asyncstdlib-3.10.5.gh.tar.gz 54697 BLAKE2B b8a99a83e97084c4e09ddac0402ca23a8d42921b72774c0658aa0b9a1aa0ac1329baae782f105a52a4b6d979d490d97814ea6eac0e7570a7ca27784a27fa5c4d SHA512 3dfa8d1e5e2ef02dbf52fe7094b68496066978cfa9839cad59222ace40e0871369b45d93c1caa87e0f029c328253f6d72d8377625a8ed182498280662fcb7545
 DIST asyncstdlib-3.10.6.gh.tar.gz 56335 BLAKE2B 15b33e90454c2b1f9ca8ddd9c71db74af1541e26af59c1a5a8b6240ec7b9e5db06f0455c778de39ff6cce1e87db41403fbc1b8965da0764f8215c4dd6bfa8e17 SHA512 e8b8b72f7d59593876f6701632d4b4839bf6110134b8dc62a33f665c52528a94f53ac6c43195520c2902e66f68b379cf7d9258e29fb25c69ae2fa98cfe4b10a6
-EBUILD asyncstdlib-3.10.5.ebuild 515 BLAKE2B f546ccfd893fb6288be566292c5278aba1dbcb769439ea1bf04e5acec6888470e02ba3883c03a50c4f8bd0336660705552b8ab04d8bde844c2721d63579a6186 SHA512 69676d00559ae18827170f967d3b3457578b4a7e9e8fd926a1e417521334524411cffc10b1c7f6824d37c8a18c423a2c14b1fffeefe2ce42ffa50979fc6c767c
 EBUILD asyncstdlib-3.10.6.ebuild 515 BLAKE2B f546ccfd893fb6288be566292c5278aba1dbcb769439ea1bf04e5acec6888470e02ba3883c03a50c4f8bd0336660705552b8ab04d8bde844c2721d63579a6186 SHA512 69676d00559ae18827170f967d3b3457578b4a7e9e8fd926a1e417521334524411cffc10b1c7f6824d37c8a18c423a2c14b1fffeefe2ce42ffa50979fc6c767c
 MISC metadata.xml 359 BLAKE2B 10bdbf5adba9cefa912d8e1f195f20d4040bc2e8e3efb3fdc6efcb8272bb58160c6d772de3fe9ad9c4cb43e2817139319ffece082c3c043f1d97cb36ed8ac7a8 SHA512 e56f712f7446a3e68137a945a1ab212f6254740ce2f962fc7ab0061f41cb0d314809ad4fe3317fd10d8ebb594fb20d690d06b0a73636b13b5fdb5184cde2e306
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.5.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.5.ebuild
deleted file mode 100644
index 3aae64aa0b23..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.10.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021-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} )
-
-inherit distutils-r1
-
-DESCRIPTION="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/
-"
-SRC_URI="
-	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index bf3175d65c94..8ac48abd07fa 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,7 +1,3 @@
-DIST awx-21.13.0.gh.tar.gz 16221713 BLAKE2B 7e875efced94fb22d782deb9583fddfa13e10079a202298d0ca05af58048d4bf70480aacec7f0e3c408c9600fff126886cb6912bdadb3f48a33932c9debd2344 SHA512 90628347f71663d4e13fed2cc529b3bda858d07130b74593582e82e19b8c6e6049c9ad6cdd419e4efa4bd366771e993665ef4527f5de336edd5f020c9a93ca7a
-DIST awx-21.14.0.gh.tar.gz 16484659 BLAKE2B 3541286c899eceb3a64719b08c0456abe34d70f6e97f3ecf24c4066da1173be02e613e42ecb1193f371703f8fa55abf0eba0106ccf884e6bb53bca9f2f2d2a0e SHA512 5c7efae528cdebffbce745f5e63807944db5a3a4b72880515da6d25de414d2d8c8a1ffb74f9f78f8cf72a6584437b627d8d53fd555021b943653d28427bd1021
 DIST awx-22.0.0.gh.tar.gz 16988159 BLAKE2B 88b2e8a1f035ca34c7dfd6ddb83ca9b72824153611861286c771a0493bf6c9fefa593d9e92116e9adf1968ee39c128af318fb7d5ef542e1d4603e235a7471412 SHA512 5ce0ea43d758e63ace024cee1c67e19a154104508dea2b67bdb275189e1f993b3b0c782e704d319196dcaabcf09db12ff36fcf73a35e5c4fdd5076a7e0649e10
-EBUILD awxkit-21.13.0.ebuild 1095 BLAKE2B 30ed96e9027d4aa915e502b7700acc5b7df74f6f46ea5d6f9feecd7b8f6649113c018f73b1507e3a2e3d13499e024d3e90d2d524b97f91e267a468b7afe06eb7 SHA512 37c7bb2792c17805fd96113fc7a6d6dee39c195d2760b89614ceb79ca4396333fab167ab022de5fe9600221f54623ff9505d1c6a025e595516b35c9a7bfd663b
-EBUILD awxkit-21.14.0.ebuild 1095 BLAKE2B 30ed96e9027d4aa915e502b7700acc5b7df74f6f46ea5d6f9feecd7b8f6649113c018f73b1507e3a2e3d13499e024d3e90d2d524b97f91e267a468b7afe06eb7 SHA512 37c7bb2792c17805fd96113fc7a6d6dee39c195d2760b89614ceb79ca4396333fab167ab022de5fe9600221f54623ff9505d1c6a025e595516b35c9a7bfd663b
 EBUILD awxkit-22.0.0.ebuild 1120 BLAKE2B 46ec711a264814630cb4147d859992a8c5ccd5d13d6d43f655af2643e7ea9865281d0f9abede93bb66aa585c9025a5809a55fac4d0bf0c2604e47961628c6bfc SHA512 11ba01f282a7f6e5b64a9f1adcfc3c7913c6a2a409965607e312fa9d7fe401ca9d0b5b099ae8a5b2bd91c19d4c06db0a9f744d3b7e44ba73b14bd056e7eed90d
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-21.13.0.ebuild b/dev-python/awxkit/awxkit-21.13.0.ebuild
deleted file mode 100644
index 707b930aafad..000000000000
--- a/dev-python/awxkit/awxkit-21.13.0.ebuild
+++ /dev/null
@@ -1,49 +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..10} )
-
-inherit distutils-r1
-
-MY_P=awx-${PV}
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="
-	https://github.com/ansible/awx/
-	https://pypi.org/project/awxkit/
-"
-SRC_URI="
-	https://github.com/ansible/awx/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/awxkit"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-	printf '%s\n' "${PV}" > VERSION || die
-
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-e "/'clean'/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/awxkit/awxkit-21.14.0.ebuild b/dev-python/awxkit/awxkit-21.14.0.ebuild
deleted file mode 100644
index 707b930aafad..000000000000
--- a/dev-python/awxkit/awxkit-21.14.0.ebuild
+++ /dev/null
@@ -1,49 +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..10} )
-
-inherit distutils-r1
-
-MY_P=awx-${PV}
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="
-	https://github.com/ansible/awx/
-	https://pypi.org/project/awxkit/
-"
-SRC_URI="
-	https://github.com/ansible/awx/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/awxkit"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-	printf '%s\n' "${PV}" > VERSION || die
-
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-e "/'clean'/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bareos/Manifest b/dev-python/bareos/Manifest
index a0bf6cfb791a..bb21601b470a 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1,5 +1,3 @@
-DIST bareos-21.1.7.tar.gz 11666508 BLAKE2B 8b5efffb987b53d1bc289aa104c10827c6bed630ffee16c26e8ab428ee20aa63a9e1e2fc03a7656d26f5905443b06c6a6f6d4860be413776874917e2c1cd0ef2 SHA512 2b7dfb16b74aa912449269efb92c85b6720f08526122c7dc9bfb648aed70b2ca81df41eacb60c53e2a154793c6ed209dd1571ecec7913a357e491064b1faab41
 DIST bareos-22.0.3.tar.gz 14529338 BLAKE2B 7759059f8652cf0b55a8754325b86257130695918f0b2d4672a7a21aa3ed6595da9fcba9a5a5f1c854af7994aa21c304720131ab99d577f01cd706f55184b621 SHA512 cbdf4bfb5284104894e7fb8ddbb20d6ecedd827c8133b13913e9a27c4e3b98b550ec60a9a23c2c4efe6d566c94ed745d77946a444e5fccb56c09ab8f740d9f8c
-EBUILD bareos-21.1.7.ebuild 503 BLAKE2B eab871fb16290a66ae4b5c4ced93e5ebd61f94f2a3b8781ebf0349731db7d7a967f59202c556f3ee475b5028cecc743eecdd08facea6f1fd70007d40c3f2c2b0 SHA512 26434fadf1c025b84c24c907189d9e62e15989cdcd3821724a3a6e5cc9537662d5e9dfcd62ad20a057db7a045f0fa2500950b6d08f8d7346b4f854c8a42897f9
 EBUILD bareos-22.0.3.ebuild 503 BLAKE2B eab871fb16290a66ae4b5c4ced93e5ebd61f94f2a3b8781ebf0349731db7d7a967f59202c556f3ee475b5028cecc743eecdd08facea6f1fd70007d40c3f2c2b0 SHA512 26434fadf1c025b84c24c907189d9e62e15989cdcd3821724a3a6e5cc9537662d5e9dfcd62ad20a057db7a045f0fa2500950b6d08f8d7346b4f854c8a42897f9
 MISC metadata.xml 329 BLAKE2B 9e0fc3eff1f6e5e0b9529f5264b5e9aac303a2806f6276691728689df3e0f23d866a57e4df9794aa59be1008d736e073c9c854a88edd0c460bc5102a2f098848 SHA512 2325dddc4c62c5f0caba21e0419aea28cb556dd56664eabb2219cf7ea0b1b3177d5e142c6760a95c0a3aba6120f60d37241f6faf01759a00a6f76b12d4332e10
diff --git a/dev-python/bareos/bareos-21.1.7.ebuild b/dev-python/bareos/bareos-21.1.7.ebuild
deleted file mode 100644
index 607aaf1bf7d1..000000000000
--- a/dev-python/bareos/bareos-21.1.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="python bindings for bareos network backup suite"
-HOMEPAGE="https://www.bareos.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror test"
diff --git a/dev-python/beautifulsoup4/Manifest b/dev-python/beautifulsoup4/Manifest
index b3000d3ec585..3084e61afce1 100644
--- a/dev-python/beautifulsoup4/Manifest
+++ b/dev-python/beautifulsoup4/Manifest
@@ -1,7 +1,9 @@
 DIST beautifulsoup4-4.11.2.tar.gz 517627 BLAKE2B 19fc88dff84c398461ecce3b66b1a92c3541114e3595aa1bae7182914e174d9c36b6de37ba120200695f6dca489c6afcd361244ae9577bc469d20a0864989d48 SHA512 68f5328f881946e80ed1af36b26da184f0af58aaf124f5f623f89c40130e1578f6dbe874b11c802e52c0ec02cfbf6b681e10eb235279631f479d14c2243e7dd3
 DIST beautifulsoup4-4.12.0.tar.gz 523942 BLAKE2B a1cde7726cfe96327300a4c9d44fbf98e3196911be628aa7633633f3515ed6c5d2d0cea61b4a4c9529208bc2339ae070e8e5ffc60d0afec133ca81079b53a49b SHA512 8f4dcaccdcd220f9641c7080d685c1eaa9c851daa579c187fda75a1d85dcf2fe4cc673c2d4b2143682003390ef1d954366ea0d2820e07f8c10418350d31bccd3
 DIST beautifulsoup4-4.12.1.tar.gz 504683 BLAKE2B a02684f0f431c7ae79118e698e985fb2312b277323bb25323c5361badc55a8b15cc9de7f2c9fbc8e5dc133e5d660692b5d1bdd546c65128d9ab56a87712cef0f SHA512 f66538e251b447e532acb5c75ec8c0af7a30a7eb4241470f0691db013ab7990a173cbe3c649f29cb58036b4ed622ee4284372fe3d091175c11baba9b15619f2d
+DIST beautifulsoup4-4.12.2.tar.gz 505113 BLAKE2B 94412a87dcffeb14655417eb61a784c8933aea79c81721ebf30114d55fd3e0f58850e0cfed354d3573d1bf18b556f3d83474b64a2a8d88f503c5125d5931321d SHA512 1dbb620f675bb319ef050ece0f343e80359bdc59cd8b8de19b1851aa5bca1081a7e953e3221ad97142198c17f67384c05b0406af24a123d71398f209fb89db97
 EBUILD beautifulsoup4-4.11.2.ebuild 977 BLAKE2B cf084c97939552e1cd2a86e6cbab030b6eded99d6418990124c27d89d8ac6267ae30e5b75b847f0bd952fb0d90dca0a064789f76109b13efa43de92e0236c5db SHA512 d90b28c15af03b7d93d303bd70a135a05e45e7b2b0813185653b640d0f8f6eaa7e1ac3af4e155449674d0f3d3fc7bb06445c0925513e0379e51f0a473dde6149
 EBUILD beautifulsoup4-4.12.0.ebuild 985 BLAKE2B 2b22be5d7ca2725ed56a0eace6d24c061a3ccf463ef43b6a37b848855b2ca4f9134fdb299a142044ba769b4b66d5e605b75469a688c5ddb9ec64969682ba5f29 SHA512 a559d956a38de782512174a4585309540869861d26c8dcaa7b514db0516dc6b2e9c245e33a30dbf72fd86bf529e0fb6414f0544be1325458d31363ce29e59a94
 EBUILD beautifulsoup4-4.12.1.ebuild 990 BLAKE2B 160cc4f456cd9549247f59ecfa7b7c65091fe269358daf990467eb8ff544d3d67fc24b1df63daa625a7ca2e365782778c13f95377152fc302b3d7d8fccdaaaa0 SHA512 7b3f2c6105faa7ccddaf40e1bf2341a3ace748c63dc8b4730d38564e602a2bccb2ea99d55bcd96f5e8bd77f19a4a2342892e078a9e3c37182134874632631f07
+EBUILD beautifulsoup4-4.12.2.ebuild 990 BLAKE2B 160cc4f456cd9549247f59ecfa7b7c65091fe269358daf990467eb8ff544d3d67fc24b1df63daa625a7ca2e365782778c13f95377152fc302b3d7d8fccdaaaa0 SHA512 7b3f2c6105faa7ccddaf40e1bf2341a3ace748c63dc8b4730d38564e602a2bccb2ea99d55bcd96f5e8bd77f19a4a2342892e078a9e3c37182134874632631f07
 MISC metadata.xml 745 BLAKE2B 16e44221decda568bcfd7fc64384f3c10d6150801bd099fbee3abb0273fa53bc83494cd9a56d43b125e9b2d773f9e1dcd35820bcc26a28048beea287a9fc3e23 SHA512 b332203a23fbeef550ce75c70afcf6eb9decf4e3e0409899d556e4e12449608100e1e6af81f163a879937bea2726195524559aa1151f917cc9facdf2bde559e0
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.12.2.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.12.2.ebuild
new file mode 100644
index 000000000000..179ee52155fd
--- /dev/null
+++ b/dev-python/beautifulsoup4/beautifulsoup4-4.12.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
+HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/soupsieve-1.3[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+# bs4 prefers cchardet > chardet > charset-normalizer
+# however, charset-normalizer causes test failures, so force the other two
+# dev-python/chardet[${PYTHON_USEDEP}]
+BDEPEND="
+	test? (
+		|| (
+			dev-python/cchardet[${PYTHON_USEDEP}]
+			dev-python/chardet[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc/source
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 1d12e9e6f2f4..e38709a9a6d1 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,11 +2,13 @@ DIST boto3-1.26.104.gh.tar.gz 630394 BLAKE2B 8444d5c3d0c60db0a77d7d96d518ffd6d10
 DIST boto3-1.26.106.gh.tar.gz 631950 BLAKE2B a8c9a0f1450a743953ebc26c75bef7ca1a52d588e5915c70f805efb26093c832bfae07f9a02a740b36ac1b092cecddf77306d3dd82f2f924ec42403c8b397c93 SHA512 2c0a7712abb5c5a4f541e94401ec03291c0aa15536884b793fb7fe4d328270af974ac70e7a538349969b737f86d8119f644595144d4399eb91ac7708762159a9
 DIST boto3-1.26.107.gh.tar.gz 632507 BLAKE2B 8331a8e925a390f56af023b49b45df307bd6077fdc24138686acc87b17a5afa15fdd9db2aa8611d745d7682946e3ff94a46d570f4a37edb847eb90b2c6ad0cd2 SHA512 53ca758026eb2952a290c8eee84ed3b3399ebb893fd8cc0ea7a7c9d1f9166810882e326bafc41c67b4183616f953ae2bdd5c91275e2c157f79c6414256f38d0f
 DIST boto3-1.26.108.gh.tar.gz 632927 BLAKE2B 836bfda9d5cab0ccd89903f98acab2dc2f13c7ed392c7fe86a13e8410a4152ca57fabf529e3d02c4591906b76e026a9813a6d892c5db8f32fd55dc27b9cecb1f SHA512 9e003e1f7d396a352cf50dff1c83ca8db40b73165880371b10ddbeafced59cdf255a9f3aa3b395347fde8471ee149cb9191280104fdec71baf7975710a356640
+DIST boto3-1.26.109.gh.tar.gz 635150 BLAKE2B d60417a5220eb1cd4a82e9652a0c6bc2bdb57749589c3596506e24e6d7f884fa4b8d480dad68dd34af0f0d71e970b43704b458cb2c8a750d81b66bc9a5123044 SHA512 6cd89835d69be9a5e87cd7f35ada43972681658eb7d1cefe3c98402690fd46360b4c0e48ca2d771b18cdce2097f985a42474ec92ab55b53eb24c671eebffe75e
 DIST boto3-1.26.99.gh.tar.gz 625932 BLAKE2B 961a640995abdafbf2cd73f83ed5af0e1314cebbc5dc154771204e7c16532ad4a84aed08cbd7789af30de518bf2e8bd5204e9a540a2d3a08e75222c2eeb9a68a SHA512 ff726483a83a11a8c088905998af0a1a791e87503b39422811d82b3122275a24eb955636407422af7552908eee22d4c1369779a7798f09f958a8af5234c0c11d
 EBUILD boto3-1.26.104.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.106.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.107.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.108.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.109.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.99.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
 EBUILD boto3-9999.ebuild 1514 BLAKE2B 5d31d27ac50ed037fb8be61559bac03bd2a8c63f3220ac93ecc864c0e3cbd34763b9b70761a9f364cbc85a0edd84c6f6eeff614292f31473b4935e5bb86fae7b SHA512 26bd2959c745f0e423d683d2fedeab9a438d215fa9b28b403d0cea81caac7436f05382b2a91a183bc1095f3b205e3b2115f931cd7803e0b9838c2a507562da5c
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.109.ebuild b/dev-python/boto3/boto3-1.26.109.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.109.ebuild
@@ -0,0 +1,66 @@
+# 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 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c7cb7af61f13..37bafdf938a0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,11 +2,13 @@ DIST botocore-1.29.104.gh.tar.gz 11360726 BLAKE2B f051024952f137e42a544d60cefbcf
 DIST botocore-1.29.106.gh.tar.gz 11366047 BLAKE2B 95bacc0bfd436c86934f7287b6b8729ef0b28ba38a0ddddb0f81a7b57893f795153ba72466de377899234daaeb71921661fd4d8c9fe395b761859ccb0eb59577 SHA512 aaad7d0c863a09bef710214230835f8f3b8eb5f2142268dc30b351446c64cf499054f6297c165a0fb28bbd3db1e784a7a5234279dba711ae02359cfcbbfd8746
 DIST botocore-1.29.107.gh.tar.gz 11367875 BLAKE2B 3a7ee035770752f848ebe47db9801c413869a1c457d31a91b8814b561ef006fbb693764377211ac51aa53296650ca5557317e87818892dc3366f410c75099a33 SHA512 54f27c76ed3c85a6252fd6b5c3b1053fba6494d5fa3e0796771197b0490cecc5c19f23b8bb542ddd2fda4438310b3a5d5a751c6b74006ae1a3bac606cb53cee9
 DIST botocore-1.29.108.gh.tar.gz 11370922 BLAKE2B 9f639ba9df35dfdd282021d258f6a40b5bc80a1cb918db56479c10854f6ae5d0e179dd6840baa39bdb229b2e42c7f40522cd6bec3db340bc7950f3557d0b3f63 SHA512 cb9632afbc12233a0483ca6eb93d2bc77814b859707e3db9c72ec5a33ea2a0f8c5c2215ab49e510ee356a0f222905fd4b6c262c8a0c30e104aa0e6842871faed
+DIST botocore-1.29.109.gh.tar.gz 11375235 BLAKE2B 9bd6333319cce685257a5bd4eb06d289946b0706ff5ee6786d965bcab64d858a967812e0692e57713e6e93fb62848898713c2a303c9e2b976f39a38af948a9c5 SHA512 d5b14de4bedd96b8396bfac997df1482b2b83cdff1469d21a7e8a6c5047b6f46bd6690f36a4de3dc54fba1121486ff6c21422d7c8b6209a877d156dff76ccd1a
 DIST botocore-1.29.99.gh.tar.gz 11285143 BLAKE2B ba594544fb219cec77659cfa48fb6e3a8241b92c911d9983450648ce97652cad7654181637fed8373fe49e33524f63920128afd4ca9c00bce45603b1ab917648 SHA512 319d70412843149aa43c8d7faeff04122d96091081d30c2da0962fadb27104a24cc147fac2c95492aa407b2f8a25ebed9e7d149c29d5d38134d836581c801bdd
 EBUILD botocore-1.29.104.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.106.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.107.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.108.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
+EBUILD botocore-1.29.109.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.99.ebuild 1827 BLAKE2B d9e353ffebf3b77bdb5b034da339f9f3cf95937e288fa522fcc40f88a4752c58ae085406bfefa595c3738ec118712cdb4ee0509c1dee7a00e2c76cd2a657009c SHA512 f0d3e81726bd65bf4c097b63e8673881949970e29d976de53c1facbccf8cd1d214fea9153f4820a5889f1892979342a0255e110b243ba613d4e803a940d46602
 EBUILD botocore-9999.ebuild 1736 BLAKE2B 6ca7ea14855f5f8db2d166ba1f29835d4c994a0a8fa38f3852406289a4465c091909562ac678f1c0bf7e640a594731b0d4319efc0f34f6bc640fbae06746c4bc SHA512 f891bf0eded88d9af3b87fc7c9ee4c6a129d263e672821f3b9654d43bb3bcac41305b834192088d15b50f3f9d36ea95374180cf13e1cb67149595ec63e4cc155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.109.ebuild b/dev-python/botocore/botocore-1.29.109.ebuild
new file mode 100644
index 000000000000..491b6bbc21f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.109.ebuild
@@ -0,0 +1,72 @@
+# 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 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 9f8a4517779b..398318da4b03 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,5 +1,5 @@
 DIST Bottleneck-1.3.7.tar.gz 103067 BLAKE2B d260263fc05b6806203c09555157926f288c60ebb88105b9ad73191c220be0e08370d7a96cb829ec8dd9ac0c2d243aeca62eb1a871e39fe8c85ba6ab507849ac SHA512 ffeacb13e5a99db85e1580b9f2ead98239b4fd0b253a3c242a5507a026b439b9927ea49becec7e4d2d8f8e4ced15f43514c0af99379389db141ae50c4513e011
 DIST bottleneck-1.3.6.gh.tar.gz 119180 BLAKE2B 8ba4ccb260731b1583eb62249fa0bdf8d25b96c978f5ff91003aaf965b0f5f5d000fb2a049f70e86266ebeb6e748cadd8e7d0ccafad1ed1a50f6aba18452c97a SHA512 0c0af2ee5ca77f86f855800748a4ce4c0fe85f9da445aeeaaffabdcdc0e2c47b18c5590b208cb8aed52d4ec4a1aa9c023588d11d1c5aa581e2c00d3d4c1ba73c
 EBUILD bottleneck-1.3.6.ebuild 923 BLAKE2B eeb0b9d516c32e8185cd23df2cd7ee06752e1ce149dc1ead6ae3243d4fd3d2d8d7ec0fa0766090c7a622150c182f527fd7397704d3f7bded83d2e80c52c2eb63 SHA512 35152cacf70d904c16bc9b0ce1a5e0e247e0d656bd0ea9ab1dff00643bda0345f49ba20f5c0ecd897b0dbc79b2e1f95570ffd3690b48ed781a8fff57918e384b
-EBUILD bottleneck-1.3.7.ebuild 899 BLAKE2B e8bb09218e271073cad588dd3f169138d59d42c4141a0fe0ae00f811dd021eb4eb33262929c896d7d46263b53ae3c562d4215da9e47582962fdcfb78e3d5e212 SHA512 f11897d95e6e5e09ec7d6fa47bd60ed31b36418dc935ba540e4ee5001974e9883a67df88de5176a8c97606334882ea75e8f42570e995532da306696a386379cc
+EBUILD bottleneck-1.3.7.ebuild 895 BLAKE2B 61dc325b8e81935d441504a918438a8c55ffda7ad6004245f99742c04af820720d06059ac2948687de510c2ba047c8716a1b5626d0a7d8c5c5bf6b805e63eda1 SHA512 891ab202db80123da997f8ece3d884c978baa6b0cc33791dd2c16d3932b942d912255800e8a6f192131ebe6fe79517d47f6a5aec46a467966c505cdbe7fbea58
 MISC metadata.xml 519 BLAKE2B 5e5e712122fb0bbc898942cbae15c7cf623aa8462257f063f65a06bc9caae6662c373963f0945f99c5fffe01270e2792e8e5d01af93b49a04f5c3c22cd3a30f7 SHA512 55d2c03dedaa48c8f802d1e4d1d7db4e829fe7357b501c3b2955d28da501eae00675b2775ab36d1131cf2ef0a3d037183bde8df4c85e986d81510df4e234b0ae
diff --git a/dev-python/bottleneck/bottleneck-1.3.7.ebuild b/dev-python/bottleneck/bottleneck-1.3.7.ebuild
index d3008c73bce6..38f50dcaabcf 100644
--- a/dev-python/bottleneck/bottleneck-1.3.7.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.7.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index 0b25eaf01b46..7e7439258688 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,3 +1,3 @@
-DIST bracex-2.3_p1.tar.gz 27541 BLAKE2B a9e33e01f014c6b784b059a76da338a708a24ff88787c98c0916a6d13ac5497a1f4f14d711cab8bde1281a9968db68bdc8fdfbc23a531ef6c89adfa9974492b1 SHA512 3c5a8a81adb78c9d3d40b57328a6a47b3257bb0072be2685c8049cf8a91501993ce470dfd394a61d0a0fdcd082405b204e5e3e0666018978b5aa820b0d74b631
-EBUILD bracex-2.3_p1.ebuild 1210 BLAKE2B 3fac7d6d97ce0e41b1bbb892c621c875a0e0aba416a6992881168979c3f12074168033065ec1070cd33300adc8d17ead85e5c2ccceb9de3a2f415c5a9edf6492 SHA512 7c186c35c28b57dea1cbb3589f64abdca694f54dbb6790560ad05bccb72a3f51f6def40a7ba9ff06fc8318360b3379cafb386ace25f7d72b47189a1c33626ab7
+DIST bracex-2.3.post1.tar.gz 27578 BLAKE2B 0d459c5fe7380363786ab09aea8e26be56cd51075a847de7f521e2c35e413f311a00110e4149ebf626ba07fc025539dcb9a69c1bca6b80b69f3c8475ff7de65d SHA512 ac8b7bae97e41d68d8be85c80643c1d4181f7f4f17bde038803e77ee9264bc2a042b9dd391b0be460fc0317f451621f3975f583c9ad89e43ae8690533fb95626
+EBUILD bracex-2.3_p1.ebuild 1068 BLAKE2B 220344ea4f8c3f5c8bef7945f7aab64c3deb935671a959cad8f4247bb084102d5e9310b5e908ce21f293a9c673d13b657451b292528ac789a37c0eb2d87d1da5 SHA512 ee20c07409ab7be42ff1ae6b0dfe8100be86d7f3858bb9740564ba956f07c85a16e83293fac8a86aa8ee377173093511aaeb73e01ade2ff55422795dd0fa77f4
 MISC metadata.xml 1353 BLAKE2B d6fd0602c7e79269273cea7837247e6f2a3bf4cb26a3abae6a70975792b12f83b8403faac84e8c4011bf236df34da5ff85904e13efd54a577f04b16ee0abd642 SHA512 74a14139c4a40c542680dfd94b2f227c7cb62981bac82e2b57b68c6c2e3be17e80222e01fd92e53b18fae2d8e33fb84f01f074e43e1ddb21e0f06bba13bda713
diff --git a/dev-python/bracex/bracex-2.3_p1.ebuild b/dev-python/bracex/bracex-2.3_p1.ebuild
index a97a596ba98d..769b3b561767 100644
--- a/dev-python/bracex/bracex-2.3_p1.ebuild
+++ b/dev-python/bracex/bracex-2.3_p1.ebuild
@@ -11,24 +11,17 @@ DOCS_DEPEND="
 	dev-python/mkdocs-git-revision-date-localized-plugin
 	dev-python/mkdocs-material
 	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs_pymdownx_material_extras
+	dev-python/mkdocs-pymdownx-material-extras
 	dev-python/pyspelling
 "
 
-inherit distutils-r1 docs
-
-MY_PV="${PV%_p1}.post1"
+inherit distutils-r1 docs pypi
 
 DESCRIPTION="Bash style brace expansion for Python"
 HOMEPAGE="
 	https://github.com/facelessuser/bracex/
 	https://pypi.org/project/bracex/
 "
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${MY_PV}.tar.gz
-		-> ${P}.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/braintree/Manifest b/dev-python/braintree/Manifest
index 60923a6ae8a3..ea88c6e1a363 100644
--- a/dev-python/braintree/Manifest
+++ b/dev-python/braintree/Manifest
@@ -1,5 +1,3 @@
-DIST braintree_python-4.18.1.gh.tar.gz 216743 BLAKE2B 715656ac712d6b79200c4453ca5ff35bf803ddaa04f57e174ebbc3f61776b3d373184ed82781349f0ea5205c8e7cedff701e6d254ff3b821be06b77c39352946 SHA512 7adb1f5e66113d663dc59cfc1df638c3bcdfc2f1ed46125b3e882ee48053e2ea07139f447cc4151dde6a7afb6986cb65d41f26a116d00a89e5f28d54409b9fcb
 DIST braintree_python-4.19.0.gh.tar.gz 217588 BLAKE2B a5a90443f3315112eed95e00d1733875b1e6c3056de57f182b13f06b47a94ac1d711b6ed7aee76e57f1388a46b89281594398c3e88c4018d5f1a4947d2ed4790 SHA512 4d464d0f36b77157d6ea94721dfd4f4354fa51e5dc9670443ee8689c08aefc0d81bd09d34d87d1a436f74a60df6cc7c0e0ff5dc366bd1779d57b46dd028d5362
-EBUILD braintree-4.18.1.ebuild 758 BLAKE2B ad30702354fe4d865abdfb1c971b9a0a9fb2facd43457a31b87c29a5efc9710732449999aca9ab07bb17167cdfed5b1be9d11fa24525039249afd108f78e23d7 SHA512 f7b052605214eb36ccc6113cbbe1f8fc9c6c294f7e9431fa694269419c92acbf07496ef5efac2055c8cca6b3b6ec426bcadecfbc3f8825a9bc00b705122d1c00
 EBUILD braintree-4.19.0.ebuild 792 BLAKE2B 9bea632040d0ce1399732bab6ebdb1377c64d5f1b00f5544e23798ae5e08e0e786be8a9306addc8302d22da23ed450536da8c318f0c9ae44751a83910151aa9a SHA512 d2d279af9f6c4ae9da3fe412e4e25137fae2d6a2b3c3050afb39dbea845abed844a6801f03ac9433b4e7f3efcbea50f141018839ea9442e66c7e1c85ccf0093b
 MISC metadata.xml 484 BLAKE2B 17a5993a7630126f55e88b92bf917ae068282c36813ea739407b65d91542d2a9977f3057889838bce776b38c5e64e4a17fabc3367ac01ae8512d06897de1a060 SHA512 c0f5406afc289683369998c79009defdd07735e6aaf60d777e524eee6c58dbaff4b936e990490cd15cd53f175accbfb3adbe55896511c79e9655f08bda24ba49
diff --git a/dev-python/braintree/braintree-4.18.1.ebuild b/dev-python/braintree/braintree-4.18.1.ebuild
deleted file mode 100644
index ba88647058bf..000000000000
--- a/dev-python/braintree/braintree-4.18.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020-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
-
-MY_P=braintree_python-${PV}
-DESCRIPTION="Braintree Python Library"
-HOMEPAGE="
-	https://developer.paypal.com/braintree/docs/reference/overview/
-	https://github.com/braintree/braintree_python/
-	https://pypi.org/project/braintree/
-"
-SRC_URI="
-	https://github.com/braintree/braintree_python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-0.11.1[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.md )
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest tests/unit
-}
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 42b89e1b7477..901e733d814c 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,3 +1,5 @@
+DIST croniter-1.3.10.tar.gz 39716 BLAKE2B ba6b12d37589e980d2cc888bdd027a7013c484aa2d10cb60261008680842f7a6c0155753ede67929779939fce8c5418d4bba326ac46820cd01a464aae996b548 SHA512 45ec9af96420909419cbd0be17d5a5e74e955fcd682f28e459fd72085b199e0d247330753e31d5d1be33f8f5db345eee92854c086f76cc1e4b2633a8655dae54
 DIST croniter-1.3.8.tar.gz 38982 BLAKE2B 2b28c7e4e991e9525f073a00ba3b346144ed6d353e95509c1fac47ddf56c645edaaa3927f8ca6615a94d37cd6926c26cd1514a25520a48b39c3028ef79ac0337 SHA512 c0216aedd594f07a9e2fef0f8f4406ad2037f1d4543f9414598e0f2ef81a61615554b1f779ce4e75d36cd5e80def3a29ee57e88c15d5d70da06ac2b861ead5cf
+EBUILD croniter-1.3.10.ebuild 611 BLAKE2B 93a8014e9d59f012b442a548a22a200352e110134d1f84572692721cf1d18c8f55c5995841c39b36f7de5fe079c0eb0522f5dcfb3efe16a40a8567e2bafb4642 SHA512 627eaf7873f9579cc877a45dabfafd79e14f1e2b2afab3972201086af635459d16d9c0dec8f720b713d24e3403f46831cc1b02ad79c15ff8f4ae42eca30f855c
 EBUILD croniter-1.3.8.ebuild 609 BLAKE2B d842724a082ce0f352f60528b9b934ad1623a6522f73fd5c4eae223780163563ebea337605a185e8a4618ef8c9d3d395fbf8ddc59fe4d7f6a5a2bcd02fcc0796 SHA512 03e18731110efebec5d787513689154adad8ecb5eb32c970d444c2b258c65ad3ec2e63081235cb240888b489808747740424db254183fd4aa0deef9f8dee424f
 MISC metadata.xml 470 BLAKE2B ee6bfe88287fe27cb8bb33258f6fbb3275daf8294a834e899975e27c34d9103e21dcdef3f43b5df3a9a9e5d741f971d0117ad6e4410c1117306d9b913c8f2bc6 SHA512 e2167dfde1b79b2ec613ad671868a7ad28e64705515534b7911d2bc1f2cfeb6e68e14b1d93e6e29ab2f60c2b49b60454d4b6d9bba2f7bcf9cc3f3a20424fe3a7
diff --git a/dev-python/croniter/croniter-1.3.10.ebuild b/dev-python/croniter/croniter-1.3.10.ebuild
new file mode 100644
index 000000000000..e798bb5c5ff1
--- /dev/null
+++ b/dev-python/croniter/croniter-1.3.10.ebuild
@@ -0,0 +1,30 @@
+# 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="Python module to provide iteration for datetime object"
+HOMEPAGE="
+	https://github.com/kiorky/croniter/
+	https://pypi.org/project/croniter/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 77889818a947..00a21800f19e 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,5 +1,3 @@
-DIST django-auth-ldap-4.1.0.gh.tar.gz 49533 BLAKE2B f99050c147d179a54fe052e72a9b2ded556819da788f5180225a6d5015d2b7b52dc6f6d65fac4d1b88dc28b3617f9caaac7df3e455d218e8a2c6af1391418b8e SHA512 d55710cf96916602d29b33e111eff7922011231c47f843660cf2adfdc226dd335d4e42e5c2933bd77a9ee5f816d044798e876c8d0de824dcf4a8a78e1bce3446
 DIST django-auth-ldap-4.2.0.gh.tar.gz 49572 BLAKE2B e33241897a2ad6ec3cefe4d8bc6cfea322f478b3db7c2e8b7726b55f9e030f10ae25ee049842322f11939523df06af81a57122d4d3c8115416a253672c43dd39 SHA512 a37500c850b3cf49d6bc7324d721c05279570972547ebd69521033e4cd6aa340948829edb3ae94d3280a8142a42d88ce77f85bf4a8c9f32753a860881b3c5d90
-EBUILD django-auth-ldap-4.1.0.ebuild 1080 BLAKE2B df342b857dfa9f7205b9634ec100a26a59952590c7f7ee7a03fbe9bed88606e4611b4911f43abd92d97a6e7efd243d63c49d20564d1f845238fb9d3bcd33b91b SHA512 18b3dc69fd7d0126d7a5367fe0bd8b880428ba21f109da9c83e719187ee139a75834da7b52b50f065ebc694dc4f6a97297e9c261d433e26f1acbd5bc0a9af790
 EBUILD django-auth-ldap-4.2.0.ebuild 1080 BLAKE2B df342b857dfa9f7205b9634ec100a26a59952590c7f7ee7a03fbe9bed88606e4611b4911f43abd92d97a6e7efd243d63c49d20564d1f845238fb9d3bcd33b91b SHA512 18b3dc69fd7d0126d7a5367fe0bd8b880428ba21f109da9c83e719187ee139a75834da7b52b50f065ebc694dc4f6a97297e9c261d433e26f1acbd5bc0a9af790
 MISC metadata.xml 405 BLAKE2B e9d6f5ca53505cbfa7f9cd1cdc47bd58ba15ea972bdf342874c031ec151a053025b8f63a8d9c96de90ae0798e77d0db019a70d21e8746449543bfa5d91e3fec0 SHA512 453100976204f0b32042a1711d257ae76214452579d3008f403efc11cdf5e080e3663b43c1946b9da91086de580c0a8cf860fc99c00138c9d1bd4a01a5d1dcc3
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild
deleted file mode 100644
index 6b295cdc596b..000000000000
--- a/dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild
+++ /dev/null
@@ -1,49 +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="Django LDAP authentication backend"
-HOMEPAGE="
-	https://github.com/django-auth-ldap/django-auth-ldap/
-	https://pypi.org/project/django-auth-ldap/
-"
-SRC_URI="
-	https://github.com/django-auth-ldap/django-auth-ldap/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="BSD-2"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		net-nds/openldap[-minimal]
-	)
-"
-
-distutils_enable_sphinx docs --no-autodoc
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# for slapd and slapdtest
-	local -x SBIN=/usr/sbin:/usr/$(get_libdir)/openldap
-	"${EPYTHON}" -m django test -v 2 --settings tests.settings ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-filter/Manifest b/dev-python/django-filter/Manifest
index 37eca68cb20b..71b8d1733a4a 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1,6 +1,3 @@
-AUX django-filter-22.1-test-skipIf.patch 978 BLAKE2B b2b04b8cba223b58834e35ec45261f5c5d6245f4d073eebc0f73577dbf94681f0d14668b9443bb96f51e03b2ebc36508102e24611dfd467611f41e0689bb6d50 SHA512 6ac98c2f1562709c18d276ca1c6ec39db9cb4fa5d73f0a7d6d5e704b115045f40b330478b3d9684d3cad5603c2cbe0ff196bc25a03f5bce5c1b0dfa3a4b46c42
-DIST django-filter-22.1.gh.tar.gz 132450 BLAKE2B 9ef9a4ee15ebd3d461803b4dbbdf9a415e7004ee6b9eaaa75c87f9b3993461e6e294621182478ba0ad06595937c9b98fe89d16e9c48e34ced7dd525f40dc926f SHA512 9db2e684815a69c8b28b512c994ad1845c7a3e53da5dc762e5833c1ee4d90c5e513aa5cb3e59d9033c509b44fe9c27ce4fe798842aec50e040c06d33cb18ec0a
 DIST django-filter-23.1.gh.tar.gz 135407 BLAKE2B a23b7c6ae4692bd991aee4c0dfc4beb699ffbaec4e831dd3d13cb7b76f6acf4ba015c73bc7c9be21f6d95dfe17691f43baeda1f04b7e8757ced315c80d111d72 SHA512 c8437c3806e9d0e05bbbb938d225abe05da33103c729ccdb97dd47b7482178530a3fed5efba22458440530bd71cc9a171bae8fa81c2a67a50e5c6f34f2c300a2
-EBUILD django-filter-22.1.ebuild 963 BLAKE2B 1c330e0eb082f876738f2b0e842a3489f787f7dd20542f9c27901f34d4b08f8d382f70aff27de0776498ac600e935ee3a261d3d4e2f8d1ad29e654574ed847de SHA512 90ca1ad74825059718d70b3b35e1977aef4c3c83d82557fd3ed42855eb37be96db067e0f151e6f7bb8167148fd19f082c59bde5273fa2d08970da9f0eb194d8a
 EBUILD django-filter-23.1.ebuild 912 BLAKE2B 43c01148f192c0a5684576faf3cf8133cf885a80096022da5c451ec7a04b9ca821e6f74f158525554e06cbd6042b7fd778212c87f2a4df3251bb014013f0161e SHA512 b0b62af78877e9a10f760f57a269b8df569c36292817899a719f4c58d2486733d40c7886faa74489c4a271f567e139e6e58ad64d11722aedca35250ab463dfd6
 MISC metadata.xml 408 BLAKE2B 65a69b978d067aa59567504b378b931dddab24cfa11723a8fb1b317cf1ed906120835fe9bdb19d5457e57ab735e114bc3fb021a7defa4d895c2a80825430a818 SHA512 1e04d4fb02d1818913f7b5ee2e81be3df339c1b0a942ad0c0ae867e168350b8dc0aeac8fd6c31b701b4f6e743a90dccc70ea9b0a47e8add1a675435b4997506e
diff --git a/dev-python/django-filter/django-filter-22.1.ebuild b/dev-python/django-filter/django-filter-22.1.ebuild
deleted file mode 100644
index 96a3f517f036..000000000000
--- a/dev-python/django-filter/django-filter-22.1.ebuild
+++ /dev/null
@@ -1,46 +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="Django app allowing declarative dynamic QuerySet filtering from URL parameters"
-HOMEPAGE="
-	https://github.com/carltongibson/django-filter/
-	https://pypi.org/project/django-filter/
-"
-SRC_URI="
-	https://github.com/carltongibson/django-filter/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-3.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/coreapi[${PYTHON_USEDEP}]
-		dev-python/djangorestframework[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-skipIf.patch
-)
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=tests.settings
-	"${EPYTHON}" -m django test -v 2 || die
-}
diff --git a/dev-python/django-filter/files/django-filter-22.1-test-skipIf.patch b/dev-python/django-filter/files/django-filter-22.1-test-skipIf.patch
deleted file mode 100644
index 883700899175..000000000000
--- a/dev-python/django-filter/files/django-filter-22.1-test-skipIf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/rest_framework/test_filterset.py b/tests/rest_framework/test_filterset.py
-index d1cb51a..b6f89cf 100644
---- a/tests/rest_framework/test_filterset.py
-+++ b/tests/rest_framework/test_filterset.py
-@@ -4,7 +4,7 @@ from django.conf import settings
- from django.test import TestCase
- from django.test.utils import override_settings
- 
--from django_filters.compat import is_crispy
-+from django_filters.compat import crispy_forms
- from django_filters.rest_framework import FilterSet, filters
- from django_filters.widgets import BooleanWidget
- 
-@@ -37,7 +37,7 @@ class FilterSetFilterForFieldTests(TestCase):
-         self.assertEqual(result.extra["widget"], BooleanWidget)
- 
- 
--@skipIf(is_crispy(), "django_crispy_forms must be installed")
-+@skipIf(crispy_forms is None, "django_crispy_forms must be installed")
- @override_settings(INSTALLED_APPS=settings.INSTALLED_APPS + ("crispy_forms",))
- class CrispyFormsCompatTests(TestCase):
-     def test_crispy_helper(self):
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index 0eea834a4610..5441acdee77c 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,3 +1,5 @@
 DIST flask-babel-3.0.1.gh.tar.gz 20367 BLAKE2B 760b3ff9b867ad14f138b75e3e13c9d40a9dd4fab1dcef57c062677d6e52b31340403125f13427b6f57487609794176055f888a277eacc2323281f6899f115d9 SHA512 d189aac67f5671c3053efa1c8049fc364c031a77568db7a502d63e2ea09867c981c12669752f1524faecaddd4594ab064249f08b8af50dfde7267322b50ed2af
+DIST flask-babel-3.1.0.gh.tar.gz 20625 BLAKE2B 44c0f6e0af8e9d48035819a98dcfe472af0e53d98486b3bca367227092d098e392e09b0383b08d0eb782732d235f6f519bf6f553ea751750a869fc5f4de4bdd2 SHA512 74faab1e259fe38caf583982bf7a3595440ef37ec223a68243fa43eadfd4d661055706ba8eb92d29f37586e6a27d4f00fbdf5be8443820346b35b9551b716fc7
 EBUILD flask-babel-3.0.1-r2.ebuild 1208 BLAKE2B 309a1026d04bca0c64e1423297fb61c70297142875c7b7bded8bab81847149617cd270c4884f547f7e9b35e5c83dd82566e6f89f67addff6b98507ec0cf91e1f SHA512 642ade16bb2dbfa1a57cbe14743d42a0e52712d86cebf5c12830fecfcced646e96308a637779475cb1f9c3cb48c8fb68ad900e48770da1bde9e15a0f67d8fb5e
+EBUILD flask-babel-3.1.0.ebuild 1240 BLAKE2B 30483c915b89d3a97e50ae99ec11ea1e1e9f2e239e962c455638c3a1b45316f9fbeff63f05bd2df41871df746065b3188ee6edce94be647af7450ef8eaf7a36a SHA512 6e1e4bbba989c06529f82e9c733f09c552d43cca665dcf51542682ddbd650422e69a3d3bd1db46afd33df1637e7d41773069091d384f3006a1e3b0ade2ea2313
 MISC metadata.xml 475 BLAKE2B 4c2f62351a8c1c7d90b9089b0dd4257519c3b284b1c3af4209083be77a5d8c0e1f537aeaa51da44bd367c2a691046de5e30fcfb0ae7702cff3c4687d7e22c2eb SHA512 4f5365d5da849e7f7a083e5813f6c89b16b6241ad3a5c9b4873c76a952c0684387df9b9abcd8cbcda3905ea4bc41cfc3847dac41b5ab318300bc8b5da2149918
diff --git a/dev-python/flask-babel/flask-babel-3.1.0.ebuild b/dev-python/flask-babel/flask-babel-3.1.0.ebuild
new file mode 100644
index 000000000000..9c422ccab908
--- /dev/null
+++ b/dev-python/flask-babel/flask-babel-3.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-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="i18n and l10n support for Flask based on Babel and pytz"
+HOMEPAGE="
+	https://python-babel.github.io/flask-babel/
+	https://github.com/python-babel/flask-babel/
+	https://pypi.org/project/flask-babel/
+"
+SRC_URI="
+	https://github.com/python-babel/flask-babel/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-2.12[${PYTHON_USEDEP}]
+	>=dev-python/flask-2.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2022.7[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/pallets-sphinx-themes
+distutils_enable_tests pytest
+
+src_prepare() {
+	# https://github.com/python-babel/flask-babel/pull/215
+	sed -i -e 's:^include:exclude:' pyproject.toml || die
+	# https://github.com/python-babel/flask-babel/pull/225
+	sed -i -e '/pytz/s:\^:>=:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 3d65bf4cf71c..683c8f0c374b 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -5,5 +5,5 @@ DIST fonttools-4.39.3.gh.tar.gz 3694939 BLAKE2B c2a758c226651866aecae198fe31dab2
 EBUILD fonttools-4.38.0.ebuild 1554 BLAKE2B f471c0c66b420bdb147bbaf8b33d3df00b4773c7b585503e44350f03c1dc6439c5572146f39869dce51d53148cc65218384a1fbd28855066c6e13bbaedb27782 SHA512 8e202db0ae5e85e34469f59b601628089cc296c244b2ed5ebdddc48b2df2c5a586e57b387fbf5c073b220c751b083058d7560c3516153bdf6765392a13cdca72
 EBUILD fonttools-4.39.0.ebuild 1562 BLAKE2B 32d0c71bb8690ec85453b61098663eac1c855cf8e18be7611641ab7c5389b1f03885affd309e1bd79d62ed18367845ae40e348160394f9df1ef92acd71a6dd58 SHA512 91c717e491081d557634e2d62be7b31b038c49203350fb055cff72d921425f5f17b2927e2c175a33b9629526c4707c687748654f8b63b20aa9e8e77136b4f0a3
 EBUILD fonttools-4.39.2.ebuild 1562 BLAKE2B 32d0c71bb8690ec85453b61098663eac1c855cf8e18be7611641ab7c5389b1f03885affd309e1bd79d62ed18367845ae40e348160394f9df1ef92acd71a6dd58 SHA512 91c717e491081d557634e2d62be7b31b038c49203350fb055cff72d921425f5f17b2927e2c175a33b9629526c4707c687748654f8b63b20aa9e8e77136b4f0a3
-EBUILD fonttools-4.39.3.ebuild 1562 BLAKE2B 32d0c71bb8690ec85453b61098663eac1c855cf8e18be7611641ab7c5389b1f03885affd309e1bd79d62ed18367845ae40e348160394f9df1ef92acd71a6dd58 SHA512 91c717e491081d557634e2d62be7b31b038c49203350fb055cff72d921425f5f17b2927e2c175a33b9629526c4707c687748654f8b63b20aa9e8e77136b4f0a3
+EBUILD fonttools-4.39.3.ebuild 1557 BLAKE2B 8d9de06ba4a7fd17cb400daa47eac2f073b7010234dd9f1f60ecf4f212bf322db7e80541ac15358da113f674f7b7de951c5b3c62a265a92349eca9cd2af7d922 SHA512 045a19d8da1ebdd5a15bb0ba83a7de46f27648ae714d2551706c998c49b6750939d14a6085e67b18b77bba0d89b6a9f1f674d57e1448c2611c8fb8752bf307f4
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.39.3.ebuild b/dev-python/fonttools/fonttools-4.39.3.ebuild
index 8ca55aca7585..ebc9177c438e 100644
--- a/dev-python/fonttools/fonttools-4.39.3.ebuild
+++ b/dev-python/fonttools/fonttools-4.39.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
diff --git a/dev-python/genson/Manifest b/dev-python/genson/Manifest
index e13640d931e2..908cc0dd20e3 100644
--- a/dev-python/genson/Manifest
+++ b/dev-python/genson/Manifest
@@ -1,6 +1,3 @@
-DIST genson-1.1.0.tar.gz 26662 BLAKE2B 726b0467edca9ca503d73c914d35392f0784ae8be01a8287b84da3cd5ae4b4cd6e12a46b1a7baf73db40377b915ddb3c4b53f4a135e3923fa775af5b51a5261c SHA512 54264dcc51cd5ece9bd428079fcd5cf833f32ef36afbb7987de9982d33253834c5c8c35d18b21ad4003fc2ffac4da02965a00844457b7d8ca6c6bf3d3facb8d6
 DIST genson-1.2.2.tar.gz 34387 BLAKE2B 2e3c3b0fd96d93fe1e7244c11828dfb42d8e9bd97058a1b76d983e02094b2e62560e00b08e2ce1d21abf7e858f481a9e2a5678d51b27162fde1d60535031f54e SHA512 9caf1936518db5ffb412c6b1f1d28b33e9aef2e6f9b2fe50bcc2932a75522dcbc57bf7bc6b3df41244ee470060295a92fb6ba0be9f6fcf512950a81615f85f87
-EBUILD genson-1.1.0-r1.ebuild 682 BLAKE2B f190ed82975a9e33094c5cd972d75ed8d5c3ea95a24a67ec15be28a9111c0fdbb98c0e0ebbdd18839e19b2d7d542064261861992d09f9cd32b7effe73311b42d SHA512 2a2eb1b8ad3aec8cc09dc01216ed80e11d4547c015f16c6090729a74fbde872969e1a174a013cc044326fdabf38d74b9d1495033120b2ff4b6fda44991354668
-EBUILD genson-1.1.0.ebuild 639 BLAKE2B 0cfdfad15ead5623f96f1d8fc715771a351f5ad64f0bc5db9173cc63b7e972cc04453de969b0580770651f5579976586855afc0ec8b3b3d185dac7293c2f62fd SHA512 718d6d7acf04dd68095ab6a33a9b44abba4d9b044476efb6f23bc398c8577b7930bf1c823e5051a942c4bb740d36ee223c1fa52f41e23240c603b2590ede7901
 EBUILD genson-1.2.2.ebuild 794 BLAKE2B 48e06e939b2d2ca05eb49c2296724517171d609caa003484304a633c721cf8e592b19bf14ba2c15a6aadd211a091694666c9a3d932189e3eb6f03f2164b0f21d SHA512 1e44a6b45a3c02c6b01a0a7b73da3073fc30e949dd98633a492593f7ad00265ab0a736334323e117d21559534eb324af02b482fdbc6eb553da61b21802bb5081
 MISC metadata.xml 500 BLAKE2B 027d4e156ceba078374f8669b9cd4f731c7e9f477a786adffc117f830244eaffe74d40a65f18fc0ed31ea1a0952070b52fc81522e439621baa599d0f12f06318 SHA512 40e78f3e97288b17e6b960bdbbb54245d4d934032ba3ca3e954654eda3d8ef9cf92eebf6025e198e5c5cddbfa5a6b8e05126030e8e423a2583961c7bbd56d31d
diff --git a/dev-python/genson/genson-1.1.0-r1.ebuild b/dev-python/genson/genson-1.1.0-r1.ebuild
deleted file mode 100644
index efd955f3b71a..000000000000
--- a/dev-python/genson/genson-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +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 pypi
-
-DESCRIPTION="GenSON is a powerful, user-friendly JSON Schema generator built in Python"
-HOMEPAGE="
-	https://github.com/wolverdude/GenSON/
-	https://pypi.org/project/genson/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# https://github.com/wolverdude/GenSON/pull/70
-	sed -i -e 's@TEST_URI@test://@' test/test_builder.py || die
-}
diff --git a/dev-python/genson/genson-1.1.0.ebuild b/dev-python/genson/genson-1.1.0.ebuild
deleted file mode 100644
index f8cbb896733f..000000000000
--- a/dev-python/genson/genson-1.1.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=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="GenSON is a powerful, user-friendly JSON Schema generator built in Python"
-HOMEPAGE="https://pypi.org/project/genson/ https://github.com/wolverdude/GenSON/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? ( dev-python/jsonschema[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# https://github.com/wolverdude/GenSON/pull/70
-	sed -i -e 's@TEST_URI@test://@' test/test_builder.py || die
-}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index fef0105f01c2..a012ea35755e 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,9 +3,11 @@ DIST hypothesis-6.69.0.gh.tar.gz 9350681 BLAKE2B e28bca5be08809d7f10723186957ab7
 DIST hypothesis-6.70.0.gh.tar.gz 9351669 BLAKE2B 04e6739a1e6cf5907486c5fc6e09d17996831fe7967df4a24e6fb3c3ab992ef0c1ade9f250a1776eed4d6880893db1e8f284df60465a81a9f14f4aa64b0b0fc9 SHA512 6fb15addd86f8737b5a99a5c4ae5f2899133772e25426cc8a9bd086ddc0246b8fd323a10213df45d5b13c0740df19597a2b7ee7566611d5d01e6897954ac0f4c
 DIST hypothesis-6.70.1.gh.tar.gz 9351685 BLAKE2B 99488f4caae4da403ebe28c2c18829d493ea76515f4a503ece0063dad2638cc5d05f9b55372d5c457b0dfc3af31d3422c44d647ea0c2a92a83b20d64c70c4b2f SHA512 a858df7d469604b2d43d003c76f43e40931f6024f6cf164c9b427a449cd0d843df401052e3312c529fd4467d80e0870810ad6863812ec53a47dcf9ec82336472
 DIST hypothesis-6.70.2.gh.tar.gz 9351849 BLAKE2B 074003592741cd89ae9ae44b3857daa3f5d1c8cbb0ab3513f3930b27fcc4e27417994c4240fbbba4649cb04716820db0e9c4f4ac745c194535a81b8a6197f7c3 SHA512 20f812ca8e005877893eacde1bac796495f8697ecbbd6da5f807a9ce6d7e310682030323a8b7bb3e646040253968d2f15cb6fcc858f47be631ef62af4924ac78
+DIST hypothesis-6.71.0.gh.tar.gz 9357031 BLAKE2B e4a83a94bb6971c3ecba4cc69655f9da23a83ab48332a7a748ca7364d9e549a671bf466e32f6e65447f809a9917fc8fd2548dd26764173ea5849a4df3e027b54 SHA512 dea1d5ec1b753649345edd784183f171531adb583e33d0e5d12b14554169fa054e05f4c16135171c708c208b42968082b3ce79cc0441efccf1eff6da37c59f97
 EBUILD hypothesis-6.68.2.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
 EBUILD hypothesis-6.69.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.70.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.70.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.70.2.ebuild 2136 BLAKE2B 35dccc51dab2ed18059ac3a0f38dd2ef843ced097a386c953410198590c3b4ac2b1564bb9a347a59644e153a6de8924f72a6eba3927da545526a31d5853c4463 SHA512 d718a18708427023d2057554e99e463d35995663899ee6d4289a96dc039f498e2b5b5ad0b21b952ef598c84a867c3bbcc7a1d97fc34c11fcd2f8fb018542a5f4
+EBUILD hypothesis-6.71.0.ebuild 2136 BLAKE2B 35dccc51dab2ed18059ac3a0f38dd2ef843ced097a386c953410198590c3b4ac2b1564bb9a347a59644e153a6de8924f72a6eba3927da545526a31d5853c4463 SHA512 d718a18708427023d2057554e99e463d35995663899ee6d4289a96dc039f498e2b5b5ad0b21b952ef598c84a867c3bbcc7a1d97fc34c11fcd2f8fb018542a5f4
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.71.0.ebuild b/dev-python/hypothesis/hypothesis-6.71.0.ebuild
new file mode 100644
index 000000000000..ccd35ad36fe8
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.71.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 752df41be15f..022c45143b3f 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,10 +1,6 @@
 AUX imageio-2.22.0-block-download.patch 1211 BLAKE2B c01e3fd7db7463bc11bf331384a21becfc3160d4880a2fd09e47bf0927d97e46787097f50a489b83c2626078b60a0cf8a0d896040981e78c107f1783c8e84c26 SHA512 170261b9fb07ccb7f7a7e058335326df1f72c8d098076bf6ca048a7ca6bac95ddb512b9e41740c385430bc25613249455203addd59931af4e70298e772303964
-DIST imageio-2.26.0.gh.tar.gz 403652 BLAKE2B 2f1948b1cee03ef4fdd71489923a1ea5b0c364fb5f000d79e1d309042184a6bb267a323bd19fce85bf47857245eb4be5283f0b3df65857d7cac57c24930ea409 SHA512 6ad8ce0395033571c0d918dbe03ffeab0e43b29d402bc91a229d3ffd689eae3d01aa09dec386d03fe028f6138887883cfda4e0a769f523ba9f6c3e3041a0cb7f
-DIST imageio-2.26.1.gh.tar.gz 404916 BLAKE2B 683ffb38c089e691c9647785f28fed616e8b60795a05fa29a684d30fff35e6021888b4f4ea75d8035dbfc3c3f5e84c241eefdf7d4a08555bdf78de7433a1fc11 SHA512 90976423d967b7cd0874fcf6ed3c7d51db6fea450859a1a1a302aabb7d971b65cceec0fdaf8e23f99a3fcceaea827c090e01b4b7ad8e7813e8db33150c14ba29
 DIST imageio-2.27.0.gh.tar.gz 405391 BLAKE2B f013de16f460e04f5d30c7bcc3c64dc05cd2ca74b359ffe43f2f84e850bec907f899f8c2cc8bcd2a6594767746bd52bd8ae8f2f0c7bd9a3fe6b5450ef043830c SHA512 28d42b59d5c59c679786fced4d3f616d8ac832da0f76da31337875404a8382e66ead6531e02ec94099f481ce84aad5271199b16eadef03bcd5db9978010a7132
 DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
 DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
-EBUILD imageio-2.26.0.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
-EBUILD imageio-2.26.1.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
 EBUILD imageio-2.27.0.ebuild 2071 BLAKE2B 10ff98b2b56ca3e3ecc2b34a0196efb3512e7e17b7b79e3abdda530552fc790e32ac033b07d9875acf85578a35eb22f67de6c5304db850fdf1eb549312b75d6f SHA512 a381707af28eb925fb71c51bd88233039cd9abd7fd347bec4ecd64542a4c4ddb8628d1a5aec89aaf3f4f01ef12f0b77229a1f0bc9e0a4de35a646fddc77379e7
 MISC metadata.xml 702 BLAKE2B 646c6a83e6d8e345fddb9cbc42a83c1193b9590937cd652e293d03e6e9d4b240a69e6e86399f5edc9ef05f96d1d4c3713dfa65f8b13984f4483b2ce76a239429 SHA512 5e1e4db52fed55ab837c70ddb9ec81a7ce0b062064e2d33cb5771cd81d50a1a2164e446531c32a405bb9319acd736141765dcd00e36d6db770434a656ad925e1
diff --git a/dev-python/imageio/imageio-2.26.0.ebuild b/dev-python/imageio/imageio-2.26.0.ebuild
deleted file mode 100644
index 30875e33909b..000000000000
--- a/dev-python/imageio/imageio-2.26.0.ebuild
+++ /dev/null
@@ -1,82 +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
-
-BIN_COMMIT=224074bca448815e421a59266864c23041531a42
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
-			-> ${PN}-chelsea.png
-		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
-			-> ${PN}-cockatoo.mp4
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# block silently downloading vulnerable libraries from the Internet
-		"${FILESDIR}"/imageio-2.22.0-block-download.patch
-	)
-
-	if use test; then
-		mkdir -p "${HOME}"/.imageio/images || die
-		local i
-		for i in chelsea.png cockatoo.mp4; do
-			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
-		done
-	fi
-
-	distutils-r1_src_prepare
-}
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-	# blocked by our patch
-	tests/test_core.py::test_fetching
-	tests/test_core.py::test_request
-	# known broken
-	# https://github.com/imageio/imageio/issues/890
-	tests/test_freeimage.py::test_exr_write
-)
diff --git a/dev-python/imageio/imageio-2.26.1.ebuild b/dev-python/imageio/imageio-2.26.1.ebuild
deleted file mode 100644
index 30875e33909b..000000000000
--- a/dev-python/imageio/imageio-2.26.1.ebuild
+++ /dev/null
@@ -1,82 +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
-
-BIN_COMMIT=224074bca448815e421a59266864c23041531a42
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
-			-> ${PN}-chelsea.png
-		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
-			-> ${PN}-cockatoo.mp4
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# block silently downloading vulnerable libraries from the Internet
-		"${FILESDIR}"/imageio-2.22.0-block-download.patch
-	)
-
-	if use test; then
-		mkdir -p "${HOME}"/.imageio/images || die
-		local i
-		for i in chelsea.png cockatoo.mp4; do
-			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
-		done
-	fi
-
-	distutils-r1_src_prepare
-}
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-	# blocked by our patch
-	tests/test_core.py::test_fetching
-	tests/test_core.py::test_request
-	# known broken
-	# https://github.com/imageio/imageio/issues/890
-	tests/test_freeimage.py::test_exr_write
-)
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index a264650497d5..9764fc880864 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,7 +1,9 @@
 DIST importlib_metadata-6.0.0.tar.gz 49776 BLAKE2B 9c4e6b20b725e263dad4acc4553b0067777c7332b33c0e56344aa2ceb09e93d71db14aebc522ae81e068a1a82ad48947f6f72eaec932933ae61d4daa2e043e63 SHA512 7d5cea465bf02722b28542f374e36ed55ab09455e1e548e838acf0cb38dcd84a79f5ef7cd673400852ff3a33271078ec8476f02aa7bf7748d3b85f4cefe3f678
 DIST importlib_metadata-6.0.1.tar.gz 49963 BLAKE2B 8f915035334965ae373977814d335b66028f85372f96a9815fe3e59ca346b60d64c16e147e8a9d1ce44e26b31851dcfbda84002fc1a0d93c0d154115f5acec4e SHA512 9ee241a8865d181fae103e643ae618f46541ba9aab299df32892739db991d78b4199df436f77d7c28aeb736e4c2cfb38301cb7133d8baff3c149f4421e0431a1
 DIST importlib_metadata-6.1.0.tar.gz 50209 BLAKE2B 8c3afc8037eb49de1e862539150a9401297bf136ca005119c1f1d19fb7a9485b1d2caf2a290eb577308e3111352113cdd51312388f952a8a1402f9bf6081e28a SHA512 7effcdcfa67d2360533205e63013934141bfa4cf5fcafa021381470e9e99025df89c1b9328d620fce6eb83f95af6919e3576f366cec47ec3a3f79414e3171e6c
+DIST importlib_metadata-6.2.0.tar.gz 50368 BLAKE2B 53a9bd67c1f89260a7ef4c0232da56f8862d4a5ddda68cf0c5fa379ad439e2a9753d933b283f9b2a30cefa48f0179c458bdae13ab7f9501446c8ba4987e3f5ab SHA512 3d7a6d5d32133c00bde0f539f036032ab3f42922f14ff2c7b69f5232ba4c000b264d7956c311887c68d8a9b54c705cc287669bf6509fde880e8898ad0b935670
 EBUILD importlib_metadata-6.0.0.ebuild 1491 BLAKE2B 716b361e65cc00524853b7b6626eb813abd547594199ef1ee5b49f5af6093897fb5cd262d9a5eebf70fb79d4cbfdcad47ad65885d0790155b05a373659ed10c6 SHA512 9a6d6a0db7b90e3a2c4d329abb875168fbfeedc256d25320cfcf248a09b027a02e3dd439e938a64cbf560be746bb44ea76352584e92778976774f769010cbd11
 EBUILD importlib_metadata-6.0.1.ebuild 1499 BLAKE2B 7fa11d410c84a54a456773d3e41cd8bb3738b7ecbe4732d7b42a32aa5c34f929ce48b6b4e79292ab6889366f21020d50581bb23228c511e2075e005130c57b36 SHA512 9eca0ca6e0d6f36e9d11f5e5bae015476949e9e8347ebf76e8b34ca1c599cff206d1be86b5e340a22c0e0dcaacf81dd6566f28a3fd5d40f28987dc15244245a0
 EBUILD importlib_metadata-6.1.0.ebuild 1499 BLAKE2B 7fa11d410c84a54a456773d3e41cd8bb3738b7ecbe4732d7b42a32aa5c34f929ce48b6b4e79292ab6889366f21020d50581bb23228c511e2075e005130c57b36 SHA512 9eca0ca6e0d6f36e9d11f5e5bae015476949e9e8347ebf76e8b34ca1c599cff206d1be86b5e340a22c0e0dcaacf81dd6566f28a3fd5d40f28987dc15244245a0
+EBUILD importlib_metadata-6.2.0.ebuild 1499 BLAKE2B 7fa11d410c84a54a456773d3e41cd8bb3738b7ecbe4732d7b42a32aa5c34f929ce48b6b4e79292ab6889366f21020d50581bb23228c511e2075e005130c57b36 SHA512 9eca0ca6e0d6f36e9d11f5e5bae015476949e9e8347ebf76e8b34ca1c599cff206d1be86b5e340a22c0e0dcaacf81dd6566f28a3fd5d40f28987dc15244245a0
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
diff --git a/dev-python/importlib_metadata/importlib_metadata-6.2.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-6.2.0.ebuild
new file mode 100644
index 000000000000..94609d071b76
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-6.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="
+	https://github.com/python/importlib_metadata/
+	https://pypi.org/project/importlib-metadata/
+"
+
+LICENSE="Apache-2.0"
+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"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' 3.8)
+	)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
index ed1f6c542f68..cc8181203351 100644
--- a/dev-python/indexed_gzip/Manifest
+++ b/dev-python/indexed_gzip/Manifest
@@ -1,5 +1,3 @@
-DIST indexed_gzip-1.7.0.tar.gz 103849 BLAKE2B b33ef1f19e47c2dc12fd6e6fcc972badf4faaecaa5571aa44c765a6fafbec8e32fe2c4254d4e62722b6e744cfa27470ce517d08025b0492e8c032663b094344e SHA512 80f82699c6b64248f0609fb34e54e3838e642040820381cc64feb70b46721b69207686f9cccd55ebfb10dfcdee5fb5c1bf6404d1cfec07eb5a97767635c5dc4e
 DIST indexed_gzip-1.7.1.tar.gz 74457 BLAKE2B b22d2120adac59e64f5bcf38c831bb54ce5d6c3dd1e959eece9a454908d9ce2aa5dc10557bd63823616bedfe9d0c039a3f1c0512ef1d22a54437353c57e15158 SHA512 fa27e476f115eca1d1d3892c3480de97cb407bd489737bebc44eb28e92be91e14312cde33a67af145b44c7d93ccc706498c2cbfe6cbff5b9b091dd083cde0f7e
-EBUILD indexed_gzip-1.7.0.ebuild 1133 BLAKE2B 7226f8419acd3db7072e735a71d2503d053a639c16255437c39f9d5f61dc94c1fb79699b40330ff460a933e209395c42a064577d94c6ff0a19e8b305d8a9f1a3 SHA512 c2840995917643faecadeb18bb9cc5fb305deb527029d21f943c7f6681ad5b8641676cc6e33840a9727aa8e982aa16173e6d91f7373b22e430832a533aba546a
 EBUILD indexed_gzip-1.7.1.ebuild 1040 BLAKE2B e1ed6645f43f1faf40fc55074265dcbeec16d021cf760c2ff04e25083b37b10d0de2c1eade98ef699cd123ae24c9acafcf298e8110b7920378e91b080cf85720 SHA512 f1893224ba0efbf41892adf3a50cabc8ca1d5c8c46fd283bd8d3e9e81305973a3ba0d93b9ba710cd698bc50f58eb8f592406f4a3e660827e3f90444ad639a628
 MISC metadata.xml 772 BLAKE2B c5788c4748250507ff0c231613f6d143839a48c5afac0d68bb806cb3d24e9119d5d3eae3135ca991dfff5bfc5955ddb545afd6293dd4e0565591fb779b3f88ed SHA512 726c025bb40efe9d30a4c1691df9c1a011684af4b1f56cb5ef6c857ae712807c15857c13934b67586f7141fa4a3f3e548acd6adffe12f6285492e1171c21ac99
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.7.0.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.7.0.ebuild
deleted file mode 100644
index 859539ace845..000000000000
--- a/dev-python/indexed_gzip/indexed_gzip-1.7.0.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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="
-	https://pypi.org/project/indexed-gzip/
-	https://github.com/pauldmccarthy/indexed_gzip/
-"
-SRC_URI="
-	https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# strip custom "clean" command that doesn't support "-a"
-	# https://bugs.gentoo.org/838955
-	# TODO: this can be removed once distutils-r1 stops using clean
-	sed -e '/cmdclass/d' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	if use test; then
-		export INDEXED_GZIP_TESTING=1
-	fi
-	distutils-r1_src_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)/indexed_gzip/tests" || die
-	epytest
-}
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 3abe5d17c5a4..72beb15122ac 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,5 +1,3 @@
-DIST jc-1.23.0.gh.tar.gz 12850876 BLAKE2B d0eb0bdca90115583409238eb8b4081bec92fa46b9c2054fc9d3637126bc3e21fa295c90d2f3910645b21d5f60b432461ebb6482bf8930a8b1c06deb3b2e027a SHA512 24d5675573e3050a3d6c9ba7bbe6be786a1f318eb7d8800ef160848163065b1fc961939ab1cae37a89407ecfd426c1aace3fef6f7985cc18e80e0d44b0fcb4be
 DIST jc-1.23.1.gh.tar.gz 12853550 BLAKE2B b10c3688025c35b4f71345756b6efd93af1e8abe2a343ca66e9f658d986f7ce60c04526d65a27286425f1f24c188de3e2ba923e4304a8e669139006db1d53766 SHA512 6f2936b6c42136909ff04233cbabbf0a5827552d83f29131c42cbc4de20a3b7fee2263a5cdec9c596d39fb3edc26dbc56863631e992d124c038c53490ba37ebf
-EBUILD jc-1.23.0.ebuild 679 BLAKE2B ed9a4947dd9c653e2e686e13a86eca2bb51271baac935de60d45a511ede083fe314b673aedf49a2e6c8fd1f96c7f9a42af3c342c4990fd751fcc05bae1c7a353 SHA512 0118ff8cb50c0e571acb0a300409490232e4793f1d67d781b05665d9c9989e1ee6ef009a089786bf2943ee7f9181ebcee96f3328dfaf3f8ed5528f2d3e60f602
 EBUILD jc-1.23.1.ebuild 679 BLAKE2B ed9a4947dd9c653e2e686e13a86eca2bb51271baac935de60d45a511ede083fe314b673aedf49a2e6c8fd1f96c7f9a42af3c342c4990fd751fcc05bae1c7a353 SHA512 0118ff8cb50c0e571acb0a300409490232e4793f1d67d781b05665d9c9989e1ee6ef009a089786bf2943ee7f9181ebcee96f3328dfaf3f8ed5528f2d3e60f602
 MISC metadata.xml 492 BLAKE2B 100e7421c33b90fb9180a3412206cdc2355b26dcacf988f1157a725ca8ee6eff44288ec12f8274360f086272ad3bd06e9df6a93288edeb9102551c65256a47f4 SHA512 cb0abbd0c1b02b1fd4c74034e1f41a53ed0b7f297dcfad4e9f6b2a4960e16790b5d879f407ab18f73c81684d3a0436327949bd628a1d1d146958f01e34206688
diff --git a/dev-python/jc/jc-1.23.0.ebuild b/dev-python/jc/jc-1.23.0.ebuild
deleted file mode 100644
index 90c6c8f3f7cb..000000000000
--- a/dev-python/jc/jc-1.23.0.ebuild
+++ /dev/null
@@ -1,31 +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="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="
-	https://github.com/kellyjonbrazil/jc/
-	https://pypi.org/project/jc/
-"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jupyter-lsp/Manifest b/dev-python/jupyter-lsp/Manifest
index 4cd4007cb19f..cc1d5ae1e24f 100644
--- a/dev-python/jupyter-lsp/Manifest
+++ b/dev-python/jupyter-lsp/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter-lsp-1.5.1.tar.gz 35907 BLAKE2B bc69791253bfcf40188fe2bae24a2681ce17835f5eb1d2640edf93a69285b33d426bffdf09c66308e6f79e33c4778e539fc2a7ed056fe64758e82acc6374b4cf SHA512 585c7b3b7ea87fd9d3ad27e3e4473f3bce56ad41d3b028173e2fcad4b0d2db5b1c0c89cd8c976c3f8b4d30ae7a63018dc1e19d4527b56eafe21ec0b5e89a538b
 DIST jupyter-lsp-2.0.1.tar.gz 43962 BLAKE2B 0a030542297c6a311ca2b9a681acf4ae4d196ebaee342fa44a7a5b0c9a3788aecdb7b6a60a4653114ae6c5a69f4da9108a831eda72401643b8bb34cad6d3de43 SHA512 539851c567cf0dfa08c9658fe98941a8aaa90f625cba1d231d54fe3f4e19cbd9f14fc5b54c39798af1d1da40075dbaa7f43e95517934571391c488639f9c66b3
-EBUILD jupyter-lsp-1.5.1.ebuild 1072 BLAKE2B f83446b8e824f4910b2c033564f14709c1449cb8543f6a3036eb266261f664575807be1f421af28954558adc23ad6308e4e6a1bc9a2ca544d87dcf33b9d1a9ae SHA512 9f706f2c53b1d1e6fc4be34cb4d96a57313f0c38d8c4bafb8e3c76f6f63dcf144831d58abde8a15dfb13e4c5cbfa7e5475d3b1346b6407e2a677dd4bfed7553b
 EBUILD jupyter-lsp-2.0.1.ebuild 2743 BLAKE2B 501715ae2cea44c0accf7f3bcfdd5f7090e575cc4e7f805340c80b3973538958618a3b64b77b426ebf9c4fc0b577c7a9bb4ac07828138cc54ad7847eccc2519a SHA512 98ee9d7e3f7329ca072d87ce04fb460de99a83cacf8e1157368be9d99c85f0eb7724e3dadfcde54b5a46895e47a286584131984563218d074dfeab29ba86cb44
 MISC metadata.xml 417 BLAKE2B 37e0faca144a5da718475df6e957d9664fa5a757735bf65985dba486180dce37621cf3c34cadef4dbefbdb5698192b601a8e0bb1c77f71ba5550e65e47cc5e9c SHA512 6b61ffc68a46993386baa1c1b95850edbfbdb8d4fa40c4111aaf4edbb7d8d4f8ed21960ee01e69e2a8b986f66c6ec4ff938392d7849e204936f05d62ce7e8531
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild
deleted file mode 100644
index c6db33b0b8f9..000000000000
--- a/dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab"
-HOMEPAGE="https://github.com/krassowski/jupyterlab-lsp"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: Find out what is going on here
-# asyncio.exceptions.TimeoutError
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.1.2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not depend on pytest-cov or flake8
-	sed -i -e '/--cov/d' -e '/--flake8/d' setup.cfg || die
-	# R lsp server not packaged
-	sed -i -e 's:test_r_package_detection:_&:' \
-		jupyter_lsp/tests/test_detect.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	optfeature "Language server for Python" dev-python/python-lsp-server
-}
diff --git a/dev-python/jupyter-server-fileid/Manifest b/dev-python/jupyter-server-fileid/Manifest
index a55210c7baf9..a2998e28570d 100644
--- a/dev-python/jupyter-server-fileid/Manifest
+++ b/dev-python/jupyter-server-fileid/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_fileid-0.8.0.tar.gz 51420 BLAKE2B 0f927734c45d36f67f61b0f7f32f3e5b42b0d9b9107cc8dc762f6d7e34014c976a5036058170bfb2d95188f0d3994524e3198a721f3cec75eff3b1e031c2a133 SHA512 780c4aaedbf979630792c04fdae1d79f6aab6b11e9cacf06003d4801c64701d64e0417d90a64c544f0dd05461032605812ffabb183396a2bdb8fc6563efff796
-EBUILD jupyter-server-fileid-0.8.0.ebuild 793 BLAKE2B 9d5ebd66260e8856200ecaea8c3be4c19e16a1bd33098f2ed1482dea825a49710bec5ef44a3d20f0e2f55a5acd2e9d9f871904bfb05e5024c48df4e89ccf2840 SHA512 3b23dea376acb04d8cbb6a1dc1a1b3146e921e39b76e5fc81c61b29e4c5cc737f64ceeca8b8aa31ffa5abbed6e47177f1c548ce3c76921cd3fb0b3e4411a690c
+EBUILD jupyter-server-fileid-0.8.0.ebuild 798 BLAKE2B 0de5b1a9098127e3689dbcf0c02f376177805e61c941ba121e6990ca8bccfdca5cf8a8b1c91c05c1dc79d807dc317a893c0fcc68f6eb1044278858f4382293bb SHA512 b748898b3bfc83153dabca1b88b838aaea663234b20e0a2d0e929a48ad1b5190f8fd92e103826ffc5235c079dc8735ada087ee2cab32cbbd913a1ceaedb71e8f
 MISC metadata.xml 451 BLAKE2B 501da442ec086270995b029cd90bb3bcdecfe6a0dc7ba0f60d6cf505930d34a56da918e593702bd8597b8ea14f91fb5c23f18a2cf0a6987d8320bfd1391be763 SHA512 379e0af3faff9baa29d49cb8069d87b7024695aa3c6bb4c8f7f063b8046ad806ff775a3deb0d31ba910f57240403f6881f703f2935bb2c63c23d2275d7179208
diff --git a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
index 60a0e77514b8..899904151a5f 100644
--- a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
+++ b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/jupyter-server[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-server-ydoc/Manifest b/dev-python/jupyter-server-ydoc/Manifest
index a23f9a338762..5e94c537395d 100644
--- a/dev-python/jupyter-server-ydoc/Manifest
+++ b/dev-python/jupyter-server-ydoc/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_server_ydoc-0.6.1.tar.gz 25122 BLAKE2B c8543bc620ff8cefa5b7f1f1bd3d889301a96997607122184cf514ab6d02c50cada7c81844c6d4d2919caaaea9de8a4b5863c024b151d45b1450f1b6c351ccdf SHA512 7c0c79de866d6a794f24ac7dbbfaecaf2a0d447c9f81690d2de82bf86372337669389397672d737b441f37b34364fee16df0bb680d23980f7da931d13c3a0c85
 DIST jupyter_server_ydoc-0.8.0.tar.gz 25769 BLAKE2B 72f9082b4c459474910e795ab94da0482f073923f89610a1ecea2663ecc94adec3979bd353bba45388a31ca1bf5918e061a7b660f37cefa34a4e09217c2e9443 SHA512 a09b099257943e30187c9b66d53a922b4b197f62af648d7177abca2c60f0538f4ef8a6dc330b2019f79848b0c8bd93645b8cf9eb657334282f4317cee93ab571
-EBUILD jupyter-server-ydoc-0.6.1.ebuild 910 BLAKE2B 444eaa6baef87ab622b0f51f05788b370481f076526afcbeba1d19692b7851173596a6871caa53136b6a797e5cb097b8d5c7829138817587980780ef36dd45e7 SHA512 ea2b8fc05ccb57781609baa871093b9c24fe13ce49aa8d41c1303e6588861f8092b2c7283ee3e70d2fa1caf5b6f5e5c6b40dad4f30ded0b4e2edf5563577c0e6
-EBUILD jupyter-server-ydoc-0.8.0.ebuild 895 BLAKE2B ebb1e36581527983bec0471761738e87126cd14ae9250106ca2d2f3a9a5464beafdae5721bba68430dbc4fd5c4bd29afc0efdd437eb07702850fa8da8330130f SHA512 1b28f45105585a829b441fb674fa67cd4c44e9af03e8de6b5aa819f879993f690cfd06a13f76895bcddadd908988e3f9cbb328d589e98cbd4fcd28d3cdc6bae3
+EBUILD jupyter-server-ydoc-0.8.0.ebuild 900 BLAKE2B c4d1e5a64c3ce091f63523862402b1483c1dad6b04c5db55cb46f79be87b0eca7fbf9fc1713cd5152bc7acbdbd3343669037a9f94e048e13f81729d526f3e33c SHA512 e31f3a651218a735bd2aa990334ef75653a6bff526b172c532a66c303217856457c95ade18d8f1658611783cf9e82b34e34a9acc1905944cf0e35e4b2734eefb
 MISC metadata.xml 447 BLAKE2B 66cfd1d1a59608e62bc7837cf0dbe48ca5a1e192f76db8e315b15e1cdea7b71d10dd8ae85181b1264e5f18bc5e58287c750009a7fa28de66ff2a748439459a6e SHA512 f558b5729e381952bbe9ef983221be36a9bfc79667921f63df978e6a3d65b57810e2cdddfc193ea6c789515b803ddd366bd56d70cee42c2b191b1cac85ca6cb5
diff --git a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild
deleted file mode 100644
index a46a067866b2..000000000000
--- a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Jupyter Server Extension Providing Y Documents"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_server_ydoc/
-	https://pypi.org/project/jupyter-server-ydoc/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	<dev-python/jupyter_ydoc-0.4[${PYTHON_USEDEP}]
-	<dev-python/ypy-websocket-0.9.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-fileid-1[${PYTHON_USEDEP}]
-
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
index 0885cc0da76e..42bfc2e7061f 100644
--- a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
+++ b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/jupyter_ydoc[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_ydoc/Manifest b/dev-python/jupyter_ydoc/Manifest
index 60800a5e602b..017baebdb82e 100644
--- a/dev-python/jupyter_ydoc/Manifest
+++ b/dev-python/jupyter_ydoc/Manifest
@@ -1,9 +1,4 @@
-AUX jupyter_ydoc-0.3.4-no-node-for-version.patch 846 BLAKE2B dd5c4764012d59e8861852ba5495577b535e4c5ce81bf6158094a58e30483bcdde43fc4c95daaedbe2ac6e401b3525d63a1f999827bd31c067ce2340109e6ff1 SHA512 6baa33bf597ee9d6b4bd086c67705817c338b9ec7f746df60eab088a7e20bea8853adcfa2a7f2d1d7364e8168b6eaf43f7bf95157346fba9a97e28fe50ff3359
 AUX jupyter_ydoc-1.0.0-no-node-for-version.patch 846 BLAKE2B 11112ffe502a4fa87abb4955f082ab6beef545a4327bb449586f1b837c78cce2cc863e7b40d71690920da6bf1346c8aa84e462cc9f16c7b51fc6a539ccea5dac SHA512 e9d82e27ce628a1e96fade29429c2532637c89cc6ad1ce307d74f493096ab003f5a9ea35247976ff6f7da8af566ef69c4cd82cec3ebd8a2a6bb72d67148b53d7
-DIST jupyter_ydoc-0.2.2.gh.tar.gz 10664 BLAKE2B d8a0536c07097e359b0145e5ca08f203dcc06d6ff1f556b814cebb5d8798dcd0ca36f70c010f410f4c14a754989db7dc65255863ea7c2610f0201820917f0e90 SHA512 f8db63a1829ffd58c8e773a2c9be674023e58a57dbd7bfffdfaf37ee735bf6cbd62c984df830198b1e8bdd5d1bcb1679cef07a77af36b02c72a704d6e9e295ca
-DIST jupyter_ydoc-0.3.4.gh.tar.gz 172549 BLAKE2B 1dd9d7e88736c8fb4681a47ba70d57871b94d2e64947fd5f469f4e0884705011f50e31f04c7f5cc0aaeb98987bf1ccf09029daa849c7aa644a04fb3dbc743742 SHA512 23523c91daf799f944684ea0b3f7768ab2625472b1f9d330fca3be91a532e0ec676cef4c2a82ee33af129e3ac9a1165272386b573098e4267af68c872607c1d1
 DIST jupyter_ydoc-1.0.0.gh.tar.gz 985632 BLAKE2B 6e4456d3eb96f40e4703d7a1413d62d82497ff46fa15c3e0c6a9dd6544cdbddf5cb5b24d87e135170af643bc45b6b88a0a5f5a3fd03986d85f8428b5f12c4b85 SHA512 7cf8f37fb28ce1b0cf02e5e2db642e6fd5debbf5cb6a119b5291ea2930b177d5f17d7236e105891e828e2c0a4ced3c06cb4e78a1b6c2c318e2674fa5da2a8b8b
-EBUILD jupyter_ydoc-0.2.2.ebuild 1023 BLAKE2B 763c31bbf9820f05160016ab0c706a255cd1790c93f6e6c03e8d29cee376cfb73f378954ebc04b8c6925f5440390d7c704838e97ffa6a0864c94df986b0578b2 SHA512 b7a39145c419cdbca591b267f963e4b9516a361748cf681ad0a7ce3f177ecb531278e7ece1ff05cc97e739b72e7113adbbb934212cd54d060bd9220020ceb5ea
-EBUILD jupyter_ydoc-0.3.4.ebuild 1075 BLAKE2B 5f2634848580504d36875efeed27f99e402c9560711fcca1dedc31a35a17eb5b74cc50e5442389a493c7b3ef73ed86add43bc2fd538a9acf5b35d2dfc9353f86 SHA512 af5e02e90f583da0c0e3f95331c6866e9bde3d283c1d4664cd95743698070082c466e86dc62da7a81cd9feafd2965d073c4548bf4709e76a8bf304cf9e5771f0
-EBUILD jupyter_ydoc-1.0.0.ebuild 1135 BLAKE2B 558839d3c61a01577aa3b7039e20025434c7ae9aa6326619bebc2453844a6c0edd058c203fce116e6483642fa53dd53af4fa36ae2938a04eb73725593a13ed10 SHA512 e7cf55b961578a4705bed024ca52f34988b2bd7c9112973b07721a73586a09ffda8e0733bdb86a8f343d75a0d9de363976aa91346120b9ca0b23a0a03a57bc5c
+EBUILD jupyter_ydoc-1.0.0.ebuild 1140 BLAKE2B 306b1d295ad5941bbffd147083e7abb0fd77fd44110245809e7d8176e3fd8dbd8817fdd4341b60466d834d2bf1b3189e66b42e95a3257d0b4d0ea954eb377dd9 SHA512 83dbc392909c6a71db5587ddf6c7acb19946252364ce265b1d12fa6227cc1d3eb3b6b3f81f520e66b4582e9f5bbcbb11a7505b93936b4e3d799fe6567527d907
 MISC metadata.xml 433 BLAKE2B cf2579c7d85eefe97d8ec81f37ac5e10deee9aaf52b16cea8ce3649f6076a3afee9e7ce6efbf82cd7713421353b53c16ed4d28b03a9b6e8b5c029fc6f3615651 SHA512 1258a3f0bd2a959055312594eb72bcd06fd639cf777543b41919da60b4082d241ad87231bdfb8c2ef057c85657875ac596b732301d3fb0c9a10cea5d2746234f
diff --git a/dev-python/jupyter_ydoc/files/jupyter_ydoc-0.3.4-no-node-for-version.patch b/dev-python/jupyter_ydoc/files/jupyter_ydoc-0.3.4-no-node-for-version.patch
deleted file mode 100644
index 8a21ab0e0890..000000000000
--- a/dev-python/jupyter_ydoc/files/jupyter_ydoc-0.3.4-no-node-for-version.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 6e0a069..42f76c1 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -2,12 +2,12 @@
- # Distributed under the terms of the Modified BSD License.
- 
- [build-system]
--requires = ["hatchling>=1.10.0", "hatch-nodejs-version"]
-+requires = ["hatchling>=1.10.0"]
- build-backend = "hatchling.build"
- 
- [project]
- name = "jupyter-ydoc"
--dynamic = ["version"]
-+version = "0.3.4"
- description = "Document structures for collaborative editing using Ypy"
- requires-python = ">=3.7"
- keywords = ["jupyter", "ypy"]
-@@ -56,10 +56,6 @@ text = "BSD 3-Clause License"
- Homepage = "https://jupyter.org"
- Source = "https://github.com/jupyter-server/jupyter_ydoc"
- 
--[tool.hatch.version]
--source = "nodejs"
--path = "javascript/package.json"
--
- [tool.hatch.build]
- exclude = ["javascript", "!javascript/package.json"]
- 
diff --git a/dev-python/jupyter_ydoc/jupyter_ydoc-0.2.2.ebuild b/dev-python/jupyter_ydoc/jupyter_ydoc-0.2.2.ebuild
deleted file mode 100644
index 30740cad3bdd..000000000000
--- a/dev-python/jupyter_ydoc/jupyter_ydoc-0.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Document structures for collaborative editing using Ypy"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_ydoc/
-	https://pypi.org/project/jupyter-ydoc/
-"
-SRC_URI="https://github.com/jupyter-server/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Requires node
-RESTRICT="test"
-
-RDEPEND="
-	<dev-python/y-py-0.6.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-		dev-python/ypy-websocket[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# Hangs for some reason
-#distutils_enable_sphinx docs/source dev-python/myst-parser dev-python/pydata-sphinx-theme
diff --git a/dev-python/jupyter_ydoc/jupyter_ydoc-0.3.4.ebuild b/dev-python/jupyter_ydoc/jupyter_ydoc-0.3.4.ebuild
deleted file mode 100644
index d2532b0c639f..000000000000
--- a/dev-python/jupyter_ydoc/jupyter_ydoc-0.3.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Document structures for collaborative editing using Ypy"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_ydoc/
-	https://pypi.org/project/jupyter-ydoc/
-"
-SRC_URI="https://github.com/jupyter-server/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Requires node
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/y-py[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-		dev-python/ypy-websocket[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-node-for-version.patch"
-)
-
-distutils_enable_tests pytest
-# Hangs for some reason
-#distutils_enable_sphinx docs/source dev-python/myst-parser dev-python/pydata-sphinx-theme
diff --git a/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild b/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
index 6b92a4de8d15..8f9b6f8ccb4f 100644
--- a/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
+++ b/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jupyter-server/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 # Requires node
 RESTRICT="test"
diff --git a/dev-python/jupyterlab-lsp/Manifest b/dev-python/jupyterlab-lsp/Manifest
index cd95831aad67..b03eae32bf9c 100644
--- a/dev-python/jupyterlab-lsp/Manifest
+++ b/dev-python/jupyterlab-lsp/Manifest
@@ -1,5 +1,3 @@
-DIST jupyterlab-lsp-3.10.2.tar.gz 269490 BLAKE2B 43e4c79e94f85497f83c8034d63164ae5e0820dba6a725048c7f11522d2ab98326e637c254251e96d72d35d7ff8962ab8750a2ba42681c4ef34a65bbb42240d4 SHA512 e154b1f382d2a70a3378f821b055d9a05e9ba748f3ca3e61974655ec3a06f73bc864ad18917171e1101692760fab44b830d2eb70676961a09e383b3544d8ba71
 DIST jupyterlab-lsp-4.0.1.tar.gz 869528 BLAKE2B 62df16ba8aef6c344324346501191776a0534ddf6b5acff4de477f8f7f8996f7ec78022bada4c16d582fdfb7f916fd70f6c9c176505d25c47e863aa65f681f77 SHA512 8f71a6f39bec08fab8401a7074d65fa9a4bdca66ed3c11f75777095f160e9eab25b75b21f1ea4e509f43ff0beebe777f690c13ad0325b5ee26bcd1ec301119e4
-EBUILD jupyterlab-lsp-3.10.2.ebuild 562 BLAKE2B 56fd348be514b6f38f15d5a77ee38fcc3ccd7075ff767aa129adbebadc10776456213d78fceb58892f1a7d40601114622eff02731946ecbb5d303bd8410e9205 SHA512 cf76c6c2a83cc873354d062af6b6403189be172c816d13bf40bb848e1885d474e9de63b713f727b3023a48643808a897e762016605789aa279e88b989f85607b
 EBUILD jupyterlab-lsp-4.0.1.ebuild 562 BLAKE2B 5515e2b9ce4a942aaf15515f82ecc03f2ef667fc9072ba13c49c4571308bfb06a6c15696bb9be6511df761c02a078819b621db663fc619013d8eb5293dc467a8 SHA512 3012407d81591318ff1d57379b4363e8c5600307f5f200ecc4ab465529cd91195fc43d5a6ff69ed10b22fc63d2653557316f1d94b7feefbaff872d343fc32b8b
 MISC metadata.xml 421 BLAKE2B cbd9c4e3ce5848ed3d0e57832082dd730d2d16a286070639602b8fcd49c49714e7f17b220251b9f16d9c5105248933390b152c060c68522d2c82b1958b09b116 SHA512 97ac68ac4e6920f23120a5818b4404fa0b510b165a44a6455a7bf76edfa298ca137f50bd9c1a87044253f5b873f881362c2667261a4c7fdb182a7d37325520b3
diff --git a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.10.2.ebuild b/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.10.2.ebuild
deleted file mode 100644
index b47017ddfb7a..000000000000
--- a/dev-python/jupyterlab-lsp/jupyterlab-lsp-3.10.2.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
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-inherit distutils-r1 pypi
-
-DESCRIPTION="Coding assistance for JupyterLab with Language Server Protocol"
-HOMEPAGE="https://github.com/jupyter-lsp/jupyterlab-lsp"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/jupyterlab-3.1.0[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-1.4.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jupyterlab-server/Manifest b/dev-python/jupyterlab-server/Manifest
index 823787fbaf40..54719581ae0c 100644
--- a/dev-python/jupyterlab-server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -1,7 +1,3 @@
-DIST jupyterlab_server-2.20.0.tar.gz 70481 BLAKE2B 188b8a9bd2bfc5a27ce6f8488d7768484fd71ae8bb93f28c8a49f63b1aef13551c55d7e18531830df26617883f6b780a491d3522a0dcb3ecddcc433cfb35f97b SHA512 7d9a86f56686344ffc1ad11a9fc7c736a2ac0e6b8c31f8b6d8e35e5fd982454b2362073038dfc2ed3a4f03ef53e2afcaa33fc2c956b63e44c3d1ae6efa1f9251
-DIST jupyterlab_server-2.21.0.tar.gz 70965 BLAKE2B bb959d2c5a507ac6ad2ed719e86a68590c51df51a126f8a44195c48ccb9a295ca0930d0c106cc9f753b3032aca4002d4edadf31f24602d22bf9d3be3eabe2fdb SHA512 c3180983e6db932a4f243e977aaa0d7e7daed34788ba3a51d1414c5b625008ec524e0bf96a559bd85279146f9bd02c31eb2ac3451c40edba1751ed695c7c0791
 DIST jupyterlab_server-2.22.0.tar.gz 71374 BLAKE2B da27d6fb6d22db4aacd4c6c7a96ca748c5ba95d6b357fb45aa3383642b23bff7b61298eb01b8a80073080248e06fae35e04b1a7e4144018e84a6b548937ad0e6 SHA512 96484afe03a23f4aa6492b15e64b3f874b144af371d65c94693b708f9152e2762f98f0dea2b7464f8240740f4be56b2cd61a8869ef001521bbb4748dd0fc7005
-EBUILD jupyterlab-server-2.20.0.ebuild 1966 BLAKE2B d19b0f250b30fb4da82ac55e84f20efd81fb73383a733026d1879c677da4df1836754090f437ad841d85ac7fa4ae4fe3080477e5043634aaa79ddd7bf0c0f984 SHA512 f09e029432d35bc556a0761ae00d9e3de7228892b72b9483ff35bcc49d83ed9d4d6bbec46b2c9bd5001755680ac3a27409d06ea6966cab7207968a6697ff2b5e
-EBUILD jupyterlab-server-2.21.0.ebuild 1966 BLAKE2B d19b0f250b30fb4da82ac55e84f20efd81fb73383a733026d1879c677da4df1836754090f437ad841d85ac7fa4ae4fe3080477e5043634aaa79ddd7bf0c0f984 SHA512 f09e029432d35bc556a0761ae00d9e3de7228892b72b9483ff35bcc49d83ed9d4d6bbec46b2c9bd5001755680ac3a27409d06ea6966cab7207968a6697ff2b5e
 EBUILD jupyterlab-server-2.22.0.ebuild 1962 BLAKE2B 297f1ab91e6eaabaa77d206491dc9974bbf660ab07d550a2c3c84d67a33bee43f17cbfac8f0799614d58654883c3183cf4e68b080f662d72b4fbba3de928626c SHA512 614c0687d7f35038feec1b7ed84cc0548c8528c149d87b01d1983fcdbc167dde4d52d1d34bf1dc80adbf497507b6cc4f0b2e8440b50e8d20cc28228d130475a3
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
deleted file mode 100644
index 680acd032366..000000000000
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
+++ /dev/null
@@ -1,69 +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 pypi
-
-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/
-"
-
-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.17[${PYTHON_USEDEP}]
-		>=dev-python/openapi-core-0.16.1[${PYTHON_USEDEP}]
-		<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
-		>=dev-python/openapi-spec-validator-0.5.1[${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
-	)
-
-	EPYTEST_DESELECT=(
-		# Fails if terminal not available
-		tests/test_labapp.py::test_page_config
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_tornasync.plugin
-}
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild
deleted file mode 100644
index 680acd032366..000000000000
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild
+++ /dev/null
@@ -1,69 +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 pypi
-
-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/
-"
-
-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.17[${PYTHON_USEDEP}]
-		>=dev-python/openapi-core-0.16.1[${PYTHON_USEDEP}]
-		<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
-		>=dev-python/openapi-spec-validator-0.5.1[${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
-	)
-
-	EPYTEST_DESELECT=(
-		# Fails if terminal not available
-		tests/test_labapp.py::test_page_config
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_tornasync.plugin
-}
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 51413d0a68c0..7a538e337a65 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,9 +1,5 @@
 DIST jupyterlab-3.5.3.tar.gz 17114007 BLAKE2B 70d32721a2579331dd4e3481f7241f5e2c5aad6dac851f213de0ac1fc3b76667bea496bca5ea13ee562e9678d51ac45df91c5901d8d3b7dc839977d3d842e67d SHA512 fdacd34ab629da2b5c2eb23f11ba4d44d5b27872e1736850319bcabbe635d31cfa2891c1c5991b152a5c1d94221e3766a20fc91033f556d8e508374bc46d5fe2
-DIST jupyterlab-3.6.1.tar.gz 16845937 BLAKE2B 41c50a9ddefc0ec97c70843e15107d3e3cebfadea2ec148e4536407b0f1b202c2aeace794b02c7cb666c316434da614c1bfebab5e5fc7e654f62677bac6e1eb3 SHA512 9dc63162955c13721c97d620a60116cd75bf10eca9c8eab08ae35749bf2dfec84c55759a361ca1abab34c44d63eded95748cfea589aff98907045b483d778413
-DIST jupyterlab-3.6.2.tar.gz 16846937 BLAKE2B 1b443ace53a68903728aa781a0a0aa95a13193b63ce3101144945e41245dd7c00554abc6c75a48feafc677d83580705393cde1a4bffab0e09d2d5bf0d67e72e0 SHA512 8ca7956f6c78413a7aecb55cd60b3dfa8491afbe3b02d9ae5b038ba4dcc762daf78768349cb586775483e8dee39d5a062650d0fd156e12a85383543f836cfb38
 DIST jupyterlab-3.6.3.tar.gz 16847186 BLAKE2B 6916722469ab100a1a240b8a565c9800f35535b2a9b2c39a6bfd275b078d88df9faa1f12d4ce3819155af7b0ed22282836f9b233534bd3e63d8a330d1cd7cd21 SHA512 3d6b4781f9fab02504b2c0223a4d060d80c3442fa6ac53ae326296d69942d68f8545450f671f6ba65c7c4e218aad62ef4f4ceb658899c21aaff3640c3055d364
 EBUILD jupyterlab-3.5.3.ebuild 2574 BLAKE2B 9d56d8393c51ac23d5564e935b0621e7afeffbcc510abf0cab42f971531ec4fe8a0afdb5e3d46839cb579b2e956f905d672e430570a39cf8b3f93c856921f735 SHA512 e8da2a35344d04bc458d628dac61584812fd25cec8da4915511d8014fac086443783f62c685a020bc573e086ee255521f0de6cea6bac011ab15e7280516c9acf
-EBUILD jupyterlab-3.6.1-r1.ebuild 2747 BLAKE2B 08de7f4ff39cf5539b46aa71b6d07b25d4909f2456b2603613a557fa10695f405affdce5ece032d10eaa727a2902dbdc5e5ed9f8415b921354682ec13df65c16 SHA512 2a05e3d7f29a205665320353fdb39a29584c86df003f09a0f058aafc41fc78bd4357dcaeebfe338e6994c7ecbcc6824535e1c6ad84b76f963819abfd77bf8c10
-EBUILD jupyterlab-3.6.2.ebuild 2739 BLAKE2B af86fa795f698b076d484e8355fc5750c9e6b8e618e3aa06ec1b8383b3dc32dec7ec750ef2c5bf93544ee7316232b3a4dacd402b433a4331d44aa7603c043008 SHA512 1fb15ac9a2aff618ee7ee59d35e5eda437cb72e42eea8a95e480504b35a356a4f195049e7b8590462edf8695d3f7f132557baa5ba770bc927bcd63f6da4c11a9
-EBUILD jupyterlab-3.6.3.ebuild 2739 BLAKE2B af86fa795f698b076d484e8355fc5750c9e6b8e618e3aa06ec1b8383b3dc32dec7ec750ef2c5bf93544ee7316232b3a4dacd402b433a4331d44aa7603c043008 SHA512 1fb15ac9a2aff618ee7ee59d35e5eda437cb72e42eea8a95e480504b35a356a4f195049e7b8590462edf8695d3f7f132557baa5ba770bc927bcd63f6da4c11a9
+EBUILD jupyterlab-3.6.3.ebuild 2744 BLAKE2B 12af870b41a8c4e7021ccefddbb659c12e60baf85cb9af3ae640998a97c0edafaccc8fb957aa3875ce8df69bd36cc18370e7e30213588c884c5c5a9686550357 SHA512 bfd6127202e73a99c1f3e764e1674e04d5cd4fc91ab2d0d287d4c99b8521712bb56f868ffb3851d43dad3ac1befef9dbb09952ab6ff954af085ec77792dc3b30
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild b/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
deleted file mode 100644
index 07c18298ca37..000000000000
--- a/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,81 +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=jupyter
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.16[${PYTHON_USEDEP}]
-	~dev-python/jupyter_ydoc-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-ydoc-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-ydoc-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
-	<dev-python/notebook-7[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	test? (
-		dev-python/check-manifest[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/openapi-core[${PYTHON_USEDEP}]
-		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild b/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild
deleted file mode 100644
index abe9ea35dc85..000000000000
--- a/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild
+++ /dev/null
@@ -1,81 +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=jupyter
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.16[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_ydoc-0.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-ydoc-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
-	<dev-python/notebook-7[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	test? (
-		dev-python/check-manifest[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/openapi-core[${PYTHON_USEDEP}]
-		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-3.6.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.6.3.ebuild
index abe9ea35dc85..8b5eec54bcc8 100644
--- a/dev-python/jupyterlab/jupyterlab-3.6.3.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.6.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
diff --git a/dev-python/keep/Manifest b/dev-python/keep/Manifest
index 49538038f36a..6c2983280ccb 100644
--- a/dev-python/keep/Manifest
+++ b/dev-python/keep/Manifest
@@ -1,4 +1,4 @@
 DIST keep-2.10.1.tar.gz 13044 BLAKE2B 178207ccad7f0feec2d9a57f0e5345e0ef9853bedd3f8efc8afac5f81c35e74ee6d3dab66b75ceeac4a3d76f2297ec645bae61f2f1e78218e910a2537984f4cd SHA512 d4144bd7f6f623b1c9c9468f5596818f47cba8a9bc80e75ebaf75f147823a01da53ef84c76b9f24240a8d0fbdb770c5cdf108c276ecdcd882ac9db0c1608480f
 EBUILD keep-2.10.1-r1.ebuild 607 BLAKE2B af3c6b47e5733e92b737fae733f51ecdd7206d906e98c2112c1db72aa8634d82ade09bd56a4d45b32a4ef1ece00505ba5070ffb42ed92ef922d5475563994252 SHA512 524f4477a582594e9b26b44ab3f23ad47758f71cd90a38319935e64d74acbac788da2f70232867b89cfd29944a1824098661d3873e57cb7df12ba616c8984937
-EBUILD keep-2.10.1-r2.ebuild 1364 BLAKE2B add26e0d49a3326cb9cdeab424724fddf8b895feb7bc11fa87e7d3ea02f48bf7d90622b29ff543b5b46d7735a30318b3d2bad0f37b320d176b8ac07d9fab55eb SHA512 c572fcecaf7aa8263133fa7f41c06aa16f9e31c0ae4904197514af2a5738cdae90e036b171049cd106c0234df659597248595bae13e95aea106ed954cb994249
+EBUILD keep-2.10.1-r2.ebuild 1362 BLAKE2B 15edf2d3d7ffd6a86a8491a2cc06c9879a333556b96b9172c5e1f3db1a10823359822f669c1fda3e42ce7ecce3fbd52a6242967184e0db86ec872bd2ee700827 SHA512 9801ddf41fc02460230b67e46e2c5cc3f6f0ec91036d76e0b33140f0e26fa2de8a158cbe0bf279bfcecd7d7e224a0ba0df12e4f325d50292972c0281697ddf25
 MISC metadata.xml 400 BLAKE2B 62327dcf8653077772b2af0a0c3ca33cb4e3ddc06f53803a01a257611ea828ca8536bd2e6b6ed6f0d86010580f590ced0931d09e8cf9aa9a79aff8def238cd43 SHA512 87ed56a0bfb1fc56de91e0b59a1dd0b8ec08b90d5b2746a27195d3a100856bde29dbda8594eb3fb301a64c58f3a9edb0d4a739c96e30e8ac19aebd6b1c8fed2d
diff --git a/dev-python/keep/keep-2.10.1-r2.ebuild b/dev-python/keep/keep-2.10.1-r2.ebuild
index 560d061eb528..dd541a6279ea 100644
--- a/dev-python/keep/keep-2.10.1-r2.ebuild
+++ b/dev-python/keep/keep-2.10.1-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 2f45c7572e07..072bf01547ce 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -5,10 +5,12 @@ DIST mkdocs-material-9.1.2.gh.tar.gz 10883294 BLAKE2B bc84f9af96fcdd8a6704723d8c
 DIST mkdocs-material-9.1.3.gh.tar.gz 10884530 BLAKE2B 1a7c257a0f1ce6fe9b5fa394cb9a8011f7d9252c5cd0cd7b935acd57aa2eb518cf4c945c164d64eca4c30c50f7e224b5bd6f122fa2cfbcf425ac6d5e59c40db2 SHA512 300410ff503bd4f751dc45aae9e3d88cb3589d0d3343208c6592a0d68f01c2c1ae5a4e0aeb80afabd0e04af3c51886356319ad00a6e8f801dbfe6b500db4eaaf
 DIST mkdocs-material-9.1.4.gh.tar.gz 10870732 BLAKE2B 3936fe1396631ac0aa2857da9b197347719ab8b49cf2afda136f16e706d685e7deaa198c18f99ff599d233ac2ea08bfbba397d2024b1fb164c96e91c19e3512c SHA512 1b62785bb0a30f5e84188cb42ade7f64ba3cab652b2eea13ee64a29767807c05f71db610e4915eadcdf301e6e12259e1905e2a1c23681f16ba63db7be6fe284a
 DIST mkdocs-material-9.1.5.gh.tar.gz 10887648 BLAKE2B c0e1c905765c1a127e467c25c3988b64eec0c79e2d554e30e39cd5e9c65d748b5198b973027337a3530beeb4e9f3a16d2e0b41925ef44698dc011501b5bb6f14 SHA512 cbd89c66dfda2554a9466f2dda16baac4a7328de1dc1d4549861395d0cd6adea9f841f04e0ac1fcd8685937954dad82aaa01be69faac86c79e28466d5aba9c61
+DIST mkdocs-material-9.1.6.gh.tar.gz 10906175 BLAKE2B d99564b40c1add79164fbc339ea1c2a1b531ba9ac442cc1cb65c65696e5391acf7718d6f9c681223e2dcab1bca1d423ed1825bfba342d81b69511fbf3bda6e5d SHA512 7f8c41d525d16a967efcd34073a89f36d91c70425890d63aa152246c7672c983e64fe82723e032bef31445d1d0f6e926203573e3036fdc79d001db78e2ae2bfb
 EBUILD mkdocs-material-9.0.15.ebuild 1276 BLAKE2B b73a9a920b2341c2a76b8c53c14f3957a6f2014180caee8d5879c2d1d0a8eb073adf27eaea6df548a3f9a9c84046480646ab543d0187d3bdd73550ac25467763 SHA512 c6f5844f78d11cbe7090826c7f1360d476ba1541c59b5bae08c312f103d3f727256b5ba2930ffb296e516d48e75e9d438f16191e7b906d78fb73224ab474fa52
 EBUILD mkdocs-material-9.1.1.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
 EBUILD mkdocs-material-9.1.2.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
 EBUILD mkdocs-material-9.1.3.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
 EBUILD mkdocs-material-9.1.4.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
-EBUILD mkdocs-material-9.1.5.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
+EBUILD mkdocs-material-9.1.5.ebuild 1276 BLAKE2B b73a9a920b2341c2a76b8c53c14f3957a6f2014180caee8d5879c2d1d0a8eb073adf27eaea6df548a3f9a9c84046480646ab543d0187d3bdd73550ac25467763 SHA512 c6f5844f78d11cbe7090826c7f1360d476ba1541c59b5bae08c312f103d3f727256b5ba2930ffb296e516d48e75e9d438f16191e7b906d78fb73224ab474fa52
+EBUILD mkdocs-material-9.1.6.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.1.5.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.1.5.ebuild
index eedc60f73616..aaf33a92c6a0 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.1.5.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.1.5.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.1.6.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.1.6.ebuild
new file mode 100644
index 000000000000..eedc60f73616
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.1.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs-pymdownx-material-extras/Manifest
index 2ba5b311bf11..6390cbd27d20 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs-pymdownx-material-extras/Manifest
@@ -1,3 +1,5 @@
 DIST mkdocs_pymdownx_material_extras-2.4.2.tar.gz 24247 BLAKE2B 1ab9bcc9c6a6f11188305d36c48773ad03d9f03cf95636f6d6eeb292d39d7cce3c4ea155caf6343b636f33dab885dd2320e2f7b12f91b5d7d03e1da1480b2ac1 SHA512 8852fab08e7dc43b005d3ebaaabaed07598751dc7dbf237a9728c1cbf8abf992403e27a515d615bbbe0b753b08a0f32aa8f18cb249b07187319c20c285fdf312
-EBUILD mkdocs_pymdownx_material_extras-2.4.2.ebuild 532 BLAKE2B bc8e3c300eeede13398e1b9550be3373fe65c99caabba8dbf96c9a244d2c69d4a781673abb9478f2b13b6f847cc66f7c895c7aa151efe758d7a9788358525fc6 SHA512 0eecb95e6b215f121172f57e6b0646ce424a615457001abfcee77864df658e5ec00470168bf4f5b486a94667e4f029b0b601f8c304a9e324e7217350143480c5
+DIST mkdocs_pymdownx_material_extras-2.4.3.tar.gz 24693 BLAKE2B c7b7518d5eaca04dff0373e897f9fb871aa8537a1438841ab58a4f157910070ccf339091340521d56b7b727cedf33dd5b3ca711155e39b505da195f2308ab0e0 SHA512 3659235bf200f2c400892e9223bc6a1465af116f6f5a85c4decedfd951eba57fbbcb70faf6c22ef9d79d049621d66e64790dad2fa95d43a41213f288b27405a9
+EBUILD mkdocs-pymdownx-material-extras-2.4.2.ebuild 532 BLAKE2B bc8e3c300eeede13398e1b9550be3373fe65c99caabba8dbf96c9a244d2c69d4a781673abb9478f2b13b6f847cc66f7c895c7aa151efe758d7a9788358525fc6 SHA512 0eecb95e6b215f121172f57e6b0646ce424a615457001abfcee77864df658e5ec00470168bf4f5b486a94667e4f029b0b601f8c304a9e324e7217350143480c5
+EBUILD mkdocs-pymdownx-material-extras-2.4.3.ebuild 534 BLAKE2B 320705168ba6cb73ca3b75247a7dff2ba28c72203c1e4e06d136d05127365c8e3cf41cde82ff82f7abdb35ec6d1d5b97bf692ab14c2a13b3ba9fe6cef79f1152 SHA512 33df5ef5370e8e3423426074facbd7c942d9c72e8adef06d180452a3311f369e8e6c8904b5dc1a767053cd34698011c931f12babd231baf1d5190fe3137fee3b
 MISC metadata.xml 1167 BLAKE2B a4efd99b0128f99bb7a8da17fde37695cff1f9e50ddec9d3b71e5eae4a09b8ba6646259c724220ee5905faa420efcdaf4be1d0828c8cc4d9e7040ebf1398bd0e SHA512 37d5b8e942796e54f31d0a2d592157d7a50d8fe5bdedf6f0e57305d60b4d7fd99f649e2604bb53cba5cf457227c3c1debfd607b3f5b97fcaee7e8209fbc900ec
diff --git a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml b/dev-python/mkdocs-pymdownx-material-extras/metadata.xml
index f4fb8893a051..f4fb8893a051 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
+++ b/dev-python/mkdocs-pymdownx-material-extras/metadata.xml
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.4.2.ebuild b/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.4.2.ebuild
index 9ba5d734a359..9ba5d734a359 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.4.2.ebuild
+++ b/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.4.2.ebuild
diff --git a/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.4.3.ebuild b/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.4.3.ebuild
new file mode 100644
index 000000000000..e58e08f51d78
--- /dev/null
+++ b/dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.4.3.ebuild
@@ -0,0 +1,23 @@
+# 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="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras/
+	https://pypi.org/project/mkdocs-pymdownx-material-extras/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-8.3.3[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index dfea1ec0f41b..7c83a0d62160 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -15,5 +15,5 @@ EBUILD moto-4.1.2.ebuild 4423 BLAKE2B 288d10f6ec1026c9cf8d744436cac1f482bdb0bb27
 EBUILD moto-4.1.3.ebuild 4376 BLAKE2B f47b8140ec727e5772f0e07e9388c979930cd64529e7ae0661b55aae32d46cb2c33898cd7df8255d91a91f37dc6a74d625c40b4be2d23df6fd49c46a3689b3ef SHA512 d5dc2854e3c6307cc7ae7b8d51fcb839819d40ed839b1f797fd1c768989077e33c4e78f0474e28feb413ba29ab9096acb1514a0ed81350b5a16441c14df2576f
 EBUILD moto-4.1.4.ebuild 4539 BLAKE2B adb9a57e4ad2429f4fcddeff8df0ad6307d49afd3b9a16f1fa6d2f6c251ee2e6ef1db1d955001e2a1ca12e2cae7cb30676493d24e6c68367208e720bf3f89960 SHA512 04f42ce6f895820356d6e67f865f56eb0426b34a1f7e6b777816eed97b3b78f519075fadaf65da5eaefd129e6c1c88548ab69e6a7c3e6722512bf1f2adae1dc9
 EBUILD moto-4.1.5.ebuild 4610 BLAKE2B 93609a81a0db21fcfd5c1a0973008ff00ae72a24cb8210088cd84cdb09d4b6675e3dfd26cca0eecbeaf2cd3c1ff85f7dff4cac596ed3a7fa3dfb0c0e952a4a44 SHA512 f57604cd7c3613ba5ba70ce5d59ba91192850e9f595aae95ae8f1b0df0f819d768c503ac6ca43d39ce14a42c8b9c931c90c5e45ef60fd4f46d46fe163c74943d
-EBUILD moto-4.1.6.ebuild 4674 BLAKE2B 5287db1684a2acc0a182ffbc40b6aec8800b6f4e505891b0df30c0a88141155e08dc5ad8b5934f634c6c830479e30e6decb2bbca2d50bf5a455da4623c9b29f2 SHA512 92addae1b34a8968501523ee1bd2b656b4fe55e5d54a6a1e2056d3e8db4b1c8836ed55d66ee992218e6b4f3244d480bad88e874232b05b16e310d236688b69a1
+EBUILD moto-4.1.6.ebuild 4673 BLAKE2B 204f1ac5853b22e73e03ac7af52f3dc4d9b4577b1bc79c1566653bc7f4badb45286666917d28a3dcf3a11e88533e3534ac7857167127f1111adfd529bd65e2fe SHA512 d36514e43fd4d4ee482089067a5c14edf7c1742de4f5109d3d71b37ca24f5ae79ce770fa7f115ba2e2b0b17adb3517c3395512ff727ff67045f77d277be70dce
 MISC metadata.xml 553 BLAKE2B 1669d17d3e655aa3fb41a489229a5fbfa6a9cfb23c667e98fbbef931992c7e9645581b9ea12011601093586cba491a5557d68e5256edb9f387c4db362346edf9 SHA512 48ae3bd9be8c3bfb68f7022d0e7bb422c2a06157967809be302067facf91db825023859d18ccea89109931538b0e93181d54a31fcc967628df61a9a3112edd3d
diff --git a/dev-python/moto/moto-4.1.6.ebuild b/dev-python/moto/moto-4.1.6.ebuild
index d30e9392b520..039bd4d66443 100644
--- a/dev-python/moto/moto-4.1.6.ebuild
+++ b/dev-python/moto/moto-4.1.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 33d81e82c113..4f0f27d88afc 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,5 +1,5 @@
 DIST msgpack-1.0.4.tar.gz 128053 BLAKE2B fcbaafbea57f87c949a43a6bd6f6507eb3a07ac5e4a9c44fabfbb7c07849f1edabb8dadcd99a547fed32bce0f900f965368c4ee744acd4e850cad5c27022f463 SHA512 dcd59bf77408acf7171bdcc46c4d6bf875d36e80b216b7721544855e6c2b20be469415ee768b2195e74fe4650621ee6bfaa7897e709ac0d8d59cdb30772cb90b
 DIST msgpack-1.0.5.tar.gz 127834 BLAKE2B 3dcf454630021e35d5c6d5ce850d7ac74a6d11d6fe7c7ed07040daa62585bd6b11dc0f68a5b4c4bf20346c25bc23017f79f2d1bad09f175008b184461d0eea5d SHA512 bc3bf27ca7a9204c5ebc009e4a03db4fb48f6c2733bef393aed16652f07ac92c9400258818743245598343c86494d39b39017ab70d7563a5844091eca11a9faa
 EBUILD msgpack-1.0.4.ebuild 1023 BLAKE2B 02ac41c76f53982fbabb4c672903e69ddd1b8384554db7f89f327387d973ce90fffdb1b6073c442b03a304f26f49cda322c92f82e4abbd0bd6786770de915cde SHA512 9bc624dce8555c02e2d4ef8293cc3cc6eb952e095e790450ad1a79635891283ee2b5bdc05d505e1fa8496963241a73a158efeb5932fd35204a60c7a444effa17
-EBUILD msgpack-1.0.5.ebuild 982 BLAKE2B 9ee428dcc90f2277a9ba86c1c0e67ade7b569a11590bddc192a68eb5e8f44c6758e350893c7318c5e2d684b08c167528677abcd94be08a721986e88cd5d0af20 SHA512 0a1cb2de6a8804a9ca8d0e224a6b7e87414ff6c31d2383b79a0d439111c891cd6040b9e6b287c289fa05ece81be45d3fd714e28716d874f2f2410d42599a8c11
+EBUILD msgpack-1.0.5.ebuild 978 BLAKE2B 83650846868576230e4672214d909692d787e348e5ee92e35ccd494b27c40bd6d7a8b224488707044b0f4e4b151f7588e915c1829598875af2172ebd69439521 SHA512 ae4c9121453c52d2d962109405c92f18f4a2f42448453c106d192b6d8e147d70c0e4acfa0174cf01082c61732a488dc207ccb409ec1a4eb5125463b312c47b53
 MISC metadata.xml 520 BLAKE2B 5facc8e5c11591c6010fe5eef4030e23502b890d15a896ada0c5625e63179887e13206f28695af92b358c56a9f9660767d8b4234c2c8b489cad41fec01af289d SHA512 a62502d0b2ec3da1b21297f4d4e5fee86c206c8d6a2c19d7bffe2a64b4a2fa990edb3ba07bbacccb59ed79efd23fa713a37b8adffa7f0cbc811fc0fa249d9b63
diff --git a/dev-python/msgpack/msgpack-1.0.5.ebuild b/dev-python/msgpack/msgpack-1.0.5.ebuild
index b58b4c19500d..d4ca09c85f90 100644
--- a/dev-python/msgpack/msgpack-1.0.5.ebuild
+++ b/dev-python/msgpack/msgpack-1.0.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="+native-extensions"
 
 # extension code is relying on CPython implementation details
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 7ccf74a1ed96..7bf8d87d5886 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -2,6 +2,6 @@ DIST mypy-1.0.1.gh.tar.gz 2763553 BLAKE2B d8d2b6cd3ff386ce0f78d32f81f3f631bbb8ff
 DIST mypy-1.1.1.gh.tar.gz 2787425 BLAKE2B e72a4dcb41107e6438b360bb342b7ac42778ab3d6bd557d7fe2a9f92f6427d94d782661ff80bee36aafa676d0cc1553bcfd74cf3e413d4afa525fd8e93e9b87e SHA512 fcd50366837d005f255e2e8ecf20c843374a5d7670d714d1f8cfdaef1c6d44e37e7e84ba91fd1d49513e3aeffc8d5c0ab40ddd7bc9fced75082c9fea60d38f6a
 DIST mypy-1.2.0.gh.tar.gz 2815323 BLAKE2B d5cdc1bb31d797c49daf5ea0427fdceaf59a131d02a687dc5e72796a03824bff923c6942c6f01ca44025fe153fea02fdaee3959317fda0d4c562c45638e8c380 SHA512 5bee7a5ae4ac608cb3b3855c0ad100ea6ba512900aa557a153e1ae5f8e779125a8ef61103a81a9584b0585a6d4eea78c3585af61fa62986f984ac2b63e6b89b6
 EBUILD mypy-1.0.1.ebuild 1773 BLAKE2B 978c99ff419963ed8079eb2289fa1888ccf559ee86f4c6c2781915928825dca9c5f822294593a4912199d758e36f9eba9caa2ae0b35f7ffd8e199010e9c477ae SHA512 ac9cc6f424fc399ee4eb8328e917c9e3866c6ec4fdc4ab72c7e970713b54bfd7090a387b73bc2f799e3b2eff743e79a2179c2c02a623aacd2b5e81504bd0ba33
-EBUILD mypy-1.1.1.ebuild 1730 BLAKE2B d551dcf3e6533016345a05ab95a050df3fd2bef314cfa0f804637507b38c97d82097ae497d86eb298e7433ad522502197a7ba66355cea1f2515d408abe1f5be9 SHA512 910864eccebd73e17b097fff17a11b04b63e84b361332a053aecee2d7d86618573f4492bf192c7034eb8ecbf45223fee6d986a04619e3c7e234ad09d171d04fa
+EBUILD mypy-1.1.1.ebuild 1726 BLAKE2B 9cf2fab36a7838a49e992ade7566ab5ab4cca1967befbf6d1cf22573c652f4cc6fa814a8fdf19e27e25941ba9c62499ddd2f128e6cd3b695469497fd6cf30664 SHA512 08c6a995645167724f195af8f44fd4b59eff7f25df2de100e5216aaede49c735d29bc4151457a29d4ee785b1c0d438872b24a3e5d58a3ca1fa2a5f5661bf0d81
 EBUILD mypy-1.2.0.ebuild 1730 BLAKE2B d551dcf3e6533016345a05ab95a050df3fd2bef314cfa0f804637507b38c97d82097ae497d86eb298e7433ad522502197a7ba66355cea1f2515d408abe1f5be9 SHA512 910864eccebd73e17b097fff17a11b04b63e84b361332a053aecee2d7d86618573f4492bf192c7034eb8ecbf45223fee6d986a04619e3c7e234ad09d171d04fa
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-1.1.1.ebuild b/dev-python/mypy/mypy-1.1.1.ebuild
index 602afdd767cd..e253f9cb68c6 100644
--- a/dev-python/mypy/mypy-1.1.1.ebuild
+++ b/dev-python/mypy/mypy-1.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 264c9b5c8238..671c5a41908a 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,9 +1,3 @@
-DIST nbclassic-0.5.1.tar.gz 20178622 BLAKE2B 1ff79c9af218011c697016ecef149f42e683607eebb8e199ef75957d9d3127858ce8f443aeedb60844e3277b4c8cd4959d123658a5103ab2112fec469ef01a96 SHA512 1dabc27ad115d1961e7881e7a51653449cae291c74aea222bbf92d49cb7bc9657ae1f1d9a81eafbd70bc0cafd57b75cd2c76bebf91aabc5fdd9eede534f1cec9
-DIST nbclassic-0.5.3.tar.gz 20199979 BLAKE2B aa509bbd2bab51b94f475e81b7e1c5661370e850680df8f64c86d76ff2aed7a84a0e6c00f36a695ef7f84cdc731fb7613107abc96fb13a3127ded6689d6e81a1 SHA512 07e26d4cb30e3388420ced182a31a050419f4a872256efca6684e4af0e08ec8bf7f6f14f127fe1391457ad5fc792377a1a7bafc0fa1a92eec455454c6321a9ec
-DIST nbclassic-0.5.4.tar.gz 20200456 BLAKE2B 65f571da08f7b101e369aaa7e80d969a6b1ee989d7eea17d7de2638d4908c27dd20a874ee990f65a8fd7dd4535b2d518e4392501e5badc3fec309acfc22e5ff0 SHA512 f85e0388c02a4f601b00329787152fa74862e7a5d9148b63d52a48395898b3428d3b07f0733fa9a0b5336e37d6fb441585555e45e2e265bba6bb9b82f45e7bbc
 DIST nbclassic-0.5.5.tar.gz 20200594 BLAKE2B 43de88221af5461e2814f7d8963d7f9f675463f116092d1fb40648a8a14065aa5888ad207b1d845884f9b5b6d6a65a8f6197e94661b7a255c84d5b34ea0c5c99 SHA512 54e22ee41a2cb497c3792b74213c13dfbcef7a8a6fb42e48a06aa6969987cec39bf0cfa835e24062e8181bd732cf6b6855f9e834a586b15c584b47df06455b34
-EBUILD nbclassic-0.5.1.ebuild 2340 BLAKE2B 8cea7ef746d71d415d70ab29162479639d8586bce9398b443ee6c3aa710d4fd1e41fbe246e9fc172e01ac26e1fdfc795b4c66abf03767070cbe097d8656ae1e0 SHA512 f1af53d1a0f864419343a533a33abd5093950c5785a237740acdcaa76ac684ce7572611042c01f4ae02fc6e00486e1895dbc29eaa4953669a883f188dccc3c43
-EBUILD nbclassic-0.5.3-r1.ebuild 2176 BLAKE2B 2a6ee406ec83c28a10c2c052bbbab597460ff8eb8bde70a9bb7ba0fa7fd84be7ce68dfd57459c84e74a6adf6479ae022e79cf708f9c6dca01bc0e815a0ef3693 SHA512 bf2b699200d294d72d6ecaef3b01db036eb2e4623163be3a382c4e6f87bc164551419452b76cded6de8b16eda2e324b448e073e05e08cf4df9ffda7e7b913dcc
-EBUILD nbclassic-0.5.4.ebuild 2176 BLAKE2B 2a6ee406ec83c28a10c2c052bbbab597460ff8eb8bde70a9bb7ba0fa7fd84be7ce68dfd57459c84e74a6adf6479ae022e79cf708f9c6dca01bc0e815a0ef3693 SHA512 bf2b699200d294d72d6ecaef3b01db036eb2e4623163be3a382c4e6f87bc164551419452b76cded6de8b16eda2e324b448e073e05e08cf4df9ffda7e7b913dcc
 EBUILD nbclassic-0.5.5.ebuild 2183 BLAKE2B 63ed58e80a87d0a67f92ffbe1b9e780d4616162f47690e77e49f77dfef3e43eb6961530aad40daa1907b68812a9b689c08ca29b7a7632b2f79ace0fbf902d763 SHA512 78fc520d6024ce335d715db8443c755f520b4303649735e01f0c4b708df24964f97d8a0f8383cbb0a0149c4816e3648e7ae42be54d6f1990cff4eb1bfc3254b5
 MISC metadata.xml 407 BLAKE2B 8be751d3f2e0e1e2952c39cd1846285ebb994d833022767dde609294ee9f98044b1189934e7d27c3134b1f06c95705687491dbf52739bdd0bc17f06cfdff53cf SHA512 6cc07376da4e55e5df153fdb0f43371ed415bed6db1bce2f67dd113d1e0f1994974dd6bee746021efb2d8c36ca2ca534109227c541d38b37b652a68b9642f2cb
diff --git a/dev-python/nbclassic/nbclassic-0.5.1.ebuild b/dev-python/nbclassic/nbclassic-0.5.1.ebuild
deleted file mode 100644
index 8115556e865d..000000000000
--- a/dev-python/nbclassic/nbclassic-0.5.1.ebuild
+++ /dev/null
@@ -1,91 +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=jupyter
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbclassic/
-	https://pypi.org/project/nbclassic/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/notebook_shim-0.1.0[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-
-	<dev-python/notebook-7[${PYTHON_USEDEP}]
-"
-
-# dev-python/nbval is missing impls
-BDEPEND="
-	test? (
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		virtual/pandoc
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx-rtd-theme \
-	dev-python/nbsphinx \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/myst-parser \
-	dev-python/ipython_genutils
-
-EPYTEST_DESELECT=(
-	# TODO: package jupyter_server_terminals
-	tests/test_notebookapp.py::test_tree_handler
-	tests/test_notebookapp.py::test_terminal_handler
-)
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_tornasync.plugin
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# move /usr/etc stuff to /etc
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild b/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild
deleted file mode 100644
index 6734a80aca44..000000000000
--- a/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,85 +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=jupyter
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbclassic/
-	https://pypi.org/project/nbclassic/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86"
-
-RDEPEND="
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/notebook_shim-0.1.0[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	<dev-python/notebook-7[${PYTHON_USEDEP}]
-"
-
-# dev-python/nbval is missing impls
-BDEPEND="
-	test? (
-		dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		virtual/pandoc
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx-rtd-theme \
-	dev-python/nbsphinx \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/myst-parser \
-	dev-python/ipython_genutils
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_tornasync.plugin
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# move /usr/etc stuff to /etc
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/nbclassic/nbclassic-0.5.4.ebuild b/dev-python/nbclassic/nbclassic-0.5.4.ebuild
deleted file mode 100644
index 6734a80aca44..000000000000
--- a/dev-python/nbclassic/nbclassic-0.5.4.ebuild
+++ /dev/null
@@ -1,85 +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=jupyter
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbclassic/
-	https://pypi.org/project/nbclassic/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86"
-
-RDEPEND="
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/notebook_shim-0.1.0[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	<dev-python/notebook-7[${PYTHON_USEDEP}]
-"
-
-# dev-python/nbval is missing impls
-BDEPEND="
-	test? (
-		dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		virtual/pandoc
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx-rtd-theme \
-	dev-python/nbsphinx \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/myst-parser \
-	dev-python/ipython_genutils
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_tornasync.plugin
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# move /usr/etc stuff to /etc
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 91581160db34..12432c0367b8 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,7 +1,5 @@
 DIST openapi-core-0.16.6.gh.tar.gz 104008 BLAKE2B bb1bdac98dfc5aef0961624488074363568f53a6c44cb0730be0d103d891d24bed86659f640e0d07da4072edc233c904c0ddcfd9e8b3960ace1af078c0d745e5 SHA512 556636a4698dcd7db6c656333849077abacdac1a440fe58210ad8f02c1f0220e46dea29962346dfb3f89d164ebc986ec750c184840be9a34a5e1dd98fbf8ef98
-DIST openapi-core-0.17.0.gh.tar.gz 129743 BLAKE2B 34b64f2c956218377d37c5f9e382aa503d50556d2a9ff292355831a39ff9632942b3dd6074cf91ba6cdb2fd93e12e4b3700232e720c71e814fde27f08052bb5a SHA512 6c284cbc8656b319291d81b73c3b714e1b9d8f85bbdf4b4636f8adcd0e47e59147f96a9cf117a6fcd49b7eeea4bbdbee28e3b60019add652e527c6af554d1cb7
 DIST openapi_core-0.17.1.tar.gz 85686 BLAKE2B f18b42fc496eaf4d6b82c15f66dd9c2eb9240402590b5a8e1f0e7b1e804c90aeef2db96d19683e9fea5846e776e95981ac52a38c47e2b56e6b5fd63d072b61f7 SHA512 0e2c673dbbfcce87ae7fbca6ec6c283d94c36376b1e17191d0bfa6c7001c62913381169b4614b5cd6131eaa67b729365036be3f1eb7641f634c0f3228de54897
 EBUILD openapi-core-0.16.6.ebuild 1846 BLAKE2B 73ce79257fb849664a63d4f0db159582f2926139119b1715498845b623f10b9acaeceafc0b6e95bf3631d02e3120c8f44e0d83e9b8eb76a5895531e848d4f8e9 SHA512 bdf757cf5d152b2bd0e56c1ff30f23293794e1f89a227b2ce322865d39fafe8068ae114e24ef59bc9467d73ab14486e237b4bb9e4fe059d529cfd1f4b2558066
-EBUILD openapi-core-0.17.0.ebuild 1848 BLAKE2B 26e6e6a14046f279d61db02c7f9dda8d7b4a5a6438e9d32e3e20c26bf4ead536dd88a9cf9c2e046bfeaa0d6b079183d710079d86f2614836fe95fe834bf222f8 SHA512 67e06e1a45c674b87a053be8a12dbf0a5ec3bcc01a104fb3553e0fa3c420993be800f0a0224dfa14a82dbdb6bf856701b2e4113dec217fe58a4edff3e32f0286
 EBUILD openapi-core-0.17.1.ebuild 1752 BLAKE2B 74de1a7c442f51ccea2099da31ba88496455bfc9636b7c6fa1c966b1ffc035199f1f33f5b449ac244281c066c5102e327ce94e2e19228f9451541d2aed4d1243 SHA512 33e3f1a9b16c20ed4f4e8360969c7e327c6501e2e6aa36baf2e8af1f8763b8814df59d39a3ed43e91da94e1c7711658925dbac55a635a1e3e6475ac46b0ff5da
 MISC metadata.xml 385 BLAKE2B a19f5b70529b6f0575e1196f3ffe0a7f38595fe7b01b43119f0f89c41a9ab5d6992f424a10f345a7407d279736a6091918b9ba1ead0daa92c9d244e4b27e4a18 SHA512 a8a39c8958ad11de5eb6896a74b3bfcb27e95c74a984a362032e4703d86f2831b6559a96a8eef80a7ef89f4687da325b3748f36b1df649cd29c2acb1ea0c9969
diff --git a/dev-python/openapi-core/openapi-core-0.17.0.ebuild b/dev-python/openapi-core/openapi-core-0.17.0.ebuild
deleted file mode 100644
index 71bba2ce0c30..000000000000
--- a/dev-python/openapi-core/openapi-core-0.17.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=poetry
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-SRC_URI="
-	https://github.com/python-openapi/openapi-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pathable-0.4.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.4.2[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/asgiref[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.21.0[${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/django/test_django_project.py
-	tests/unit/contrib/django/test_django.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index b2217f04f825..6948f9e52d32 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,8 +1,4 @@
 AUX plotly-5.8.0-fix-versioneer-import.patch 541 BLAKE2B 51ff6cbab8d9124243445f758aa4b976b7c26e1d3ce633e943bff133b81c0a7587feeb9d5e98a63f319c6afed8dc06e06fafe765ffd51fec245215c849fb4955 SHA512 db4743e538dddfe66e4c9c766698844af4d09c68188afefe92b6419adfe7cc0b1e9c1266d702d590b0b8dfc14bffbc8f08262ead0bff4dae3b5c71fa1259a4b9
-DIST plotly.py-5.13.1.gh.tar.gz 30629767 BLAKE2B 818fc888f8bc15b2dc95557363214c69fa3cbba6c973cfde02c1b9a718cdaaa22e03a95e8d5876003bc12bece3460d50216395b94d503516ceed6c836dd1675d SHA512 75b57d212e9c1e277c9136a30e95e2d1d64049fb719c9c97646760b69a2ff61576db0b8e06eed799552e9388bdb9459720030d027d466cb88fec38492b61c79b
-DIST plotly.py-5.14.0.gh.tar.gz 30697515 BLAKE2B 53c17d418cacc7da6783b5ac1b1212a9d2e1cb957a196a398dcdd9185829389592a428ca7b173f4ad78c59171336cbb15efc0b35a46581bc9206fbd2a302b3bc SHA512 c36610d3bb6e0f0f2c25cb06672bbcb16adc83f4203b7ec0a79b18a04e20bed26bcc253d8082e4d4dca63f0253a8c0143e65e006e52f9044be6b526994857d8c
 DIST plotly.py-5.14.1.gh.tar.gz 30697895 BLAKE2B 2fd602b353cf6097f3b0341cdd07b82fe38181a2c2cf21a7a7fe3b88c65160ac0b1a000bad9eca540754570f0b06b746f286f2a7bc89dfdd4454356165b6ded9 SHA512 cf053ea47425ad4f4f1412ce8ba037f49609a292b61afaa63bd8c00f010353f56a648cded408b9788055e2bba69e6a71192b55602d11d4122dc76e6dd3085a11
-EBUILD plotly-5.13.1.ebuild 3100 BLAKE2B f65adcad42d0a8325673f9fb99d954eb41216839092d036a5ca7330bf2d395c18572adb6d57d0c8a7f8312a0671a815bacbad73112708b3857d7a3f0a924a62b SHA512 b2b17cee89f06b8a946fe07d84e6d57cbb02e33a0cb231a5f21de0cebc35e97a96fc9c946bd3119c108097b35e8a30214cf28403eb6366a683536735256f5d99
-EBUILD plotly-5.14.0.ebuild 3025 BLAKE2B 2502ee70dbf2c994e3472eea16199281c89bb7118428d417342bc05729e41e674e417576602c80f8c7a33d11bb94838430c8c4aae5850651bb67cc1e84e94f42 SHA512 d60723f83828fa2c55671e052536d6fe15887779819b704dc1bd2c29fcc3de6a6b24aa75e25e4a27af38c759dc2b2fb9841e7fd1e3bf4284cabcba26d9da45e3
 EBUILD plotly-5.14.1.ebuild 3025 BLAKE2B 2502ee70dbf2c994e3472eea16199281c89bb7118428d417342bc05729e41e674e417576602c80f8c7a33d11bb94838430c8c4aae5850651bb67cc1e84e94f42 SHA512 d60723f83828fa2c55671e052536d6fe15887779819b704dc1bd2c29fcc3de6a6b24aa75e25e4a27af38c759dc2b2fb9841e7fd1e3bf4284cabcba26d9da45e3
 MISC metadata.xml 627 BLAKE2B 453adb04f4caba9790fe5223635245c8bca7ca5c6dc1930f09537045580b88b5fa1649e47158b13be6cc5cb09b4479a47690e37ef13208b47a95f82d14793a91 SHA512 a5183e9d217d1312e8d383ccb4ade66b92575492b6c8ed8987e3af18e9e456836b62b2d572ce62f9e01aae47b4a2bcbd12f79b4bb6acabfe69c2b63b20315bd3
diff --git a/dev-python/plotly/plotly-5.13.1.ebuild b/dev-python/plotly/plotly-5.13.1.ebuild
deleted file mode 100644
index 64964a4dfd08..000000000000
--- a/dev-python/plotly/plotly-5.13.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-MY_P=plotly.py-${PV}
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="
-	https://plotly.com/python/
-	https://github.com/plotly/plotly.py/
-	https://pypi.org/project/plotly/
-"
-SRC_URI="
-	https://github.com/plotly/plotly.py/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/packages/python/plotly"
-# The tests are not included in the PyPI tarball, to use the GitHub tarball
-# we have to skip npm, which means that the resulting install will
-# unfortunately lack the jupyterlab extension.
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/jupyter[${PYTHON_USEDEP}]
-		dev-python/jupyterlab[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/shapely[${PYTHON_USEDEP}]
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/scikit-image[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.8.0-fix-versioneer-import.patch
-)
-
-EPYTEST_IGNORE=(
-	# Needs porting to newer numpy
-	_plotly_utils/tests/validators/test_integer_validator.py
-
-	# kaleido not packaged
-	plotly/tests/test_optional/test_kaleido
-
-	# plotly-orca not packaged
-	plotly/tests/test_orca
-)
-
-EPYTEST_DESELECT=(
-	# Also needs porting to newer numpy
-	plotly/tests/test_io/test_to_from_plotly_json.py::test_object_numpy_encoding
-
-	# kaleido not packaged
-	plotly/tests/test_orca/test_to_image.py::test_bytesio
-
-	# Fails if not already installed
-	test_init/test_dependencies_not_imported.py::test_dependencies_not_imported
-	test_init/test_lazy_imports.py::test_lazy_imports
-
-	# Minor matplotlib incompatibility
-	plotly/matplotlylib/mplexporter/tests/test_basic.py::test_path_collection
-	plotly/matplotlylib/mplexporter/tests/test_basic.py::test_legend_dots
-	plotly/matplotlylib/mplexporter/tests/test_utils.py::test_linestyle
-
-	# In python 3.11 the produced error is slightly different
-	plotly/tests/test_core/test_errors/test_dict_path_errors.py::test_described_subscript_error_on_type_error
-)
-
-# There are sphinx docs but we are missing a bunch of dependencies.
-# distutils_enable_sphinx ../../../doc/apidoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not try to fetch stuff with npm
-	export SKIP_NPM=1
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mkdir -p "${ED}"/etc/ || die
-	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
-	rmdir "${ED}"/usr/etc || die
-}
diff --git a/dev-python/plotly/plotly-5.14.0.ebuild b/dev-python/plotly/plotly-5.14.0.ebuild
deleted file mode 100644
index 760cd2ec5a69..000000000000
--- a/dev-python/plotly/plotly-5.14.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-MY_P=plotly.py-${PV}
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="
-	https://plotly.com/python/
-	https://github.com/plotly/plotly.py/
-	https://pypi.org/project/plotly/
-"
-SRC_URI="
-	https://github.com/plotly/plotly.py/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/packages/python/plotly"
-# The tests are not included in the PyPI tarball, to use the GitHub tarball
-# we have to skip npm, which means that the resulting install will
-# unfortunately lack the jupyterlab extension.
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/jupyter[${PYTHON_USEDEP}]
-		dev-python/jupyterlab[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/shapely[${PYTHON_USEDEP}]
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/scikit-image[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.8.0-fix-versioneer-import.patch
-)
-
-EPYTEST_IGNORE=(
-	# Needs porting to newer numpy
-	_plotly_utils/tests/validators/test_integer_validator.py
-
-	# kaleido not packaged
-	plotly/tests/test_optional/test_kaleido
-
-	# plotly-orca not packaged
-	plotly/tests/test_orca
-)
-
-EPYTEST_DESELECT=(
-	# Also needs porting to newer numpy
-	plotly/tests/test_io/test_to_from_plotly_json.py::test_object_numpy_encoding
-
-	# kaleido not packaged
-	plotly/tests/test_orca/test_to_image.py::test_bytesio
-
-	# Fails if not already installed
-	test_init/test_dependencies_not_imported.py::test_dependencies_not_imported
-	test_init/test_lazy_imports.py::test_lazy_imports
-
-	# Minor matplotlib incompatibility
-	plotly/matplotlylib/mplexporter/tests/test_basic.py::test_path_collection
-	plotly/matplotlylib/mplexporter/tests/test_basic.py::test_legend_dots
-	plotly/matplotlylib/mplexporter/tests/test_utils.py::test_linestyle
-
-	# In python 3.11 the produced error is slightly different
-	plotly/tests/test_core/test_errors/test_dict_path_errors.py::test_described_subscript_error_on_type_error
-)
-
-# There are sphinx docs but we are missing a bunch of dependencies.
-# distutils_enable_sphinx ../../../doc/apidoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not try to fetch stuff with npm
-	export SKIP_NPM=1
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mv "${ED}"/{usr/etc,etc} || die
-}
diff --git a/dev-python/pyaudio/Manifest b/dev-python/pyaudio/Manifest
index ee901282e5ff..3dbd9af167d6 100644
--- a/dev-python/pyaudio/Manifest
+++ b/dev-python/pyaudio/Manifest
@@ -2,5 +2,5 @@ AUX pyaudio-0.2.11-python310-size_t.patch 845 BLAKE2B 68eee6ebd83440e0f42a51a1c8
 DIST PyAudio-0.2.11.tar.gz 37428 BLAKE2B 18db51a651876135a6afc6c8c60e2221017a311fe1aec10497905bc35b81a73b5e9f27201431566bac3d13bcf582ec12a3b818c51f0e5e70aeb4ad177608461a SHA512 64db5542ee60837c9b07677e146fc7b060ff47c8b1c04cbb575bce79dd3ed4776c201e169ff2860f27dbe9e00a77046ba0cb925b55f7c546f8de46c6df68954e
 DIST PyAudio-0.2.13.tar.gz 46820 BLAKE2B f0c55f4d6d028ab1210c031b6a3808f93f7963a49cf54e4c9ae65bf936f218386d4a43322b9bd645233e6f881e3d15cdcc6ceeb7fe65fd287696048b206cbfbf SHA512 1ae453cae442118ae1b0db44ca8736621a361af3686e47561bffa0d43352039ed5f882412ca22a2a4320b362f966e727b0e38bb9706e99b85d99bc16cc943008
 EBUILD pyaudio-0.2.11-r2.ebuild 1180 BLAKE2B 93c20775883f7f93e51e894beac9f7bfba805cdb87ac57a7628e60a961d310239a58f79cac1453490f99f9c5c23982bf0bb172b1cb50fc45fc324135ccf0e664 SHA512 bd7882fe8600e7ab6835c82cc6f55bad65091b11fe1e5337f150a8e86aff5a01317b118e929e263ff57cee0efefe63db3480a5ac213e3731bbb1e78f7b1079b7
-EBUILD pyaudio-0.2.13.ebuild 1046 BLAKE2B 3015e058d4afc1fe01a5e275fc3c338457233c8de6c1809afa9ac2b80ca4ca46de8a11e27ad81afc3668ff4f007ce1498068aeb95d5672630925c105fe96f955 SHA512 4e37b9b163956993ace0efa0c2e983725586ad119f9aa06abf9646902d62cc0dd8ecfbe42ac36b721398d1791912903dc111b5b6f12bf6b4ec607aefdc3cefbf
+EBUILD pyaudio-0.2.13.ebuild 1045 BLAKE2B a8b39438c08df45cf785644195b9a0b2f9c9eb5e5866013061cc3d153675b1622de16e948970be21040361006c26a5d9004a3a6dcb466e43333aeca43f049819 SHA512 af77263338ba0c228415e35e371d6697cea62ac5949180c4fdb39a07bcd58f1e1077c23040124742d3be25b69335f84c28627c465698d59383263a9eeb8c9056
 MISC metadata.xml 640 BLAKE2B 54eae253ef66fcdc9f69ff477374237c964b53b9b53a3d418a560bb2fa681ca438b81fcfccbd6cb6f16a4f2698adeb8ef9e9d203403e5750a157f1adfa3b0cb1 SHA512 b04e933cb7cfc59ea59dd9d8523fc34c05acada24c54fb5c9b5bf1fb7aee4c9b74848605d131a2d47d09b3a4ad3ca6d999e64848ef46aad0fd6a6757723df3b8
diff --git a/dev-python/pyaudio/pyaudio-0.2.13.ebuild b/dev-python/pyaudio/pyaudio-0.2.13.ebuild
index be2811d356a1..ef0fdfc65b2e 100644
--- a/dev-python/pyaudio/pyaudio-0.2.13.ebuild
+++ b/dev-python/pyaudio/pyaudio-0.2.13.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://people.csail.mit.edu/hubert/pyaudio/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # Tests work if you have the correct HW device(s) to test. 0.2.11-r1.
 RESTRICT="test"
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index a8ba1cab3a82..0231ee73d3bb 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,5 +1,3 @@
-DIST pyghmi-1.5.59.tar.gz 251390 BLAKE2B 0299bf92e6252e21499172e9d4389ecd2a19912ddb9cf9cd8769fc6dd994536526f909711975af58a01169ec2aa20eabba5ca20a5f66ddaaf948be9c1f77060c SHA512 adb64a400a53a17d8837972220807b9bc6f00291316c2f28a45f56d7f9fbaaa8775002e37eeb12e96445636c7a0a25c2829f4ee6c9ffa4c52a83fb35d5391b47
 DIST pyghmi-1.5.60.tar.gz 251748 BLAKE2B 8e860847293db5b747144b3f5e21690c898ebc80c5de8c24dac169b38653893c90b80b0820d3acb5309e95e934cb75e8390b9b5f65e08513a1bd0b62ee62fe9f SHA512 a75528fea803ec68ae12f34befc7d95072baa1bffb8a60d62ebccf41b62f5bdbb510d1b11d9f31ddcc82830ebdc3b31ef6d51b5bca16c89be5dd450cd0a1f82e
-EBUILD pyghmi-1.5.59.ebuild 938 BLAKE2B c5d2c394e1426d06f47476ccc20a27794c451a9e7d0e17d58f7bee098f368b5014b3fa44a25069236761d6ab5dddf5be57911c4da84e085738cbf6c905088b95 SHA512 a493c3e88aee99c2cc96462457a2be48c11b59e7de2cca55512f2a8ceb69860bd5e4ef82e58258ceb19c09c3059ff3cb6245a22cb139d0fb076f878d37c40e89
 EBUILD pyghmi-1.5.60.ebuild 938 BLAKE2B c5d2c394e1426d06f47476ccc20a27794c451a9e7d0e17d58f7bee098f368b5014b3fa44a25069236761d6ab5dddf5be57911c4da84e085738cbf6c905088b95 SHA512 a493c3e88aee99c2cc96462457a2be48c11b59e7de2cca55512f2a8ceb69860bd5e4ef82e58258ceb19c09c3059ff3cb6245a22cb139d0fb076f878d37c40e89
 MISC metadata.xml 439 BLAKE2B 0c7ccbc424041a506c60bb0934e40465b64a9779d4d2b6992ba5d4c8563b114da1470a1b221798773824b92fc7b5d6e7b2f0b0afff7f266ea1fbf450f336c497 SHA512 0c919c41bbef88b080cd5941d767cb3f79e935dfedb6da16353b80da2966d488936768b8ad04c7fc695b3c6376143430115f5533b3492816bf293ab2ccf37fb8
diff --git a/dev-python/pyghmi/pyghmi-1.5.59.ebuild b/dev-python/pyghmi/pyghmi-1.5.59.ebuild
deleted file mode 100644
index 7b3d2e7d3897..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.59.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} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="
-	https://opendev.org/x/pyghmi/
-	https://pypi.org/project/pyghmi/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index b3b1b04af878..d63a5adb8386 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,5 +1,7 @@
 DIST pymdown-extensions-9.10.gh.tar.gz 1056472 BLAKE2B f691d3fd762b97dd42d59c8e647469a8c0cc4202849661fdcc1c445721c48bd5ea84190a99306b9b5b2215968daf1f19f0765b11fb757045288188e07b55b1a1 SHA512 61784be05ba19424da8964f0b852733900a8f9bd699037f6cb1a3c608133c3c7cb3528549d3165d15340e680a67768d30f687c782cae56fc8030e246bcf4f023
+DIST pymdown-extensions-9.11.gh.tar.gz 1062074 BLAKE2B d695fa946c264f7ce2da7731fd5ce5388152a2179830108a6b43f769144246c33118084b4b2fe1e45b4255e26dc91871be699043008f67d2f04c5e5396f9ad12 SHA512 7745f0da83e3ecab9ac16947662c7a4da31e9ed62c6c519457083e0e8075f386a10146f18edc59cb17dee383335bb303c109da2ab08501118a53ee7315b1095f
 DIST pymdown-extensions-9.9.2.gh.tar.gz 1017219 BLAKE2B d41f0863654c3d4aa6a947f5fef9d0029368e4a990f48a6997ecd1a0196a6b70198a698a22bfe536217bc001b4d21b69b2d5e3b479616825787648ef33ad1a9b SHA512 7f89f527f4d28ee31bf74dfd2343509592d287e1196e8a5045bbeaa5f2a038defc36e5b52ed53064f6cc797534032ed7a9e733070ff68db099e41614b07e417c
-EBUILD pymdown-extensions-9.10.ebuild 1339 BLAKE2B a17bb663838cfbf81d48afb97b1905735c3fc6bb5cfa734d81489b2f96b1aa02ee902f2731c9af3f3e2ad531a6ca605154aa5ccc41c0799edd1adc2035194146 SHA512 e48e8084d053998501be1ff9025ea88d6f8f7c439230acc20266dcec638cb15ccb5b25d9c4926d5feebc5ec490a7dc2b81a78295e97dfda595dc395b8121716c
+EBUILD pymdown-extensions-9.10.ebuild 1337 BLAKE2B 21dd25d87ea926bb1d1a1fa3060acaf76e1948a95e043fd6edcd7e8ab35d6665129b885652c337f8c207743bfaf0bc3f734fbb2ff0044a4d207d371e76bb29ba SHA512 9b9e354c7f764464a363a5013f6b62bba64ce780c04e4c56b0f76565129bff2ab55a794262655c2e080ac7993d7c6ec04968189f7186493c4158b3131e041399
+EBUILD pymdown-extensions-9.11.ebuild 1339 BLAKE2B a17bb663838cfbf81d48afb97b1905735c3fc6bb5cfa734d81489b2f96b1aa02ee902f2731c9af3f3e2ad531a6ca605154aa5ccc41c0799edd1adc2035194146 SHA512 e48e8084d053998501be1ff9025ea88d6f8f7c439230acc20266dcec638cb15ccb5b25d9c4926d5feebc5ec490a7dc2b81a78295e97dfda595dc395b8121716c
 EBUILD pymdown-extensions-9.9.2.ebuild 1338 BLAKE2B 6d5e34cb889686295059e16467cb3597275f11adb00ba549f4e9ec8bb156aefb63df91dd7932a83141b328b9bdf82eb21214d083be7192220ee888a86d3dd0df SHA512 da3c24b8d40a29460a1618a6eb54808a5e848e9188752899302f5c9043c62621731bb5bb81ba3908224f280baf3609e7a632d2063f1ec2797297036bf76f127d
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.10.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.10.ebuild
index f263d806c725..0c69268fb623 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.10.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.10.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild
new file mode 100644
index 000000000000..f263d806c725
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pymdown-lexers
+	dev-python/pyspelling
+"
+DOCS_INITIALIZE_GIT=1
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Extensions for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions/
+	https://pypi.org/project/pymdown-extensions/
+"
+SRC_URI="
+	https://github.com/facelessuser/pymdown-extensions/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+	default
+	# We need to do this manually instead of relying on docs_compile
+	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
+	# https://bugs.gentoo.org/859637
+	if use doc; then
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest
index 1d3169df16e6..de6d753a1e8c 100644
--- a/dev-python/pyside6-tools/Manifest
+++ b/dev-python/pyside6-tools/Manifest
@@ -1,5 +1,3 @@
 DIST pyside-setup-everywhere-src-6.4.3.tar.xz 8789448 BLAKE2B d9083bd636d3ccf2636b58385fffbc1499db0cbd80e199581e68a440c01b16acd440d7fdbaf41d8b4caa9974d31e457372ed7a80f1525929777d2265fe1297fe SHA512 cc8051d52240b9aca531e3163523274334bfa339f2815ed46c4b4d09be2419f1f4cc6ebfc1e591658b5caccf840f8791333ea119c72a1e53591f1d8ca2e08baa
-DIST pyside-setup-opensource-src-6.4.2.tar.xz 8759528 BLAKE2B cc1a18e9dc81eb02bbfffd38816da68f053337f94c485fdd2f99488ae7ade2e899be1d98518def8f39a4eeaeaff6018ff09402bfe55b3484d78d8c4d9796b4e7 SHA512 129ea420000fceef9726fab9e0320e8286a34aa0855fc4bd369adc0020b76909b3a5ac8c3fa622b73da1561b39dcaeb8ac121f634918e2c0460a9ebaccb0f659
-EBUILD pyside6-tools-6.4.2.ebuild 1360 BLAKE2B 91ba1b2b502ade19c7994884360da37765a3a53316d1e3aa3c3bb1caa32381e698ec3e9eee154e1d2043c3fc56fa27d1a0b7dd1eef75f6c39641d777a515df23 SHA512 e447426935e76c41d8356e2d0d8eefd6b6da51ad358584f028f810b61357cbf69c450a3db681f75b53151e47370d2403009e1edce04ed51ef77236137d4b3816
 EBUILD pyside6-tools-6.4.3.ebuild 1380 BLAKE2B c80b111d63f3f6c4de373534328c85f8f36d9b754aef72c3e272d9f89c0b62d7cc16784744c9225a2b828fc2df419c0f0d9bf84b915ab3f30bb1cdd05e719aa5 SHA512 e98c7feebd5c0133d5e2e4ec99452df1c1df08c697842c4c86482f601ce94d07408fe8a211ad7973cc13d77c96374b65987846fd29444d670207be56a03874bf
 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.4.2.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.4.2.ebuild
deleted file mode 100644
index 3b91041b8b88..000000000000
--- a/dev-python/pyside6-tools/pyside6-tools-6.4.2.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
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{9..11} )
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake python-r1
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="PySide development tools (pyside6-lupdate with support for Python)"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/pyside-tools"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-python/pyside6-${PV}[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			# the tools conflict with tools from Qt
-			-DNO_QT_TOOLS=yes
-		)
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
-	pyside-tools_install() {
-		python_doexe "${BUILD_DIR}/"*.py
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	einstalldocs
-}
diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
index db452727acc9..133aaaae4f3f 100644
--- a/dev-python/pyside6/Manifest
+++ b/dev-python/pyside6/Manifest
@@ -1,7 +1,5 @@
 AUX pyside6-6.3.1-fix-designer-plugin-install-location.patch 685 BLAKE2B 2f3b3873f4f1f46b737ae85467798b25fd1634a15a391cd7fa04a1c391a56cd57a68ec4f98b51460cd805fc75cc0ee50b9addc4a757520429f6b7e66101ed609 SHA512 76ca097b42b47d3b290966fe805b1b4f58e04ab05d8e5420dfa1014e3399452a0326d964d2304068c78a6a82bcea2883d5c9e6a51b383a7f96a7520cfebdfcad
 AUX pyside6-6.3.1-no-strip.patch 953 BLAKE2B f88bac603a584213a864fcfc7c528f1d236ebdbfb653c3877316cd0b95c30c2f7288b1c81c6a90a3e4228536da4aa63552991fefa952f450b0b852b3e2aed94a SHA512 2920075a26fc059bdebc8eb5fa7c15de74729b7f8d1eb59197f7426afa7a65f1f78a8ebb76e946b2dfaf5817dbf090744bafaed2f2156f2d1548c2932a7ce61a
 DIST pyside-setup-everywhere-src-6.4.3.tar.xz 8789448 BLAKE2B d9083bd636d3ccf2636b58385fffbc1499db0cbd80e199581e68a440c01b16acd440d7fdbaf41d8b4caa9974d31e457372ed7a80f1525929777d2265fe1297fe SHA512 cc8051d52240b9aca531e3163523274334bfa339f2815ed46c4b4d09be2419f1f4cc6ebfc1e591658b5caccf840f8791333ea119c72a1e53591f1d8ca2e08baa
-DIST pyside-setup-opensource-src-6.4.2.tar.xz 8759528 BLAKE2B cc1a18e9dc81eb02bbfffd38816da68f053337f94c485fdd2f99488ae7ade2e899be1d98518def8f39a4eeaeaff6018ff09402bfe55b3484d78d8c4d9796b4e7 SHA512 129ea420000fceef9726fab9e0320e8286a34aa0855fc4bd369adc0020b76909b3a5ac8c3fa622b73da1561b39dcaeb8ac121f634918e2c0460a9ebaccb0f659
-EBUILD pyside6-6.4.2-r1.ebuild 9135 BLAKE2B ee65a35bf585fd245949f42bb48fff2ed441da6f96507f28a725221ac06134ef17fca4d4acf2fa38778fce62008e716b7a6c2326ef68cadb96d70d381c1fb9a1 SHA512 658fe5ada14cd93d5417ef848896b2f09405a52ade33f16c02fe67b3f69aeab22891f385347ad3bb1b894f7dc3e0456f1c0a8c375eb8447ac1bf8974a25fb534
 EBUILD pyside6-6.4.3.ebuild 9155 BLAKE2B 1c9ed40606a9d0e8e6785715ac1398caa5727581778f37df490489ab0197c1870671bb23075ff0d19a8dc8d9eafc3822bda12d0c33e4ebbdb12458262a6ebaf6 SHA512 dda651a801e0e33d0e22459a4bb3e46f95360638a74ad4457edfbac27c98bc4ae59819fa4183335a19f3ac3dcb087dfadc26291c26b67822af81fb3daacaa91d
 MISC metadata.xml 1830 BLAKE2B fe8b0657824ef49182b8a5ac334539e10ff88d56f1d0ff517ce9247f0ec1c8b82158688fefde8e01c99fadcb0268e6e0109fef49830ffdec821e803e2ad23517 SHA512 4b49ec54b699673da2c9173f849f70e2a42321608c2893fa9d161a2ff51a917864042b3c0421c3723b98bcbde0d53e78e8c832f25a689dc7e3499d05446a014b
diff --git a/dev-python/pyside6/pyside6-6.4.2-r1.ebuild b/dev-python/pyside6/pyside6-6.4.2-r1.ebuild
deleted file mode 100644
index 55aee68d1d8a..000000000000
--- a/dev-python/pyside6/pyside6-6.4.2-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide6/QtGui/CMakeLists.txt" and
-# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/pyside6"
-
-# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="
-	+dbus charts +concurrent designer gles2-only +gui help multimedia
-	+network network-auth +opengl positioning +printsupport qml quick
-	quick3d serialport +sql svg test +testlib webchannel webengine
-	websockets +widgets +xml
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liner from within "${S}":
-#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
-# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	charts? ( gui widgets )
-	designer? ( widgets )
-	gles2-only? ( gui )
-	gui? ( dbus opengl )
-	help? ( network sql widgets )
-	multimedia? ( gui network )
-	network-auth? ( network )
-	opengl? ( gui )
-	printsupport? ( widgets )
-	qml? ( network )
-	quick? ( gui network opengl qml )
-	quick3d? ( gui network opengl qml quick )
-	sql? ( widgets )
-	svg? ( gui )
-	testlib? ( widgets )
-	webchannel? ( qml )
-	webengine? ( network gui printsupport quick webchannel )
-	websockets? ( network )
-	widgets? ( gui )
-"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2)*:6"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
-	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
-	charts? ( =dev-qt/qtcharts-${QT_PV} )
-	designer? ( =dev-qt/qttools-${QT_PV}[designer] )
-	gui? (
-		=dev-qt/qtbase-${QT_PV}[gui,jpeg]
-		x11-libs/libxkbcommon
-	)
-	help? ( =dev-qt/qttools-${QT_PV}[assistant] )
-	multimedia? ( =dev-qt/qtmultimedia-${QT_PV} )
-	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
-	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
-	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
-	serialport? ( =dev-qt/qtserialport-${QT_PV} )
-	svg? ( =dev-qt/qtsvg-${QT_PV} )
-	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
-	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
-	webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] )
-	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
-"
-# testlib is toggled by the gui flag on qtbase
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
-	"${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch"
-)
-
-src_configure() {
-	# See collect_module_if_found macros in PySideHelpers.cmake
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
-		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
-		# try to avoid pre-stripping
-		-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
-		-DQFP_NO_STRIP=yes
-
-	)
-
-	pyside6_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside6_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside6_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
-		# Uniquify the PySide6 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside6.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside6_install
-
-	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside6-tools) to target one
-	# "libpyside6-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide6-${PV}/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
-}
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index d6694ad1e46a..b3c42ba16de3 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,3 +1,3 @@
 DIST pyspelling-2.8.2.gh.tar.gz 150733 BLAKE2B 1bb96679ce54d48967ee57a7dde00131884e2801a8a4f4e016f9a552b92d435650314ae66a356c90e3e4c585d2701bfc5e63f19b92347c8fada4de64e9a982b6 SHA512 0bb4fbacbc72935d4fb2fa0608d675fd0eec85f178c0994d341bc8635b53f39a4c82a1d50e43446cd39873a877e75b1530eafc36450f37d8f08cc174ba39e440
-EBUILD pyspelling-2.8.2.ebuild 1412 BLAKE2B 27fb6fe003cf11d3e99da6e7fccd869dd0bc25e1dc6e9fc1f8bc9f80a6f4c1f6fb49fdf5d55461dc393183b8a60c80ae3305eac508ac5a89a27170b812553939 SHA512 ef89ba087148a4bdd9a91c264cc3138622d3c480474b68f8d629ca3ad8b94893eb6bae6158682b9932f6f9dd4f4549ffc1b5134873986b592dbe49cb38475b28
+EBUILD pyspelling-2.8.2.ebuild 1412 BLAKE2B 9b261f3d5b4a860e9f3bfada254cde2a0da12d18b267ac16dbc083010c2721081c631888942b7f7402346883f27c26a40a72c2fc82769004b63b7f68eaae4681 SHA512 85d29db76a122ff1b09dccae5f1c20fad20c04c82a67e6dd50a4a819be3a4b6e66b87db0ee21c2ae43e3413102645778f90a700541b34fbfeb1712e4006f54e7
 MISC metadata.xml 2024 BLAKE2B ba187994d3fba90c24276f96371a70a47c652c85ce20d4a11b2a74707e6345b202db00af9771cdc41518267a5a6b0c1ea85d7b68401ff8cb421cfee1fbba98c6 SHA512 53d11553f7e4fbb5057809e0eef8bc33564226bb92c0900f7cc40e8fcbffd20aef04b4635bc2ff2d0c778475fc564a4de02afd1293099710ea81490a435b3f18
diff --git a/dev-python/pyspelling/pyspelling-2.8.2.ebuild b/dev-python/pyspelling/pyspelling-2.8.2.ebuild
index 39b4dd5d22e9..03913d2033b5 100644
--- a/dev-python/pyspelling/pyspelling-2.8.2.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.8.2.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_USE_PEP517=hatchling
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
-	>=dev-python/mkdocs_pymdownx_material_extras-2.1
+	>=dev-python/mkdocs-pymdownx-material-extras-2.1
 	dev-python/mkdocs-git-revision-date-localized-plugin
 	dev-python/mkdocs-minify-plugin
 "
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index d4a32d18381c..541a09066ebe 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,5 +1,3 @@
-DIST python-engineio-4.3.4.gh.tar.gz 300665 BLAKE2B 78488fb7deb54136a255b1027e52e1869e7d09b38769d3dd144b26146ac8db58091238c3f1cfa81d4c29af4d1bd8bb998559756053e53f6c7876c2866da31575 SHA512 427f224ae24d939d55316931cd087676741195d578415224de291f9871b535fdd02b835ac32a65d73be0428c8c4be0414faefca06a4964b1fe34e2ac91b02694
 DIST python-engineio-4.4.0.gh.tar.gz 309353 BLAKE2B 4cf40802fddcce2e53e205bdbe73bdf0ec822e15581fe4a9939b8d05c3eb6ba82a99d089d4708169b197aa79e5b5f14001ff86f72025fc6d96c99ed6d73fe620 SHA512 b7995aaf2583ec58ac87f048608653ade3846dd103616ee90b3dc12cc7e27c7d37959cd3e1ebf6e138395ff6fad8cd011407b6660258715e513bf72c8a3e1f6f
-EBUILD python-engineio-4.3.4.ebuild 1340 BLAKE2B c25afdae70cb78c7f5bd394d372baad930a60be6874cd33f9f80ad6d1d07cc4197078322259b4f455d1d148f194ddd1eec6d2efaaa42f86c55322355c0e5e972 SHA512 8ec674f0e58693425abf2c75acf8bf8d3cb3cd59b846b145f7c8700ce7340ab865e141c4c322155fa0ddcb003334a484f84409adf63701cb100157e98d834ff6
 EBUILD python-engineio-4.4.0.ebuild 1340 BLAKE2B c25afdae70cb78c7f5bd394d372baad930a60be6874cd33f9f80ad6d1d07cc4197078322259b4f455d1d148f194ddd1eec6d2efaaa42f86c55322355c0e5e972 SHA512 8ec674f0e58693425abf2c75acf8bf8d3cb3cd59b846b145f7c8700ce7340ab865e141c4c322155fa0ddcb003334a484f84409adf63701cb100157e98d834ff6
 MISC metadata.xml 518 BLAKE2B 7325d24cc26b1a3b4e2dec04159cdd4ebcceaf0384fccbee11205f9c000b1e9f84f97c742a6181dbad419e2527c6f874bc3f89760daa6b6dd2feb9b1f874b515 SHA512 40fe9ac96224019d28206f75ae6249c75dbcb759918c03826af4f8a394586bd5df445ef475cd009e8af93ea5c7424abebbbfd65ac2e2eb7bdd9e8a29f2dcb34f
diff --git a/dev-python/python-engineio/python-engineio-4.3.4.ebuild b/dev-python/python-engineio/python-engineio-4.3.4.ebuild
deleted file mode 100644
index 75393f34860c..000000000000
--- a/dev-python/python-engineio/python-engineio-4.3.4.ebuild
+++ /dev/null
@@ -1,53 +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..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Engine.IO realtime server"
-HOMEPAGE="
-	https://python-engineio.readthedocs.io/
-	https://github.com/miguelgrinberg/python-engineio/
-	https://pypi.org/project/python-engineio/"
-SRC_URI="
-	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-# Can use eventlet, werkzeug, or gevent, but no tests for werkzeug
-BDEPEND="
-	test? (
-		dev-python/tornado[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-EPYTEST_IGNORE=(
-	# eventlet is masked for removal
-	tests/common/test_async_eventlet.py
-)
-
-EPYTEST_DESELECT=(
-	# also eventlet
-	tests/common/test_server.py::TestServer::test_async_mode_eventlet
-	tests/common/test_server.py::TestServer::test_connect
-	tests/common/test_server.py::TestServer::test_service_task_started
-	tests/common/test_server.py::TestServer::test_upgrades
-)
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 3510cedf4fef..3a738db8220d 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,4 +1,4 @@
 DIST python-gnupg-0.5.0.tar.gz 61154 BLAKE2B 0ae7e8ff669f51b47410a7a5aef16ca6792db18f28c59d3ce6615d0852eba1e201e3d000d1f644ffc1a362a74ee56c0930dd5814c23238137d6d8696319fd130 SHA512 cfd302257b53fdc9318004db7323ea5bf4bddc055b65b24386a1ecb27cd476fdf1bc771adcdde70a4eef442982a0c57dc832b92274bbe5ba16cbdf3247f4e77a
 DIST python-gnupg-0.5.0.tar.gz.asc 801 BLAKE2B a3df8ea4c22c2df8351aeb51a670e36e2809eef2248507842b9580f819af5c4e5a7ad4902ef54f2a62c3629a2d658cac346cc1647838e8066b2a018939e1a751 SHA512 58fa1b201803bb542e3fb9c1c567d83abba0e897b52efa331942899684e15b4c44a225c28adce58c69c290d5059fc562556b79fec21f960c894b30a8f3642405
-EBUILD python-gnupg-0.5.0.ebuild 1101 BLAKE2B b3d92c32afcf34ca44ba993d596849e15127605e15af0241c65021ad1ec45d2c8fabdf11d4cb0870903b586d8816749398290ab588fa58759a29027b2396b842 SHA512 a2c0dbaad181c07ff9164fb60b908fa5dbb36545d6dc2f72366d5c7a311794d678d12a3137fa5ebebbcf8f4ddc22fcfb23059a0f299f5c8df01dca3a22b7e4d7
+EBUILD python-gnupg-0.5.0.ebuild 1107 BLAKE2B 1a0bb69f913755d794778f003c905d286994100f60e6fb6feeb2d51b918eca8503f60e3fe52e9445a890e865298df16a755c8627ea9651a1777728eccd8dc67b SHA512 42bbdfdb725bdec521a3a878f8ac9acb1382a282576297bcaf9c96275ae9392ac3c3d01c2b72042864b65ccc5535ce3ed664cc3cf2cc17bffe0fe8b3bae89874
 MISC metadata.xml 633 BLAKE2B 8f4c4f15c4aeae389c2f13e972248da4d7bb9adc1783a54e3882e677d7ce4f197fde565cf7c68a197a55291ea6a15f99c3b39dcc0bd3d18ff981738e5b4a94ab SHA512 77944c5fa529fb844598005386dd639ae30def95a66087b1e1e5441f21a8ba549d6ef0e28dab88527d11cae2a4a6d6c1871dacc765d2fb12188d53e893bd0df9
diff --git a/dev-python/python-gnupg/python-gnupg-0.5.0.ebuild b/dev-python/python-gnupg/python-gnupg-0.5.0.ebuild
index 9c72de703690..d2c233293861 100644
--- a/dev-python/python-gnupg/python-gnupg-0.5.0.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.5.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://docs.red-dove.com/python-gnupg/"
 SRC_URI="https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz"
 SRC_URI+=" verify-sig? ( https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz.asc )"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-python/pywlroots/Manifest b/dev-python/pywlroots/Manifest
index e281006cda8b..030d10d3b571 100644
--- a/dev-python/pywlroots/Manifest
+++ b/dev-python/pywlroots/Manifest
@@ -1,10 +1,6 @@
 AUX pywlroots-0.15.24-no-import-version-check.patch 592 BLAKE2B 24ef9a82a3a7c62e8b0669cd25e6cd984a633ebf8f276436f48d54f6064119cceffe400a8c386e6407f3063fa678bab10d4151e0a5976041eab0ff36a16b7c6b SHA512 4a93ebad7670ba6ff41e68030b33a15d7545f244fa5b982fc3dd12c3a349e70f2e59267c9d6f2383a80e2376243118cc46bb4b3d9027abbe3cd9d69d1be5ebf8
 DIST pywlroots-0.15.24.gh.tar.gz 85570 BLAKE2B 0c7ba0be6159152488785298028bb1feec20e2380357060a850dab417b3fb1fccb4a9e6cc6564d2b7f124bf4fc454789549267e9036b0b4559e5fcd4c6f06196 SHA512 b29b76cf18a65b2ef19d15ecf018a9ba44119d60ee61435967d17f06d5f7544d2117f2e9a81574734c71591a237b00c8584a5cc6d6adb928f39f11170f21ee94
-DIST pywlroots-0.16.1.gh.tar.gz 90101 BLAKE2B 5b26b8aeacef7336353376f1ac0f230f88e50da3dca1ac726470791555edb9c486234122242ced3220b893eb6d0666cfc6519f23ed3922645549ff012ab46d04 SHA512 599210486c6461660b2c85b69726afc30c5b0d835e61ee2cf246296aaccf9d8fb1e332d7eb50a30599f155fbbd7c5c204ca1158d9a8122fcc36fbf745085902f
-DIST pywlroots-0.16.2.gh.tar.gz 90372 BLAKE2B 94107199e912b53e484d0fd81f18900bb5b2283a588b09da2c078606881f1cbe8e25bec3bada32e1d0c74300374d66c95d56ff976661813730ffedaf023cb57a SHA512 314339e6b4f66f03af74fc7e69814b4e1e879da6ec624f33eb3b04e26a7a4159776f182830a3b2ff31720021386cab70cdfc16a0b2377414c94cd834fd1ca26c
 DIST pywlroots-0.16.3.gh.tar.gz 90971 BLAKE2B 67eceeb4e4724ee3c1dcc3afb21c3466a21e8a1e9b56b2adf0a7b236990f9fc69c80f7ae056d0b0f9914149ead29cdb9dd671606a7fc67b2e860bb0bccd3a19b SHA512 46a095c818eee4205115a948f5b88078815aa9a4849e2f08108d3898349772acab70a71c2f083e1a6e78c29cc612661412203d618e77f1c2d94d1387fcf6425f
 EBUILD pywlroots-0.15.24.ebuild 909 BLAKE2B 42b30c5528e97f9b49af68db993c4a609b8af80148269fef618d6f0079d5b557f133e4f7edf6326874c16536e7e72f5a0102341006af1149a45603b0eeed86a7 SHA512 409fb7c21a46dbad3bee34d6f9a3be8d6494a2db0da04f54242d66fb33355c31c0b7da62465e73d1bdd8c8c8e2049738e13d67f915a1c3eb324f17389269b5e8
-EBUILD pywlroots-0.16.1.ebuild 856 BLAKE2B e9584ded94c13df59dde116c93db300ea40efe30ccfdf7da8bcfc6d6c88ed7987446f6f9de874be5fabd5875ed698a3b4cd0c6b9a8bbb84c555f23bfea362358 SHA512 6d303052aae9c75b04d4d8625798f32c54438aad81a69c21364a877f4be46ba89ae6bded3d5771812cbdce3ac84e91a7cd015d8c98e481ad76054e696a9df2b5
-EBUILD pywlroots-0.16.2.ebuild 856 BLAKE2B e9584ded94c13df59dde116c93db300ea40efe30ccfdf7da8bcfc6d6c88ed7987446f6f9de874be5fabd5875ed698a3b4cd0c6b9a8bbb84c555f23bfea362358 SHA512 6d303052aae9c75b04d4d8625798f32c54438aad81a69c21364a877f4be46ba89ae6bded3d5771812cbdce3ac84e91a7cd015d8c98e481ad76054e696a9df2b5
 EBUILD pywlroots-0.16.3.ebuild 856 BLAKE2B e9584ded94c13df59dde116c93db300ea40efe30ccfdf7da8bcfc6d6c88ed7987446f6f9de874be5fabd5875ed698a3b4cd0c6b9a8bbb84c555f23bfea362358 SHA512 6d303052aae9c75b04d4d8625798f32c54438aad81a69c21364a877f4be46ba89ae6bded3d5771812cbdce3ac84e91a7cd015d8c98e481ad76054e696a9df2b5
 MISC metadata.xml 351 BLAKE2B 8c8ef3ef1d58928c0a15fcd756e4d1c94b2793626c9b4e9cbeb31443119cb47fa4975063547065cbc6e06f327ec7d36beb5e74973fd3d372ad4f7feeac3410ea SHA512 b4840e4149647c29e358b64d3de99a0f2b148a4d7d123d7ef7df67cf918a3f599d3e199ed7ef4d0d39bf8ccc8e4630058db4ae3a2260119ce1c5d255bf2dd9c8
diff --git a/dev-python/pywlroots/pywlroots-0.16.1.ebuild b/dev-python/pywlroots/pywlroots-0.16.1.ebuild
deleted file mode 100644
index b802883e934e..000000000000
--- a/dev-python/pywlroots/pywlroots-0.16.1.ebuild
+++ /dev/null
@@ -1,44 +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="Python binding to the wlroots library using cffi"
-HOMEPAGE="
-	https://github.com/flacjacket/pywlroots/
-	https://pypi.org/project/pywlroots/
-"
-SRC_URI="
-	https://github.com/flacjacket/pywlroots/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-# See README for wlroots dep
-DEPEND="
-	>=dev-python/pywayland-0.4.14[${PYTHON_USEDEP}]
-	>=dev-python/xkbcommon-0.2[${PYTHON_USEDEP}]
-	=gui-libs/wlroots-$(ver_cut 1-2)*:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.24-no-import-version-check.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf wlroots || die
-	epytest
-}
diff --git a/dev-python/pywlroots/pywlroots-0.16.2.ebuild b/dev-python/pywlroots/pywlroots-0.16.2.ebuild
deleted file mode 100644
index b802883e934e..000000000000
--- a/dev-python/pywlroots/pywlroots-0.16.2.ebuild
+++ /dev/null
@@ -1,44 +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="Python binding to the wlroots library using cffi"
-HOMEPAGE="
-	https://github.com/flacjacket/pywlroots/
-	https://pypi.org/project/pywlroots/
-"
-SRC_URI="
-	https://github.com/flacjacket/pywlroots/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-# See README for wlroots dep
-DEPEND="
-	>=dev-python/pywayland-0.4.14[${PYTHON_USEDEP}]
-	>=dev-python/xkbcommon-0.2[${PYTHON_USEDEP}]
-	=gui-libs/wlroots-$(ver_cut 1-2)*:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.24-no-import-version-check.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf wlroots || die
-	epytest
-}
diff --git a/dev-python/qiskit-terra/Manifest b/dev-python/qiskit-terra/Manifest
index b56b8df96aae..4cb8fc95ade9 100644
--- a/dev-python/qiskit-terra/Manifest
+++ b/dev-python/qiskit-terra/Manifest
@@ -40,7 +40,6 @@ DIST pyo3-build-config-0.18.1.crate 29134 BLAKE2B 288519ea8b17bf81564ea7e91fa548
 DIST pyo3-ffi-0.18.1.crate 62852 BLAKE2B 86bc534333e05578b1bf890fdd71af685d626aebbd8b4132162c1d29ab89ee493f903497fecb576164a1b23df11b36f20c18cede97ded567428724a702f0529f SHA512 35f2838f6b06bbb1ad6ebdc0d68c750fc8cffc43b62fadf2b76d4a395a4655797e9d93543ffb204ff7ea312f7f37444375c556831a231122f9fc1477ec986bec
 DIST pyo3-macros-0.18.1.crate 7174 BLAKE2B 0eb2d106d193cfb14fc8c9cce175458a38bc069f9c232a7bc541e2951bd06ad3dfab483f730ece97a4ca2827ad4dcd0444e77df6a8ff79cc5861c2985d0d2b7a SHA512 baf43c6c5ef8f5fcc91728d693d52453b779de5c48cfdb295449a32ce559c0304e3a93b43bad7b312eee1c44bbe680efc57423d4e38986f3c6eacebf07998609
 DIST pyo3-macros-backend-0.18.1.crate 48618 BLAKE2B 8db09610fd6fc95d1979a4065f89611c507ff7e7f72d9cd64590f85f6d8543ee6d234e772c55db88e3624808ad135389f5ff0edfd2eca6ecf1a29ece332c1c2e SHA512 20aed4aa485d6ffc02b0d08aa4c5fc086e73482aedb5ebce155c3f973d0e058902ef806740d483368eb80caac4ccc163516eaf56a027910d71cedc5bc0ee665c
-DIST qiskit-terra-0.23.2.gh.tar.gz 9530943 BLAKE2B 72160fc302162b3432aa11e5e063004e8eca7ba4d16320b96b6ba6e5621e7e89fd8d34a129fd6d41548d626aacd6461f084b23471fc126ef9e475afa9540b314 SHA512 92536209dae13c5a0720d3acc7f46f7632bbe3be35330970b6d166853727193388aa0afa613ec15f08a86cd3a55991d7c655342dc6a2987ac49588400e7f759a
 DIST qiskit-terra-0.23.3.gh.tar.gz 9524438 BLAKE2B 9b2c322f2db89e956aaa9a5b939daf38d9d85bb388f337a042f7e7595a021c38228e12c1d0fb2953d4bfbe622776d4d178bfa91821dc14bfcf282cef616f24cd SHA512 d5a92b2274bc14a8f74a8c6aed774d71f01921efd6178b2fdb5f054d7bf5d2db84f25da4d035af730338cb95001d1822336f97b383247fcb8accb629a5bd117d
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
@@ -70,6 +69,5 @@ DIST windows_i686_msvc-0.42.0.crate 717477 BLAKE2B a37e068f45590f0c31349acbdb568
 DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed3004809244654268ee1bec17975166ca876dd393dcfe8a2ef0ca65d81b04c8f513f95a0fae9405ba796c085951bc2c597d252a3122f7dbf6425 SHA512 7df7ee0c345f0a2c37d7f9ec3a2824116b4d7a943bf245787509e67809a4f31ebb1862e212efb2d943d82ccef77a716437cdc61004396ca86e95e688368c6dae
 DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf
 DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
-EBUILD qiskit-terra-0.23.2-r1.ebuild 4794 BLAKE2B ef322c8b61707beb7ef7e9702c50bfb611e26c468b66de46fd1a9fe0a026104bc4bbbf131b80fc402c0419398e1ca8f42420d765150f20b05de8756f5557d160 SHA512 fb78516570e4b1defab4a27c69dee55d93d2f959005342e56a2cea3d0399c7ab3d0d03136ce014bc53983b859da937ac1fcab76b58e113d4b33b6301e57b6381
 EBUILD qiskit-terra-0.23.3.ebuild 5549 BLAKE2B 45fdfcf760c4e0514f9a40c82a26ae4b12d886ac83092312843f409a2189f9e0ef40e262ae6deff8a629cc415a2895db1d9c915c355e788e612b0e02b4c7a095 SHA512 6f65a9ffb7f4cbc87263d4f781e02c1e9fe542347bf30155b78dd609f58a0b75c8a3728c2e1cee01600e366c97c571e9630b84dbc7646e69dff3a10e1be5fd6a
 MISC metadata.xml 1099 BLAKE2B 4d2ae544b77d18aafe53ad0bfdc7bc32b9656eb4096d8f2ed0c2e71e8718d260d1030207753cd4e0b10748ec7508813f84a5232e7d491348be2c7ca1fcc5d860 SHA512 113bee16467977079ee15aab442d9255f9d3d3ad29dc27f2082b1f9b902856ce827aff722f988d4a9da2bc8762523002d8acb5702271ef87c188990c2b677038
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.23.2-r1.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.23.2-r1.ebuild
deleted file mode 100644
index c3eb8a31ec2f..000000000000
--- a/dev-python/qiskit-terra/qiskit-terra-0.23.2-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	ahash-0.7.6
-	ahash-0.8.0
-	autocfg-1.1.0
-	bitflags-1.3.2
-	cfg-if-1.0.0
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.11
-	crossbeam-utils-0.8.12
-	either-1.8.0
-	fixedbitset-0.4.2
-	getrandom-0.2.8
-	hashbrown-0.11.2
-	hashbrown-0.12.3
-	hermit-abi-0.1.19
-	indexmap-1.7.0
-	indoc-1.0.7
-	libc-0.2.137
-	libm-0.2.5
-	lock_api-0.4.9
-	matrixmultiply-0.3.2
-	memoffset-0.6.5
-	memoffset-0.8.0
-	ndarray-0.15.6
-	num-bigint-0.4.3
-	num-complex-0.4.2
-	num-integer-0.1.45
-	num-traits-0.2.15
-	num_cpus-1.13.1
-	numpy-0.18.0
-	once_cell-1.16.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.4
-	petgraph-0.6.2
-	ppv-lite86-0.2.16
-	priority-queue-1.2.0
-	proc-macro2-1.0.47
-	pyo3-0.18.1
-	pyo3-build-config-0.18.1
-	pyo3-ffi-0.18.1
-	pyo3-macros-0.18.1
-	pyo3-macros-backend-0.18.1
-	quote-1.0.21
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.4
-	rand_distr-0.4.3
-	rand_pcg-0.3.1
-	rawpointer-0.2.1
-	rayon-1.6.0
-	rayon-core-1.10.1
-	redox_syscall-0.2.16
-	rustc-hash-1.1.0
-	rustworkx-core-0.12.1
-	scopeguard-1.1.0
-	smallvec-1.10.0
-	syn-1.0.103
-	target-lexicon-0.12.4
-	unicode-ident-1.0.5
-	unindent-0.1.10
-	version_check-0.9.4
-	wasi-0.11.0+wasi-snapshot-preview1
-	windows-sys-0.42.0
-	windows_aarch64_gnullvm-0.42.0
-	windows_aarch64_msvc-0.42.0
-	windows_i686_gnu-0.42.0
-	windows_i686_msvc-0.42.0
-	windows_x86_64_gnu-0.42.0
-	windows_x86_64_gnullvm-0.42.0
-	windows_x86_64_msvc-0.42.0
-"
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cargo distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Terra is the foundation on which Qiskit is built"
-HOMEPAGE="
-	https://github.com/Qiskit/qiskit-terra/
-	https://pypi.org/project/qiskit-terra/
-"
-SRC_URI="
-	https://github.com/Qiskit/qiskit-terra/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
-"
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT
-	Unicode-DFS-2016
-	|| ( LGPL-3 MPL-2.0 )
-"
-SLOT="0"
-IUSE="+visualization"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/rustworkx-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.10[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
-	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/symengine-0.8[${PYTHON_USEDEP}]
-	visualization? (
-		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
-		>=dev-python/ipywidgets-7.3.0[${PYTHON_USEDEP}]
-		dev-python/pydot[${PYTHON_USEDEP}]
-		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
-		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
-	test? (
-		app-text/poppler[png]
-		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
-		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/qiskit-aer[${PYTHON_USEDEP}]
-		>=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
-		test/python/transpiler/test_unitary_synthesis.py::TestUnitarySynthesis::test_two_qubit_synthesis_not_pulse_optimal
-
-		# TestOptions::test_copy - TypeError: argument of type 'Options' is not iterable
-		test/python/providers/test_options.py::TestOptions::test_copy
-
-		# DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('mpl_toolkits')`.
-		test/python/test_version.py::TestVersion::test_qiskit_version
-
-		# Hangs
-		# Broken by https://github.com/Qiskit/qiskit-terra/pull/8952?
-		test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_dispatch_4_3
-		test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_with_target_4_3
-	)
-	local EPYTEST_IGNORE=(
-		# TODO, also apparently slow
-		test/randomized/test_transpiler_equivalence.py
-	)
-
-	rm -rf qiskit || die
-	# Run the Python test suite rather than everything under test/ which
-	# includes the 'randomized' suite. Upstream run that in a separate CI job.
-	# Note: use -p timeout --timeout 500 if debugging hanging tests.
-	epytest -p xdist -n "$(makeopts_jobs)" test/python
-}
-
-pkg_postinst() {
-	optfeature "qiskit.circuit.classicalfunction support" dev-python/tweedledum
-}
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 27e3fcf16b4d..378e6a001f10 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,5 +1,5 @@
 DIST reno-3.5.0.tar.gz 83644 BLAKE2B 803d3d3c9ed572624b77d2851221edcd0a86241f86876970f1a64877d3083b39d8e574567f14dea52680538770a37bc70c55d74b66ddab6fda551209c32bb844 SHA512 4d48ec3faf26d046498edccc0dd6007dff36d8346395b5c62b2b85a8ff9bba5ac571cbdcb2aa8e522b6f4c155bd845a416cc715c30a29e8eae6d033ee1b52be7
 DIST reno-4.0.0.tar.gz 84541 BLAKE2B fdb04fb337d4cd1f9ec7c4656fdacdd76135fc44dc3357fdb43056204756ccbf854fdadccf319c3c3b2f19b611479b34f8e5afcb20f178c2aca2aca5241a165c SHA512 1058416f0291a6d8fe8e3600f0e02ebc8146541fd665b4c5027c24f1e3192f178424701a48c4413f94c997719cb82fd257dff5d0fcbb5fd7fcb4aba205baea62
 EBUILD reno-3.5.0-r1.ebuild 1134 BLAKE2B 246d6177ba5c8aab66b9af191ae95d835b285bcfda14472693f93863b92b13d0aea0411d233b48d14f8acf4d4f2b3b2417f49f98e27441aceb70c707b634158a SHA512 ff0a8f9127e8c4d82dad924fb979b2fc0f7476846abb7457563bed40cca6eaef28bbe6e9f64b927587311c336f18660c83b8517f73988265f1e6182738e55df0
-EBUILD reno-4.0.0.ebuild 1137 BLAKE2B 1713fc76bf450f7fc7472d1202bcbc8983bc86ef9ca5fef10d7be101fb2ff02debdf62c880beacda2f54e9a4bc15f1763c73b30220968cde1d57ce55bbff6189 SHA512 f56d2946aa8775ecb5e631656f1072c6a396b5da25cb818daa1e267cc607600d72c69311ceff2626eb3a422620d37d960b72c4c04eea2c672d037625b307e729
+EBUILD reno-4.0.0.ebuild 1134 BLAKE2B 246d6177ba5c8aab66b9af191ae95d835b285bcfda14472693f93863b92b13d0aea0411d233b48d14f8acf4d4f2b3b2417f49f98e27441aceb70c707b634158a SHA512 ff0a8f9127e8c4d82dad924fb979b2fc0f7476846abb7457563bed40cca6eaef28bbe6e9f64b927587311c336f18660c83b8517f73988265f1e6182738e55df0
 MISC metadata.xml 501 BLAKE2B 3c3c1d7026eba72db293c2c7e628cd79127314ac578b1cd2db662e058c0be9b0225b3304dbb0f5b30d38729e6bb495014905ae27c924fcf01b3410e2e7f1a0db SHA512 8944b85dd5a9dbd5419abbd8c70d74d414f987053a9721ec402b047af2e35b2584254d19aede528cb96b8f720f8b92cabb6797ddc2c41ea700c2fa5e3ecef627
diff --git a/dev-python/reno/reno-4.0.0.ebuild b/dev-python/reno/reno-4.0.0.ebuild
index af452418d530..0f8379712afc 100644
--- a/dev-python/reno/reno-4.0.0.ebuild
+++ b/dev-python/reno/reno-4.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index c88569e4300a..43a6a7d0fd5f 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -7,5 +7,5 @@ EBUILD resolvelib-0.5.4.ebuild 509 BLAKE2B 4445d147d6f81b10f571b4e2c4e5211b78013
 EBUILD resolvelib-0.8.1.ebuild 613 BLAKE2B ae174343346660b2772b7d84564c771b614ce700cd89606fa7ee0c04239c43b1a38ed1fb8b896eec756613662d969de8b3567e3be457513655b76e7aaa80edb6 SHA512 b9d2328a352cb278fa5918b50ce3f18989313b854c5fe670aaa44f5a23306b5626cd4f5c167e64093ce38371aec2c76cf650ecedd467c63934b09dac2d68e705
 EBUILD resolvelib-0.9.0.ebuild 671 BLAKE2B c7aa5f54c8eef4427f177f092864206dd8d035517ea80207091e796bb906e79ca9f730054733085168dc00fd6871a07f802824aa96276b6426007e9a6f198e48 SHA512 f1b867a01dbf2930eeb40e2776650c6b513d7aa1a8ccd6c672cb0dd380f4e846d870d61f908ea26e700452e67ccbc2c4adef29b5626036519a85fed2f2855edf
 EBUILD resolvelib-1.0.0.ebuild 670 BLAKE2B 6d0da577d667ff9ce316e2a7dd26ab9b43996d5ec748e4aa97d0508c4f5f93eab608508ce77a6d30ff8ff36b19ee76cfb93bb80cec7620c313e4aba53052af35 SHA512 16c436a142026d0a479fb311f9133d75e275deb76f16dd20b00c808f14d1a37aa700895b926e7f46765251fad5e1585821bbbe87b9aa2b81cdf12cf33e358377
-EBUILD resolvelib-1.0.1.ebuild 670 BLAKE2B 6d0da577d667ff9ce316e2a7dd26ab9b43996d5ec748e4aa97d0508c4f5f93eab608508ce77a6d30ff8ff36b19ee76cfb93bb80cec7620c313e4aba53052af35 SHA512 16c436a142026d0a479fb311f9133d75e275deb76f16dd20b00c808f14d1a37aa700895b926e7f46765251fad5e1585821bbbe87b9aa2b81cdf12cf33e358377
+EBUILD resolvelib-1.0.1.ebuild 669 BLAKE2B 76d816fe61ebc6ea338417209316e72c17a34697bc961cbede01e1ec6cc4d53c8b20cc544b5d755d9b772d457fb5deeaee716264de30bde0f7cc70a7ab5fac4a SHA512 59c59ef972a3ddfb6a232e7474737143cc544225e94b24b25ab661fa2d6e13c58ac4e29c41c3fad081ad12cee34d624b43904aee82e2e61f3f13118c7f75d560
 MISC metadata.xml 864 BLAKE2B e62049b9f1eca68e3148fb112e0b1b51713ec88deea5ddc7eac28b84003e427f6e17d018ebb27f68b59a5007e7ace47cb89e25af12df432a1ebf13feaba9dff1 SHA512 7af7a80800ba0c3da0789f545a6b3e51c35cdba8785e2aa8761c1689d5ec7a3b9f428f28b182d86ed6625042d2d85d52ebb1095134bd2c7013302abd4ecd19b9
diff --git a/dev-python/resolvelib/resolvelib-1.0.1.ebuild b/dev-python/resolvelib/resolvelib-1.0.1.ebuild
index f764eec0b7f6..5782814673a4 100644
--- a/dev-python/resolvelib/resolvelib-1.0.1.ebuild
+++ b/dev-python/resolvelib/resolvelib-1.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
index d4d20134313c..616a190efbc1 100644
--- a/dev-python/semver/Manifest
+++ b/dev-python/semver/Manifest
@@ -1,5 +1,3 @@
-DIST semver-2.13.0.gh.tar.gz 43674 BLAKE2B 35d0ca0b61836d0e6deb97f067a0c1cbba310dde6eb83d78f02f85c3f7485114ad549559d572d4494aa7c4444c7d6feabcb36394561a238489d56bfd04ed8590 SHA512 ca0d408d8bb7305e90802ea04d935cd7b76b8f166a9ec97ed3427dbc2cf60eeca0b2d27ad0cb2f15f32f5b2589d6717a63717c463183374c5335bf79e1eec222
 DIST semver-3.0.0.tar.gz 204359 BLAKE2B 93aedd2e1884147546c064f6d0cf96d6a26c1591974bcefc0318eda90e01a73a99111babb9e6dc7f2b5c12b3cad94329dde7454c87891c9364d1fdbed5dee30a SHA512 b8b4299172f5a4325a309c686e5fee7339083fe2cba3852b69ff5ca355646d092d30ec1a3fe107ecb2f86c8845d4189d3d2c6f668c9df86ede69e995dcec93bb
-EBUILD semver-2.13.0-r1.ebuild 661 BLAKE2B 3404eed98ef9fd0f935414734eb25f58a4540547e1708d05601f22241f3804008c775bc5a9d0af20ca22f28b245222e554e6d293e5f1dda91b3a6e029d35029d SHA512 1a085c0162927e96c139f686f2dfea01cfecf19ecb6c2bc91f0a3e7633d5a56f7d6b0dfad4c5f8e1a0cf46069bdb78398d10d7e0663faa2eacb03f5d688efcb5
 EBUILD semver-3.0.0.ebuild 502 BLAKE2B c17dab33e2df4f135bfd7a7a06626194bfd91698c476f9dbe15ae0cb44cfb550214182b7bf6773b3a2cdcc083173df1d88a92b91d59960ddd68a4c5ee25c9c38 SHA512 efb548b181fc604dede5355debf861ffd72b376c43a721c887cc871da7787f074c75c2c68bda426fa88752bf642d6e68960009c8f3b6e16704de07baff04bb2d
 MISC metadata.xml 388 BLAKE2B acaeaf260073c58d5bac6d2c59228301009c59492fd03d51ec0127229e2bbdead1d14dc716f100cd2543be8e50020f06299d6dbad125514756f7dd659b8119ae SHA512 97533f8b2877e780da67de9a47dbc87de751b4ea3831cbc44b345ba434736f584ab3e937c472f62c57410764facf76d6c8ab31857f9fd8e66626072c032a2714
diff --git a/dev-python/semver/semver-2.13.0-r1.ebuild b/dev-python/semver/semver-2.13.0-r1.ebuild
deleted file mode 100644
index f534300fab4d..000000000000
--- a/dev-python/semver/semver-2.13.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-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="A Python module for semantic versioning"
-HOMEPAGE="https://github.com/python-semver/python-semver"
-SRC_URI="https://github.com/python-${PN}/python-${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# contains pytest/cov args we don't want
-	rm setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest
index 5cd86bdb6019..6d508925a4fc 100644
--- a/dev-python/shiboken6/Manifest
+++ b/dev-python/shiboken6/Manifest
@@ -1,6 +1,4 @@
 AUX shiboken6-6.3.1-no-strip.patch 1001 BLAKE2B c486f9423d4934c2305e8f3109f017dbebd568573469a2fced8da895fbc61ef07a80e0d1c846e7a57988801d6ec4be05b86b46a8039e6702d667129a899fc137 SHA512 1f3e5b082a978e3ab8d8f4d9a5a0a661b8c063e2ece0221440abe342fbd45d566a384d588dbf00a1e469687f82da3728cd53e35d02077ce6a748d3747de3cec2
 DIST pyside-setup-everywhere-src-6.4.3.tar.xz 8789448 BLAKE2B d9083bd636d3ccf2636b58385fffbc1499db0cbd80e199581e68a440c01b16acd440d7fdbaf41d8b4caa9974d31e457372ed7a80f1525929777d2265fe1297fe SHA512 cc8051d52240b9aca531e3163523274334bfa339f2815ed46c4b4d09be2419f1f4cc6ebfc1e591658b5caccf840f8791333ea119c72a1e53591f1d8ca2e08baa
-DIST pyside-setup-opensource-src-6.4.2.tar.xz 8759528 BLAKE2B cc1a18e9dc81eb02bbfffd38816da68f053337f94c485fdd2f99488ae7ade2e899be1d98518def8f39a4eeaeaff6018ff09402bfe55b3484d78d8c4d9796b4e7 SHA512 129ea420000fceef9726fab9e0320e8286a34aa0855fc4bd369adc0020b76909b3a5ac8c3fa622b73da1561b39dcaeb8ac121f634918e2c0460a9ebaccb0f659
-EBUILD shiboken6-6.4.2.ebuild 6457 BLAKE2B f0b96978090dd9dc0aea46fbd5543554772cb82001467f3e6583f69c7d6f63801f9f09aeb3f3a6117825a2cf310aacaf2f4f6ae203fb4c06a8fb6c6a41ef82c2 SHA512 d59f1e97f0e9abed7089c9460a4826f428417717a5c745c617cd892c977e5da3a617777f4f51e85fd0206145c873e8b90b0738a63900b3a8461710fda2a6bba8
 EBUILD shiboken6-6.4.3.ebuild 6477 BLAKE2B 81128aafb302660ca2e259bec6148555887648be9ffb5b6cd055c9b39b7d93a77759ad59e805757b3e6256200e4ad245ee78ec0b39a08f4ec1e33fc93a22b242 SHA512 a11755eb4b633825d108fb3ca7998ea2b53542fa14b6a174c45036753060f39d92a3ef5c5fb8f0316efc1c3f295bef6fd46b456ee6d4e2b2f26d5c5eadb519f6
 MISC metadata.xml 730 BLAKE2B 33e7e589d02ec0517e134aa50407ecb97c6800be3ab7b69174d65776f62c1f25c2b2209d51299d9e0110b5f5e9322ee2c0b43dc89e6b12c40ea322ca9bc8eb3f SHA512 cc4ecdd9bc86ce59c2027c6f87307d32bd76d5d2cd8c07edb6c60cc5317ea52a96136c7597a179d75f1632db2999300d8b8f0567679ba3fc562804774fcdcc98
diff --git a/dev-python/shiboken6/shiboken6-6.4.2.ebuild b/dev-python/shiboken6/shiboken6-6.4.2.ebuild
deleted file mode 100644
index 48247772bd81..000000000000
--- a/dev-python/shiboken6/shiboken6-6.4.2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Split the "/usr/bin/shiboken6" binding generator from the
-# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide6 ebuild should be revised to require
-# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake llvm python-r1 toolchain-funcs
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide6"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/shiboken6"
-
-# The "sources/shiboken6/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2)*:6"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-LLVM_MAX_SLOT=15
-RDEPEND="${PYTHON_DEPS}
-	=dev-qt/qtbase-${QT_PV}
-	<sys-devel/clang-16:=
-	<sys-devel/clang-runtime-16:=
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
-"
-# testlib is toggled by the gui flag on qtbase
-
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
-)
-
-# Ensure the path returned by get_llvm_prefix() contains clang as well.
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	# Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide6 does *NOT* care whether the end user has done so or not, as
-	# PySide6 unconditionally requires Clang in either case. See also:
-	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Minimal tests for now, 2 failing with the extended version
-	# FIXME Subscripted generics cannot be used with class and instance checks
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken6_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-		cmake_src_configure
-	}
-	python_foreach_impl shiboken6_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	shiboken6_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the "shiboken6" executable for the current Python target,
-		# preserving an unversioned "shiboken6" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken6 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken6.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken6_install
-
-	# CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so"
-	# library and one "shiboken6" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken6-${PV}/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py || die
-}
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index d289130590d2..0dcf0e64a1cf 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -5,5 +5,5 @@ DIST sphinx-gallery-0.12.2.tar.gz 402524 BLAKE2B c872ec403adf150df540253b996e35f
 EBUILD sphinx-gallery-0.11.1.ebuild 1086 BLAKE2B 90f5886ff545981d49dcb4c68d70d9b8145d61a63b5b3f06f79ab35fad1bac183d1f416252ee1038377f087f328f3be1a6005a7967174b087e9b97c5529c7e6f SHA512 a856665925eb0d873b82b980e9fb5f284332d7236ce1ab07969f6a984fb29c30c8872f42291b834c23d5d51de9e995ab43eece64fdef8c690a3fe6a8c0a396db
 EBUILD sphinx-gallery-0.12.0.ebuild 1492 BLAKE2B 73e0b547e935d500631a673760b6076a6b23c2c05f44937fde39a639501be401d9cf566136f6449f05b6423480b99706b6f8cd51d29d124feccc016eeb4c29c4 SHA512 7ece7ea4c297981634839cc0c92ffd6cf2f4f988ca7dd56d66d46c3593ced1f621e6702c96945d6ccd4c1c32da621ded222ac7dab563e43e0e6e4ba1994f1663
 EBUILD sphinx-gallery-0.12.1.ebuild 1492 BLAKE2B 73e0b547e935d500631a673760b6076a6b23c2c05f44937fde39a639501be401d9cf566136f6449f05b6423480b99706b6f8cd51d29d124feccc016eeb4c29c4 SHA512 7ece7ea4c297981634839cc0c92ffd6cf2f4f988ca7dd56d66d46c3593ced1f621e6702c96945d6ccd4c1c32da621ded222ac7dab563e43e0e6e4ba1994f1663
-EBUILD sphinx-gallery-0.12.2.ebuild 1492 BLAKE2B 73e0b547e935d500631a673760b6076a6b23c2c05f44937fde39a639501be401d9cf566136f6449f05b6423480b99706b6f8cd51d29d124feccc016eeb4c29c4 SHA512 7ece7ea4c297981634839cc0c92ffd6cf2f4f988ca7dd56d66d46c3593ced1f621e6702c96945d6ccd4c1c32da621ded222ac7dab563e43e0e6e4ba1994f1663
+EBUILD sphinx-gallery-0.12.2.ebuild 1489 BLAKE2B d0ac54e3b7a00537b93c25d2659ba5d12fb40ae7676e080a0a108f3337e8c616354eca757dfb315f806d97d1186419e2670c7d44f63b909514cdb938e5481071 SHA512 e83c66891e9ed3d1fa2b16a9fe619989b4d265f5dbc4ecde5da53ef8c6057fd5f65150083c9f9aca9f0c7bd5dc4e46c7e4a8112b67e61f295c577c0ecc46e928
 MISC metadata.xml 424 BLAKE2B 4e5cd1e912fd5934c7221d3e5cc60b2894eca6b994384f6ceb8397ce9c5312be1e9869b57f9dd7f3ac66501b20e6fd6abd2f33b5d19b93d3a12f7158ba08e7c6 SHA512 17acc19bf43dbbf1a377949576252f77fd334ddd8a3bec593d2339db5a44e4fde831f9ce47be97318bf72e30a062608f883e48cf572904b3476fde0df33adb09
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.12.2.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.12.2.ebuild
index fb10706de391..1d0ba5bfa967 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.12.2.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.12.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index a95d9944ea1f..deb0ae304e1f 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1,3 +1,3 @@
-DIST spyder-notebook-0.4.0.gh.tar.gz 3869758 BLAKE2B db809e9a2b93206ba0236e825b7d8f612efe552be5b9bbcdd60021ee143f16674e05847834bbd63a801c32e2264e5335685887aad0519033a315b3c2c0fcd3d6 SHA512 ab97429d276af815411b9a63bc04e291e5ed596bb9c551be8161e71761fc21a61b896b73ec1d93c9a2b4561ba228b93ac86f3b542a515cbfc651e9e218f6f778
-EBUILD spyder-notebook-0.4.0.ebuild 1245 BLAKE2B a2644cd4788e28edaf1f379d1f52a73ca0086155a3a434cabcbc0cc61d4f3f619e6f99ca6fa67ef56f02c976df7d98044c7db581a1b5c50f8df058f0bd3f0241 SHA512 be77705aa706a9d0265e10d750a1ff63f939805e4d748272ae068bff00590babe7c93b4934877100a8072aee494507b26eea94471638bfe4f9fb78a91eac4e0f
+DIST spyder-notebook-0.4.1.tar.gz 1756246 BLAKE2B daccd224f822d10b0bc527f6e12a46b975631c1eee4edd1e431ff8a71e126d4ff2006853b05146bdef3c8978a34a38d1c30ff9da9076f9c954a7ecdbe9eab4af SHA512 f4ad23ba218dec708f876fe13b11e172df2430c9c9e57916a8f10f43f3728788801d7749b37a7474b329fa8750c0d08ddbd5131142035868f23c1975228d840e
+EBUILD spyder-notebook-0.4.1.ebuild 1060 BLAKE2B cecb226af57a5cf5c8c8f6d3ece6449e3953eedc0108b827b2206bd2b2de4b2b391cc7b5d3ba3e35477f373bde00aae7c8b859e59c6db35061c05f5c8f43418a SHA512 f96ac4c73271a7201684ab7f70274ee1bb23fe29933bc1d69e1a1f3c959b2ca3cd900a1278e8f6bb440ba3fd3f6d90fd0e817576e6c12b05f6f6729088fdb09b
 MISC metadata.xml 427 BLAKE2B 33a2a084ee10c6a4b0646bbd7e866e81e2cd42bbfeb8b2ca1341a19f1af31001a2a34ca8ae5d44b783b5ded83c30b5fdc9e08e626844fd9fb6170b481ab501f4 SHA512 ddd984e2536912410966b76ec42b2a466a100f68a49fe153ce249eaafff9a1feec358292c58495d88cddd588ebdab5fe78c22f4c893194e64defab5a84257fa6
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.4.0.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.4.1.ebuild
index 25b504aefa1d..0d025a6e42b6 100644
--- a/dev-python/spyder-notebook/spyder-notebook-0.4.0.ebuild
+++ b/dev-python/spyder-notebook/spyder-notebook-0.4.1.ebuild
@@ -4,18 +4,17 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
-# ERROR: Server components are missing!! Please run 'python setup.py sdist' first.
-# DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 virtualx
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+
+inherit distutils-r1 pypi virtualx
 
 DESCRIPTION="Jupyter notebook integration with Spyder"
 HOMEPAGE="https://github.com/spyder-ide/spyder-notebook"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
@@ -25,18 +24,20 @@ RDEPEND="
 	dev-python/qdarkstyle[${PYTHON_USEDEP}]
 	dev-python/QtPy[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/spyder-5.3.3[${PYTHON_USEDEP}]
+	>=dev-python/spyder-5.4.3[${PYTHON_USEDEP}]
 	<dev-python/spyder-6[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 "
 
-BDEPEND="test? (
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}]
-)"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
+	)
+"
 
-DOCS=( "README.md" "RELEASE.md" "CHANGELOG.md" "doc/example.gif" )
+DOCS=( "README.md" "CHANGELOG.md" )
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/stomp-py/Manifest b/dev-python/stomp-py/Manifest
index 56c7c0923e7b..58fab4276c0d 100644
--- a/dev-python/stomp-py/Manifest
+++ b/dev-python/stomp-py/Manifest
@@ -1,5 +1,5 @@
 DIST stomp.py-8.0.1.tar.gz 35300 BLAKE2B 12209e99066fb5bb1f3015398f5eb27186322ce9d92feca46adc4d275aff1d5138908da69abe3be512325bd30a3a21773886ba5fa21917c71d13bc53b0977de4 SHA512 009189cd07c379641c9fa3b3af1df70c9e26b77bbb6d2443a78b56ff9895b4382e90a753db83f4a863fae5ef5765c660d2f82ef14ab6e74817bc83e7ea8ba6d3
 DIST stomp.py-8.1.0.tar.gz 39808 BLAKE2B c6efb19fbee81142f251c4bf4114b445878b81fa457260a306cb82ef5e9c57f0b75e3dc8cd6035676e688f1d33081cdf936ac6ccc0628819722849d60f4d8602 SHA512 7385842a23fbe6022c386489641948932e805430ce71c09079d9484fe17d02241ee705d92a1bcdf873eebcbacf68f44bbf884ea103c8963944b84758073fdac7
 EBUILD stomp-py-8.0.1.ebuild 1060 BLAKE2B db1a0c5ebb663559f586be366455e0ced04006fd1e875dee24f985f739d904a4c46c60bdfd95a40df7aad245ba1ae7440274621a7fb0ad08553ae53ac668b2ae SHA512 c612d9e59cd891b8b0172e10ac0a6730e2af5e6d038f0561ab4f49ede7e1e04cb6396f3b024df37de0588959551462a9b840f2b0620bdffd8c8858bc0b82bfc6
-EBUILD stomp-py-8.1.0.ebuild 978 BLAKE2B 4c042916197fb1cc4341787cf01672646b81f990919a2e7edb51d0c6b31cc1c8d506e16b48d868546041b8023ab0f983fb2f614ef4673041025fae11126bdbb1 SHA512 834ca1e7132ee0e2f51a9bd2bdee36c05d93e9b560c4ddc55d54072a4654d1e945e33f651c040ce8f844d725bf52c800cb05cfde61f183c5f6c23cefef651f97
+EBUILD stomp-py-8.1.0.ebuild 977 BLAKE2B 38e7d1d533af33d25251c08ddede1cc6974bcfcca0b0ecbc983239206e62d6fd9c21f819a8a96a3c38cf845ca9eaae695154f17bb53b7b5712973e63d67705d7 SHA512 b1301cfa745dda0da85cb8ad0b24be0c13fa84714070f1e45a83bf7ba085adeb1713238864e74e6e26ec5120fe13c4790c0b79c7a03c5c271dd331e7a53eb20e
 MISC metadata.xml 402 BLAKE2B 2cca58b54cd707a4c0db87e034f4e6387e9243aabe392cd0046d11b6d2074c57285798db5a81d7f3f6854a9a43436a193678d384ccde45af0552bc50b26e77ba SHA512 770aac685fa99c5e3a01bab4864d6af4c9c810ad52c4f8a2a0c32a4303f0e5e9a1573d7ad6220737e6fa4093c5a1430fb2a7765a151bcd5aa9925e059d5bed41
diff --git a/dev-python/stomp-py/stomp-py-8.1.0.ebuild b/dev-python/stomp-py/stomp-py-8.1.0.ebuild
index a779d1c0f9e0..828f25bdd8d7 100644
--- a/dev-python/stomp-py/stomp-py-8.1.0.ebuild
+++ b/dev-python/stomp-py/stomp-py-8.1.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pypi.org/project/stomp.py/ https://github.com/jasonrbriggs/sto
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="<dev-python/docopt-0.7.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/structlog/Manifest b/dev-python/structlog/Manifest
index c92c42c41422..cd28ca321590 100644
--- a/dev-python/structlog/Manifest
+++ b/dev-python/structlog/Manifest
@@ -1,5 +1,3 @@
-DIST structlog-22.3.0.tar.gz 743718 BLAKE2B 38d909d8672e03fc87c07cb48feabdb2478cb1c2ecf0a4950356b807817a4947627e58114f09072a598465dce1ff5f3c813f3ff6279b9c234b5dc4bea3019c77 SHA512 3326c597c2029ec544a1c47f4fcb848929ea1f6e9bb75bc8566a1a6b1e020e8ff2f330336b3c25431223994d7accb8f51bb302fe7226170b7ab977277aaa1740
 DIST structlog-23.1.0.tar.gz 746300 BLAKE2B 94e6099729803fff717c24922f90be0484f045e4fe231398242a890e6e18359f9a5c231985818d655141e978fe06546f36540a96ebe332f5bbf6d5500fc111c0 SHA512 24e28791e12a4a106062368771385ac06e80bd50fb051d2a71205cf9e6ebf92ca8a4e6c0efefd8d862699ac8dee9b4d1ccf4ee33f8d76233acf5256d69f9593c
-EBUILD structlog-22.3.0.ebuild 627 BLAKE2B be35613261c36a353d1c9a08d116b4fc1b0e0a364941e9f19ab83b76a1f808af68cd3af94c90d8a6cfb86ea995593fe8cf32c4023ab89506c58168fac7db7ff2 SHA512 b50f3dbdb04712bbe320c77234965df55d9fe4742290cee1c4383670ba32ee35a9abf4b3753113299791f4f0ffd305d49db936300d32e0f1ff842c410f78c92e
 EBUILD structlog-23.1.0.ebuild 671 BLAKE2B 3964f11f44c39328814d2b9d4817c16f33b09cf0da142ad370040c1811b693df899b242ff14f0c77c14dd5fb32ca57c338ef886c520d8a8bb4e1399492fd0f9f SHA512 5aec16dc1094bb8a0ce09a5d60cbde0176f9f47e391df148f3d7717d8e3cdeeb7da31b1114a165e11786523047fdaa3aa3de9635a5a5aab727145a3d8d18e418
 MISC metadata.xml 499 BLAKE2B 3fd4b395c6312a21c1db3ad187013d4fafe64725d00fc7e0c1b7db7b1be3cdae014c0688f9bfc867af791cc806d4212d88b7f5f7e8446d32262e1f7d77aa7964 SHA512 87195f8f65e6892029749b08fe428f2d2bad0d261c562caebed9e6052f932d9f73d57227acdc456601bb9ed48f313d9ba8f2581f6d7949a2fd9b7ff3d9f03e57
diff --git a/dev-python/structlog/structlog-22.3.0.ebuild b/dev-python/structlog/structlog-22.3.0.ebuild
deleted file mode 100644
index c454d9f9be67..000000000000
--- a/dev-python/structlog/structlog-22.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Structured Logging for Python"
-HOMEPAGE="https://github.com/hynek/structlog"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 274b83d62b05..6c2fce4d3081 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,5 +1,3 @@
-DIST tifffile-2023.3.15.gh.tar.gz 331071 BLAKE2B 4bb1f725bd38523dd60383aab530c8e8ec25a71fc5e9350cc77023ab2ce4bd8c5d85dc97a50144fc0148710be8bd7b0f8b5f20d4e2f9a85b541cc9b0e41ebfaa SHA512 b7f8f5a0a4dbacc409a39b1906104ee0024e7275ca1d7dd4cf3137b29dc38ef13103719ab191f7b61e2ef939e734d7442977d5f3a2c6560a1ce0361cd488ca7c
 DIST tifffile-2023.3.21.gh.tar.gz 331285 BLAKE2B ce63dc2f389d3e93cf50c52efe849423c091bdf048ce7f408fe6ee4556da4b9efcbaa031e7bc7f2b3f953117f7ce18014d1a77f9253a82d6dc4352464cf4151d SHA512 68b90d7eab293991b0227090d5b4c047469cd65c339f8d19da68097d99640c7f45cf8746eac4b3da9a388a58cd4343bbcad25496b08c13c913e48f982e14f5b9
-EBUILD tifffile-2023.3.15.ebuild 1600 BLAKE2B 2a75f65bcbe7cfa39d1d9778521c7c201c01e4bdaf5c5d24a47748e2eb6a849e7e1a1f508c1d49453de839bbfa2e0b0eaddbf8910c6d5a0fbb2e5364791a275e SHA512 ea82d23134791f8748abe1fcc0386fe57adb00d5eefe57174b3bbc2bca3c790538c13d78f675e5f1f4559b236a62738bcd613087a9c59893770466db90385dea
 EBUILD tifffile-2023.3.21.ebuild 1600 BLAKE2B 2a75f65bcbe7cfa39d1d9778521c7c201c01e4bdaf5c5d24a47748e2eb6a849e7e1a1f508c1d49453de839bbfa2e0b0eaddbf8910c6d5a0fbb2e5364791a275e SHA512 ea82d23134791f8748abe1fcc0386fe57adb00d5eefe57174b3bbc2bca3c790538c13d78f675e5f1f4559b236a62738bcd613087a9c59893770466db90385dea
 MISC metadata.xml 346 BLAKE2B 8cecb51fe01826a2a190c4e3020836f5706a918515a3ef5b4624fc3e9985411a8fd3c261fb7b6d8ad4f4486164487d11bdc2b071eeb5a95083db4c5323ae2dbe SHA512 81f8f6f5231d6cc9a8e7f95416a63cc52027f58fa54ce16bacfaa0ae285a48c5a3850d83d5ab50ca89be248ce386528db32811b23d61fa0d0e1e0cc737150465
diff --git a/dev-python/tifffile/tifffile-2023.3.15.ebuild b/dev-python/tifffile/tifffile-2023.3.15.ebuild
deleted file mode 100644
index 66babf481615..000000000000
--- a/dev-python/tifffile/tifffile-2023.3.15.ebuild
+++ /dev/null
@@ -1,60 +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_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read and write TIFF files"
-HOMEPAGE="
-	https://pypi.org/project/tifffile/
-	https://github.com/cgohlke/tifffile/
-	https://www.cgohlke.com/
-"
-SRC_URI="
-	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/dask[${PYTHON_USEDEP}]
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_tifffile.py::test_class_omexml
-	tests/test_tifffile.py::test_class_omexml_fail
-	tests/test_tifffile.py::test_class_omexml_modulo
-	tests/test_tifffile.py::test_class_omexml_attributes
-	tests/test_tifffile.py::test_class_omexml_multiimage
-	tests/test_tifffile.py::test_write_ome
-	tests/test_tifffile.py::test_write_ome_manual
-	# requires tons of free space
-	tests/test_tifffile.py::test_write_3gb
-	tests/test_tifffile.py::test_write_5GB_bigtiff
-	tests/test_tifffile.py::test_write_5GB_fails
-	tests/test_tifffile.py::test_write_6gb
-	tests/test_tifffile.py::test_write_bigtiff
-	'tests/test_tifffile.py::test_write_imagej_raw'
-	# TODO
-	tests/test_tifffile.py::test_issue_imagej_hyperstack_arg
-	tests/test_tifffile.py::test_issue_description_overwrite
-)
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 597ec12933db..7e22c31f32c5 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,5 +1,5 @@
 DIST translate-3.8.4.gh.tar.gz 1158012 BLAKE2B 37d26792b9382d318e359db3c7087cbf71a444c4f76c9b3fcec9311820ade1d3f346d7ff4b22983d6a49e0afd47b4277d2c0222e2982d56f52fcf7f655bd349b SHA512 28d452d9da1d1b400e88a30b9f997dd70ab2db5e6ae33a7882203bf6b59abf6bd315bee97c9f01de536dc752fde93429bb65aeb7b6386482193a68a472bd2e9a
 DIST translate-3.8.6.gh.tar.gz 1158560 BLAKE2B 127083188e3f25551e1a55b4499fb2247e7fb7c751d813f6a78491ec2f1e457e0c18d3416cf05533d11e36201b36814054f4eaf94693d04351a0928a0347fa98 SHA512 271b34ac44835af2e50537ec5a6a5d4dff497fd3358fe53c92e800109a347206d544f71bee7181ec335736a462578913262ddfbb27d4bcef39f247338bc99134
 EBUILD translate-toolkit-3.8.4.ebuild 2436 BLAKE2B c84859e2882719d6557918f1580a4a027ea586ae062f877baef0559cac641b59281abadfe9a1f888899778fa76babdb301e73796dff6fe03cea09161848bea2c SHA512 9f50a862bf8ff4129ff974c3ab1d4e4c3863585393aaf35fc1056c63fb6fda24485458e240abda227f5d995427e4796913b30e63b6bae5459f903c50f40384cf
-EBUILD translate-toolkit-3.8.6-r1.ebuild 2298 BLAKE2B 07249d48ff690a539f300e9bccc5ca6d9c0ddffcc41471b88d2c5c078703d47fbc513cfd19f5c3497d7c62183b466ea7babf0be5f783a55ac974271e50d89f8a SHA512 05192aa81f29a35e6937b8973d82460e6c675743c8c60e04ea16f57c0aa13edb11fd742e064ebe3398a599c050508613c00761c3f20ddb01c4b453473dc9d24f
+EBUILD translate-toolkit-3.8.6-r1.ebuild 2295 BLAKE2B a8e851122065cfc5053ed8d50aa09d1afebbe1b3a0ba4b7a9f4129aaa0400ee77b4c4619aaa7f83488f691e141b1504e5cc8d082fbf832a3c6e2c052bfd78506 SHA512 feb37807713d699ac2b0b2bd4e9d44b070cfbf4ffab61a15553866b7c79c6939cbeb4cad3b7d6cbf96ff5b33b4dd4340fca9a0bbd88f1ecb25c20756cea9a5d5
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.6-r1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.6-r1.ebuild
index a01938b2b2ab..36e56c03bcce 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.6-r1.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.8.6-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
diff --git a/dev-python/trio-websocket/Manifest b/dev-python/trio-websocket/Manifest
index 7757643915f4..3951edf6d99e 100644
--- a/dev-python/trio-websocket/Manifest
+++ b/dev-python/trio-websocket/Manifest
@@ -1,7 +1,3 @@
-DIST trio-websocket-0.10.0.gh.tar.gz 43808 BLAKE2B fd89ab74c3844a14940ce07a0abc07a0392607b492fa4b6e1d81ba3aa2c37338706975cb800332751c9ea70e934c4169fdcd29dd047019096726164a2130daa9 SHA512 04d775a7c1a232b470a7f415b57debce4bd1c3732934a94d65e3c9f3bb45c5ffea7464557100e2e9f68a2aa6a7812bd686220de046f399a0d0242309d2d9be59
-DIST trio-websocket-0.10.1.gh.tar.gz 44657 BLAKE2B c7e895c5beccf40baa8603f1e3c62396e4d8c716d9a51b6977c0854f65b4c40a1edb40812f80d55f0530c2e59f10f27f2b62f72a6fb91c693ae0d67aeff3161c SHA512 bd26d72c5de70d8176b62c950e6c2bf6cf47ed5a55bb63f88e675a9d353076be45f45387da8fa9af71b8915d93914844f2a7a662351e4776c4714734512bdd7c
 DIST trio-websocket-0.10.2.gh.tar.gz 45025 BLAKE2B cc80f7b8e06bb88bef69c6326dd899a27523ea70e0ea10c8b02a26498102638c569ffe21e2b4e355f9c635d60ae8ae34664d311bf5fe286456e43e0f9c2ba481 SHA512 ad8d4facb153b59597ca7dac14dabe60ac8ca4331aa72df8120e01ec726e1f392a8167d070f72534eb735b5dbf4afe46e385c0e3a2dd250afa2280c6a5a0c863
-EBUILD trio-websocket-0.10.0.ebuild 916 BLAKE2B be70dc19a783ace1115dc1454559b8fa52d209e322a2f77c94d811d46586ba9aabc8ff048990983cee263b7f5d7431a956229dc674666596706f96bc02849a41 SHA512 f195846a849d9041fa32e67dda0f073aa32efac97a28855e9dd9ff2dbc7b965ce20800694db2a457246a19dadad28f0d2683c518348937907ca0b3926d79a96e
-EBUILD trio-websocket-0.10.1.ebuild 916 BLAKE2B be70dc19a783ace1115dc1454559b8fa52d209e322a2f77c94d811d46586ba9aabc8ff048990983cee263b7f5d7431a956229dc674666596706f96bc02849a41 SHA512 f195846a849d9041fa32e67dda0f073aa32efac97a28855e9dd9ff2dbc7b965ce20800694db2a457246a19dadad28f0d2683c518348937907ca0b3926d79a96e
 EBUILD trio-websocket-0.10.2.ebuild 928 BLAKE2B 0e8013fe69030a1feeeee5e72368b2f385cab00de9a0e6fef4f783113f321d687edd6e81d393ce831b9e5205c35054ce08c28090657a3a1f382b0ae89e1f527a SHA512 e640c473adcf69be31abba398edad3f56de935ba48bf332ee154d927b57dd5562a947b13afba50e66187d50d402dabe2372c52f290c9505eb432d060b0560373
 MISC metadata.xml 409 BLAKE2B 68c9d1ab2984909315d2ec3f91f2703cc0941911fb049c35614c2cdc935e55f0f2440f6624aab4838f0d7d07e3e5717d19c7138660e82f8a3cb237e610a974e1 SHA512 c9d5e6f956b40d03d0a062ded846c507e783c55404a76b75141004df7d43e6a8bf5810480b4286a6bdf2d48c30aad51261e48581abb8799c107b924cd8131170
diff --git a/dev-python/trio-websocket/trio-websocket-0.10.0.ebuild b/dev-python/trio-websocket/trio-websocket-0.10.0.ebuild
deleted file mode 100644
index b95a0f2797fc..000000000000
--- a/dev-python/trio-websocket/trio-websocket-0.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 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="WebSocket client and server implementation for Python Trio"
-HOMEPAGE="
-	https://github.com/HyperionGray/trio-websocket/
-	https://pypi.org/project/trio-websocket/
-"
-SRC_URI="
-	https://github.com/HyperionGray/trio-websocket/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/exceptiongroup[${PYTHON_USEDEP}]
-	>=dev-python/trio-0.11[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-0.14[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-trio-0.5.0[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p trio
-}
diff --git a/dev-python/trio-websocket/trio-websocket-0.10.1.ebuild b/dev-python/trio-websocket/trio-websocket-0.10.1.ebuild
deleted file mode 100644
index b95a0f2797fc..000000000000
--- a/dev-python/trio-websocket/trio-websocket-0.10.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 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="WebSocket client and server implementation for Python Trio"
-HOMEPAGE="
-	https://github.com/HyperionGray/trio-websocket/
-	https://pypi.org/project/trio-websocket/
-"
-SRC_URI="
-	https://github.com/HyperionGray/trio-websocket/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/exceptiongroup[${PYTHON_USEDEP}]
-	>=dev-python/trio-0.11[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-0.14[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-trio-0.5.0[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p trio
-}
diff --git a/dev-python/types-docutils/Manifest b/dev-python/types-docutils/Manifest
index 1b8cdb4489a1..4a18b0863dd0 100644
--- a/dev-python/types-docutils/Manifest
+++ b/dev-python/types-docutils/Manifest
@@ -1,5 +1,3 @@
-DIST types-docutils-0.19.1.6.tar.gz 9279 BLAKE2B 04dbbfbe9320bd3e209de7d628ffd4adcd79074233606f067d2e1def8b877f5d39a42851e30de7010dab2c8ac3742886cafa49ff3023f86d20edf42234da7f34 SHA512 0b362b762f2bf21f5608edad9847c43f4e8c926f9599af33aca09abb297467fb857cb1f1066633270e0b1b4570571093f4777bc8b313a2f138f6f9f979e2a7e1
 DIST types-docutils-0.19.1.7.tar.gz 9370 BLAKE2B 4a0de7d58a7d17ead5865d7ccd167e8291d31a11156c14fb080dc3b78c743b7a89e06652d799241bfe55bd937533cd9c254bfe1d200ce1b2182e2c7c51e9800c SHA512 cb4fe6015c91576a06662c3523487c512f6b15d6c6ff41c7daaebf2f6820edc187fbbfe912e5b300198f86042113b8dbbc0422777532cdc281663bc328e155d6
-EBUILD types-docutils-0.19.1.6.ebuild 373 BLAKE2B 8dec0d93924bb7e297be9b249cfb673681de368eea49c5e48b8e95eff7cf09117d03a6a0d692b85f200af215e57e53331d2392a98bc2d7c69144d6d541cd63fa SHA512 58617888fc7fcf514482f0c5478a7574d05dd1751d504268e9a64b82b4e3eb7e52813dd2d4a04a0f6075c01b3a5ab34fe3a9e25b7dc1ed84be1fe1865d2a7247
 EBUILD types-docutils-0.19.1.7.ebuild 373 BLAKE2B 8dec0d93924bb7e297be9b249cfb673681de368eea49c5e48b8e95eff7cf09117d03a6a0d692b85f200af215e57e53331d2392a98bc2d7c69144d6d541cd63fa SHA512 58617888fc7fcf514482f0c5478a7574d05dd1751d504268e9a64b82b4e3eb7e52813dd2d4a04a0f6075c01b3a5ab34fe3a9e25b7dc1ed84be1fe1865d2a7247
 MISC metadata.xml 325 BLAKE2B 399aab1e8779e48d84998d6fdd595638aaf674b9a7076573aad7ade16855c4fc785dd45b1eff833c8ec7accda2a08cf561dfa14237e4edf6292fc7961ad76f7e SHA512 fb2768e73dd948c79654ab22c24d868a418576f2008153e45e4d0b42e2750872884bd35451ee3917203469d72d1c76f84d849e9d3534dc1006eb4d80b3ef04d7
diff --git a/dev-python/types-docutils/types-docutils-0.19.1.6.ebuild b/dev-python/types-docutils/types-docutils-0.19.1.6.ebuild
deleted file mode 100644
index 9a24481a1e60..000000000000
--- a/dev-python/types-docutils/types-docutils-0.19.1.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for docutils"
-HOMEPAGE="https://pypi.org/project/types-docutils/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/watchfiles/Manifest b/dev-python/watchfiles/Manifest
index dc9880b429b1..f92da994f2dc 100644
--- a/dev-python/watchfiles/Manifest
+++ b/dev-python/watchfiles/Manifest
@@ -1,94 +1,55 @@
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
 DIST crossbeam-channel-0.5.7.crate 90257 BLAKE2B ac8d47df391d64e05f2eac2df7113d9038d53639d963cd45109c2de71a1b32c9f687052d5fa88533271ea3569519627729fae1e092d2491d2b66bc38e21e176f SHA512 70d605a224db1a4e2217280cd2269a954781bb21a0dc5b0b08a5a83794daf1c941181f271c6a8347f72321ca2119dc562ee016fdc18104d5d3327a82b412e9fc
 DIST crossbeam-utils-0.8.15.crate 42326 BLAKE2B 23e6bd2a6535c6fccf7b7d17487fdd4095c92a3f3ae383a72dd6d90c1c49c2ec8d96dc01a94c7127b2681bfaef843585b3ae8665ecbc43b2e7db8434e31c6c8b SHA512 adb9ce1886396bc637299cb8122d102bcc9e561f25d67ef73e98c9ed8a8b13b78bc0f5bbacab19d015e1a7690bc0201f08b3d8e82393ec347e7f2933eb622533
-DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
-DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
 DIST filetime-0.2.20.crate 15027 BLAKE2B 393bf9696992ebd17a8319f23d660a8c841b536109d8216103ba163ef50c78dafe35f640c8996a707a43fc523d24becf38ced2cada9cf072445b13bc3138ae38 SHA512 71b2705acb0aed833b8c5da8f07384aeb0e290be78c68f4bfc044bcb7e8285740186b74b0e37c619d93bc05b9022a83cb0edb75c688b106cdc844f843d0e8a0d
 DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203a609bd92a7fde38afaa71248f4610e89c73eaf982a5d76560f9503081b7b10573046b1a91f09de4b642709417a SHA512 e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7
-DIST indoc-1.0.4.crate 13122 BLAKE2B f7a352bc2d19f3f2d1479b6add45daf841e02bba563ce9af115118b9bacea6bd39ab2a663bc992b2302de73b52bac1024130aab3dcd79c5b4286c93dd7305928 SHA512 b2d90f074f9a34e330d7d6e6313bd569cd857c791b8ff79191a70f19064fa53ea2ede30bbd16587fb438e69ccce4c3e2fbb127610ba8e470daf076d7373f0213
 DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8
 DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
-DIST kqueue-1.0.5.crate 12654 BLAKE2B d3d420a1fb2928af7e67106caa90b37fc09c5fae52e90df252b1f87bb8495a523ff248005670ad751e5cf4fae7a36923c2e9564ff267370699e07c5d5f97d22d SHA512 fb39f411e8cc40c7ac85dc679394d8fa02978da29666c15a8a303be75ff24c4e228d918ad9314313c8ee94c8b51dc4f8611e6e2706bcb76722ce0f406d5599f9
 DIST kqueue-1.0.7.crate 12554 BLAKE2B 2302bb9a6aae077c1b69e4892614e87fd86187fc4608cea08cd510a46ddc3a06b27027bcf6a865550187c983f3f80a9c7dcd6d8a6ca891e2cb6fb2d1a5d17396 SHA512 03a1eac44bab42b683312c7f541fc235ead3ec89e7e0b6991acff431f85086df9dd8a9ee1b80f784c9c5452d3e497170b734883ed0fd117ef033079d72f6c1c1
 DIST kqueue-sys-1.0.3.crate 6673 BLAKE2B 79254d667b4cf1fa556f1773db23b00ac431bdea6c8ecf914e3c0837fe4e25a45c9b6fb76259d628e4c76a20f749df3fc285b54ea63ce3b52d21529358e81c3f SHA512 76023295abaa4415c1d7b37c844432ece522b762f78983cdf58106f65ca553ee96193bd8c93f3fd0af029d266d8414f2ba4d1b8835bcdc180acc7defa6269731
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.124.crate 577742 BLAKE2B d39356e89647df6a0468c2fe7ec351955afcddd38064fb64215833c716bc16636001b6d377d21cf31b773c3f392d19ec5c665d450e81ce09a55bfd6a080c82ca SHA512 19fed1eeac7ffbbe36ecb5beb3816b5244d3017b72376e84e532f253e07ee7bc310f6f636aed46174653232fcdb532c2506bc070bef31699db20572df0c45de3
 DIST libc-0.2.140.crate 669153 BLAKE2B f4269549f6b450a3da3196ecaae52afe178d5b6905666fae04e2879f975f0129788898ca2ccd214d721af42a8b2fa86b26355d6baa0a81c223b56c658ee66dd5 SHA512 f450fe619ea2f45e4ada2567981987f19d35a9f13f88a0ce3a53e1751c6fbff708ca69fa6a64d807cce5dfe18b08751f0695d8a01e68e269da1aafc831528b7b
-DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
-DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
-DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
-DIST mio-0.8.2.crate 88272 BLAKE2B f704802aeec66cb47a011989709e6c35352b55bc7330dac7631ea144ed71bc86a433ef742207e3e37c47417bcd7ebb505287baebb839294e5833d228a2514c57 SHA512 c82ea0afc0de8acf162188a6131373f3cb3e7f3abb3094dd51fa9094e42a36806954f267840b3fed18c0ac3ee75af0451dfea5509ab65a94dcc93057c7d37393
 DIST mio-0.8.6.crate 93658 BLAKE2B 32b10be05ef5d1ed44da41cd03c1624ccec78b6a89b5104ab7a1a3b84dfd299bc7bf7f3671aaae0a2759a56120740915d380aff05af5f5f8b9e8e22fbcfa8203 SHA512 45b3d2a911b66be556dfb79d87ffcc57ee5f33a03fb30f319631796090caf8779e94cda37fc7a76685c69483f1cc7616c15440b71bfcc51239928d8879873f6e
-DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
-DIST notify-5.0.0.crate 37091 BLAKE2B 37faa3ecd07573731d3672c24f343bab1b7e7748a1f91771628bba5ff67da7eeeaf78036fcf7610fd41e748dc668ba1c42c419119bdacf72ff8398f3f7fefcd4 SHA512 196bdbd6958df56e5d3ffccc3036875c206a57258e18e10dd44091b3a547fb177ed16f6f11e854f01442a043aebdf8bfa5c06ca33ed4ce03a673a536935a973d
 DIST notify-5.1.0.crate 37269 BLAKE2B a11937c11bf32aa9b872e78009a5b92f04f326ef1d0c5037611a89974c0011c9656475864aba794d7b1b30635ccd01c475d250ddd1a8aa0f4adbf46f2e86ec1b SHA512 b04055d124aaac30eca9bf56d910ce2b6350967061b42cc83d2852ee6c8e99fb687dbe0569daf0aa98b1b7397b9b8970aeaef31a34cec84108f6de9fd6a88b52
-DIST ntapi-0.3.7.crate 126994 BLAKE2B 320b513d86af462c6e4d3349e4edfd28d73ddc8f09264adc24eebbbb79976642a9d530bf9af4e61e0409e35f4164d49f9ec054dee9694cfbcc76b237d6c84104 SHA512 6f5fc3b3629f028e03e878681a5a426945e471578c5dc78e121560887a9af285fe432f7401b19b7422e65c3b762651afb9a57a2f7605884c851ddf41b741585c
-DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
 DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
-DIST parking_lot-0.12.0.crate 39761 BLAKE2B 227ae508bebea21bd06c7a9c1651879ce3f5cd308019c8733f6b88e75a57b57d19b7bbc5dfed5ef1bff57ec0f116606ab699cfa6017b6e00078e7e4717cd58a6 SHA512 efa1ebe2f3849a9c6ac484c7e1cdd279640539468bd4d4da6c4c97ae34e86fa3a42818ee4839dea512635fbbd836829dbadd81dc05208614c820d1374139673f
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
-DIST parking_lot_core-0.9.2.crate 32254 BLAKE2B ef53a3e10228569dd38e1c5a8816fadfdf6b02ce01bf8b7099c7e3f1f71b4fb6c4d8ece8e52c9ddfc9a5ece6c273def2d9bf5aad8afd76ebdcea8b1ce08ad7e7 SHA512 0443dcd867d8be6e5d1b6ff0af8e31bde6378789e30865442bb15f48ac955beb847ab5954be4336fa47aadb7478606bd217b745134de50c16486c26e07fb10b5
 DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0
-DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
 DIST proc-macro2-1.0.53.crate 43351 BLAKE2B 9f93a0407a2c871bdeab7c48f4f5ab2497ea75e3c56929a659c2d18fd735bb0e65908b240ea4f64289b48f00185ecfabad24d8422e7fc08fab6b3be59dffab02 SHA512 a68e0b21f13d52c3efbcfc9fc9a7b99ba7fbdae5b975afabed2f2f76cb312a0abbbe7c791eb6e0a99f7417c0ffb749cc4596eab7b463dcbcdb9858b81753a84c
-DIST pyo3-0.17.3.crate 408939 BLAKE2B e67ce34c626dbede3c76abf66ba5078827e8a75644ff9fbd83eccf3d53096a3c2e0991da8b3489ea9984c665751308bcf4aa9c3d31dd62c72127694156a7a0a9 SHA512 5c83ea76202edce13c370d023562a9009382e36fdf3fcd7c4dea844ab8e5e048db4cc79a9c0ea98fb7017a83da16924ba0981ad98bd83e75e2fac434738e9740
 DIST pyo3-0.18.2.crate 418755 BLAKE2B a45c27639d9c4c5a4e017b7e8d7580aba285ee11295f344809e30ac23b70e4541f2cb765dfeee20fdf4d441e1449f5cad4bd6308a52822eea3595305081d4b77 SHA512 b97ebc10939418d7fe3d6219921875cc7253f3aa7cd9d06b1486f8757c6d102377eb851b3a669c670423af2c80e389b736f0ce04a6cecb716c952413d06fe434
-DIST pyo3-build-config-0.17.3.crate 29230 BLAKE2B 193df0c15a2150505c823338e76f4d75e2f28158626edf332da2b10b6a81bfaf7f95a3a32c9f218717504b2f0dd80d3fb61c78ab3df9cb9024c3686f8ca002b0 SHA512 92652ffdfb3f6c3c8a1c2f97f5e2ed19175ba6bad5cd0f0c113b569369193aa18d95adc780bbdb8202d815a1ec0b6aeaf40d93d64faab42f4e8b452c806906a2
 DIST pyo3-build-config-0.18.2.crate 29138 BLAKE2B ad37bacda5f0e5c8eaf382b3371de251b83c721dc2378a0bd3700462bb65273bcd4277589084f6af0a2959f17b370fe5e6a5699c8689107220333c57387bf0ae SHA512 01f544938d83a8283f5101f69673f8a39d2052186e7c712709be25c5ae17a11e7d68c2fd9b4bc7661fff9343ebf3ccc196c1259321061f048c59696692601ae1
-DIST pyo3-ffi-0.17.3.crate 62854 BLAKE2B 3f1c519b210de0aee19b832845c1d44237f780f18173ddc1b1cef5eac1060fab40fd8dbec067a49e4d28fc7edcd0bd751f54438ad42a8b98641de0517052c64b SHA512 c08481d1530207fee544a5dde14253415e5451c1c013b86ac1f0e9bcb3c1df7866764cd11bad523105b6821725560329b89ff689b3aa2f0698cdab148d0fc12e
 DIST pyo3-ffi-0.18.2.crate 62903 BLAKE2B 31e52b73705c1e5f44e419f314b1674a722a604fb52be5d5e5ff2ae9881ec9f204c1f51760570ed4c210ea530bd9295a27beaf9b5631ef02370d42d3e4c0be18 SHA512 495dcf45154ce89b8cd3a3fe193938e199465cf510df1713f7ad82e0a138ac2f8f1b73ec80f8af72f79a4ed26a9f4e4e93d52357ad4f41a213ec0c7b602734b9
-DIST pyo3-macros-0.17.3.crate 7257 BLAKE2B 4c5e166a37c31f2cc21b7dce9b46dcdaeea0f12299c421430efe72b47ac954f10680bf6ecb28a5f0058abaf22519f6ce05d21e5de534e362ceb9847049601f4f SHA512 f99d38ea69b1d46599d203908d12eb3fe4869a48b21b3eaba0c9c8e52b9f2b3c5ea72505dcb9b3330450dd724eeba859eef724fe9624ebbd8bd3cbcff7372df1
 DIST pyo3-macros-0.18.2.crate 7173 BLAKE2B dfa5792be03b3b1164471ef9ff4ee672fe8e57d0fc169ca04da1542d86262e7e526be079e303b8a4899bfa4b0680d38604f80263c71b33ead5bf0a60871f473c SHA512 a2c367b4b1556b16304ef0da4ed8961cc760d259da9fbdabf791ac910de4f1e9f193227f10ea4215a52c701bd0ee92311dc91d272b9364017e2f6ebde5698f72
-DIST pyo3-macros-backend-0.17.3.crate 49992 BLAKE2B a922c3c2c1f494002fa8592704c43ddbb4d9bf650187adcfc94f82c1275bcb69d444ede404d1b40bdf1e199427e8de880464b76c7385c2f96633544ad021c4b4 SHA512 b4dbddc3ac7ae542560459376127cabdbb4de83c04d70a4efe0976fa94e6ce94a7a62723f689a8fbb1d795fc235b1ac3611f8b4985ae2af0db4a9dc08de48927
 DIST pyo3-macros-backend-0.18.2.crate 48722 BLAKE2B 662822ae71702cb7d173c1ac7ead49cecde0dc4545bc3f5f30fd9ef7fab5537c13509bc8f18b2a8d05d7fa7f6fc8d0378a44d67b85edadfdf6ca153fc698a7d4 SHA512 433d9287bf3cdf84291c8d04ca5b24ecab2186379db554d6b2cf271e8716a890dcdc0717b2a00267e85dc637520559ef8e883bde2e2b16dd8cd580c1468c2dc3
-DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5
-DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
-DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
-DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
-DIST target-lexicon-0.12.3.crate 22990 BLAKE2B 7ca04aab44917345e51c7212e8f9d24cc0c7b759cba6031313c2a6f5bf4139b34be27e65ad150fd83f14b440a8e4ce125d156634409cbb2ec01cd370b213e738 SHA512 4ba0de71cf27c4ee330c9b61fc0318cfa3e179b57a7b0a79f296e0b33602c664c4ee2a676d09e0e104add2e0b56144cb5ddcc096a16f332f67862ee94b052f86
 DIST target-lexicon-0.12.6.crate 24357 BLAKE2B 5d9aef958155bdc1b546b9940083cf81ba4c638525e2d46340e50c4274764b39ac19a12214f3ff64a6830524a2ecea9d555db3f07d5d7dbccd7dd809255c4499 SHA512 63ccc047d10ebff55c3b9be400e2deafcaba7beb28ee67bae6d5df58e7c08362b2c4e0004f6daa582928850701969015ad43714c7ad46df665474667ff4db58f
 DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088
-DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST unindent-0.1.11.crate 7700 BLAKE2B d4d1dde410c4194acb51f74f374cf11fa872e49fad8f5f24b596d72476403e5e312fedf7b0bcb1027384d53c8de565368d63c30eaf70a6e6cd958b82e5288ca3 SHA512 f800d6c37fe72477908c91457a738a73d2b8085bb5ae303d6d954405d6ccd98833b5da16a12c3ad1ab75d32a68dedc706dfaacc0fcbb95571dd829cdc03a356a
-DIST unindent-0.1.8.crate 8326 BLAKE2B 3123c6b540b152d89cc7a9a76ff1315549f973c6a26adc6ca1b40518973fcc95a9f8da94d1c52ee551f2870181a265aac7e4339a3d46ba5280021b49ad842df2 SHA512 7752f4a29306b3c43f768bc400d610d1537457b22cceae8a5ebba31c857e219dc433a10a676d3cf94316a7cd6c7013c8960c825c6f1f9db5a3c2edd0a60591a8
-DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST walkdir-2.3.3.crate 23125 BLAKE2B 3bd354b9796a31bd4c8f4ca695514101a7837ae2134fa1ffec20df1cc946a67b38c6b50affbc2cb79ffee0934474d8269378dab5ac49a4943ccf8c7aaa51db11 SHA512 2b6e1e27c16e310f636eb1c9ee58435509fb8f7a6c5beba4dd13d87aa1d91599a593bfe720a675d536ce63e217c31e240a57122455d8e18de1282a9e7fc3defe
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST watchfiles-0.18.1.gh.tar.gz 43837 BLAKE2B 74decdf9ee1b99d93a7b0301b0dcb4a522a32577160c48b8690d0d0d713bd04ff91cd9e5d18d43d4eec348640c70fd3b5f458bfe322354852a5b5791e3747d77 SHA512 6d2b164475357d98b3531dfa18e50c86120b5339f17786a9b99ed97cb4dfb87c6a4183c5978fc2044a987ffaeeb4218ba46fe25b24a6e3e661a11e39c9eb211f
 DIST watchfiles-0.19.0.gh.tar.gz 44079 BLAKE2B 6dcedb8e642719041ec885e04ce16bb6e29310fdc6cd8e301fdd0b965ac994648bfd3959cafac98688823919156c3dff52585984173971bc132fb218a73a46e2 SHA512 0de8dd6600ca866007a3a5dd1e792d219f91ca0333898844b4de184aebdd3314b2ccce143cf2a58c1c458053d7ba7d3076f808ae1c754b9306fd5528a8f53924
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST windows-sys-0.34.0.crate 3369228 BLAKE2B 301f89dd2cc7e60980269deeb7f328d8895c80acad9f0056b3c510e339c7eb6963a152d7dd2c69380c802b17a630cd6df269399f18c298aefd8e9cc53e19042b SHA512 e12b2ddac3e1b841630639c6896f1389e6bb69c33da278e6499e0d31fde5d5b197ac636f430a52ccea6c3bc622e4410618d13819ba4d4c272ef2ea599be356d8
 DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354
 DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47
 DIST windows-targets-0.42.2.crate 5492 BLAKE2B 42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0 SHA512 84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9
 DIST windows_aarch64_gnullvm-0.42.2.crate 364071 BLAKE2B 97c4e3b2a2dd3f936f9bfcdad23639c9c4c499eed220aec361d26d6013d798efa118e6b298f9cf841ac149d2ae5d58ca653731718450fcf2910bb5f6fa39159f SHA512 75cd7eb1def8ce9d0ff3d7468d2b1cc31cc76c08f981a2460c3d1eb09cff7100d7442863a3591621c1f5f3b3f4badf0b5c95285b6ed583e37283a8403f1095f1
-DIST windows_aarch64_msvc-0.34.0.crate 674445 BLAKE2B cba324bb4fdcde12f4d89384450c5adfbd6f728ac47bd162b33a12c5adf0654c8374d4b0f1e9347d48d2e7d014f701fe85763709824f75df21b42d01341b53a2 SHA512 974c6f3c4bdbd217d9deac7e973b00c115e8b9b831f8b9d933455b11b8b6eb59782f7c7a06c9a4d81fdd41729858e303051eb0d56b971fea1025e86d2b702710
 DIST windows_aarch64_msvc-0.42.2.crate 666981 BLAKE2B 9f3cc5592cdede08bcdc1e7c455325279e3b763d96942695e10dccf1dfc37a81c749b69a7d6de883d4c0fa6e8a0d2f578fe2a8d6c42ad8ef6282590bf8fc87b7 SHA512 d2dafa8c94d01c1b65ca1bd631d31f2ef842f1db7accb132ff78c3f8483221b991afd3391563e03dcec42bbc9cbdc0ebdab47b991d25af85b5ba2ac1bbf8db63
-DIST windows_i686_gnu-0.34.0.crate 772343 BLAKE2B 7c3fb8d9b375ea82ab3e28da0c462c912a5286236a6bb8bb3c5eb68013d527dde064c368e1d452e73e26efcb1b832933b2891c2255673824c27045be9edd954d SHA512 e388b214d45ec14182af4c72e7b27f22dc7ac17725ce833e05cef9770b677dc929a20ffc1c28f604d5c8100f68d7bf4427feb2aeaf6edb776dc5bc1b505a94fd
 DIST windows_i686_gnu-0.42.2.crate 736236 BLAKE2B 4ef0496462afc73d9d72af7e5da1e6d3506a92f8172930e88ae64ab97596ffd31c4f97fb969e9b677e30159c27f00a8e756deb006b630fb98ce83f03c8b762e2 SHA512 ad09d650a05cb91cb6b40f59025c023a4c286bc1194586697c506016df2b9b0d5b02606b81687bc634795a0d9a9b8a73e486599328ae09c853e8e5ba662fc59c
-DIST windows_i686_msvc-0.34.0.crate 733497 BLAKE2B fe7588e946d95c1570ea0d90db82dfdb8a050ca331dc3edae6a786c2a10fad88ae99906959334b396c1972d88dc40010dacf655fbf9f5d39a6bd78bacf2025bd SHA512 86771e1fed40e7398d3ce65bee46fcbfeb630e0f77766eeb1da0e5b2c47f94bd728f645a5c799ea8f7ef6653b37903d476b5b3eb763218bf10dd7af6b31c76dd
 DIST windows_i686_msvc-0.42.2.crate 724951 BLAKE2B b084286cd4927efd2889b149abf8a9fe9d3d777130db9e592982660dbf9a96a0f5e723ca121465787aa11877d2d29a5a7d7cf066cdc8fa7e90d7ca7dcb7677f1 SHA512 c1706fc36d4b157c020744a11b3eb5d7dfbf05a0b56775bc717e94b7fd725816b20154fdbcd69ac08dbfb8b8bbfa74fab72d7a9c10399aad6a1cc54cf597e804
-DIST windows_x86_64_gnu-0.34.0.crate 744301 BLAKE2B fb0775c40069aa42fcabd01ff09fc7557236e3cd270c771b3648d7f556e9aeb9add7130b117fb107f3562bc199b728d3636779a99c9a1aad96aaf6b99f975f3e SHA512 61f532c2c95edf42f79ced48be9d4a9810dda327f45ff2dbff19a5fb888e3ba206f2b875c5b5571884f27742fb380d5f1e105e6d5fa460a2e529b53625123d86
 DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295e99c992d8f9839fac8a51338a0e7c3b9cdcd0429c456ca8c1c139a8c687ed7ed6c43a82250889d881aadaa65bd037223e0a6 SHA512 5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f
 DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3
-DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db29872754549e4df9cf895a1387d9ddfbf8c599e6e5a2bcb835f450d8218296a99d08fbfb2db469e244b0abdaa13f16bcc38b35a9 SHA512 3bf5308993a259f5d1b3964698550151c5819a0d28a02928c6f7d70443be69131255a896d423f086a298842ba773502de8a8e8bb2ce8adbf7bf848ab40184bec
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
-EBUILD watchfiles-0.18.1.ebuild 2227 BLAKE2B 4fead4e056b3a47392bc2a599c4e703c11dda5f6cf839159c6704069334ae27ea039af091c8477d2221b664f8375cbe8163f7d07a1e78628bc16b78c26847274 SHA512 bdc56f421440282b92a74790bf16dc107aba315d74c6b61bac2a95d6e79ee048ac713185fc18c89ba926fd70a655034788bcef9c6626d7c8e1f0883c219db7a5
 EBUILD watchfiles-0.19.0.ebuild 2319 BLAKE2B cc3aa23d3d50df555ba9a5b2d1c94b0edf86ea91e6f3dee2b761b78b9c26fc66d6256f71e5d2ac8e958241963ac3d087ff7ddff93d571b3ee74246610e6302a0 SHA512 780ecca94ccc7a85802de5deb7bf404d4ca11295a1df6a00d6c22d458bb3824870232e7a20247e4ec98f69fbc6acbc438d5a2347c9fa50bdc5c85f7c84615f14
 MISC metadata.xml 355 BLAKE2B 95253406e11c30a7a3b5462d3c835010313bed3122f9d16ff73d6959a5c1f4c8922e324c839fcae9f541c7b1d84544cd38718ffcaba039b8c61292eaefa37447 SHA512 e1c11224e0129eb696e4e92a41ec0e35819febee2eb967982e016f7a0d02d95df8465867e0202d8e7ac59cc579f73c79d9ed6b87eebd44b3b64d63a5642ac458
diff --git a/dev-python/watchfiles/watchfiles-0.18.1.ebuild b/dev-python/watchfiles/watchfiles-0.18.1.ebuild
deleted file mode 100644
index 0051cd21cf1e..000000000000
--- a/dev-python/watchfiles/watchfiles-0.18.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-CRATES="
-	autocfg-1.1.0
-	bitflags-1.3.2
-	cfg-if-1.0.0
-	crossbeam-channel-0.5.4
-	crossbeam-utils-0.8.8
-	filetime-0.2.16
-	fsevent-sys-4.1.0
-	indoc-1.0.4
-	inotify-0.9.6
-	inotify-sys-0.1.5
-	kqueue-1.0.5
-	kqueue-sys-1.0.3
-	lazy_static-1.4.0
-	libc-0.2.124
-	lock_api-0.4.7
-	log-0.4.16
-	memoffset-0.6.5
-	mio-0.8.2
-	miow-0.3.7
-	notify-5.0.0
-	ntapi-0.3.7
-	once_cell-1.10.0
-	parking_lot-0.12.0
-	parking_lot_core-0.9.2
-	proc-macro2-1.0.37
-	pyo3-0.17.3
-	pyo3-build-config-0.17.3
-	pyo3-ffi-0.17.3
-	pyo3-macros-0.17.3
-	pyo3-macros-backend-0.17.3
-	quote-1.0.18
-	redox_syscall-0.2.13
-	same-file-1.0.6
-	scopeguard-1.1.0
-	smallvec-1.8.0
-	syn-1.0.91
-	target-lexicon-0.12.3
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	walkdir-2.3.2
-	wasi-0.11.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.34.0
-	windows_aarch64_msvc-0.34.0
-	windows_i686_gnu-0.34.0
-	windows_i686_msvc-0.34.0
-	windows_x86_64_gnu-0.34.0
-	windows_x86_64_msvc-0.34.0
-"
-
-inherit cargo distutils-r1
-
-DESCRIPTION="Simple, modern file watching and code reload in Python"
-HOMEPAGE="
-	https://pypi.org/project/watchfiles/
-	https://github.com/samuelcolvin/watchfiles/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="MIT"
-# crates
-LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2"
-LICENSE+=" CC0-1.0 ISC MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-# enjoy Rust
-QA_FLAGS_IGNORED=".*/_rust_notify.*"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# fix version number
-	sed -i -e "/^version/s:0\.0\.0:${PV}:" Cargo.toml || die
-}
-
-python_test() {
-	rm -rf watchfiles || die
-	epytest
-}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 10d8083416c5..e6269bc18c31 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,3 +1,3 @@
 DIST wcmatch-8.4.1.gh.tar.gz 117065 BLAKE2B 6528170503507aa9742a0e0878f7cfe2586408471acde82ffbf1011fbf48cbed6a45d580436cb6a63a54a81d1c237544a48112eb4c06f923752eb09521d7f8a5 SHA512 6bc8d59b678a40e28eee7816f3b447fe3396f52e982df8e0b5e26472b4ffd1342f58edc41850386954783e6d07f1d66d9372cc1495f048b9a542b572b1d8e20f
-EBUILD wcmatch-8.4.1.ebuild 1276 BLAKE2B 87a3a18d93103b9bac5812a763d7a573988aac175fd2496786a1424dcfa58860ea9e058fff92fb9327ad0745877fe887066f064dc53ac2c1b280a0a8d43d2eeb SHA512 e2e5ae532e68e3caa6dfb72091f471a270f5e21f0bb7fd3c2024f6df79a1fbfca6da5ffb4a13f6c8bb42c7fa0f57f9c25b4ae7e74416a5228dc54e55717062aa
+EBUILD wcmatch-8.4.1.ebuild 1276 BLAKE2B 7583a319cda54473db0ec09992deee137ebddf110999874a710b3e1e7168fa3c253e4464c09f867da2a3c8c56049c4cd228710f9a28f29a45a85e55a325468c4 SHA512 5b10614ce5e5e7de7c67725dad3760e6e67445f15cb66bc0a093aad2ebc8f84cb059bb01e627c3a9636ba651fd6bb153dd6cfd3a016302787bdd4e5e44f1dca5
 MISC metadata.xml 3087 BLAKE2B c15652b6011b559ecaddfa76231050204a857839e3520dd77a626580d753225389f4484e22aadcd58e0e61558836655ae29adc01349484774b27142bd633a9b8 SHA512 68361ca29cbebb9a9fc9a456d485b64796b0fffc09201ff1c09e7ed913526923dca179c7e21b0420e50a55e53ab3bd01e6ecea204b38995c81cff36c49059f16
diff --git a/dev-python/wcmatch/wcmatch-8.4.1.ebuild b/dev-python/wcmatch/wcmatch-8.4.1.ebuild
index 7c604979306e..5ce47a994029 100644
--- a/dev-python/wcmatch/wcmatch-8.4.1.ebuild
+++ b/dev-python/wcmatch/wcmatch-8.4.1.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_USE_PEP517=hatchling
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
-	>=dev-python/mkdocs_pymdownx_material_extras-2.0
+	>=dev-python/mkdocs-pymdownx-material-extras-2.0
 	dev-python/mkdocs-material
 	dev-python/mkdocs-git-revision-date-localized-plugin
 	dev-python/mkdocs-minify-plugin
diff --git a/dev-python/y-py/Manifest b/dev-python/y-py/Manifest
index 8bd37f5400f6..ff7d53ed7b57 100644
--- a/dev-python/y-py/Manifest
+++ b/dev-python/y-py/Manifest
@@ -1,32 +1,24 @@
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST bumpalo-3.11.1.crate 81207 BLAKE2B ba76008fb5a975aca12b6f893779e18dd353a22a42cbbeecd5870622a7cbc0cd7e37036af600c570b8a55f26ea8d07f44a9aa1a8373d977b6f75bd4276730292 SHA512 70e90bee1fa4e783ff5a3b18f192b9347bafab7daaa907e74913a415a66c29acfb073fcfb46150801aa7649ab0d2ec8a610de239551565dd167bac72ab13a9bc
 DIST bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
-DIST indoc-1.0.7.crate 13716 BLAKE2B fe515fcf534a552feba188aea5d5da0febc123db24485eb887a3431592780fd468f6409167457c68a7ef6368fcad71c14fcd7922bf2de29794a341d7d4cbbf0b SHA512 b60e534953d600bc2de3d6951f9da67ca3ab3c78fdce3e9c5f91e544ca848aef0c22c35a26fe7a39c07bd916a79fdf496269fecfa5491a58e178f37b2965b348
 DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8
-DIST js-sys-0.3.60.crate 79257 BLAKE2B 714facdab00d567d074de4a25b69487400c23194d0f58ca784159483f9e02289acadce084b1514d8816cc9e0597800de82a5298b071b7df19a24df93541f23c1 SHA512 543dfd444539fad27bafcbbf112366f53d4ccf4bc63f8bb17820d818c3e1804656697ed6268a793f383ddf6b6227f7e9b3a11fb6fbb24e10732fdbd971801665
 DIST js-sys-0.3.61.crate 80158 BLAKE2B 07980db627a1f4f385586ad0609b5daf30d590931d2ca0c123f2d84f6c97be0ea935aaae3ccd082440c7e7da1adb4eccfd054a3598d99351fafdfa748f567b5b SHA512 f97bb546af2111fe072a23cbdc71e4fbfd39fbfc6be37132b306853d5737175d4c9c0c4661096012f7fce3612f81509e62a97df8bcb21d7cc796a8084e5b2e16
 DIST lib0-0.12.2.crate 19829 BLAKE2B 55df45984371f1a3ffb678f88297212832e88dede8d5f6af8bacad75045d83c5a724b020898fcbe937888e6763d0ed18262427eeac5a3b42cbb1dbb910cc216a SHA512 8632540e8760b41aebb6b43f7d29e2dbea9d5cf6c2beb66ecebbd56107378309db1d5550d6801420031eff6a7fd2fbfe7f98298bb6efe84d9242771a70ff4691
-DIST libc-0.2.138.crate 609081 BLAKE2B 210aa9a7ba99d69533946fb06c2ac6ca0714b3d4c0c5a80096e188f849319dc5509b3b41ec56aff7d1ee899378be2197fe9f8dc921500b11ea6cdc8b3b15df45 SHA512 986ccf0fcd18dd124fa6d3d89c3c7cfeca1046270a6a1b5c4addcdbc7f7f36216cb74094836ce8e97a9e331b97ed893d57daf39e919d24b001c4789a022f7761
 DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
-DIST once_cell-1.16.0.crate 32120 BLAKE2B 59bfc8a44f1fec72442e3d34bf4be3a5af073f854f07b3618b2857c759dca4a0fa6ba358514ae28c25d745b01bb7b390ffe9ed6e296d163fd3dd67e49092b87a SHA512 bc199570ee43bde9245a2c4637ae738e370ce9988635c8342349ceb6fb158f376247b69f9ec4ea0e6d76b934decdc77a524299ebde96c0a2c2d29d9501b9a568
 DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
-DIST parking_lot_core-0.9.5.crate 32396 BLAKE2B f793c855ed49476510c200d20895cd7f62e93dcb4fcadeff5528a8564f43e5e8d45f3857bac355b765d09753b554cb9af308a9a95add518d3325434ac67a6ca7 SHA512 1c430ffabfd33e8396178615829f6f623edc34d30393658b4cfaa263f4ae6e4101a9850333d3b54af058dc499bc66240a18041f31e920d5bc866d6bf66809378
 DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0
 DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
-DIST proc-macro2-1.0.47.crate 41955 BLAKE2B dbfc20b61443225130d08b05deeba56e63e76921e56359c9b0531798b18778d6ddcb56c3372fb6ccc68586a6c1dc725054f0e83f93e8623cb5ff6a7a2ed3dc83 SHA512 60c5d0dcbdee7ddab40664882d3cf5a868f7ea5b49ebab3b4419c3f325582b816625e73e0d1737bbd46bd7d765ece6c81c2ff4be894555d4b255f5cb9255e931
 DIST proc-macro2-1.0.51.crate 41804 BLAKE2B 579e5a157da81cd8350a6407603e5f8102bb9b6618ea8e81ced1692a6a6f4b57bec35aeb965b643f2542f65a3b9965fbbcf7e0ade35cf159270583d34665a628 SHA512 10ad77a5d05437c1b2c40a8f82389d081e64993171aa6259e8dca98d9afb04f5fb870f2037ad626a280d59c1a89fd4482bead701d744d6fb7c893bd9e78dfc1f
 DIST pyo3-0.16.6.crate 364587 BLAKE2B 935b3347770e1fba76f6aee6b4ddc41cf9cb13be77e76d2668985012776a119906403a8fe95ccd0e33b4630bd38936693d2fd1b7b3d11d84a4e53fca021a2f36 SHA512 fe297e4d171ecb5a965ce9f3a0527a086766ac5607ba7b59b2a3a8f6cc66da3959d93f1d6aa688d67ceebde41ac4adefce18c0d52c1b77d0cd95cf1178f52325
 DIST pyo3-build-config-0.16.6.crate 28891 BLAKE2B 26667482bf9f5b140daab9728f58965a8417e879bfeaf27d9c61f75502150557f3d5952bf52b1d16360ade2f58ed44f99e10a5781a6d241844e9202735c6625e SHA512 a015bb4c328f0d1e643d64831e029bbd66cbf635ab616533f35aefce59abf1c5d596099feaccb81bff02e863867c14f975ce6fc55bc05d99ea47b5f6fdc2da5d
 DIST pyo3-ffi-0.16.6.crate 60756 BLAKE2B 148e67de195577a1676c80be1a5538d80cf25b0d9eac9facfdcd223dc40484a9c3c7c84377f727e83e50118fa803591acc1d800b93adf29c91e6a15154c2856c SHA512 97c69900e2b355a002d10e48883cc8d4d9245d07f956087fb9c3b0ecfb9039c84c3f3a23f17caf28c637c4522f0fe252fbbb16b543825e4f724ee19232a34d22
 DIST pyo3-macros-0.16.6.crate 8453 BLAKE2B 518809b1236149f14b264d48f642e873aea2b22edb655cf4cf4d6307d2eeb7544228b80ca7559397d3483c837ae2ea9f772a26563d01a95613dad0a1a704c1e9 SHA512 95b6898da9974ef232b04197e47ea4e7d60de9f817da9a9995f07b05ca74965df2b2e8e8267d616b665b04ab810b93ca17255b20df89ac9c71014e5c9fd3a9f1
 DIST pyo3-macros-backend-0.16.6.crate 49252 BLAKE2B 9fc531507d4f9d0e7ed183987fbabd043f7c31afe6488c53c6100d98e75e5296e9ee7cc4eb14798967ac62e7d8c31d602eac5166699058def384e4f029a3cf0b SHA512 49d82cff8762eeb27d8220aa98b2be43f614445f156212d45abef052e347ba2f4a7930e7c5c8a9843ea895ac5c223afc6527d036a9cad00efff9bda18907b019
-DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1 SHA512 3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
@@ -36,49 +28,28 @@ DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST smallstr-0.2.0.crate 7521 BLAKE2B de85addbf6f23141a5797b7eb448fac2349f96801fc2f7faea66b21356723406d83e0c46d26198e0bfbd1df9bc4673f611d72f2a3ef222358a3d57fde1f7183e SHA512 88f835ccf1eb7a618d931f2234cab47eed32de67da31fde3dcd64495aeabf17daad83b9c6ef87c42267027e649eb6f5a880fdc7a1716addd3bbbd37315d39563
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
-DIST syn-1.0.105.crate 237549 BLAKE2B 14e3187e9e1300c3c62d47504d61f154d4f3f22284fd1a44a5149764eb5b8937d74783e42d48380e1a31920a9319e8e7af8a86e8e9e8bb46bee839964bc4029e SHA512 4e2475853587ec669d43890c88074c00c0fd45a84631f8a0b513f8eeeb78cacc297976121af9488419d2979b33579c5d2b782e18e3fd32dcee35227e767cae0d
 DIST syn-1.0.107.crate 237539 BLAKE2B 5a65968806c72fedf69638661f827a0426b9e49c2f9a5e5208f986105f8facca2bdf241f92f74bde790e9a0dd68240d4827a345a939c087364360e19a5cbeff3 SHA512 58132adb76643521a6a9cbc0316431318ac25f8517bba3cbb98e7e28ed536f9e24f643e898fa21a2f74cc8c1aeafaecf9b4199b23048c7be8c0bab2fe3aa7623
-DIST target-lexicon-0.12.5.crate 23224 BLAKE2B b1d31ec4ca5a529882b76a6a6bc8bbf978cfe8d7c9da0227879898ce1f2180e4d43225360bb4b4a7e9f3229ad1f4297b57c77d285c471c9c724759b0e987f6f0 SHA512 6df675ab1ebab2ff2844c3dfdaf58de3c340868ad9cd7b8c0d63d4fc9fa25e78027643d34c19b4634913c5294de7b330fb5a100984df58e4c943b3ab21ebfaca
 DIST target-lexicon-0.12.6.crate 24357 BLAKE2B 5d9aef958155bdc1b546b9940083cf81ba4c638525e2d46340e50c4274764b39ac19a12214f3ff64a6830524a2ecea9d555db3f07d5d7dbccd7dd809255c4499 SHA512 63ccc047d10ebff55c3b9be400e2deafcaba7beb28ee67bae6d5df58e7c08362b2c4e0004f6daa582928850701969015ad43714c7ad46df665474667ff4db58f
-DIST thiserror-1.0.37.crate 18752 BLAKE2B b8d792715cfdffccba72af132e414a6ef28f8e4dfc0608bea49bda1bde5b6acb13da24feaabf4467b8aeace9b6d90a97e2202f7d24bfb753cc4019c2243bda25 SHA512 07f0cf9da1bf1029d70c1b6f0c54bc41ed759214683f35cf6b321ec2d69173e3da0abf80a692115a1e4630400b1fbf462878053853fdc6026edb40f7e13be72e
 DIST thiserror-1.0.38.crate 18947 BLAKE2B fb81df34dba2958395ae360cbb14e2708e5a3cfa5cd0bd03c58f29c146d8afd8595a7ca1b30f1ed2a75ba140a55ba450fd4fd040aa1a1dccb0baf393b0e98d60 SHA512 95b8ca682b579834a04058f03ed0c994ccef426d75e0fcc28ee47151d343da25e8fe31f8157744d942aa54652115f477fc6037f91c581dbc127b829cc96476ce
-DIST thiserror-impl-1.0.37.crate 15428 BLAKE2B d91e9f058e1a2b722f604d9a399c0f291c5309299c4bc103427f8927ba41c9937c7e7cd4c0f394dfb9d96799be8a3d5b33f8e869045f58228a43354dead5117b SHA512 37d90875118fe45b51afa89dd0acfbe4d9852b899ad391b419b5181a92bda115cf5569ffef57caf6020964d5d847c2b1f191c99e2c0caf7d4166f531bd19f952
 DIST thiserror-impl-1.0.38.crate 15429 BLAKE2B 96202c256e970fe23f07b461d71430889e36d9f0e83608d001c6feb4e86f4a34047ce93617b27f89c6e2a5d6ad8702b9f64ac7e59bfee221677261fdfcb06e69 SHA512 628aa28404a181b384ac6a11a433829a5481d97face5bc1704349414f36e93440738122fca716fdf878719870d10e0cf8d495df6b1d40913e985c2824cbc3aba
-DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c
 DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd SHA512 ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86
-DIST unindent-0.1.10.crate 7703 BLAKE2B 75458d7f21ded1eca4bb3f7f55b2fa73bf92b2309316eca1b2ffaa0c9f8d7cd8c7851b96688f6597f4af6973f70e9053c2708c1228fa6a9784e41c778488c4b7 SHA512 46ff1a2c042972af2fe5958677b2fa5adf3b9edbb168bd66cc93baf9d1b128f583d9502b83f174b35866343b57a57c8a91a465eab267dddae919af24095bf6bd
 DIST unindent-0.1.11.crate 7700 BLAKE2B d4d1dde410c4194acb51f74f374cf11fa872e49fad8f5f24b596d72476403e5e312fedf7b0bcb1027384d53c8de565368d63c30eaf70a6e6cd958b82e5288ca3 SHA512 f800d6c37fe72477908c91457a738a73d2b8085bb5ae303d6d954405d6ccd98833b5da16a12c3ad1ab75d32a68dedc706dfaacc0fcbb95571dd829cdc03a356a
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST wasm-bindgen-0.2.83.crate 169618 BLAKE2B f6158596c80a0385bee0a05bd9cf0b3beee83a7958efb40244956b4fec2c83baa1a1b4605eb604f313db3508a7911c78f645acbb19f6fc93eef27e9f7f0ac109 SHA512 ec93d1334417d0329e113d5f2da7f16c0f1209d71e5cbd21a2dc9278d877e70ca2327ff7863b40505504883ed51d6bf20dda98c22ef44011a47c604a7b44e82d
 DIST wasm-bindgen-0.2.84.crate 172947 BLAKE2B 90c9b846bcea9d099a394b42f126990db82d1dcbe247f8b63f8c91cdfbb5e2d184d36daedaf8fcee58c34afe89bf9a30454063693d64806ead3427680a87e7af SHA512 20f8c9e4f8d81c66e34d9ca2b266fabaae30da9015d139cd4eba3f314c67c17cb562c6eec5127c41302c11c2f314237add2524a8b9a4d5346b8822a37e467b2d
-DIST wasm-bindgen-backend-0.2.83.crate 25620 BLAKE2B 3cbba20a2f5344c0ed2791de7b04ee294746606289ba83a9c139b53b56edf31eab8d3b3802cec309d5395e2404bbd75b7fab5d748a9961b36906fabeb0e66493 SHA512 dd1b65733e4d0a198d61a5287bb75db3e03ef738d2c2dcd3ce3e873c27d41c90cfcbb775ad40b2a546190db8d7213e5866f8e3f9913c28fe4b43a49054bfea44
 DIST wasm-bindgen-backend-0.2.84.crate 26344 BLAKE2B 5686a252082afe128ded295584d972fe4af11a30fe37a80e142d213eb2e4bca567182bfc5addf1571696bd12e68e029148cffaa9af088d1269a1201af72e64d1 SHA512 afb06e21d916cf1af137159ac86924fbee3a958ef73725bdf6bf205e15465857791070c721e0fc0164eb6e37d195bbb6a3f03661c81e1e5a9ab8502bc3704058
-DIST wasm-bindgen-macro-0.2.83.crate 12075 BLAKE2B 3b358ba7c2a3563840f54f11170cde78044a8f087659daa7c784fa252f5dd4b7f6200eba425d95b568e50fd43c04c32a509994ddaf5248120feaa67586402150 SHA512 eb83e06f998e858cf25494c1d171984269e72db798147d4d1d8aeeb25ea7a35c5986b882011e131968621742ceecff976430856b4e8b7d7fd7f1237767cf01b4
 DIST wasm-bindgen-macro-0.2.84.crate 12857 BLAKE2B 23ae9963cc2cf9bc589f5d77c8d3819aeb9d671f0bddd17093b2df096cc800d2130bd2a994b786a5f446e9194947199b3f0cdf1c16f15e7283a4ae319ca849a1 SHA512 23b69ff601c149909d81200bc2902018ec71efad8aec9cd84a0653025aaf852cc86d93e28c5f60144ba6ce5aeff04b90d23761e263e3783d45097316525d6f43
-DIST wasm-bindgen-macro-support-0.2.83.crate 18530 BLAKE2B f305c9fc1f7bba5bee65a1c76fc2216c98aa306a072286e1ced048ab191f49e7e4436bf2f67d4c1fff558f59b2cef5e9b40e9e940268128ab1ebeb3c64696107 SHA512 804014c75ae5f8c1c7f0fad3f3209887fa346d74029e5f6e1830e44f7318719e65c4a643c71d87cf388f131fd370af40d536bbc15fc11c25b91cb785f56a908b
 DIST wasm-bindgen-macro-support-0.2.84.crate 19076 BLAKE2B 4f779d7d0a406f376092ea8193851dbc86e9dbb822464db66a2022274665b03b9bf6552f79263014510cfaf4284847e98e8173263a6565f1af0c29054bd33fff SHA512 f2a8b6e0170dcea0d2f4a50361f036ad6604c499a89f0cf602578d0958d47c193aecebbd98e63310f592b08f8fe53da6c3d7a124b433ee384aa22371d9c963e5
-DIST wasm-bindgen-shared-0.2.83.crate 7194 BLAKE2B 4dd1cffea1edc98dcd4993bf6fdde8100fe00d1e97322ce8bc0bdefd0c659047c8c726e5da27b59fd7a6621c1e5385c18204e834c6c6fd1fb9de52f95b40e40d SHA512 2bfc1a068fa41a9ecacce7bda494fc0485c57ccb102c1d76c87a42e00ad30b944b0cb788642e8339d050a0e831ce8306844a77292ab9f79ed765b65cdb4765e7
 DIST wasm-bindgen-shared-0.2.84.crate 7219 BLAKE2B 4910158ed884dd9dbb32b1539b0c89a583f98df05cb29654487a26db063c973d44cb086dad4b466f9bc63104e3d4da72fe9feed32618f8243151dfb9ccfaff29 SHA512 fc4bf134a33c71852b91d09fbf1e1801e2b97b5c2756e2680d0c1f8701da30b22b56777d8e806e13602beb040775824966e378f7b9805e131a385e7816ddd010
-DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2 SHA512 b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354
 DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47
 DIST windows-targets-0.42.1.crate 5524 BLAKE2B 755cb6184733417763bb650fb0bd84bc757503aacbf0d91b811d42e9e8efda05434bbe5518006a88937a82a2a607605a9b609df4f34eb58674d09564667d95f3 SHA512 940c85f6214aa4da17787d3bbfe8d6107a9a7fe4f2e2fcf2b1634facf4619620ac2a7a835ebdd0f57970c992c459ba0a780e64e89945005b240c92563c42711a
-DIST windows_aarch64_gnullvm-0.42.0.crate 357917 BLAKE2B 58da715a46692ed786fa554338d446eaaa50c63ec1d4090cf0690a9211c0221034479e9066cad1c98234410519833826ae3163bf6724c3b06097d5b84d7b9fcf SHA512 8bd60142e8982ddb14dde4e93b9753f9ac34830c05c2a1dd4568377f9a928651bf9f026a0080e5bc7dfa62a45942376736954e3ac800855d00eef0c72929f338
 DIST windows_aarch64_gnullvm-0.42.1.crate 362795 BLAKE2B 722b45789bcd1d973803b327d44072fbf9c904d448e29ae9e56d2f9d1a3e9b64e06883e4bf5ebf141f1e924235858fd1472e07a744cc5b16a0a3a4fc8ec8f6d4 SHA512 51eb9fa7ea441a9fef590c12576a8bbef74932d40fafde8f9e3a28f2734ce5aee6dd5fa478fb3847443241c8c392bb4abbc6014c71260bf924431779f7184f73
-DIST windows_aarch64_msvc-0.42.0.crate 659424 BLAKE2B a8c9a288767756f2086bd0706774cdcce5c8639431ad76ed122d4b6d13c936ca8fb1a463d34835b3a2728f4444e2f4b91ee772f00c54f348094da69c05ce6b93 SHA512 20c0840adec84dde03b143e5b82bb0003fee675310487f0071a81ed7f40ee647c4018ccb9ebdbc4aeada717ec8600a30dfb15510c6b336f07becdb7167668fd0
 DIST windows_aarch64_msvc-0.42.1.crate 664655 BLAKE2B f4a060b802016a6d77a8ea6ac44c35dfec384acef9c45f932e2b6aca9d3ac48ae031f99e5b58f270d6020b8796e9dd06f7e8ffa7cc5610ea3f69181c2be7adc8 SHA512 f6412bae4b041201ef94e5a159ce90fd6b09816350204d4f573c1afdfb0a6d62d7887fbc2e416b40ec1d4478db521be492edf4703d87482d6d0006a51b827538
-DIST windows_i686_gnu-0.42.0.crate 728570 BLAKE2B b72079610b5c4fc798a79fa757b19f8c8baceaf7f4ce824193a65fadaac988ebdff1719a74d676b7dd017e11ceb029402bbac4e55c35206172e15a9bef422f78 SHA512 a24dd1ba5eb7d5231853bebadfde0575ae9071a565868d2f3d1bc6ec0a87380c569a621f0cba2552af7a1e46ac62f09f87cfbce3f674be06be1a7c1d3f421474
 DIST windows_i686_gnu-0.42.1.crate 733428 BLAKE2B c1ca24973aca06b255d9317735cca7a13f7f69293da52dad41df43a5cdf48aac3d40d8b6765cf564905fb71cb548308d757f01167efe7a61da7bd2e2a7080f0a SHA512 61c3271b07df1d4585c875d27cf1686c8f595dcbb79626e8d15ff47228f7b7a4556d3d994566ccceee0d6795a4c76767f85f4579282fc9eed731e04c7e193a57
-DIST windows_i686_msvc-0.42.0.crate 717477 BLAKE2B a37e068f45590f0c31349acbdb56848106d6de0e1f8030e6bd5e1e174bd9a46737db54fbd61de99054e5e8c5263eaef0508c440f43c39dca82baa77792ff2743 SHA512 740400e2b11c1d177f7f37f844cd2a0f84b97a5adb03a7656661deb026b593a799ace8da1f9013ba9f74446fc43260d01dff7d4be607129ec7d602f341b2b4d1
 DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360dab647a1fe525f0ae4b44e6842d93c5674d9f202e8bbca99a0d30ecf7d138af0c48eec8e69e08bf285db51e32bcf83a2c54 SHA512 8afa4f92cb7bd96d4fdbefbd8e7bcaa37dee52224d5d8b950c5a537d3bb805bf9781097b8bd44d96e8b62b1290e3a3020557502fa3b357a53df6fea36b318932
-DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed3004809244654268ee1bec17975166ca876dd393dcfe8a2ef0ca65d81b04c8f513f95a0fae9405ba796c085951bc2c597d252a3122f7dbf6425 SHA512 7df7ee0c345f0a2c37d7f9ec3a2824116b4d7a943bf245787509e67809a4f31ebb1862e212efb2d943d82ccef77a716437cdc61004396ca86e95e688368c6dae
 DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892
-DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf
 DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
-DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
-DIST y_py-0.5.5.tar.gz 50300 BLAKE2B e1719216577fa0baad2bc30e6d7840d66d78df9efeebe5ecac81aa0d51935aed62750394c1fe7eebdd9d9049ffa2e77dfddbda73b40e1c77dc23e53029a01f8f SHA512 af6ac11600cbded4324f50668a2f9db090714bc13aec34b1ad99bbda8f604e0d99b0bedc549971eede5fe2b7011cdd87cf3bfb7fdb3f4c0176441c67c32c5d8a
 DIST y_py-0.6.0.tar.gz 52897 BLAKE2B 2df6218e072e1bf78d830ded98733670dd9a3d6a3653ce97875ee9736393d119587f0dfc1a99217e14dc61c186f57e64200eae97defa4aa4bc6de0aef887bfa4 SHA512 6de1bc2845a3cbe72fc22c66e5f9c46001171583e6967b1dac9d53d531aff4f84beb7c4d55b64950507a127f092bbeb025af5633829b040c2dc6b450a876c90d
 DIST yrs-0.12.2.crate 7745097 BLAKE2B 756587548acf4cb7e6e7540dc7ecdcde47eeadda810409b7bdfd7665b118a47c6e0efd7186fb016f10700b74810a3cb22d6cd51f6c765b7692915306099ed144 SHA512 362a1e69e9c53ca544eda8432e94e7d10f67c6fec1b774f6ffbd76ad6523bc22f15502f468f7681c27cb4f45beb1839dd6d0e835e0e55313fbe076b793c7e253
-EBUILD y-py-0.5.5.ebuild 1833 BLAKE2B 60adc9048b2cab822007b2ceb932bdfb3160de7cafdffb12b9f1de83f3c37547ba70672bddc838c2de3b3fb8bc995550677817d22e097448e1db9c780db036f3 SHA512 01c1cbb1db3b771d67f6ff87a0fbbfc194feb3b1e2df9fb378a927a53eeabae6b1dfe028729621a588851886c03f860c656a3a5e69ea7a70b8491eba83fd9c3f
-EBUILD y-py-0.6.0.ebuild 1841 BLAKE2B 6d7be842fe1b12a4a31630edca8b7055b2ab3e657e145e3aafa36b7d1ded0be92b47248220d69a799228f4ee03d3cd6372c29fd87cf7fd42629c45c89aed0ed9 SHA512 391ad3438a5a1ebd6e004ba61aa6d7948d64ee37bafcc77c7cf345568593c26757f83e3153bb09bed11991b8889b7f182ddbf0f085efa6ef4db7e7a88d02c627
+EBUILD y-py-0.6.0.ebuild 1846 BLAKE2B f1b7ef391f9c824c1d05bcbf7192ab579bdd84a27c0aab77f5a9a34e5dfb7cb9b06529bc63d97f0cb53e68d97b64b9bb088483adabded0a6f29ecde5bc700833 SHA512 28bff0ea40d27271063c3fad0b8d0522c2e13377a563f548e2b836319499f94b04bb610413c238968e65f751feb18ea61ee35bf9df887be713ed22e5fbdd76b3
 MISC metadata.xml 370 BLAKE2B 49016eda86d4a650ac748df5f006f8718f68c2f6735494d6e68dab409fb23f2f2ef18b6a6f78ddca7b3f96e92ee1821888c214656981d1319409c098fbb82780 SHA512 fe544c96841b90c40d01e674ba77148a55b13b287e9182e519482a8402587972d9117cfd1d70fd9132618ae6cb5a704bc5ed67d38d7eaa18d2950ee4851b61fe
diff --git a/dev-python/y-py/y-py-0.5.5.ebuild b/dev-python/y-py/y-py-0.5.5.ebuild
deleted file mode 100644
index f77d52b7fc10..000000000000
--- a/dev-python/y-py/y-py-0.5.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{9..11} )
-
-CRATES="
-	autocfg-1.1.0
-	bitflags-1.3.2
-	bumpalo-3.11.1
-	cfg-if-1.0.0
-	getrandom-0.1.16
-	indoc-1.0.7
-	js-sys-0.3.60
-	lib0-0.12.2
-	libc-0.2.138
-	lock_api-0.4.9
-	log-0.4.17
-	once_cell-1.16.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.5
-	ppv-lite86-0.2.17
-	proc-macro2-1.0.47
-	pyo3-0.16.6
-	pyo3-build-config-0.16.6
-	pyo3-ffi-0.16.6
-	pyo3-macros-0.16.6
-	pyo3-macros-backend-0.16.6
-	quote-1.0.21
-	rand-0.7.3
-	rand_chacha-0.2.2
-	rand_core-0.5.1
-	rand_hc-0.2.0
-	redox_syscall-0.2.16
-	scopeguard-1.1.0
-	smallstr-0.2.0
-	smallvec-1.10.0
-	syn-1.0.105
-	target-lexicon-0.12.5
-	thiserror-1.0.37
-	thiserror-impl-1.0.37
-	unicode-ident-1.0.5
-	unindent-0.1.10
-	wasi-0.9.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.83
-	wasm-bindgen-backend-0.2.83
-	wasm-bindgen-macro-0.2.83
-	wasm-bindgen-macro-support-0.2.83
-	wasm-bindgen-shared-0.2.83
-	windows-sys-0.42.0
-	windows_aarch64_gnullvm-0.42.0
-	windows_aarch64_msvc-0.42.0
-	windows_i686_gnu-0.42.0
-	windows_i686_msvc-0.42.0
-	windows_x86_64_gnu-0.42.0
-	windows_x86_64_gnullvm-0.42.0
-	windows_x86_64_msvc-0.42.0
-	yrs-0.12.2
-"
-
-inherit cargo distutils-r1
-
-DESCRIPTION="Python bindings to y-crdt "
-HOMEPAGE="
-	https://pypi.org/project/y-py/
-	https://github.com/y-crdt/ypy
-"
-SRC_URI="
-	mirror://pypi/${PN::1}/${PN}/y_py-${PV}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-"
-S="${WORKDIR}/y_py-${PV}"
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="virtual/rust"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED=".*/y_py.cpython.*.so"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/furo dev-python/sphinx-autoapi
-
-src_unpack() {
-	cargo_src_unpack
-}
diff --git a/dev-python/y-py/y-py-0.6.0.ebuild b/dev-python/y-py/y-py-0.6.0.ebuild
index 466b0a6e4fe0..cc54b8be1df7 100644
--- a/dev-python/y-py/y-py-0.6.0.ebuild
+++ b/dev-python/y-py/y-py-0.6.0.ebuild
@@ -79,7 +79,7 @@ LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	virtual/rust
diff --git a/dev-python/yamlpath/Manifest b/dev-python/yamlpath/Manifest
index a9f4cf98e9f1..220cbf1f3b80 100644
--- a/dev-python/yamlpath/Manifest
+++ b/dev-python/yamlpath/Manifest
@@ -1,5 +1,3 @@
-DIST yamlpath-3.7.0.gh.tar.gz 224352 BLAKE2B 9a5483847fa765c3f06a4746b6c364ba66657f739383f0eeaac4f639bf44762bf1d3b7c468ec376d2d8d8bc6669daa60512f2202de6ec3407a5dd674d022f50e SHA512 d0ca007065f5efdc7c876d9596b37028881c4b3782f478f4dd87525cc6e316005bf23b930ea723bf524bc455c492c9eb07c50ccfc9333d9d794f110fa63dd268
 DIST yamlpath-3.8.0.gh.tar.gz 227377 BLAKE2B 9a722a6f637144a8085c7b71c8ac0c966d2ff7eda7b7136614db06406024c21cdbf6b30d3a5cc7b78ba8e268d406c0db15f15130098b680a1ce36a6eb8d31b9c SHA512 8a91c1519a7a93b099c77d2f850dc775c0ca8147d3ea4eb96408bb3f53a102301c6a9b6d1c5c47580a59f701e8316ff49e27d4643c21c8bc87fb337e6982e91f
-EBUILD yamlpath-3.7.0.ebuild 1120 BLAKE2B 135fc3c69e2bae9de6765cbe95459d80dc3f47863802c57a0190e7138613f9fd45f73a3994678cfae9c2a9338008d6a815c2fafb1c7cb9c2edc01449c7a1f2f7 SHA512 5ac6f83b72c71088f2baf503b595fdf13c6e460cbc0a020ab50279ae3205b1e165b581601002c0204e9d84cc3f682f05d45037d3afd225efedd58e6541f61bc7
 EBUILD yamlpath-3.8.0.ebuild 1120 BLAKE2B 135fc3c69e2bae9de6765cbe95459d80dc3f47863802c57a0190e7138613f9fd45f73a3994678cfae9c2a9338008d6a815c2fafb1c7cb9c2edc01449c7a1f2f7 SHA512 5ac6f83b72c71088f2baf503b595fdf13c6e460cbc0a020ab50279ae3205b1e165b581601002c0204e9d84cc3f682f05d45037d3afd225efedd58e6541f61bc7
 MISC metadata.xml 664 BLAKE2B cdf919f6a46dbc7ed8f2546509a623e0e784da711afaade20ec79b2861e8c83f54f755ce68ec2944bd0edb92f2e05b18a9c0ff93430c185574c41de2d789e03d SHA512 8020ca58f464e2aed71c01c29375b95dda238be6cdb94468a0abe50c7ce0270a42d723318f34cb4eb8728184cbe6769c7e666f43cffde37e6e9f42cab4d7292e
diff --git a/dev-python/yamlpath/yamlpath-3.7.0.ebuild b/dev-python/yamlpath/yamlpath-3.7.0.ebuild
deleted file mode 100644
index ad955b668138..000000000000
--- a/dev-python/yamlpath/yamlpath-3.7.0.ebuild
+++ /dev/null
@@ -1,54 +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="Command-line processors for YAML/JSON/Compatible data"
-HOMEPAGE="
-	https://github.com/wwkimball/yamlpath/
-	https://github.com/wwkimball/yamlpath/wiki
-"
-SRC_URI="
-	https://github.com/wwkimball/yamlpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/ruamel\.yaml/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if ! has_version "dev-ruby/hiera-eyaml"; then
-		EPYTEST_DESELECT+=(
-			tests/test_commands_eyaml_rotate_keys.py
-			tests/test_commands_yaml_merge.py::Test_commands_yaml_merge::test_yaml_syntax_error
-			tests/test_commands_yaml_paths.py::Test_yaml_paths::test_search_encrypted_values
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/ypy-websocket/Manifest b/dev-python/ypy-websocket/Manifest
index c20940f8b03e..4c1e561ee0a6 100644
--- a/dev-python/ypy-websocket/Manifest
+++ b/dev-python/ypy-websocket/Manifest
@@ -1,5 +1,5 @@
 DIST ypy-websocket-0.8.4.gh.tar.gz 13416 BLAKE2B 9dd988d6eceb624bae2385180c408971a776f06324407506886c2ef5b8e713277a4c4fb0a2d328a20695d4db8808997c125bfb48faa60c93fe38bb1a1e899766 SHA512 20794b182bbf3958df9f3097ab8c4657acef1ca294c751e0524bc5a36cd7b7a6a2766ae9295cd5f9fc31070813d5b56e0e1e25e22931f63171f88b4757bb1584
 DIST ypy-websocket-0.9.0.gh.tar.gz 13677 BLAKE2B 663cf37af7ddddc1bf208da05bc92fc36d866b1a1f86eb2ae1d8362b023db95b68085b5d9eb35b5f34e106f41a819249db6a3d5d102f1c6a5bf04828d2a9cfc7 SHA512 5a193285fafc206de116e087ba10f37ee6e7238968d9c3e88537e054fd8c2238f9bf55c2b2dcb5871b8af9b080caba912a3526e124c33ea3156f19621312cdb4
-EBUILD ypy-websocket-0.8.4.ebuild 874 BLAKE2B 0b6e5033b6dfa0db728f8770cfc8ff8af14ccd435c6f484033b8c3be13fa79e5d94bec4f9080f04c1aafa7a3235aeb3dab3812aaa3e4ae1683e37190dc1090f3 SHA512 07b87293c9373232601e08dd744346f14d489e76f6b1f90278020a2ca65ee215af3bbd47bfff4530940c11fa6906a1ea2251ebb7430cfb5a883d25411a5db604
-EBUILD ypy-websocket-0.9.0.ebuild 1099 BLAKE2B c4f41487e2e7674ea8ed39cb5da6ddaeb271649a0e631ad736824d89e28ce43ee480105306139f84106b250f79b952439f9288e41b77187ebd87bb6dfac6a550 SHA512 5b9beea8e330231eb18be1c08a867512de43d2c06d9cca1bc26955ed4f7a9f1b195f02cd2f074d38029fa61cfc1b7d7f8e93020490d201e1d484110af92ecd61
+EBUILD ypy-websocket-0.8.4.ebuild 879 BLAKE2B fe80cd47734c258da8d959c48ec9bba22f9ce10e2c091c181247b8e4e3664499cce764acbd0b61c149923a6f090bb542ce08662c8433aca7875f2927948eb6c2 SHA512 bfe1656fe6aec60315f1d3037252efbb69b7016ef1a99e48eab316325a1bba26b7a6edf469637af4831689094b1acfd87c8e5260c758fba5247339996f53957d
+EBUILD ypy-websocket-0.9.0.ebuild 1104 BLAKE2B 4d3d27bd15946c0aedd0b32a7023977fb308f615446906745e72cbea1f75e84a5d7f6f31a4058f029f2b3e901e066ff1318212ab39d6a8f04281255a5b2aedb0 SHA512 32f38d19e9f1088f4008ea4efc997bfd5af3b4639ac2ffb0fd129010af1555086512f7f411784d6174ec3f361c41e3d30793dd04c7192f173ffd0123a238456b
 MISC metadata.xml 414 BLAKE2B a58b2ac27d2f9e1a1d06c8fd9dcb6f9d1654fd2665d6d676a734ba228b71f6da488b835b7cb5739a6acad7102a669356e8f872bc96ce40b6ab0104699f8a7379 SHA512 533c2d5a8363cc5575d8ee08a3642f8b6fd11311fdef7d6902cc5e19fb33512ca2d9a6ecde76e909a6192a48449d612bb2b6db7b96ad1d99a89d67b06b749d76
diff --git a/dev-python/ypy-websocket/ypy-websocket-0.8.4.ebuild b/dev-python/ypy-websocket/ypy-websocket-0.8.4.ebuild
index 4394429329a1..7fb01fdeafed 100644
--- a/dev-python/ypy-websocket/ypy-websocket-0.8.4.ebuild
+++ b/dev-python/ypy-websocket/ypy-websocket-0.8.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	<dev-python/aiofiles-23[${PYTHON_USEDEP}]
diff --git a/dev-python/ypy-websocket/ypy-websocket-0.9.0.ebuild b/dev-python/ypy-websocket/ypy-websocket-0.9.0.ebuild
index f068e06e1ea7..d5ae3bec2235 100644
--- a/dev-python/ypy-websocket/ypy-websocket-0.9.0.ebuild
+++ b/dev-python/ypy-websocket/ypy-websocket-0.9.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	<dev-python/anyio-4[${PYTHON_USEDEP}]
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index ca54300e9a8a..37ecd2890da0 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -4,10 +4,12 @@ DIST python-zeroconf-0.51.0.gh.tar.gz 152236 BLAKE2B 2339bd47e4f8abecb5b56c722e2
 DIST zeroconf-0.53.0.tar.gz 138658 BLAKE2B 9a0af4a08a51d8b39d6eac30a1ad92d5e7c14bdaa3a7d8b57b3664c91c0c740af6f08c3bbe1d5ffb4a950e4cc1bec12b9426b595f76232d48510dd5df25c1b57 SHA512 9309b385a1acdcdb7d2812e0b554373fc2a5324f804636cf32449aa158ac629387f670c1770bce5e11245f9e482a6bb379f7e3cbf935a1977fca8158181163d5
 DIST zeroconf-0.54.0.tar.gz 139937 BLAKE2B ef8e8ad309a73bd725ad1aa8af54dd14d338f68c5f23643a45cd88a2e8ec8a64b6c589ec0d00a341769003e858554da0edac49722d81c92ec36638cfe4d8d0e2 SHA512 ac2f2c76e8d551102919ae27dcbcdaea80e4ec1b0514edab7d9776feb20466933669590af5f9de90395df909c371a6d30cc086daa8861464ba51f2aafd3a0592
 DIST zeroconf-0.55.0.tar.gz 140032 BLAKE2B 02de3a67e687d2fca36983fcabb1a781c81b2bd67f58497d9e1c847c0411987303dc5a20133dfa5332e660a59c27264001d884248996964e1706703c08b2df15 SHA512 79e263828d66f5110837e3a38eec595375fcd4b7f07272e1f22c00970b343781064ebcf6faf3f488c8326b6e455359ef53f990c9152149520bea5f1dee4c834d
+DIST zeroconf-0.56.0.tar.gz 140060 BLAKE2B 3199ebb995754f4c7a2b4881564664d95d2483f6307cd898ec1beb7e12fed0bc3ce501a0f4732a3f1e019db1641d08804d2f38ad769277c95a41b8c266860126 SHA512 8ba2cabc58ae5586b6e89f2771e4483a488bf4ef5201fe8684befc2930d34f96f5fd07040da7ec850f9450b2166ad22ef571821a56e33222cf5708c11f5f4aba
 EBUILD zeroconf-0.47.3.ebuild 1714 BLAKE2B d5a5092327d4de61e1bec37c6d963030c5703ed4fe3360ab91f42133456367390bc547fb8f591512d86093078f2a279b16fcbbaff49252b6589498c55ac805b3 SHA512 1d6fc8b09de6aa52049ae8bffa2cde9d5a1299495b8af075805059d55c1a09d206b8cc161fc32728cb3cfcfbff4757f28baac6ced0ab3cad3dab7f88acec9fde
 EBUILD zeroconf-0.47.4.ebuild 1716 BLAKE2B d8ab5caed8f2a6af3e2d2de5a1e57d4a9a1feb1406b2d9e3f2c33aca8d32c1bd5d1ec157525de42c134c78f657f60b657497ce1225ae8daafca7e51e570a49df SHA512 9a319e0420919cd2220f727decbfe3ccc04e7fdd9a1e7afb64e4dad04ca7550fd64a5f08f33b20cc022b9dae248d45d233c6a3e97ce0d7c329238932f608cd9d
 EBUILD zeroconf-0.51.0.ebuild 1716 BLAKE2B d8ab5caed8f2a6af3e2d2de5a1e57d4a9a1feb1406b2d9e3f2c33aca8d32c1bd5d1ec157525de42c134c78f657f60b657497ce1225ae8daafca7e51e570a49df SHA512 9a319e0420919cd2220f727decbfe3ccc04e7fdd9a1e7afb64e4dad04ca7550fd64a5f08f33b20cc022b9dae248d45d233c6a3e97ce0d7c329238932f608cd9d
 EBUILD zeroconf-0.53.0.ebuild 1565 BLAKE2B 0f7d4a9fbd5f7975ab67b763d3fa31ed9a93eb89fd3df81e45b31c6d4a589a000ee7b5981b6247d2d07d94f8e7bea6928ca4eba9de8d8cba2d0b6f97b93dd6af SHA512 2249906f572d4bdf4d9a1a1723428e0a6ddcb053df65f7bdcdca46bcc65eaa63d5bd3637c8eb051d11f46e07ba577949e2f9658ad631dcf98b81ce78bf7afa1a
 EBUILD zeroconf-0.54.0.ebuild 1565 BLAKE2B 0f7d4a9fbd5f7975ab67b763d3fa31ed9a93eb89fd3df81e45b31c6d4a589a000ee7b5981b6247d2d07d94f8e7bea6928ca4eba9de8d8cba2d0b6f97b93dd6af SHA512 2249906f572d4bdf4d9a1a1723428e0a6ddcb053df65f7bdcdca46bcc65eaa63d5bd3637c8eb051d11f46e07ba577949e2f9658ad631dcf98b81ce78bf7afa1a
 EBUILD zeroconf-0.55.0.ebuild 1565 BLAKE2B 0f7d4a9fbd5f7975ab67b763d3fa31ed9a93eb89fd3df81e45b31c6d4a589a000ee7b5981b6247d2d07d94f8e7bea6928ca4eba9de8d8cba2d0b6f97b93dd6af SHA512 2249906f572d4bdf4d9a1a1723428e0a6ddcb053df65f7bdcdca46bcc65eaa63d5bd3637c8eb051d11f46e07ba577949e2f9658ad631dcf98b81ce78bf7afa1a
+EBUILD zeroconf-0.56.0.ebuild 1565 BLAKE2B 0f7d4a9fbd5f7975ab67b763d3fa31ed9a93eb89fd3df81e45b31c6d4a589a000ee7b5981b6247d2d07d94f8e7bea6928ca4eba9de8d8cba2d0b6f97b93dd6af SHA512 2249906f572d4bdf4d9a1a1723428e0a6ddcb053df65f7bdcdca46bcc65eaa63d5bd3637c8eb051d11f46e07ba577949e2f9658ad631dcf98b81ce78bf7afa1a
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/zeroconf/zeroconf-0.56.0.ebuild b/dev-python/zeroconf/zeroconf-0.56.0.ebuild
new file mode 100644
index 000000000000..18c772b8a425
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.56.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.{9..10})
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+BDEPEND="
+	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+		tests/test_core.py::Framework::test_launch_and_close_v4_v6
+		tests/test_core.py::Framework::test_launch_and_close_v6_only
+		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 1c4db5af1114..f1558bd35e1b 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/ammeter/Manifest b/dev-ruby/ammeter/Manifest
index 65744a2b9795..d44cf3b594f7 100644
--- a/dev-ruby/ammeter/Manifest
+++ b/dev-ruby/ammeter/Manifest
@@ -1,3 +1,4 @@
 DIST ammeter-1.1.5.gem 19968 BLAKE2B e4a7af65c8ee798b24f0c8a312315461779f5e1c31d97da1663d73b1a9cc65b99ed9f693259eed01a4152ab220d34ddb91ee4632657035fc1768897fae60d60e SHA512 35758fccaa51c9873747f24710168bdc0a0b25bd825d15e434cd17341d07f73a5078293d5045dcf88061765e92fe08f9b2470b4f206d859e82ec7befe64c1d93
+EBUILD ammeter-1.1.5-r1.ebuild 1486 BLAKE2B 2672feaa5cf1f8451fa4c3ef417ff089820a32638fa34869e94c40b07666a16d506ef02e7b8eda7b95445f90df9fe70827f60171478c0e2fe7eb14efd70e8876 SHA512 0c1694f03ba0e76d43bd949be29e36cc4031549a4be61460f3727f4b17e8e5cdd25d8c36867e5f53828f2483f3130a05f648a0d1d31ce4f7c123e44816c99ac4
 EBUILD ammeter-1.1.5.ebuild 1486 BLAKE2B 17cb67fcb79df9644d47327ab65d8ade0864daa8cb52e4fbe3f70bb55911d66b04bbba7813ef368a2432590175a856fa861bfe08431c0834ccecda4961effe94 SHA512 6767fa1d1018b11a634847e067febc832aaa1406604fd1e56ed62ee5f5ff83bd290758bc1fa9401c009ebee794281113de13a7596229d741b893be5a9d8e2c39
 MISC metadata.xml 349 BLAKE2B f63971308267e22a747000a625bd7ced372e06a7599054445fc99e8e6157e02e9d95582d7006c14f232158f0bd401e6e78bad557ff8b5e2e0e9d85a833ce7c12 SHA512 732175dba3196bb0de8b66c2ae96010de71c49ab7080e4eb5e25d05fbd447ffe61d31ca68a83e918acd9cde0fcc000fb54c1488ed36363792a2bda68332332d6
diff --git a/dev-ruby/ammeter/ammeter-1.1.5-r1.ebuild b/dev-ruby/ammeter/ammeter-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..dfe1f090e843
--- /dev/null
+++ b/dev-ruby/ammeter/ammeter-1.1.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Write specs for your Rails 3+ generators"
+HOMEPAGE="https://github.com/alexrothenberg/ammeter"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/railties-3.0:*
+	>=dev-ruby/rspec-rails-2.2:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rails-4.0
+		>=dev-ruby/uglifier-1.3
+		>=dev-ruby/rake-0.10
+		>=dev-ruby/coffee-rails-4.0
+		>=dev-ruby/sass-rails-4.0
+		>=dev-ruby/jquery-rails-3.0
+		dev-util/cucumber
+		dev-util/aruba
+		dev-ruby/sqlite3
+		dev-ruby/bundler
+	)"
+
+all_ruby_prepare() {
+	# fix the gemspec; we remove the version dependencies from there, as
+	# it requires _older_ versions of its dependencies.. it doesn't
+	# really seem to be the case though. Also remove the references to
+	# git ls-files to avoid calling it.
+	sed -i \
+		-e '/git ls-files/d' \
+		-e '/\(cucumber\|aruba\)/s:,.*$::' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# haml-rails is not packaged
+	sed -i -e '/haml-rails/d' ${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
+	rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=">=4" ${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index 624cc768e006..078c5afaf633 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,3 +1,3 @@
 DIST asciidoctor-diagram-2.0.5.tar.gz 12482984 BLAKE2B b0ef8596d2f2dfcf11fcbba876141aee38e8615195159f76e07b45c00b46bd85824dd6e8e9f571b396bbd9d082c5d60d4e05cdeac27719bfca53216c0d1b1816 SHA512 7e3bfbfb08d7389a039b1727bc173fca82e05134bebd89f3ca65d5e7860555034ff5e785c32e55ea2cc9826343456c6ecdfa15fc76f4d94858461356ab3ced71
-EBUILD asciidoctor-diagram-2.0.5-r1.ebuild 1212 BLAKE2B dda6c30d4bc71ca1eae8d859a88abf888bafa563ff806434f21edc3ac20bd44937fd09045093b12e0ea7210dab6dbde014a9516b689b810668adc1cba94ecf32 SHA512 d559d6501b8345ba30a3b9d6fdc94c7f7e2f5b83cd06b564ae45a1e028c59c9994533e8b088fbc64489f45dbbc22d4958cdfbc4234e53b3164dfed98eb927539
+EBUILD asciidoctor-diagram-2.0.5-r1.ebuild 1219 BLAKE2B 61342fe4386b43966a3086a568023278129be9270502cacb70bb7a4ca77dd57c623f8fc6a6f96a9ed5788d66ff53e6249c7b299d6df1a0c6744174ea6251441e SHA512 57bde827d63c7f7b9cf29e914491f81d75fb3af96740faff7f94f5d275893259fdb6a4705ea79e3fb43b202732e7f45c826d4cb2702d8b0f3022896bbcc459eb
 MISC metadata.xml 358 BLAKE2B 0a7ccfa951823c5c42d8ce280483f15e73abaf453c24b79b68bce29717bb3ae4e4656f40d7bc320479e65d8942bf43cb4abca9b9d916d2c27275880ef2034367 SHA512 4cb3cea3081700e1eb920452d2408fbf7ef730232e2979edc057c10b1ff879d14d97914765c644fc8d055c5705b8bb16b2a9651001733b102b8a05a1e72e1cdb
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
index 4bb70f45918d..e410dc816a2a 100644
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 3b0d6f5bac2d..318dd4bed2d6 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,5 +1,3 @@
 DIST autoprefixer-rails-10.4.13.0.tar.gz 1386370 BLAKE2B a96eb20ebb940a63abf22819e7b2c1727816e4e70cffff5fce3f84c09b783c7f6aac3d6af2483670bbacf4e8032e71f8b144bdc41846464935dbf57fa23d98f5 SHA512 698e8f91875d7fe73d4843cd4dda65b695e3654b9bbf02070a0fd4d61ebf9fb00aaffa8ce63b738dc5d345c5536c79fa985adfa779f47d57412c791e3388cc97
-DIST autoprefixer-rails-10.4.7.0.tar.gz 1372138 BLAKE2B 5d4ad1cb82fc0e82557232fc1a050f87fc2758967c21e2e566049686efec41b599e3cf7e2b432d164c6a29c2463ab3c695703878c23188ee97a46e5aff6a26a2 SHA512 c1d3a1200c05a3b1219716058eb28babef4bc26eaca1ebdc09a901709435f25f097d3c39398a07283a75ed37b30a45398fbe31095e649f6d94fdc6de2346aad6
 EBUILD autoprefixer-rails-10.4.13.0.ebuild 1026 BLAKE2B f98dd22e61471cea6aff6c0231b91816ce5796a27c1e95aee010abf41e01ec5b9bfdcd1b734d1bb4931913106817117363107aec98d87a3266faa00c93d6f809 SHA512 ce122ad5882101312acfbf32140d68d60d4f026736a451a76b0c6af1c5e59fd46c7dfbcfc9341310587959d8b9a38b6be90c01a040f1d890939325547c566df5
-EBUILD autoprefixer-rails-10.4.7.0.ebuild 1026 BLAKE2B 99a8f87c0f21b1b49e16c5eb549f1d9d41120ddf560173e14d738fd726a12fa91bdca509a0ede02d895203bee5f03e9efce0655f787942ad6f81459b05d57395 SHA512 ca8009be6ac6f55130340b88d8da1c811ec5d4c65771f6291b9da7f471bd224f7322f26fa97f66e5eb622a6e8617fb4904137d3c5305745965b7804ac46be8fe
 MISC metadata.xml 348 BLAKE2B 12e9c7a355924818b5a7325556728b401a1f54ebc3482f9087ed959976038fcc946d976b2a664440cee124fe0962c476c0c1fb34946b040fbe5cbabcd9d63f78 SHA512 cf6112194ed7aa00fbda32165cc0829d338d86cbba4d099147b5b21531a1f6a5acec58647a0960ac9c5540086c1c2ea14a4e8aadb4eb5482431f68b3116ef6e6
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild
deleted file mode 100644
index eda88a78ea79..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-DEPEND+="test? ( net-libs/nodejs )"
-
-ruby_add_rdepend "dev-ruby/execjs"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-	dev-ruby/sprockets-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/ s:^:#:" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/bindata/Manifest b/dev-ruby/bindata/Manifest
index 0de5ca85b679..6d97127652a0 100644
--- a/dev-ruby/bindata/Manifest
+++ b/dev-ruby/bindata/Manifest
@@ -1,7 +1,5 @@
-DIST bindata-2.4.10.gem 80384 BLAKE2B a95f607771cbee45e65748ff8f09a87f2fa5b1462f311a0630b4202ec99d2c20815e0ea2e451c52583e5964f29189a56a63e1a03a6193d23125d1720beccbb4f SHA512 4f3fee967fd27e5f69bcf0126582191579ff36786f9841e31253de6d5de9de21c81b71e4efbdf5a9c5d8585a8404e2064bd378feae0a9a5cc9bd3664846ea423
 DIST bindata-2.4.14.gem 80896 BLAKE2B f01cdd12a66ddb9c94a583d0629d4e9ad7fef8dda36ad0267d9a0eddf505f0c68127a8c1add0bc3450e66185eeb58fd8cad8aea57d06f147f81ace5a22d77ae5 SHA512 5aa18d10c9a05c6b41845e258925fbd5bcbdd1cbcbf2c581dde2212f226437c032c4158835dca9881aaeff94a52b803c6294fda35a7afadadc76829875c3e9b0
 DIST bindata-2.4.15.gem 80384 BLAKE2B e874f396d1ac7902db0fadca4b2d75da3af6ef553d84cea07a7fefa2fcba46d383c4c4b1ec0db8e744675253fd86dc5e9a287b3834616286a08f1e5605711443 SHA512 366b9de24ce6276832f0ea9c76cad70b433aa1f7f29839a1317b0fe2582f9c91d16ea90d74da7364d94f088b53ada2597b0e25cee859487657af4db20efed930
-EBUILD bindata-2.4.10.ebuild 490 BLAKE2B 28ac678cef4db8d8812769d5988c1d383deccfc89433509d932ad3d533c710ca685894e994f6b11fc1e0441adc2ab5b63821dc9921a2a2bfcf9fa7e6433272c0 SHA512 f5d4a9e5005c4a03cc8f9a0c492efd29584055bada9b99f41274b8ceeef3a4cc8ef779f5c15cfb50a03b43ea76b1b2581a75f9e7e8f59d3df8b8c1ee49be7b1d
 EBUILD bindata-2.4.14.ebuild 490 BLAKE2B 3cf1b44d7ca77fd8c280508f6ddc666e59247dac3d70147ee6a469a24afdddba937bb205b917052eeced1a5e298d624dcd9edf9164eaa6b0da8b4fb0140de4ad SHA512 67e1fe1d39f3cb7186fa768e5ee33cb373929d6b98547dc49e7eefbfd66aa16d3679f1396a1d36a0ca81d0375efc5c5c971db9ea7457d1f12e2edad890bcc465
 EBUILD bindata-2.4.15.ebuild 497 BLAKE2B 3d372e170d85b7507fc90369cc10b9e6aba99d6ddad3ffaacf20eebbd4d60482ce816a7f0061ee0c5e53b9e943c74e53e573e1549c07d24542c46d866fcefa6f SHA512 828a1706cf7b3690f5935709d102a4d17218ea5f849edeb01a42c02700051bc9126aa5c1f484d2f353c152630f844f8f71c0bfa7e354e5b864c2978a103a0100
 MISC metadata.xml 328 BLAKE2B 299726a22f84a94b8e3d3553fdc543194137d10020fc67fb8145f50c7f10ddfe825ba9b22f20ab09f815646cd152de7c3027e9090f902356a75ba11f12033fa5 SHA512 f8257e5b1e928c6801226e7be3e0fa6ea015e447f9b0bd10ea88830e6c98222f3d1fad55d92b7eec622886d2eff4d566e0f5f0e3d2d677d1f1dfb989a6846603
diff --git a/dev-ruby/bindata/bindata-2.4.10.ebuild b/dev-ruby/bindata/bindata-2.4.10.ebuild
deleted file mode 100644
index 2f797ad91789..000000000000
--- a/dev-ruby/bindata/bindata-2.4.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parsing Binary Data in Ruby"
-HOMEPAGE="https://github.com/dmendel/bindata"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/[Cc]overalls/d' test/test_helper.rb || die
-}
diff --git a/dev-ruby/bundler-audit/Manifest b/dev-ruby/bundler-audit/Manifest
index ed3663d64a5f..7d79b89cafd5 100644
--- a/dev-ruby/bundler-audit/Manifest
+++ b/dev-ruby/bundler-audit/Manifest
@@ -1,5 +1,3 @@
-DIST bundler-audit-0.9.0.1.gem 48128 BLAKE2B 33afa1a7df1cecd0a0c3f155dc631fd1ce25aaa587b5dbe9042ef2983742dbb755914d9c598c832e9b9ca10dc2838bea632f3c79c2fa88a24121cc72787cf93f SHA512 248f7e6b8c7446ff0906d9be6c7bb946f901465dbff079d87aec55ff65a6a7b2e76df600d5d5d1704fd03deec7461cbe3c097bdd4f2d93ebd63c7d1dbf13ae43
 DIST bundler-audit-0.9.1.gem 49152 BLAKE2B a4942a84e8b39b6087960a2c611d5473e41076587a020aadae982c9096f91b0681f312bdbc00d73db1ba034d65e05c970532246deebd4119911ed6abfc6655d6 SHA512 86060dd95669e358d7267799b48a179469fa8aec6d97ce3d3316c974be7aa4652958ad72e5302770e3dd372026bc1054438877f1741a82a63ac6fb0fc14628f0
-EBUILD bundler-audit-0.9.0.1.ebuild 1215 BLAKE2B 93baa73ac44a5f9e8dd9f8f511bd0bad511abd7c0f9d9922b32b1532bddf8b9a92b1b068a59881ab8f64640dba343ad6bad6abb3f64b4cef1b7ea31db7c2f169 SHA512 02b0b1c403c04cc152a841440235be7e2ec136fb5958c3885d619e893c9d69296b849b924060bb6d5bcd0e8070af7e9a9fdda07d46f523c302b8bb6ff7e3e579
-EBUILD bundler-audit-0.9.1.ebuild 1000 BLAKE2B f23f001246fec86ff28c001119ca6f60fe69f49a2109f87c9dc12d252fe6cdc9e177d28ca63d162a8f2d8e6c8eb553c5d86176e81f8ee69df5bc75a9f19c7b4c SHA512 024d6fa323d0e3f930670cab0b9cc9975e3a4012b6e1d7399e3d26991fbb2ec473579eb3571686205fb161f8dd318f7c941dfc4c9485c420b58603c8594c4b91
+EBUILD bundler-audit-0.9.1.ebuild 1007 BLAKE2B a8176145b72cbc31581cc126d6fe0939914c2129205e6e3f6a73906e45d73cb1c9ae61f47b9b88198d208c00de2767c9b18544a5e850196d63367df2e5f9a770 SHA512 e0039e4d351f3043c59d131fb5e15e2687b339edc9402d39cf649bded06d97d3d788f8af71a76e637ddbcacca4cdc8696b8f6dc38fa830659f18a4cee23b7228
 MISC metadata.xml 338 BLAKE2B ace789d7488589dc1b89c611be2203930260f5062fb29b72c06feef97f3bce137450c2c3196653fcb5dc6d0e52ff0ab21e8d0989324d5a79be181fd1d8e6ad82 SHA512 0b42bf0312a05f3b85da7d9e02d47432ade81bf81047c760679df050d23e6b41f5a4424372d2298a054e62f3cb4f1712712411b99c351b16112d607ff1803740
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.9.0.1.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.9.0.1.ebuild
deleted file mode 100644
index 34c66400cad6..000000000000
--- a/dev-ruby/bundler-audit/bundler-audit-0.9.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides patch-level verification for Bundled apps"
-HOMEPAGE="https://github.com/rubysec/bundler-audit"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-#tests are trying to download AND have some odd failures
-#rspec ./spec/database_spec.rb:113 # Bundler::Audit::Database#size should eq 323
-#rspec ./spec/database_spec.rb:117 # Bundler::Audit::Database#advisories should return a list of all advisories.
-RESTRICT=test
-
-ruby_add_rdepend "
-	dev-ruby/thor:1
-	dev-ruby/bundler:2
-"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid specs that require network access via 'bundle install'
-	rm spec/{integration,scanner}_spec.rb || die
-
-	# Avoid specs that only work when the source is a git repository
-	sed -i -e '/describe "path"/,/^  end/ s:^:#:' \
-		-e '/describe "update!"/,/^  end/ s:^:#:' \
-		spec/database_spec.rb || die
-}
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.9.1.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.9.1.ebuild
index d8a50883e0cc..0d028518a6ec 100644
--- a/dev-ruby/bundler-audit/bundler-audit-0.9.1.ebuild
+++ b/dev-ruby/bundler-audit/bundler-audit-0.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index a72d0457f7d8..3985015d633c 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -1,5 +1,5 @@
-DIST bunny-2.19.0.tar.gz 208864 BLAKE2B 81d17b98e7fd944aa0ffedc02015c7696f0553888d2c11ccb05cda977b09ca7f79746a1b1a651ca0fbd17fcbf2b56fa297919ea3d03ee77491481ebdaa27baba SHA512 39e9b785853275d469c5af0977ea8a5d0e2e13c5ca0f51dfe39552da728345b9852c637e81ad468f92f089d10fdc701abd8105d0eb336b55a071d3329018b111
 DIST bunny-2.20.1.tar.gz 264063 BLAKE2B 03f27d9a7be3995dece690531f2fa4f6e26fdb1b95b8e0c08ddff42ae6b9bf34f149183e993f2357d0e4c91d81f3f2d50af4e693774cfa9033fbd5737a4ee5d1 SHA512 bd07aa86e68d4777860650c817181bb5c772533e1645d451ca0bc7172bf93510e79f8fe46d15cf814ee5f239f2fc361fdef1b20a0ff5194b52b7f1ed953c888e
-EBUILD bunny-2.19.0.ebuild 818 BLAKE2B 3177c01e9f6d81b6028fd951a87767b694ce6b51ccc53a6495e3436793e5472c61dab5f76d750ac2f1ba4b774d83e7487ebfa78902cf69dcf8dead1c48af4303 SHA512 356b3bd8ca030d8fa6f8a37dfcef8da1f640587ab54f3b422c418210b1f9402d355087ea1f37a621ce6b2d050aca9a2a3e02b07c08f572d1040a7f31ef789196
+DIST bunny-2.20.3.tar.gz 264485 BLAKE2B 593890c68f3be6060e9b77001fd912b83541490d023a22b9699735751a2bed5226b6a2925a15b42dca45c7c1094014382f583923d39ad94bc45c0a7a5b55704f SHA512 fa9d1a0b53875caf798f9422c5f964213b51b11c248b93563b51e9b4d5cfd9ce1e3521df6d7e2442482b5e39afe0d70e9a87564f3189cc3d3debb11014b66fb5
 EBUILD bunny-2.20.1.ebuild 811 BLAKE2B f14982706cae468de7e285cde98f0d47b404ab2c452dd8e2ec8b1b3627b62d723c05d2f93726bba04c34cb86480538f8633f22a1fbcb9ab38b43c7eefdfad4a9 SHA512 7a6b7280dca25f31387913a8683abf6ab469afd5a24bed36e56cf45fbeafbc6a62c1f56dfd444a970af6dbab8467e21c12033cbb29ee0a44e1cad36ad3da92a8
+EBUILD bunny-2.20.3.ebuild 818 BLAKE2B 72654df70b4e111dac8deb928afea6253e7fb88e920e11d4080c4fd33add4543ded0b3f4fd4c31656b9c6957d9a16bfa49ee158cc1eb128ddd8605b1f8e0a04a SHA512 5e8d95e8a2508b14cab68e0a9406006b57b4480f9ec915e3df12d6195e14f8008095ecc58a01defcbc2555659288f39b21d2ff12f2b4f13e1fe8c4e60e6c3872
 MISC metadata.xml 340 BLAKE2B c28068e983d8197e5df95ae32b7ec166093a0f5ed60f02cf8364e036316146128e36fbdce0a904534d6b9e6503270c62abe434b144c6217dc0a97b61f5acabf9 SHA512 b5d9cbda2124b4adde8f27fbcfd7f617b02ed528822734f62c1399a3141c127ba51d862a70bb72bb760fda1142db5517a60d91845baea99b658ecdde0987825a
diff --git a/dev-ruby/bunny/bunny-2.19.0.ebuild b/dev-ruby/bunny/bunny-2.20.3.ebuild
index fb2f1ea4fe3c..9cc42e064b58 100644
--- a/dev-ruby/bunny/bunny-2.19.0.ebuild
+++ b/dev-ruby/bunny/bunny-2.20.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 # Tests require a live AMQP server.
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/digest/Manifest b/dev-ruby/digest/Manifest
index c88593cc8d45..9bd50078b51f 100644
--- a/dev-ruby/digest/Manifest
+++ b/dev-ruby/digest/Manifest
@@ -1,3 +1,3 @@
 DIST digest-3.1.1.tar.gz 59341 BLAKE2B 460ed1567b1e24d56e7be66bec06d4dac4ce86ab21392c192c7455a9d735f84a5450d2482e9844f526985dd83af290f60487c179563f1190b0acf8c6241f1b60 SHA512 7a74654f2240d21d1ffb7d8f4292f9f17c26da7e24c970964ddccc6da7ee2972b834ce0830657f87b28773c84565a172d8a1fa287656929a34a2941f9b28b028
-EBUILD digest-3.1.1.ebuild 1095 BLAKE2B 0502f8bbc27c8c8e0f0cd6d783db957054e0c7a8042505e0525fb568a915933f436d66050bddee3f6c9fd2a6cb72879cee9976eb81eed17871d065f7357325fb SHA512 b82b149b422ab28a33bb77eb92fcc1e733104925325e8441a53771bf144cd898741970842313ccb4cc6d91b369cba2f2e829efdd1f09b099b41f66a7f29b7c35
+EBUILD digest-3.1.1.ebuild 1094 BLAKE2B bcb3906ee36735060ddf89c54ec37d53a9710443bdf16cefc450436f85e1c2dd10d7a4dbbdff61d9dc12fcda7c6ec835311d1ceefd1fd898919c87c14e29b471 SHA512 daac138d3af6f7823ee8a88d13830e47c3abd6f418e2203a69e7892c03d8f044945bd4242aeae2dd9fbcb02d95f91f866055afca6340e5a2b8f7e73135a1d288
 MISC metadata.xml 338 BLAKE2B 1a016bd3e85b4f5b69ba5786b1ff95851702539014544cca7228219ca187de64a4c95067d45de0a88f2127a91ac8e78b175821682c13ff7ada4effbcfb7f7f48 SHA512 2e64f3ddca50af8e92e9cbdc83fe2145ca3cd88f65599f9c14bb835d27549051ad6e2d82fad57bd798a2812dedfea31f00ba89f7e6de040288be5b435c11d95b
diff --git a/dev-ruby/digest/digest-3.1.1.ebuild b/dev-ruby/digest/digest-3.1.1.ebuild
index f44159e6f2c6..ef707b75a3da 100644
--- a/dev-ruby/digest/digest-3.1.1.ebuild
+++ b/dev-ruby/digest/digest-3.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/digest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index 752dd3a61f99..2f61f5c190f5 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,5 +1,5 @@
 DIST hashie-4.1.0.tar.gz 86972 BLAKE2B 33979037db67f8a7f20ae85e3db6e8b5415b9b2659a5961e2c2a97e3197fef1500cedd8557af314baf8395a9790e8a457633ecade944c198c295f7f13847afa5 SHA512 f2a36ee812e39d679390647514ff894d4170b61ece6d37ef42f1203212d80d2dee63b4af162d81ded451a53c058746f26fc16810db4c748cce9ca6635a300a4b
 DIST hashie-5.0.0.tar.gz 105224 BLAKE2B f15fd3ecd5dcdf88ea97d4aa5e13d984bbfb4dc54a687b4f166d9d84f07ddc0037f4fe251a4ec4950a5b89aaf4f0e43d11467018d63e3a89ae980ec06caf3dd6 SHA512 fc1f9399895f67af77af7b2d1d993eebd221d2b779781625bf1bbee579547580add7d7d0dbf1791564c8df6764c19617721ae5139ca949c81a316beacfe8c806
 EBUILD hashie-4.1.0-r1.ebuild 1414 BLAKE2B 07ca818d318de830c4ba163819145aba59b8d1c42c24c20ebcc3c2060651f061aa36662de518e430adb46f9b17c60251591b734fc622d49518b722fed401f686 SHA512 7378a17821af6259921424a29b94c7ce06554ee3d5a38f669904cc362d057782aacc6445c0ee97c9a6d8e9df6d07bba9c629e52818b67191692779033a13abd0
-EBUILD hashie-5.0.0.ebuild 1422 BLAKE2B 0d777c578daefcd2adf57d444880dbc6f9be205372888250b6fcc72cbeedf1cec88ab1056c280a5935dc4da2839d79b9f9024edd94c613337224d3777ca796a9 SHA512 1ce21476cfc84a4c1bc92a5282303dfc24a06e6e9464940f49d91c1268a02a2ed90ef4b428ae5b2ba0beb8b2f462afa7ba9b18cf930809dfa90147052cd26a63
+EBUILD hashie-5.0.0.ebuild 1421 BLAKE2B c9b83429605929075aaa18eee3c971a3852040d488e32be4f9711bc5bfefa22214ea4a8823399b85edb156b016f551f7ccb7ee7d9fdb4afdcb8b2934c5d11021 SHA512 6efa721fa1edb4410b7d2c58bcbb4ba622dbd0b5fbc73684b1af634d7edd52620609336179b253f1f5e743ef18452dcf2992e485a9e79f9335cb47dd10d993a1
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/hashie/hashie-5.0.0.ebuild b/dev-ruby/hashie/hashie-5.0.0.ebuild
index a4fd5e39c3ca..6f38d6924dfb 100644
--- a/dev-ruby/hashie/hashie-5.0.0.ebuild
+++ b/dev-ruby/hashie/hashie-5.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/activesupport )"
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index 100437f4c38c..11c8f13ef4ff 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -7,5 +7,5 @@ EBUILD mail-2.7.1-r1.ebuild 900 BLAKE2B 7997703b19354c7ff61cf888f646fcd6ebf1e0d9
 EBUILD mail-2.7.1-r2.ebuild 949 BLAKE2B c82168f20e1eaf3fdfcf937aa90a19f942e95d4e46859ad6d375ba75dce0a8c5b297aa2ef8a9de9a29176536b1f701a1b1af305b267be0476af342ffb08f6bd2 SHA512 c30eaadb411315e5448755c941ce86d1238415abe352d1e7679d9f6cbe744d4f6b5ae0f7c04b94660d7dc5e23d9d791a0311055090ea6923364e032a5c9c063f
 EBUILD mail-2.8.0.1.ebuild 1021 BLAKE2B 492e5b9961e5f97c3eec209b9ea8ad6726550bbeea159a38b22451beaa27dc84cf3c47c1dfab5b5b562fc8aacf479341b173278f29d23ad5bd34abf2e3953239 SHA512 d99141264f04e58f032d4c44cb8117aee8c83a477e161e250a002cf80685712a289e1184722d6f645a858f1d660c18d159f18a6f7b414a572ed4012c3ef9e0a2
 EBUILD mail-2.8.0.ebuild 1021 BLAKE2B 492e5b9961e5f97c3eec209b9ea8ad6726550bbeea159a38b22451beaa27dc84cf3c47c1dfab5b5b562fc8aacf479341b173278f29d23ad5bd34abf2e3953239 SHA512 d99141264f04e58f032d4c44cb8117aee8c83a477e161e250a002cf80685712a289e1184722d6f645a858f1d660c18d159f18a6f7b414a572ed4012c3ef9e0a2
-EBUILD mail-2.8.1.ebuild 1021 BLAKE2B 492e5b9961e5f97c3eec209b9ea8ad6726550bbeea159a38b22451beaa27dc84cf3c47c1dfab5b5b562fc8aacf479341b173278f29d23ad5bd34abf2e3953239 SHA512 d99141264f04e58f032d4c44cb8117aee8c83a477e161e250a002cf80685712a289e1184722d6f645a858f1d660c18d159f18a6f7b414a572ed4012c3ef9e0a2
+EBUILD mail-2.8.1.ebuild 1020 BLAKE2B b53bd0604781f3317dc97a56ac2cdd40f8c6a21fa03a177db54f5f993e446f71bbbccbcacef7e72e3cbdb0c6a1a9bb6da9c2cc75183585ecbfdd96dc2debfea2 SHA512 40e477e1d29e4b7d6422bec630c25404574fea3196e9b40e8d6a49648f2c14351b1bd54183b95915d348c1ffb6944622203c8e1315f7d6dc5adc14d619b24afa
 MISC metadata.xml 337 BLAKE2B edda3267d35eae7a763cb191424ad231a356da5d17ce213061d0111e9addab8d34ae9bb52e47c0ea05d58258d04befa284aa3930d316429ca4b82c2d676bb61b SHA512 06ff50f20204499fef8bf6eb3af793ec7b471c2d1a29fd30b821086f934344a6251c0304cc52c9b720af5a7b7214831a68813c33f36fe4f679deb8667d3cb7f8
diff --git a/dev-ruby/mail/mail-2.8.1.ebuild b/dev-ruby/mail/mail-2.8.1.ebuild
index 27ce6a1cead4..8c4ee8b49827 100644
--- a/dev-ruby/mail/mail-2.8.1.ebuild
+++ b/dev-ruby/mail/mail-2.8.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 06cc110498db..bfc6f1151cac 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,3 +1,5 @@
 DIST mechanize-2.8.5.gem 142848 BLAKE2B 73fbf0ef6e3091bd37ace311415056bbc94ef22cfe5411b440faa791747faac349765db20c18a0133037e9564c061c13b250aa2a5677152d7fa0732d8a4a10cd SHA512 8ef26d80c7c55f564084eedf6c7255849ccf6efbb2e6ce11ddb3b5f8f3591861200041b89416ab3d8b9a8595c6c8de1f9c7e01b8e0c6b63265488498e2584c94
+DIST mechanize-2.9.0.gem 142848 BLAKE2B caea8897860db3fd0f5d8abb5102f5cc6ba3379e5e8dbc046dc8f709d1adec10e9101db1a88295c53f5da51d4bbf78fc51454eb105ae7417a5707d0f30d80e5b SHA512 0402fbed9e740b3faf0f76ce3ccb88602d0243ad54f7e025586c0c75ae08670c6be53c49d425b3c7378af2fff478d17b61d238fb7d2858b26629d68089a09657
 EBUILD mechanize-2.8.5.ebuild 1139 BLAKE2B a190c347ad1c379ed6fbd41e253dd6594f251b08d61b0e26b3bd359dad14945489f69f0965b617808b3f1c27dee674f6bf1ac79a0cfe295743014b8ed13b270b SHA512 7efb3e5d05e040c15b219a4589967bbb5ca2382c6d3cee8f35766b961b8628eb089dbd22b3fa8a7024bbb10b34c75e8ed8b3aaa2e643a7b857dd8720e8c83fb2
+EBUILD mechanize-2.9.0.ebuild 1140 BLAKE2B affe7750c74492403e3550ee136893842a03565d98ab8a6536075e3fc708f6e6da3710156fff337e11a8d575f3c2a173f1e4e9f17949b46c7f5bb6650d8bb589 SHA512 fe49e477a6741c326066a8a3d55feca4037fe4805de84b476125fcbe814dd93b15f2750cd4fcd8e75f13e4b5605ddba55a2159f475a6c632afd37a413df94758
 MISC metadata.xml 350 BLAKE2B 021ec7067e4b814b603126e68d4985450e443ad8953b45a8a5c3f28168edd0439456d96de71f8964f5002035eda5eca61d36b3aa527d4aac4c9f946f4a0bf8cc SHA512 b0971ce005597330094359747a6825c89e76f6d4c3ffce0a02f3b4c4f17be3fb9d2472ac12e3f9630b61016414bd8ead74dd3a955cb99365aaa6a54d27430ea0
diff --git a/dev-ruby/mechanize/mechanize-2.9.0.ebuild b/dev-ruby/mechanize/mechanize-2.9.0.ebuild
new file mode 100644
index 000000000000..5244492e278e
--- /dev/null
+++ b/dev-ruby/mechanize/mechanize-2.9.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md EXAMPLES.rdoc GUIDE.rdoc README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library used for automating interaction with websites"
+HOMEPAGE="https://github.com/sparklemotion/mechanize"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.7
+	test? ( dev-ruby/minitest:5 )"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.8:0
+	>=dev-ruby/domain_name-0.5.20190701:0
+	>=dev-ruby/http-cookie-1.0.3:0
+	dev-ruby/mime-types:3
+	>=dev-ruby/net-http-digest_auth-1.4.1:0
+	|| ( dev-ruby/net-http-persistent:4 dev-ruby/net-http-persistent:3 )
+	>=dev-ruby/nokogiri-1.11.2:0
+	>=dev-ruby/rubyntlm-0.6.3:0
+	>=dev-ruby/webrick-1.7:0
+	>=dev-ruby/webrobots-0.1.2 =dev-ruby/webrobots-0.1*
+"
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e '$VERBOSE=true; Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/net-imap/Manifest b/dev-ruby/net-imap/Manifest
index ec94a71affc2..ee82a64bf5bc 100644
--- a/dev-ruby/net-imap/Manifest
+++ b/dev-ruby/net-imap/Manifest
@@ -1,4 +1,4 @@
 DIST net-imap-0.3.4.tar.gz 103226 BLAKE2B b08ee0ad9ad788c1a58e583b3e71cef6e13f6c4f35cc1a67909715a30b0797987f71b1a790e0ca3a2a4b0da3b23ac2451c5e0fb8217506eb0e050c2c2c624362 SHA512 ced2433212738e1c54b783602dc8ed79b0d6fabef0d830d12e4d1a8b7f1df896596499a4b986dab1ac8e1e389bf88f87c854ceafbe57b7ad1cf5c0db29223ba1
 DIST rfc3454.txt 138684 BLAKE2B 56c850a7f5782c1447ae633ad9a380253b97925b9edeadbeb9001f4905157c353db967125dfb3bfef1e1bc2297142e5db424cb3b1325837ab4bb05db1f0f92a9 SHA512 79a85fede7df9202cbaf3fbb0bd59d951352c56208da2adf0baa5571ad92fd2153a6348000994b733c8a1bfdc93c38c86ed33708ecdef8571f20f906564384b6
-EBUILD net-imap-0.3.4.ebuild 1139 BLAKE2B 308d41e11273988be203ce9e48b2bf18806c6d10782d3997277aa55c828c425e198e46ea990862000c44d9344f8eb473371d468f80b69fd6478200c52fd87aa5 SHA512 bee2a6e455ebf80d05ef0a82449ede9ef45fa39a4140f5f2658da8488c1933bef0030f2514a5d8b262b5a7141da23c218611b92a3a56e9e6efd0d14772dffdc1
+EBUILD net-imap-0.3.4.ebuild 1138 BLAKE2B b69b5e9742ea6951eb5b512c1f12c3cc3c1452f454995025649e46c0ef2abcfc99c40e798b3d523d39be32b18934461968f8e3088c08e9ea2823771959d5332a SHA512 705d4e1ccf7dca1e3a1fc6112b67bd6d6f82529beae42620e6b45459ec08df6b32e1c09b7d615b44c5dc4f9b4562c5a6bce999833e85bbb5777e92f21ba55b9d
 MISC metadata.xml 340 BLAKE2B ce089ee2eed44b5b96fa730c464c6e0299db5bbee1db0052a5c5e959079e7c14c23c0a7d1b6bd8d8e7faf83ed8379535d5059c10ff75b69cdb9d522c5d0099ce SHA512 ecf13d294eb224c7510bfedb5a093c78de5d2537431335708bc1046254941b583b3c013006adeea41d2f8df147dcf45c46c6c9b50841500761d6a6f0e0c71bdc
diff --git a/dev-ruby/net-imap/net-imap-0.3.4.ebuild b/dev-ruby/net-imap/net-imap-0.3.4.ebuild
index 346494ad130c..6768c45e01ae 100644
--- a/dev-ruby/net-imap/net-imap-0.3.4.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-pop/Manifest b/dev-ruby/net-pop/Manifest
index 1b9da398f2fd..b77eee9e245b 100644
--- a/dev-ruby/net-pop/Manifest
+++ b/dev-ruby/net-pop/Manifest
@@ -1,3 +1,3 @@
 DIST net-pop-0.1.2.tar.gz 21598 BLAKE2B 6d5082f135804a72f2b09f9107601f0dd6b42f33a9d46cd36eec1759b3376f82564e305596cfd519ae64a8c820fcbf57ab9ff29cc16ab9298b9ce069a1405b60 SHA512 5f7e78cb5499f1049c93732f88857d0b2bf9e864bcfc897beddd3fc86883204ff6c153ae9fc24715b1625fec5e2ec673e913a1495e43ec0e077e52d88aaf3448
-EBUILD net-pop-0.1.2.ebuild 892 BLAKE2B 84ec74a267c3a661a8e1f1600779fe0ebe7f54eb3c94f4b4870f265718e55ac2ee8ebd38d0d91a3e0e4beb53bec84f1a15d41a09340405f67616394862d3e3db SHA512 1ee5b7e62bca0e23311f12c51e544cf97a4fc92a20e613547e81740de90dbcecd14c5a4b2564774a87e9218707c05d11cf8b8506718aee3321f8638014727585
+EBUILD net-pop-0.1.2.ebuild 891 BLAKE2B da51709ebf1361c60de0abcc984173a577a1002d1588ab4fc526a9bac8222a54b7f2a7f4a43e781c7d9361dc458c58f171860d3e1c904581a4adb5999403c683 SHA512 89628242337549f58f7bd15cf10b4fafb34808b46e39c972a32207e3ba77b08cd162dac35811a6a9ef6cbe1f8a49b05077286b46223216cab236f23926537f33
 MISC metadata.xml 339 BLAKE2B 9723b52dde876efb195385ce0916ac29cfc27255f44af57ad1803e03409d762e095d2d89de8d49296f142b8ec29b160e57569d2f13818a0f43f0c01a709a6ccb SHA512 de6928b0e5693c02bf27a65aebcc2cac0bcd8d896c3df9596467368011959794ab4e8318d96582cf8889e77b585b0b96aa446522c362fa3cc1e4716260f2b930
diff --git a/dev-ruby/net-pop/net-pop-0.1.2.ebuild b/dev-ruby/net-pop/net-pop-0.1.2.ebuild
index 201d7cd6f0cf..22cb9ba1dde8 100644
--- a/dev-ruby/net-pop/net-pop-0.1.2.ebuild
+++ b/dev-ruby/net-pop/net-pop-0.1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-pop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-smtp/Manifest b/dev-ruby/net-smtp/Manifest
index 2bdeeca2af95..7e875c4050c2 100644
--- a/dev-ruby/net-smtp/Manifest
+++ b/dev-ruby/net-smtp/Manifest
@@ -3,5 +3,5 @@ DIST net-smtp-0.3.2.tar.gz 24567 BLAKE2B c498430c94470fbd11e23a5bae7fe4d866fa2ee
 DIST net-smtp-0.3.3.tar.gz 25297 BLAKE2B 29339faf7c7a3870b2eed7d2b9058ad7b3beaae9bddd3fe718cbcba0c65faa3e118916ac2e2a8cfc9e52c602bde301929c037856b68e42881bdab3ecbb90b01f SHA512 1936cede296d899f2cbcf5874b1472e808255cca21788037f6e8f38f8b1ef05779fec0c4f51a3970c09191078fee84c85e909eb9223034bdc293a1215b004ad1
 EBUILD net-smtp-0.3.1.ebuild 914 BLAKE2B c0f64ee86ff3bfb635b90733711f0ed90db772207b692cf1cdbfa3e006b452508a98ccb3cec45316881dba9f8bdee1b63a43fa88fa4d76d41bd7835aa770c890 SHA512 1eb34ec15e58ccf7868c14a61546a7ac59bdc93ec5721458cf334b90af6200575369aebabba2597aa20640d3f01dfab52a61d7826c53583767cee409b2ab5e4a
 EBUILD net-smtp-0.3.2.ebuild 914 BLAKE2B c0f64ee86ff3bfb635b90733711f0ed90db772207b692cf1cdbfa3e006b452508a98ccb3cec45316881dba9f8bdee1b63a43fa88fa4d76d41bd7835aa770c890 SHA512 1eb34ec15e58ccf7868c14a61546a7ac59bdc93ec5721458cf334b90af6200575369aebabba2597aa20640d3f01dfab52a61d7826c53583767cee409b2ab5e4a
-EBUILD net-smtp-0.3.3.ebuild 928 BLAKE2B 399196fd6d36f369aa3c492472d124ca16d2e1c976c4e3d74f2ac8728ccc686dcdf8d318521a90ab4925f4f24a815886dd9d40ad194e21f74df2611299150b96 SHA512 3b883caf9d4580d1c11e1d19b5e5049d725c0708beb25eb489fc6b2394ab460561d3a730607f2fef76ea0d5802f683f43f6df8c30079e95bc2badd2447d7f817
+EBUILD net-smtp-0.3.3.ebuild 927 BLAKE2B bb77e183d9c9581723c91f4de49921910d4b612dd455f46a22a570a1e293a5e336f5d94eef0ca50a128c002f4307916f458b24447d2c7e3edddaf6653cc52efb SHA512 0912da8bafdd273acbd9185e7c35edc6e9085f7d4e9c7b75238d1be72d963224306e8ecc2a4616083a8b59b694f2c615df07eed58ea891abdda706b9034a217a
 MISC metadata.xml 340 BLAKE2B f644899564ce6b222e40d25c4bea15c69f467cc56be91d47e506804d9cb9d9d812f970afb63185bcf21437e4697c3153976c267753ffa3b79d3a75b7eb258e0d SHA512 d8b4c65ca944809289b3fb43c09a5d83e584772905540bce7e9c82d9fc85aab1b1b124f2cfb3965c15bf28fe1fcf7f031a4089288889c03bf1dab1d453d8fc60
diff --git a/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild b/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild
index 18fd17b1811b..b28706fd65ab 100644
--- a/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild
+++ b/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-smtp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/rbtree/Manifest b/dev-ruby/rbtree/Manifest
index 3e3a6fa8f51d..417927d160d1 100644
--- a/dev-ruby/rbtree/Manifest
+++ b/dev-ruby/rbtree/Manifest
@@ -1,5 +1,5 @@
 DIST rbtree-0.4.5.gem 30208 BLAKE2B a2e4763f99a3cecb4b7525ed7637fcb5fe9efd45f61125164804fd6a883fad2ed688357af9264317898500bf8f9d31b5797cb93d88982c06b356a9de0b5b74e1 SHA512 e1a1692fb91e85299d86083b02d71aa6ecb293ada2e3f17d2000344d064575148d3ab68b3f5bc4da420b8bf79bcfe353afeb52cc3b450eea662bb69d9ebeaf2d
 DIST rbtree-0.4.6.gem 30720 BLAKE2B cd44852f8de9138d9f590825c62b1863e8a4fc51a3f150317f929e200430b9a4fcc7f7b83deb0904def84cfe3debf102e7b200fe1e894422b0515297ed44baff SHA512 7c9f5ac83ee78191efe3fb7fd6ef0afaa7506245191dbe92f3eb9e5f19b9fcd8157f19901d49d5ff9b4661a498a67d79e39ca86c79d8df99fcf11603b54a0158
 EBUILD rbtree-0.4.5.ebuild 440 BLAKE2B 5e12aa8a865d5053c4a1b63c3bc5f8a4662679c157e2c8780113b2ba9b357fd4dba59385a6742af0b5f386d280b611c9b04f0ccc829e25c07dc5b9d649bc58d7 SHA512 b434d841445a84a6395e2825dfcbd0f5aa6a34297010653d0d8e844a4909e153713011cb13d0170130162475373d039df9840a46848f8f0018717ea0f9ee9246
-EBUILD rbtree-0.4.6.ebuild 433 BLAKE2B 293266a9f61f70f703ee3aecc7b6539fec13dfe704c5f88ee01833a47f575e64f2f2818e537334178b37f6eb9a89f07af1ecd5a72178d42097e8dc84da2ca34e SHA512 378045b9ad996097097ace8f03a0de30d9efbbc68d1a21f28fe81ccecee33a2e016dc5b606fd6ce4c9e4e07cc062c91c6d58dee8a2b5db4ac9ef6cd97709c53c
+EBUILD rbtree-0.4.6.ebuild 552 BLAKE2B 128ac7bf4a754671c7b5b8da7aaf7a6f1c7c818d8d99f711d3d74a22e8e57c5b557b187511b858da3dbdf9f6a8cfa3e39fa8b8b82891fdf6056e9afae3804d26 SHA512 f12f026c16f4297c1f49cd9a857c20015881ef65d4805c632feadcaa8dc359ac5e9b048bd136d6477aab2ad0dfa8640e406f0505fbf7c4a6cb7bfeecd83db9ca
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/rbtree/rbtree-0.4.6.ebuild b/dev-ruby/rbtree/rbtree-0.4.6.ebuild
index 78a13193347b..9bed1dcba918 100644
--- a/dev-ruby/rbtree/rbtree-0.4.6.ebuild
+++ b/dev-ruby/rbtree/rbtree-0.4.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
 
@@ -16,6 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+all_ruby_prepare() {
+	sed -i -e '/test_pp/aomit "Fragile for whitespace"' test.rb || die
+}
+
 each_ruby_test() {
-	${RUBY} test.rb || die
+	RUBY_LIB=lib ${RUBY} test.rb || die
 }
diff --git a/dev-ruby/ruby_version/Manifest b/dev-ruby/ruby_version/Manifest
index 8bfc013ee09f..3852bddae4e3 100644
--- a/dev-ruby/ruby_version/Manifest
+++ b/dev-ruby/ruby_version/Manifest
@@ -1,3 +1,5 @@
 DIST ruby_version-1.0.2.gem 24576 BLAKE2B 93283e11d49a4b981a64b7e61c68b93ab7abbc91c20de152e1936a1d57db54eec7e8d3aa756f96e52a531a3d72891724f53d3bc39f85e3be70d06d2958abef4d SHA512 638fa85d768a3975bd3eddbe71ef4c44a0cb4d135b44f746b1636cc02cdb4313331e41e35f7ed4f4a0132758d8264995ac8aa3e121abbeae5b95c62fe0d9132c
+DIST ruby_version-1.0.3.gem 8192 BLAKE2B 6585ae4ef9c3c7a968c35ce503696fcf64b10212147cf02171e6ed9be6059d9ba9d355bd4f5e848b16f78995c61d30bcd0ee6b37708854ce446bcb945c20acfc SHA512 8e03113f06a2d52f0e8ae89c4936bdb9b4d244be17303d178f2c7bcb129b655e7a7841e967322beaec0e16d46d05233542cc007d81a9b2d6e75e60e34dba612d
 EBUILD ruby_version-1.0.2.ebuild 480 BLAKE2B 5c28d45a99da4bb5799c2f538865317e17f41eeeb79cef2787b0c1c9976385c7dab0879c436cc68e8cd32811e42a973f8e0cb0f3e6a5c99a499b24e653461c78 SHA512 e841b8b2b82ef3c8a1cf9a21456e108ee852c7f93cfdac199fa9eb1b36a9446122a50129db6e10c37d2807d7b3b892b4af1a20dabbe3851ebb0bc26fc85f8bac
+EBUILD ruby_version-1.0.3.ebuild 478 BLAKE2B 972ba1742701838b3a2f897380b188ed4109ac331b08e04cd8be67490e5af9370dd29e9f44b9e517d6ebb9ec0b254f6a768a1d373a719ec4f62690527c62188d SHA512 1b5b6ef677218d478be60eaf607cc79aa580747cc86e43002270bbb27ca90a6d55556d06c927a4bf22001139a8d1723349cc9bda3bf5b8f64d044633cdf1c60d
 MISC metadata.xml 338 BLAKE2B 3c631f5aaf66c50cbccaa3105c723c7d7be60e7cb7f498b8b96a93744a5f57ad506112782f5591eab6d391a9ce86e61f92afadfeb59896d90a9a5d93aeb6fef2 SHA512 f6b971f926a0b74f85e7f8ad7ef3a456b5279e899d26d296629373891f44752fe860697101108c94213e201d2e2d0422c2d6f6c208e9aca16d20887e1ef78d70
diff --git a/dev-ruby/ruby_version/ruby_version-1.0.3.ebuild b/dev-ruby/ruby_version/ruby_version-1.0.3.ebuild
new file mode 100644
index 000000000000..cabc8045d683
--- /dev/null
+++ b/dev-ruby/ruby_version/ruby_version-1.0.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A class which offers a convenient DSL for checking for the right Ruby version"
+HOMEPAGE="https://github.com/janlelis/ruby_version"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
diff --git a/dev-ruby/sass-rails/Manifest b/dev-ruby/sass-rails/Manifest
index c8a132f9c233..00ac66db2b34 100644
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@@ -1,5 +1,6 @@
 DIST sass-rails-5.0.8.tar.gz 90020 BLAKE2B 20e9e6e4701b0a14ff10f343fb94065af0110d86aab1bb4676de4806e20f8031b4cf7961002828438c3ae6be9802b3a2e4367882241e8fe745029747d31f9b04 SHA512 05d9e8d269c608723158831e215599a8482383fe79a9c3416fa8efd11bf9bae7935c5b7a1f5e8a22a85336abf4ceecc50578f0c8e51310c09b2540831959652e
 DIST sass-rails-5.1.0.tar.gz 89994 BLAKE2B dc0083af8399d2ff1210a6430d47ccaaac88b337da5cfeb61c7a4f0c6b1f55d59d896a874945a943cc322fabfb3a31d80a1a467a12d04f2c1a1f9c84cbb452a0 SHA512 894b957b6b72d340ef2eebdc721c58c2d101fd275a10265f859f17f654736b3d3542a7100db922236925af40ae090406689815a4bb4f623c5f70652685571b7e
 EBUILD sass-rails-5.0.8.ebuild 1063 BLAKE2B 0b7b2824bd31277ce1028080b495480b6e49431141266d461e08e54a6bbafbbf0da22c3712e5d9ed98cc4b4ea89ef728fe8ebe167c4118db57d85bd54a6026a4 SHA512 42d0651e8a5ba3b2cdd51e505cf125558a01bac9880b5dfbf63c528efad45f550ac6822b15116f54993db99c1524b6f0315af9555dc3268bc0b2330cd3d30c06
+EBUILD sass-rails-5.1.0-r1.ebuild 1063 BLAKE2B ba6d373768e28322335418bffb701e9ee7af511a70a1cc65e2a8d530197d2828650aee82a28de7ea8204fd9b5c77545fb8fa7798a277ff16d857f372e056346e SHA512 44da16ae9cf17d521e070ca281bdd0b5db57da34aec6317a5cd20cb9ae2b5079799de0fca9c3d305c7412351e0bd8167d632213ab0a7cab221a47419f5bffc64
 EBUILD sass-rails-5.1.0.ebuild 1070 BLAKE2B 4fbfb80c056498724652e6d5822dd624837ada1a5cb90bdbc876b8e31dc1fdfa4e41b85e4d75d5db018114238f01018edebc08137cb5b3a70896a7995ee37c80 SHA512 a99e3a9d88a372e5d62552a6a922fcd10caadbdc2f94c03ca76b864aa06b911528f2a84fcd110282ea5825e4cc9aefce636d60ecdac6526be743581e86d6eb13
 MISC metadata.xml 343 BLAKE2B c5a05184557a2483d634a9684fedf6bc5d53522e766510829d3765a937f68dc7b8c887ff82f4e81bdf3e25385d32a043813032beb255a061b51ccb03c094b9c1 SHA512 a2d0d0783101ee59353b76a9557f50876157228c532442184f2ed72ff21286127cc83d0f0040ec6e2927d4ec45b04e891d7f13cf221d1fe09e176ac9896c195d
diff --git a/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild b/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..98d966c01624
--- /dev/null
+++ b/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
+HOMEPAGE="https://github.com/rails/sass-rails"
+SRC_URI="https://github.com/rails/sass-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE=""
+
+# Restrict tests for now since it is hard to set up the right
+# environment with the correct ruby interpreter and Rails test
+# application.
+RESTRICT="test"
+
+#ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
+
+ruby_add_rdepend ">=dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
+	>=dev-ruby/railties-5.2.0
+	>=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4:*
+	>=dev-ruby/sprockets-2.8:* <dev-ruby/sprockets-4:*
+	>=dev-ruby/tilt-1.1:* <dev-ruby/tilt-3:*"
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/sassc-rails/Manifest b/dev-ruby/sassc-rails/Manifest
index 03e3c1e93703..4150241780a7 100644
--- a/dev-ruby/sassc-rails/Manifest
+++ b/dev-ruby/sassc-rails/Manifest
@@ -1,3 +1,6 @@
+AUX sassc-rails-2.1.2-test-directories.patch 2849 BLAKE2B 9c054cbff7c0c3355333e3a1846d2a2ea3fa31a7721dea697628f2242c4b3be9d4b199c3f5ed7c2712ed7764b450a543c4bff919d648d7a4648c62ae8f2d5e99 SHA512 5c7e7e285189db56fbe8693c161080d9acf5ca3b075eed8946bdf3b1fa6c0afdea5abf1520e926ca9eda27a9563356ee76645e8e5fb24fbcec594d2101158677
+AUX sassc-rails-2.1.2-test-isolation.patch 4755 BLAKE2B 4f1abb47ebc46fad927d5cea9d3c90f2caf6ad4e265534b9e62f2d203809b21cac53dc37e1eddaeaee96414b3d933a4fda44174f34e5a81cde2a5e07342dd74e SHA512 dddb76598f41ccdaa684e9449ea21c1fb613c99097b18f06f2719515c9005b17235ddae4ca06342d9c53741d4fd9ef93df693f3686af69a1cc872649d07352d9
 DIST sassc-rails-2.1.2.gem 33280 BLAKE2B 1ecd048a879ea9ba08390ed81c679a3a4461f3937d1b0ce5ee001810067286f386ea885787984ffa417d2af191f178563e892ea24f1b466b6538c815fadbd9e3 SHA512 d250f22a3f2c4afb56a22f4533194d80b8a301730e5e4b49f9613e489f7158e7bd9c02cff8e1ec8ce727ede25f1c03a2613a664291967b5e97e210f7890d0bc8
 EBUILD sassc-rails-2.1.2-r2.ebuild 954 BLAKE2B b6cf69a9fc91057163615ecbf3787098dd146f737fc70dbf2754be359b2d7784ca139fee69f788a12bd38b6333bd6dd5037c3799d417422abc22a6b3fa7af846 SHA512 9fc3df4994c0127f16cfccc8a048cb654118fb165d593baf04d409238d0123d3cc0c9c02d3187adcb8b8ad64b8c0306f6aa4fea51a993860807de33238d14b5f
+EBUILD sassc-rails-2.1.2-r3.ebuild 1270 BLAKE2B 35a78e6b5e44c7be77fb3485fa7113737eb59c7e66c8221a8a6f3ec84bf3b7a018bc0999fedd16f4d9ae5820ae32d5ec17de1896f422b56c6aa6bade07a3166e SHA512 472b3cd093729b56e227e219045ef2bbb07cba879eac1e7b67d1861538eb1acec1a2440c37b371f19a6a2824fb750e20c6f9ae2ddc1912d2b7a86fa41118bf53
 MISC metadata.xml 343 BLAKE2B 6319dd108c825d78ce2b27bfcc376edcc437b9710eaa62371617ce5bcfdb673e948c81ffe1d48a8b5d85fccaf26b450b063b5366a8f9f5d12a0d6e1798418aad SHA512 2f57cba2c2b633b7794296478ff1a8cff92033fc30169917ee85aa7388bdc267191699307bbaf5096f249f0cf806a20fc763e21346330309693c221489db8f20
diff --git a/dev-ruby/sassc-rails/files/sassc-rails-2.1.2-test-directories.patch b/dev-ruby/sassc-rails/files/sassc-rails-2.1.2-test-directories.patch
new file mode 100644
index 000000000000..dd4ae709084c
--- /dev/null
+++ b/dev-ruby/sassc-rails/files/sassc-rails-2.1.2-test-directories.patch
@@ -0,0 +1,73 @@
+From 9b653021e7a5a192758968a81b0dc81c68f298d0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 27 Feb 2023 16:38:38 +0100
+Subject: [PATCH] Run test cases in separate test directories
+
+This is in preparation to be able to run the tests in isolation, because
+recent versions of Rails does not allow multiple to calls to
+`initialize!`.
+---
+ test/sassc_rails_test.rb | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/test/sassc_rails_test.rb b/test/sassc_rails_test.rb
+index a15110d..f8c36e4 100644
+--- a/test/sassc_rails_test.rb
++++ b/test/sassc_rails_test.rb
+@@ -4,14 +4,18 @@
+ 
+ class SassRailsTest < MiniTest::Test
+   attr_reader :app
++  attr_reader :test_dir
+ 
+   def setup
+     Rails.application = nil
+ 
++    @test_dir = Dir.mktmpdir("sassc-rails")
++    FileUtils.cp_r File.join(File.dirname(__FILE__), "dummy"), test_dir
++
+     @app = Class.new(Rails::Application)
+     @app.config.active_support.deprecation = :log
+     @app.config.eager_load = false
+-    @app.config.root = File.join(File.dirname(__FILE__), "dummy")
++    @app.config.root = File.join(test_dir, "dummy")
+     @app.config.log_level = :debug
+ 
+     # reset config back to default
+@@ -30,8 +34,7 @@ def setup
+   end
+ 
+   def teardown
+-    directory = "#{Rails.root}/tmp"
+-    FileUtils.remove_dir(directory) if File.directory?(directory)
++    FileUtils.remove_dir(test_dir) if File.directory?(test_dir)
+   end
+ 
+   def render_asset(asset)
+@@ -169,7 +172,7 @@ def test_line_comments_active_in_dev
+ 
+     css_output = render_asset("css_scss_handler.css")
+     assert_match %r{/* line 1}, css_output
+-    assert_match %r{.+test/dummy/app/assets/stylesheets/css_scss_handler.css.scss}, css_output
++    assert_match %r{.+#{test_dir}/dummy/app/assets/stylesheets/css_scss_handler.css.scss}, css_output
+   end
+ 
+   def test_context_is_being_passed_to_erb_render
+@@ -287,7 +290,7 @@ def test_globbed_imports_work_when_globbed_file_is_changed
+     begin
+       initialize!
+ 
+-      new_file = File.join(File.dirname(__FILE__), 'dummy', 'app', 'assets', 'stylesheets', 'globbed', 'new_glob.scss')
++      new_file = File.join(test_dir, 'dummy', 'app', 'assets', 'stylesheets', 'globbed', 'new_glob.scss')
+ 
+       File.open(new_file, 'w') do |file|
+         file.puts '.new-file-test { color: #000; }'
+@@ -314,7 +317,7 @@ def test_globbed_imports_work_when_globbed_file_is_added
+ 
+       css_output = render_asset("glob_test.css")
+       refute_match /changed-file-test/, css_output
+-      new_file = File.join(File.dirname(__FILE__), 'dummy', 'app', 'assets', 'stylesheets', 'globbed', 'new_glob.scss')
++      new_file = File.join(test_dir, 'dummy', 'app', 'assets', 'stylesheets', 'globbed', 'new_glob.scss')
+ 
+       File.open(new_file, 'w') do |file|
+         file.puts '.changed-file-test { color: #000; }'
diff --git a/dev-ruby/sassc-rails/files/sassc-rails-2.1.2-test-isolation.patch b/dev-ruby/sassc-rails/files/sassc-rails-2.1.2-test-isolation.patch
new file mode 100644
index 000000000000..afd2274fe0a0
--- /dev/null
+++ b/dev-ruby/sassc-rails/files/sassc-rails-2.1.2-test-isolation.patch
@@ -0,0 +1,90 @@
+From d2f47f3f7d6ea382a45b87042dfebde7dfe57b9a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 27 Feb 2023 16:43:07 +0100
+Subject: [PATCH] Run the test cases in isolation
+
+This is to prevent test errors in recent versions of Rails such as:
+
+~~~
+SassRailsTest#test_setup_works:
+FrozenError: can't modify frozen Array: []
+    railties (7.0.4.2) lib/rails/engine.rb:574:in `unshift'
+    railties (7.0.4.2) lib/rails/engine.rb:574:in `block in <class:Engine>'
+    railties (7.0.4.2) lib/rails/initializable.rb:32:in `instance_exec'
+    railties (7.0.4.2) lib/rails/initializable.rb:32:in `run'
+    railties (7.0.4.2) lib/rails/initializable.rb:61:in `block in run_initializers'
+    usr/share/ruby/tsort.rb:228:in `block in tsort_each'
+    usr/share/ruby/tsort.rb:350:in `block (2 levels) in each_strongly_connected_component'
+    usr/share/ruby/tsort.rb:422:in `block (2 levels) in each_strongly_connected_component_from'
+    usr/share/ruby/tsort.rb:422:in `block (2 levels) in each_strongly_connected_component_from'
+    usr/share/ruby/tsort.rb:431:in `each_strongly_connected_component_from'
+    usr/share/ruby/tsort.rb:421:in `block in each_strongly_connected_component_from'
+    railties (7.0.4.2) lib/rails/initializable.rb:50:in `each'
+    railties (7.0.4.2) lib/rails/initializable.rb:50:in `tsort_each_child'
+    usr/share/ruby/tsort.rb:415:in `call'
+    usr/share/ruby/tsort.rb:415:in `each_strongly_connected_component_from'
+    usr/share/ruby/tsort.rb:421:in `block in each_strongly_connected_component_from'
+    railties (7.0.4.2) lib/rails/initializable.rb:50:in `each'
+    railties (7.0.4.2) lib/rails/initializable.rb:50:in `tsort_each_child'
+    usr/share/ruby/tsort.rb:415:in `call'
+    usr/share/ruby/tsort.rb:415:in `each_strongly_connected_component_from'
+    usr/share/ruby/tsort.rb:349:in `block in each_strongly_connected_component'
+    usr/share/ruby/tsort.rb:347:in `each'
+    usr/share/ruby/tsort.rb:347:in `call'
+    usr/share/ruby/tsort.rb:347:in `each_strongly_connected_component'
+    usr/share/ruby/tsort.rb:226:in `tsort_each'
+    usr/share/ruby/tsort.rb:205:in `tsort_each'
+    railties (7.0.4.2) lib/rails/initializable.rb:60:in `run_initializers'
+    railties (7.0.4.2) lib/rails/application.rb:372:in `initialize!'
+    railties (7.0.4.2) lib/rails/railtie.rb:226:in `public_send'
+    railties (7.0.4.2) lib/rails/railtie.rb:226:in `method_missing'
+    builddir/build/BUILD/sassc-rails-2.1.2/usr/share/gems/gems/sassc-rails-2.1.2/test/sassc_rails_test.rb:48:in `initialize_dev!'
+    builddir/build/BUILD/sassc-rails-2.1.2/usr/share/gems/gems/sassc-rails-2.1.2/test/sassc_rails_test.rb:57:in `test_setup_works'
+    minitest (5.17.0) lib/minitest/test.rb:102:in `block (3 levels) in run'
+    minitest (5.17.0) lib/minitest/test.rb:199:in `capture_exceptions'
+    minitest (5.17.0) lib/minitest/test.rb:97:in `block (2 levels) in run'
+    minitest (5.17.0) lib/minitest.rb:296:in `time_it'
+    minitest (5.17.0) lib/minitest/test.rb:96:in `block in run'
+    minitest (5.17.0) lib/minitest.rb:391:in `on_signal'
+    minitest (5.17.0) lib/minitest/test.rb:247:in `with_info_handler'
+    minitest (5.17.0) lib/minitest/test.rb:95:in `run'
+    minitest (5.17.0) lib/minitest.rb:1051:in `run_one_method'
+    minitest (5.17.0) lib/minitest.rb:365:in `run_one_method'
+    minitest (5.17.0) lib/minitest.rb:352:in `block (2 levels) in run'
+    minitest (5.17.0) lib/minitest.rb:351:in `each'
+    minitest (5.17.0) lib/minitest.rb:351:in `block in run'
+    minitest (5.17.0) lib/minitest.rb:391:in `on_signal'
+    minitest (5.17.0) lib/minitest.rb:378:in `with_info_handler'
+    minitest (5.17.0) lib/minitest.rb:350:in `run'
+    minitest (5.17.0) lib/minitest.rb:182:in `block in __run'
+    minitest (5.17.0) lib/minitest.rb:182:in `map'
+    minitest (5.17.0) lib/minitest.rb:182:in `__run'
+    minitest (5.17.0) lib/minitest.rb:159:in `run'
+    minitest (5.17.0) lib/minitest.rb:83:in `block in autorun'
+rails test /builddir/build/BUILD/sassc-rails-2.1.2/usr/share/gems/gems/sassc-rails-2.1.2/test/sassc_rails_test.rb:56
+~~~
+
+This is caused by multiple calls to `initialize!` method and very likely
+due to this commit in Rails:
+
+https://github.com/rails/rails/commit/fe4377098b3800c3998f0583549a414b99b72b19
+---
+ test/sassc_rails_test.rb | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test/sassc_rails_test.rb b/test/sassc_rails_test.rb
+index f8c36e4..36686cb 100644
+--- a/test/sassc_rails_test.rb
++++ b/test/sassc_rails_test.rb
+@@ -1,8 +1,11 @@
+ # frozen_string_literal: true
+ 
+ require "test_helper"
++require 'active_support/testing/isolation'
+ 
+ class SassRailsTest < MiniTest::Test
++  include ActiveSupport::Testing::Isolation
++
+   attr_reader :app
+   attr_reader :test_dir
+ 
diff --git a/dev-ruby/sassc-rails/sassc-rails-2.1.2-r3.ebuild b/dev-ruby/sassc-rails/sassc-rails-2.1.2-r3.ebuild
new file mode 100644
index 000000000000..ace5a004939f
--- /dev/null
+++ b/dev-ruby/sassc-rails/sassc-rails-2.1.2-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrate SassC-Ruby with Rails"
+HOMEPAGE="https://github.com/sass/sassc-rails"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-test-directories.patch" "${FILESDIR}/${P}-test-isolation.patch" )
+
+ruby_add_rdepend "
+	>=dev-ruby/sassc-2.0
+	dev-ruby/tilt:*
+	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.0 dev-ruby/railties:6.1 )
+	>=dev-ruby/sprockets-3.0:*
+	dev-ruby/sprockets-rails:*
+"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/bundler dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -e '/rake/ s/,.*$//' \
+		-e '/pry/ s:^:#:' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/pry/ s:^:#:' test/test_helper.rb || die
+	sed -e '/test_line_comments_active_in_dev/askip "Fails for unknown reason"' \
+		-e '/test_globbed_imports_work_when_globbed_file_is_added/askip "Fails intermittently, similar to test above"' \
+		-i test/sassc_rails_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index fb8f5aac4420..16611ed1619f 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -6,6 +6,6 @@ DIST shoulda-matchers-5.3.0.tar.gz 244767 BLAKE2B 4a1a006702bb352acb338c71e0c315
 EBUILD shoulda-matchers-3.1.3-r2.ebuild 552 BLAKE2B 8eff4338b6ced75ca8d5e43819353c92bec689b1102bb8d3e9efa22eb52ffc10957c417faca1872caed87bf6b25e77f47bf9c81978fcc9a4a09c14c61eb3792d SHA512 0c8536c66cc563f970738eb54a862f6c0ad4d1beb9cb0a07dd28679fc469e9fc8f6aa1db2ec04098f988d0ef135addbcb3d83471e0c89bb399d9c4999e0539f4
 EBUILD shoulda-matchers-4.5.1-r1.ebuild 827 BLAKE2B c9550fb724c931bbd22aea68b7768410d0050f2bdad8f9d6b9b7580ca69d4dc64c9803961b6987c34ecab7005ccfbe75952b3d83ef5a379905792ac6bb9ae9d0 SHA512 361984de3c4ef339fa20f9004788621aa018fcaed209c5eeabeb3044a44a223c5de693677cca3fb82f33c5aa58194ce16a335fbe43176ae32e595e58e0d5746a
 EBUILD shoulda-matchers-5.0.0.ebuild 835 BLAKE2B 4cd1f13995f9f8d48477b828de3ac1ab1f4df0a9b389c8f2bd01a8170d7f9606e22d32ab334702875bb5f16f7ee00761beded8326e29e9c22efa7ff70aa67ef5 SHA512 dd02b4d8c42ba5e0444102ed1441a7b62c9e606b7e767adc5c227cb9bb15cf250e5d35754c970fea5da4afa13eddd49dcdd02d4609bd8acd48042a14db104af7
-EBUILD shoulda-matchers-5.1.0.ebuild 835 BLAKE2B b0ab4ca8d9a236c5178ce76bb19e61b45b2f1ec192859af1ca26fff82c268b31e1d13084ecadc4d10a87109a97839c9c59668d2649273024f5531117174415a4 SHA512 d7631d93ba08f09715fa4fc68dd215f2daf0b710e8f0acfa74af361dc0b898788b3d2be571c11da5ef0b5ea626d1e11fa232c445a482b20380c1e59160d5edda
+EBUILD shoulda-matchers-5.1.0.ebuild 835 BLAKE2B 19e1d321fa1051e17bc1d13b23fb5401f07e80779f6fbdc6d1741e959be0f704d78c591d8d0552439581e3495f6feabd35173d7f686897d68c47397f6a11395b SHA512 dae2fd3667d6dbc6f79e2a55983f3c221498e74b992ad375e9dcf6c12d7878338d930a71bbb9842e80074c5377dc680052fa646481508cb3f01b2d7590f729dd
 EBUILD shoulda-matchers-5.3.0.ebuild 765 BLAKE2B 6c27aa9a0661182d0f0c86b1616023e4c1f71d61da33415eeadf1f267528c13e92b32dd5354f9ec47539b860775935e8366ab21912960e8c5360b2186969bccd SHA512 9ef5573efeefac9ea996eff8f51dc4cf9a264f0e46ae5d0f870c6d6510f3b54d5e2749cdbddd31640f2b9efc05c4bfc3d555c7dfdeab359454de1a54c07eb757
 MISC metadata.xml 468 BLAKE2B deac17b1815c5381c7220dfd64c5b07dfcbb40ab1e9a3d60c69113e28d4132b0347e825a7c2ed836a541f3f97a898e794f4f0a9712045959c490962c757f95fe SHA512 b6dd01f25c76a89d822835ef56d8968eb53138ccd44507d7863e45834674eaac84092b825b5ef107be02109f82c5dc5d4ce60d21729da071b375f52f8fda4c4c
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-5.1.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-5.1.0.ebuild
index ff1abe80e35a..d300b8f8bcfb 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-5.1.0.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-5.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 5961970119c2..7cb1a8626cfd 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -6,5 +6,5 @@ EBUILD sinatra-2.2.3.ebuild 1169 BLAKE2B 945caba2ba540c84ce59ca0394ecefd9593017f
 EBUILD sinatra-3.0.2.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
 EBUILD sinatra-3.0.4.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
 EBUILD sinatra-3.0.5-r1.ebuild 1406 BLAKE2B 6f693d2a3907f4b7fe2123825c0ab2d046ac754ca943a10f6ef7ba06a3cdbff0b6a8cd9da66946a696910c01834c033e8e98f2eb543a4dbef5f88e0a12fa98a7 SHA512 8450a5c1216becb9ae798c558c5e0aaa89453adc3948c0a021a9f9cdc561674c5709d89f248880ec00769066a1999a62b5c1749898216bae0bee23c1d697b1c3
-EBUILD sinatra-3.0.5.ebuild 1163 BLAKE2B 3d76cea60668d9c5f458fd20b5abf3f5121f3f9547d6d84d3d3ea6fb62ae6fcf6ab0097e86ce2175d298547cd403be261cf703251186b84db0e908a33919fb6f SHA512 d6d03d8bdd36af7b4cc8d38997d56359813d17dc84157a51636fdb7d929dce93f938bbd752fd85709a03de662fefcb95527a1e0a154637b9ab27970389d3150c
+EBUILD sinatra-3.0.5.ebuild 1162 BLAKE2B 03a501a76198e2062f4fcc7119ec7ab80f8a99b6c6101fe54944a13890feba4a9e138fa6b2c3874051b2da0bd5a7be7270fe54f5dbb8173dd1314fd92ce97c9b SHA512 5ecf1151fb089075004c87fb97913dc8ddb344f93cd1765c2b48af364bf75c6df5f9ebd02087e25d87d23275daf02a1db464cd86c2fb074b1d683b2d8a388a05
 MISC metadata.xml 393 BLAKE2B 730e333a7e2203f0219040e53c2ddd3a894af807a242e62df1fdb94a2eee0350c52348a55699c80d4674f0b6024875627f68e2061b740dced0e2ebd2155e5b38 SHA512 fd922f80dcd2c7c663506680f9b6d86f810c68d1c6f81480063d3c20aa561a972f0fe837dbc636848191092c7b599d7e330ffe296e41c0da6f46dba68d2cea7c
diff --git a/dev-ruby/sinatra/sinatra-3.0.5.ebuild b/dev-ruby/sinatra/sinatra-3.0.5.ebuild
index 0329ccd4ac42..0f6a098f1385 100644
--- a/dev-ruby/sinatra/sinatra-3.0.5.ebuild
+++ b/dev-ruby/sinatra/sinatra-3.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/sorted_set/Manifest b/dev-ruby/sorted_set/Manifest
index cfe0333079d4..b1389ea984d4 100644
--- a/dev-ruby/sorted_set/Manifest
+++ b/dev-ruby/sorted_set/Manifest
@@ -1,3 +1,3 @@
 DIST sorted_set-1.0.3.tar.gz 4863 BLAKE2B 43dc21205db8cdef8be016d041607cecc7c23a847b2622518f212fe65d00b4bd63bc77c356f3e96ee84c6a1a702641f8248bb3d3201d7252652fd2fac7900d88 SHA512 67236fdac7d024203dd8d7432ec575008a14ad1e54367f6afb168711158ef5abac24629417751b0e11f641607d0a83689ec79e0c42b44025a6a7671cdcf3a70a
-EBUILD sorted_set-1.0.3.ebuild 659 BLAKE2B 24f0383d788e1c2376cddb869e2d2cf07bf4092671b10341a37ed150d6be63f119b12c6c3e06ccdfbd81b3fb9fec5d0b1adcdc79ab44340d50e9a3def44e0eca SHA512 128dc08334e802a28245e48ffb81ffa70c0c996e0c2ab16e0b0124d6a4dc9da9f95755b099a254a1a65f11504dab47cc4c170e0bed1adfbfb62c2cddfdc1bef5
-MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
+EBUILD sorted_set-1.0.3.ebuild 666 BLAKE2B 46c55bc0c95e3e6a8d458a595622c1ce103d5ca6fbf4ae22a49b34317db0ac55a542846a83ceae50a3276afe3e48a5433fc742375f9b7540ab44d2444a04b838 SHA512 f8ffc34d0cbf96213b81d76404a6063c00c7a026c59f5acd8e06f8ec26d1afe5db0d1f251ffa3ab551a0d966b52451e3316ded641a33483cdb3f9bd7c59daec2
+MISC metadata.xml 341 BLAKE2B 165efe2754a9f1e40af5e418cb439cc4ad83f0fd0c9d411adbf23a719480b88bd929fd19241ea36bbb49ffe5a9894cd09ba43d77cb404954f45848a8c986b247 SHA512 41881b23bb926a939b2670f86df13c1c121aea2556f9fb8cfe09a28d17067c0c3331fe356c62d27eb8a629fc8178c026a87c3c7fe7c60c28c410f76d6fc1dd1e
diff --git a/dev-ruby/sorted_set/metadata.xml b/dev-ruby/sorted_set/metadata.xml
index 7a38fd1850ff..e3eef5d46cd0 100644
--- a/dev-ruby/sorted_set/metadata.xml
+++ b/dev-ruby/sorted_set/metadata.xml
@@ -5,4 +5,7 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">knu/sorted_set</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild b/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild
index 9653d09dade6..0889870ffe77 100644
--- a/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild
+++ b/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_GEMSPEC="sorted_set.gemspec"
diff --git a/dev-ruby/strscan/Manifest b/dev-ruby/strscan/Manifest
index c53bf62d850b..916aac888de9 100644
--- a/dev-ruby/strscan/Manifest
+++ b/dev-ruby/strscan/Manifest
@@ -5,5 +5,5 @@ DIST strscan-3.0.6.tar.gz 36514 BLAKE2B 3a303ab8185aa12ef5fa748541a7c00dbea102e7
 EBUILD strscan-3.0.3.ebuild 907 BLAKE2B d7830696a4fb3f98e1f5cc086579e3dbf9c545f06ebdbb68ce6eb2875d856c90b6b86c02af05b63807f32395b7eeef933dbe1443d2a97db12462665f85a2d404 SHA512 40b50552e808075de4205397cb180be113e3dedf7f81040a30f6e46802980d3ddff72ad661310cabf817955ce19be226f6e082144a1c6e496d339740d0f30c57
 EBUILD strscan-3.0.4.ebuild 900 BLAKE2B 036e6157fb7a86cedfbe0ef0099bb47f36aa11628e1bafc5ed9005f7869c8291ea56fa4ee11a6d2af7019f42210b41ceedba8072a18f90d9339c1221bc342862 SHA512 8b7d041d82a63052c2c3c0ecd2039d57e0e86a1f99377665548f266b3626806130c12f501a712d34c1d4fca58ab30460e0f36f9ed91e61a98f2a69d667ef8ff4
 EBUILD strscan-3.0.5.ebuild 900 BLAKE2B 036e6157fb7a86cedfbe0ef0099bb47f36aa11628e1bafc5ed9005f7869c8291ea56fa4ee11a6d2af7019f42210b41ceedba8072a18f90d9339c1221bc342862 SHA512 8b7d041d82a63052c2c3c0ecd2039d57e0e86a1f99377665548f266b3626806130c12f501a712d34c1d4fca58ab30460e0f36f9ed91e61a98f2a69d667ef8ff4
-EBUILD strscan-3.0.6.ebuild 914 BLAKE2B d71279717fa0fa94eae7c142542b6cf58d8d3d8075f4e938ef31e774a0bf04ff247417ab8bcd323750c59b828c83a2dc0bdc6dec698e6b6392b2512a3f7a0c5e SHA512 4dbd409bfb635bb84cda839791315db9ff8153ec7950b5d66b44b083e53d9161284798c45f312b72cfdea8810e996b417f9188f0a6984b1aac211ccdfa5d66f9
+EBUILD strscan-3.0.6.ebuild 913 BLAKE2B 7417f453ba3ee3be9f2d3ff129e6424c32def1c3a4e6a5ad17430f2de2039251b0ac240f8e02f3675ae08837d46509c6cd5b8f3528d60bde16d6f27a3610c205 SHA512 0f162c6d61e14d0cdd8b2e24fa8f52275cca7d5b57ceab58094b56b0a0c93ba4e36ad36eb4528da6af823dd8213e2bb40a371dea290e18757e5e7493244f30ff
 MISC metadata.xml 339 BLAKE2B 78f4ae75b57e9192dcd9490dad00fe1ba916bad247dd6665b7eb6c4804ff1340c78407f6c79b777c555817f17e6ca3beb25a29f3d44be8b1865659a0b127f826 SHA512 8cd27e859d447843da29169be15647a5b7355d830f375aa59e8b39d701dd9b9c7c377c7f53c53eeea6c7222f4f9aec0ae0f7040673e24d6cdfb8b25f411819f0
diff --git a/dev-ruby/strscan/strscan-3.0.6.ebuild b/dev-ruby/strscan/strscan-3.0.6.ebuild
index 3a8741562659..df3dd7d896f8 100644
--- a/dev-ruby/strscan/strscan-3.0.6.ebuild
+++ b/dev-ruby/strscan/strscan-3.0.6.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/ruby/strscan"
 SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 6548152f58d6..141e0b1e6e95 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/directx-headers/Manifest b/dev-util/directx-headers/Manifest
index 8ab7b0182349..7e93482e3c61 100644
--- a/dev-util/directx-headers/Manifest
+++ b/dev-util/directx-headers/Manifest
@@ -1,6 +1,6 @@
 DIST directx-headers-1.606.4.tar.gz 352341 BLAKE2B 5b79e5fb0f807c7766708ac3467f0f8bbf82aa68e3aa71abc84c6791742ffe625a5fed4c36dceded9b372af5349e41e431266cadf21b173e4a659b39f840b41c SHA512 3fb4142f8ceedd8484f5f7dae5804a7a0012951de344936fbf22991d6ae659d4e5093e1627bfe51c3cb0859340b13171c4f6aa68377ec26ac05038acaad8c540
 DIST directx-headers-1.608.2b.tar.gz 395823 BLAKE2B 72bb71b75895afb0407af674d9877b680f77eb3133d2b23b833dff4b43230960f88fdc083d714fb09556d9babb530c34642dd3835b3fdc809473abb601ae8aab SHA512 d4e82615751d9ee46c456c676bfd6831c47d159ee58634531fc1acd09927f00c4e8d379cb233a1f89e3489a6a30d8edc0552b76945071badaed6a9c8591cbb0c
 EBUILD directx-headers-1.606.4.ebuild 648 BLAKE2B 881da74b9ed223cb65de3859fbbfed3b415e8eb9be047b1bc8ba9b98633a6f5c807f9b367052971e563137a60db7d0f45002f6465deca506a9c45de52fd5578f SHA512 47c3aecc72f40f86d25eb47fa4f6ac841bce837c9a1f8a55aae694d2745c607812568c1f9e44797a968f275f0dd8bca1ec0d713aad0af11d907f6c6f4c26f533
-EBUILD directx-headers-1.608.2b.ebuild 650 BLAKE2B d41321c80731a1a4f6910651b15b176ad36248a10ec8da3fea0cc4f19a19bed8eab77997552fe95ddd13ba2e943822aec92c4574cdc4e04323193b93a8b8f3ea SHA512 a0bb9533c3735944bea50e3e4927810a74d7ac8931b861ff2139cfe4ccd6fd345f03c61e89adb52bebe706203ca75da245e8beae75fff281f346305a8808d401
+EBUILD directx-headers-1.608.2b.ebuild 649 BLAKE2B 8a3c142c39d8848f7cecb3256d4a4256510fb6e965058bb967ac4b8f01801b9fc260a387c1b01a4c93e6e78b06a991408882ef3dd3d80205775ef35433d6bd48 SHA512 7cb875ba7342976608ad644073a653c6499bd855091de9b94791b0282d1bebace8ffe754ec468dac0e32f01c3282c9ca4f8d75c934c7c4126ad92db711c63940
 EBUILD directx-headers-9999.ebuild 650 BLAKE2B 9ba540c786a2d37cb6077cdd8ace5483c4cf042706afc262c09f6088946e4cf1186d6da31fd937d3d75f7953005cb54b274cf77335cb5818ed415f9e1987f104 SHA512 9cc4b43fc783d90679c17693afe5dfe51beeed88180c9a285f898bf608ede80164603333be6afb324116724131ca832c46382475154df5d2e6f16a59488cc5dc
 MISC metadata.xml 325 BLAKE2B 5f99ebc7e34bc34ed7ce7de68b4856195b45a4b482fa198972f3f054a4b945bb548a046b71e07ed2e89d3486b7259291bc1b5d09cfae739d0daa091d366a82e7 SHA512 f8ff1d6fafe3c2ed1837ab3db04a52351ccf851098046e0240c5619745682c2669aaa0791a792647d0af533cfc4f83b68171cc2afd05a30c532b918d42111216
diff --git a/dev-util/directx-headers/directx-headers-1.608.2b.ebuild b/dev-util/directx-headers/directx-headers-1.608.2b.ebuild
index ad4198c30d5e..ffed8fd1159f 100644
--- a/dev-util/directx-headers/directx-headers-1.608.2b.ebuild
+++ b/dev-util/directx-headers/directx-headers-1.608.2b.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/microsoft/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 76fec9d1eb68..9755ae09e579 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,5 +1,5 @@
 DIST opencl-headers-2022.09.30.tar.gz 65371 BLAKE2B 3197f02e759fb885d353802ac065e53cc6ced32acb65f40a94a5dad2d4952d5838d6b0f70a46b184948dfc14324cdfa076329692135c5cd79f1eae2d8f50d04e SHA512 6a669258d0f2d50f5359aa21d4df1b8ee3d5b0068825dee2841521bec6aa32cb628f5ace7fccbce736276909983d18610d03a9b5a0d6ea6cc0f3c5b3cff778b3
 DIST opencl-headers-2023.02.06.tar.gz 66125 BLAKE2B 75018fab7e530c955b4a61dc40626751894cf9c471234f0d1d5346d1eb38d00b13df5f87cbd2af59bfa17d014bb20f9ed13727fb660bc79b3728c075b7b1c613 SHA512 41730e80b267de45db9d7a3bcf9e0f29bfc86b25475a86d50180a7258e1240fc8c8f2ad3e222b03b3ef50c10ef63fb5b1647c056fec615e87965aa3196e8ac60
 EBUILD opencl-headers-2022.09.30.ebuild 609 BLAKE2B 70eb498df294bf5532a83144deb0db94a249789a837737bfa042b53b852d52dfe08a5c0f2dce4fda1122916dc439092f4e5ba7399b4f9ae3ca5f27f97acbdf77 SHA512 1327990574f155aabbd2a8eed3afde3b4e6449d3637a0182258ca45b9d1f282c6e8ee330fd8f2ed3f378c5bf1028ccf2acf2ed49367dde0aa1aa70779344cae3
-EBUILD opencl-headers-2023.02.06.ebuild 612 BLAKE2B 1f61f7484a2f3b1297a645de9af5bc4434d67e59e8f0e6dfd93ba3a3f08da99d5b7c336975b617747f2c6b75b1913fefc6cafd594e51da56bc35941f87563714 SHA512 c21f9e22bfef1a20da7f8c78de382a744a4d54bd6fa37bbecba7f6ae5d2790ebdaae32c9cad33d1e4d49d235942590e1256827c543935db328e4266c82688a85
+EBUILD opencl-headers-2023.02.06.ebuild 610 BLAKE2B 1031ddb114d94478f2a2bc1e5ec77d2043cc3b4b9117f0dc5204c9b004be0a8694056b67157fc4307fa3ab5c70bf327556e48d70db63e16f4ebc93d95ffa6ae8 SHA512 082ee9bb351286a50940de147798337d279204342e6afa4c883276dc4b35392b71f50951f681e060066e973aa33cefb7f8be8b89fbe7bab1f11c7bf69f847dc9
 MISC metadata.xml 1055 BLAKE2B ac96e1bf07e353236170d3678541555b7d901984266dfd1356456db90effe430e6a042afc0b9b5a7f51d0e9cfbcef0fbf66fb46de82fdc8cc1cfa29c6cfd61d0 SHA512 6233610591851e415ab0354ca900dfdfa14fa2442e56094d547420ce710942be86c701820c3a63e2c6f070b74c0801f92bbe9ed6c7f2a5cae406f74b81acd86a
diff --git a/dev-util/opencl-headers/opencl-headers-2023.02.06.ebuild b/dev-util/opencl-headers/opencl-headers-2023.02.06.ebuild
index 84f7dd5f1d80..1bc76ecd3e31 100644
--- a/dev-util/opencl-headers/opencl-headers-2023.02.06.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2023.02.06.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 11dc5a71c726..d4c01b03ea4e 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,8 +1,6 @@
 AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031ecb33987daa84c355c3628ab7f24bbab90afb24b0bcec6c0ebebb56339374fa35a345481aa9808bd538be SHA512 31bad085867ebecedf0c9c3ed1223e7512238892d69b5224e850d744c5965bf7a2d7cb90978d9cce6da8dc554dba36803d604b8c6ac2b7cc9f2718ef7d6fc644
 AUX pkgcheck-0.10.21-fix-scm.patch 1470 BLAKE2B 2ca07fd6f5736df1bc8ce374842bc5d8090e7e705bf0c98630ab94e9c12ca2f0cd0be6b9bd57d59e67f2b25f971865ff3583d66f2815762e68943083636656f7 SHA512 360091ce895ded5abec23cfe7b9d268d22ae59a237c2f9f85e5463488d94dd8fa86eb8e7b148d0d92066d69854d263dd08645620bc43aedabdd8a283adbbd8d2
-DIST pkgcheck-0.10.22.tar.gz 566826 BLAKE2B 714eb92bd43b4c3f2319aecb343fe6580f754ba50ed6fa986faaedcba71d34f2834ca85d17c961d327c90081dc305febccfbe08dbc13a706d972e289271214e3 SHA512 45532faa169d42f3d5a94a17e83089d4789e7c3e26226f2e5441ba8816cd3610a9025cc392bb32d6d78f202354ab11117fbd07ec2550d7e3255c02c6cb96d98e
 DIST pkgcheck-0.10.23.tar.gz 568903 BLAKE2B 8b00dc93d0c3f597f7397d2e7b3686d11b12da715d6e8071f1b02a8085061cbb2d7cb24bde6a73ef6e5d1459637cb78e536ce80a162f188a42739a434c62c397 SHA512 3bcdb91bf73cde60fd9fc2f5e470c5ccdfd7b3564e83192201b0fa1dc38265e1e0c7f7052039accbb62c55d816a6e89317d7d388c0cc3da3b4836475cb82bd03
-EBUILD pkgcheck-0.10.22-r1.ebuild 2217 BLAKE2B af41a235df61258a02f411cba4da7ecdd3e3019713a5cdeacfab6ea1ea95d36b13fd50a321dbd2699c26fb099a902a4fe5845b81e65e55f9d9808a19e1762fc9 SHA512 42edb05e05c4d6a2d94d88d767749224a705b94c6d6cbc3ef633b2e2dd657df980d9597e67f7bfd49c31430fa624f22021748d5425d82a63c7561b097176566b
 EBUILD pkgcheck-0.10.23.ebuild 2161 BLAKE2B 205f7a20d466ec9d3300d373e9aefea4420489b251b077543375fcf40636820fe2d258f8c10421434f167f4654e1da69d4b21c36b493236c241ff10929c2462e SHA512 3ac329f184a5708c80e3d1096c964054126f5d1f367598d881c526861160f0dab970ef9c2ee49db43fbbfd1f0af13a9c1edcca5d72a5ca7ff566ced3e82825ea
 EBUILD pkgcheck-9999.ebuild 2169 BLAKE2B e94f98e25963292d6581d4e167816da3b62ecc26c93bb7810365b3c1d6978ed803a4c8176065035202c2184e8b54abfdf0b443e18d0e7d619a3762086a0a96f8 SHA512 57aeb9a89927976fd235f0ff5f6fc625dba260ef81a937f85a9e72380e30f091287ad32d4781b9971222640f17855b99f4fb17018e59f74ea1dac2f877997023
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
deleted file mode 100644
index 4e4cb79a4a27..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
+++ /dev/null
@@ -1,98 +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 elisp-common distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
-		https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	inherit pypi
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="emacs"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.18[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-libs/tree-sitter
-	dev-libs/tree-sitter-bash
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-	emacs? (
-		>=app-editors/emacs-24.1:*
-		app-emacs/ebuild-mode
-		app-emacs/flycheck
-	)
-"
-BDEPEND="${RDEPEND}
-	dev-python/wheel
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.21-fix-scm.patch"
-)
-
-SITEFILE="50${PN}-gentoo.el"
-
-distutils_enable_tests pytest
-
-export USE_SYSTEM_TREE_SITTER_BASH=1
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use emacs ; then
-	   pushd "${S}"/contrib/emacs >/dev/null || die
-	   elisp-compile *.el
-	   popd >/dev/null || die
-	fi
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-
-	if use emacs ; then
-		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index ab7daad97f26..672ea6b3c99d 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index a0b3d1f8d3c6..08b6178ce022 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,5 +1,5 @@
 DIST encodings-1.0.6.tar.xz 312720 BLAKE2B 4649d8d12fcfcbb7de9e8bd8aa7e77514835a56990123549137b4bbe5615c1e9fcddccb13b6442d8a525efd147926801a5029cb10126462b29e31e3354da3683 SHA512 2d52486996939401121bc858ba23031f70eef857760db8da4c84f083e981868e4bc7a8c2ab6d59274a0cf95f592a0dbfad47bce6c9299bb45d115b48abc39134
 DIST encodings-1.0.7.tar.xz 299588 BLAKE2B 25c1be5e1bab85630617803eff63ad3a55ca865db5e5ffad98979986f2396e501d40736ebf90c9d9548bad79dff6ec53440c9e0e0bfe27e2f22acfe24a63bf5e SHA512 dc72982b14e5d89fe1eff1ab11f308796c89255a06337d8cd6bf65757f11dd0a5478b41d844793213db8fe9638389734f148abe9df9fb05027ea563dacde6ba8
 EBUILD encodings-1.0.6.ebuild 688 BLAKE2B 3fd065aa633c63beec5ca01550c3d93e28345fa9c4463a2a2df58c4cc806d8ffa3a81533fff9481f48bc00d12f2cc016023df033d3ec3cc670a7fb8fd7f31058 SHA512 dcd38396dda51aa217c1013ed322060125f09a472282d17e1b683af9139d315a4061bfacadef6212bcdee258e56e0f40e3c5512e7b100045f08b4efbbdcc44c4
-EBUILD encodings-1.0.7.ebuild 696 BLAKE2B 1d2fe428efa148a994484cac105d77e15af1ae9b4abf98da7fb2f75a6127addc1710e951b6a2e5af5841dec3498722d1cb23fd14f07c55e7a34acffbd3f9c693 SHA512 e1b84c81bcae8698c27ed55a5b299f3410a7b6bd79a0cb9acfcfeb51cfafa6cb736e421a35c4f22771405dc3e00c88a4ce80e0de11c8d6e0b2ec2a1027bebde1
+EBUILD encodings-1.0.7.ebuild 692 BLAKE2B 049149f5e44e676d7d4f575d530c3192b2ff32598f0e2019ca8ee33cd3875d22240676acde2d424e760c79729abf70c6c50ebfcf2173fa1edddfec351b46dc71 SHA512 ed14e275e7c36874ca6074e79832dc537e95edc726da15339eee5ce87a695b2ce2c53d023a0a0747cc5e7ac9b58408857cd87af312abb5b40ae69cc5a75552bb
 MISC metadata.xml 341 BLAKE2B ff668fe646cbd5895866eef4178c3d51c0be0524644ce378ea0f798ccf78f6e54caee6ec4ddb48feb8f24c12fa580c9f3910f896e510ab5066223f68c19df9d5 SHA512 1ab7f8b64854de585079f24dea9a93a599acb701fa1ae9f93ae80f06d929dfcb46169f8639f0edb6d659aa6008f0f3686098e5764f91b2174c3c4273c76ce7ac
diff --git a/media-fonts/encodings/encodings-1.0.7.ebuild b/media-fonts/encodings/encodings-1.0.7.ebuild
index 59d091fc67d0..0e184af085f5 100644
--- a/media-fonts/encodings/encodings-1.0.7.ebuild
+++ b/media-fonts/encodings/encodings-1.0.7.ebuild
@@ -10,7 +10,7 @@ inherit font xorg-3
 
 DESCRIPTION="X.Org font encodings"
 
-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 ~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 ~x64-solaris ~x86-solaris"
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest
index 2a1426798100..a932fa601304 100644
--- a/media-fonts/font-adobe-100dpi/Manifest
+++ b/media-fonts/font-adobe-100dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-adobe-100dpi-1.0.3.tar.bz2 1113104 BLAKE2B 055d8723af853126125eed181d3752c8aa58f5820f7835fab624917ed8bd1bf428064e472811f6538116b3dafd8984f4a651a4ee26924722394535b12e645aa6 SHA512 27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987
 DIST font-adobe-100dpi-1.0.4.tar.xz 886528 BLAKE2B fac12a9ab96fcc6053a2ffd491b4f98dcf82b278e191b5a28426ff9c87ef3b0663d3917e10c50a58e1e52b6f26b5b3ae6f63f757cbdedeb20a3230b09acce186 SHA512 fedb86672c3b9cb624ee5d74d1d710f21d92c2d48a1fcf0a45b54b3f992f6f5599fc271d38a7e25ef123b64d405fa60a3d46883fe7a9d71ebad83c9b418f8383
 EBUILD font-adobe-100dpi-1.0.3-r2.ebuild 304 BLAKE2B 0de2edd9466a6477d7bb0b2780f1941640691879aa838080808551a1923013608503fefff661703a6fe86a5b571b54242cf2ada88abbfbd52b035d3f13e4e6f5 SHA512 3261bc1da6fb558949e609e0987b57252aa76eb60156e287a18124ab939fc5994492192faf243d6e986f70f6f2fc04c604d7d6eb0924b83524d87daf21fab487
-EBUILD font-adobe-100dpi-1.0.4.ebuild 359 BLAKE2B 376b7b31a2b5a763b02d32a729e4a71ecda8f8f00bca97d299729147d3a4e9828bb43a41e375d1a2ee512e001924a6641e61e8e8b5fa9e74451af485f7049299 SHA512 a5a1d6b2bad09ef7466e8642e21794257a365ba3f604b41c5da62f809e8ebc84ff0975970d3793c7687617a346d173648be6b39cb121298894ce842c87cd4a71
+EBUILD font-adobe-100dpi-1.0.4.ebuild 356 BLAKE2B ec68e588691d37da842463227942cbdedb7dd7dac268f3e9b2be490ff0420b838d579d18e145037ad1c9b8c38fcd4f4523c045a04cddbde4d907d9244478fe33 SHA512 0ecfff0ab3a9e83c24dfb12e252e77b4fd86a6be05bf1a648719fd9ffb619c48129bc064f6eb07e8de2646e25eaeef319e3987022ff4bf3c0c31823439ae0696
 MISC metadata.xml 344 BLAKE2B 0954178dff3df3a40cd5cc6ef0bb5ad5b7822d324472a53621ce6c061fd51fe96729abf317974be81f38d7434d2f9050f47ab148d69fc4891e61fca83f6256dc SHA512 93645580fd6d6be673913b2017644ee58e03246ac087cf0e4712e470ac999c342b4c1477e2cd25f8c768aedf2dc3e88723f54cfd86bfdced50caa97c9658d76c
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.4.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.4.ebuild
index fbe04feb5faa..e618ec723d3b 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.4.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.4.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-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"
 IUSE="nls"
diff --git a/media-fonts/font-adobe-75dpi/Manifest b/media-fonts/font-adobe-75dpi/Manifest
index b438828e6f52..0b4940d9c167 100644
--- a/media-fonts/font-adobe-75dpi/Manifest
+++ b/media-fonts/font-adobe-75dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-adobe-75dpi-1.0.3.tar.bz2 889542 BLAKE2B 5ca08b27bbf9880794862615af9e6e5b566fea6529523fa393136221690bb244c1a39ef90f939a0275fa8e176a84f9a4bfe0f464acb0549927bfecf6c6831e13 SHA512 c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d
 DIST font-adobe-75dpi-1.0.4.tar.xz 735140 BLAKE2B 1e9d833f750c4dd3841053aa16dea94fe2675cc4b7fce76680ceee4ec977ca29faba885ef26a6b0d20f240a478525d9c34e16925b4c9c114289917444a1ece03 SHA512 4e63c268525f21c03525870129c8d42cbd17a03d86d9c88bebdccb5094a1093acef1d2b6d4dde221559cb19f047b86baf58fa8ad65d28d4cb6c3064ec164836a
 EBUILD font-adobe-75dpi-1.0.3-r2.ebuild 309 BLAKE2B 36b0d9bea4bd68439b08fac4b8fa60a1deb2f54f0722659030cfd48622371af10a273db458e88495d2aa8c34f84b3679082f4a376bd0f3bf3102e65914d23157 SHA512 a49802eb13c92208f74c008df8a2e1f690888e5420ed04e2c7f81e9e4849ad9f64f13e6e32a7df2691a04d42359190c2c8a9960653f36683ba00ee8fa880a834
-EBUILD font-adobe-75dpi-1.0.4.ebuild 364 BLAKE2B 9c803d81ce3ae48258b92205b663e517ba489cbae99529f02c2013888fbc89ea295f619a530f8a899bf7c61fd8d2f5ae9f7e1dd6575dd44d6c7e4a7a99b0c603 SHA512 1ea9c1fc94f4c413f60d03af8bba1b9056d33199f496a8121d1823fb744862d23a6f0222cf8a82139d4a39824956e84be6d4115f8176a9b0f628d748fb989fb3
+EBUILD font-adobe-75dpi-1.0.4.ebuild 361 BLAKE2B 908e4a7a38c6f67692fc47a8ffe79a70511fe78f0a39e5e76704e4d5e18d453ef8d3d9c18a0cfc0394a1a428083e8825a18e20ff0987286456a11404e1eeeac3 SHA512 e6709d8032fb01b018d097a3506c7c018ae4d1e8799e4c7cb4b28575193f5711b01d7bfbeb69a35562adb65b57cdd1f8bec0513fe71ba2891e76ca61036ade62
 MISC metadata.xml 343 BLAKE2B 7e7fe6ff2d453204e5f8cd28a1620f0c6d04920941af5f821cf15e68a156fe88205c6050f467e561bc439f2fcbffc4f9c889b53449ccf46a9c1562edb84967ea SHA512 7ae80ab0b1a0801e3af599de60f33a579334ead5fa82e900037692c3adfab54acbf1c526b193caef5c0e64c97cdf016fb7b8e10a823f993cc1bf7be167466323
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.4.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.4.ebuild
index 6824e09e0919..3f33c6594afb 100644
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.4.ebuild
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.4.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-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="nls"
diff --git a/media-fonts/font-adobe-utopia-100dpi/Manifest b/media-fonts/font-adobe-utopia-100dpi/Manifest
index 30f4f7c9c20f..0707c8bed42b 100644
--- a/media-fonts/font-adobe-utopia-100dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-100dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-adobe-utopia-100dpi-1.0.4.tar.bz2 353852 BLAKE2B e5d37b5608725ca36987999aad269e3ed5a988069cbe232ece934f2ed71dfaa94ed78499e911f16f7f6d8114e684d501920bf927ab3551cc211f27deace2f613 SHA512 fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b
 DIST font-adobe-utopia-100dpi-1.0.5.tar.xz 292184 BLAKE2B ab39ebaceadff69fe0254ec8818224628b83ba297b65106c587e9d56aced049742e0a0c284d013ec575c360676c6780ffc25de3aa28a9d76adfa96e1bb3942fa SHA512 9685d66de107ab3142aa9322bbded20f4f538d7bcd8c97bfb4db8eb1fc440724b0c7574ee8b4b5e96c81044c8ee4da175dd638f03dc3e1e650200fdf7b8a169b
 EBUILD font-adobe-utopia-100dpi-1.0.4-r2.ebuild 318 BLAKE2B 5730409a15543fb9a73256bdb2e9924b347bf50366c813fd78bf5920fd93dc1fe570dde5d0397219f184c509a9f037281843eb4aa07f9aa9ab1ad0b6b0edb965 SHA512 0e8ec8178b5a89472bc8a3f66b7f57d3066aa398db78b77c0080ea53f4eaa40ca622ff4987fec715ef779aeff8f7858f3ff0d19777e85f29e952af4d79583d06
-EBUILD font-adobe-utopia-100dpi-1.0.5.ebuild 373 BLAKE2B beedc3875e8b59641ee1d65dd5f18f12fa6d98abd8667b315ef567109a0fb41eb8d2291855ede36413f3a478a07a606826007da78c0a853708bdea986fdbb48d SHA512 4c8eb1fd77f0dc08aecb65e22bfb218ae5b65167868bd3233d05b16709c486cd7a04337cac8256d94b193a5b994054e4fd7644c6272174790a62de376ad74561
+EBUILD font-adobe-utopia-100dpi-1.0.5.ebuild 370 BLAKE2B 466a6d5f043147069ad18f5d52fa51cf7f480776bd4669b40fc4faccfaf5f32ad5559ae34f45137088ce7a4d1c955e8263772ffbf0f255042431b4a2295ffda9 SHA512 ab51201a433760dfa5dde9a258e0e90380c0c6fe7bb2366bdea0fcc0d84f6bdb50a632e0202c722483ba48dac883eab53b8fdda25114e97df1bbd5d9c43c19ed
 MISC metadata.xml 351 BLAKE2B ff8d67016e3ef1870ce9203ae6e768c14287991ac01204fdf9adad84fc210ceefce57817fde30ae960f1927b8f6ba2eecda97e9e4378a1546b986963d6d146f8 SHA512 b2581978a8b9063a864947eff01c8236b035e7ddff697941a6ccb17c4655ec75501b8b1d25930c19991fe0eb06b4f0c8920efb104ef85f71b5667eaa2a2b7b6e
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.5.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.5.ebuild
index 55cc003a6eec..b02d35652353 100644
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.5.ebuild
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.5.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-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"
 IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-75dpi/Manifest b/media-fonts/font-adobe-utopia-75dpi/Manifest
index 3cc155b2b3f2..c2fc7f11f91d 100644
--- a/media-fonts/font-adobe-utopia-75dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-75dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-adobe-utopia-75dpi-1.0.4.tar.bz2 273484 BLAKE2B a304d690de9727c5678dc1613cf7c8960594607a5f21fea15d03caade18df23ea83ff62fe7bd6c12750a0c9ffd11c28d4507e811eb271a1d1f874f0bcf0e3a92 SHA512 c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92
 DIST font-adobe-utopia-75dpi-1.0.5.tar.xz 247312 BLAKE2B 8ec3044fdeb6e5eae00994db5e7edfc108df71cd9ae19f5d89302e9ad152faae8d9e633001c4cbe42bdc4d4c84b341a34842018cf1a20dcf12bfa88a5aa1326b SHA512 9608698288fca47bf61cff911b8f081593807eed9f138ea22f05a7b6c26c481ec5144d79665cf509ba889df35ef5406e0de71710362bcf6de6b602c12158e22a
 EBUILD font-adobe-utopia-75dpi-1.0.4-r2.ebuild 317 BLAKE2B 7104d7fbe50cd9ee808d4a24f7bd375bd8a7b28ee19e95340f0a7e58edb5435fc387ce69ad7eb0ad861961bcc09ddb275915469d67360ac92c0c9d2d06bc04fc SHA512 ca72e1092b41fc9568378dbb9a8d9c8e5ca7178bd7c97ba88b1ee4bbf260294ee6fec670a61013f7063c20dbc6a1884e12302af5994d516daf375d542348017d
-EBUILD font-adobe-utopia-75dpi-1.0.5.ebuild 372 BLAKE2B 6b8696b4d3014c17ba7328958a727c0d185ce7f51bd3195576675d06685c81281bc2c5e1a55c3c702a6e67e31ec9e7e32c3b57bc9eee37364cc3efbc3ea2f39b SHA512 5ffed2d0e18cb8b7120c856daa8317375ed0533d7f53f14e099fc22c5fc629f17ca0e94a0ec167ea04c534c99aa1251b2df6bbb1e897ee1d8fb34b01bc28578c
+EBUILD font-adobe-utopia-75dpi-1.0.5.ebuild 369 BLAKE2B 200770aed59e680f9c5cc772ee6d12d9b7476f9bbe96817fe03ec5bf04d01196fd965fca274bbc7581755b9d26277d2a5b936a5316b5bf8e85c9b9b73d330a57 SHA512 a4552c1eca4a04b32eb045ab5a4bcb8b313846974cd17d308495a393d541ee3b7920bb36b8ec21ef12c26a5a8b0a00a32f94458eca70caf157bb809f1b4874eb
 MISC metadata.xml 350 BLAKE2B a41853dea3e43b6a86ea7a33573d4d39da5668bdafbddc77bf5c6ccf17429e10e2f906a930b008a27adb6e5d809e6527c4288639d925f55caf686a4691123d7b SHA512 18d198deeb929f2b964a763aad631ae83bbfc97788b8aa8bcfbc7d35958809664616d3a59a3d8a0b4c5e3aec43dfa4fc478a2624e95addc033f2c8b6a9073eda
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.5.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.5.ebuild
index 4abc0a842299..6999dd529dd2 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.5.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.5.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-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"
 IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-type1/Manifest b/media-fonts/font-adobe-utopia-type1/Manifest
index 19ae82264779..94154e520251 100644
--- a/media-fonts/font-adobe-utopia-type1/Manifest
+++ b/media-fonts/font-adobe-utopia-type1/Manifest
@@ -1,5 +1,5 @@
 DIST font-adobe-utopia-type1-1.0.4.tar.bz2 269159 BLAKE2B 0e23240a7b79a43c0508935b460e1f7f4cedc72e98dd903644b97d042983dde4c62610f53055d35717bdad56c5a9f52962bd11c4ee484cbb9b89b6c4c95752b5 SHA512 53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6
 DIST font-adobe-utopia-type1-1.0.5.tar.xz 264312 BLAKE2B f1c3bb224ca165266938fe36c250daa87e94dbf4e5a92eecc2245526947a8992a388611f7d4a225f89201db33d1d7a454f15f33946b1eb6b8b0914bba7671949 SHA512 e30f4c7702f47a3a42206975fbcfec058317681956d246411e50e372b669bdc875c5d7fe28bad7d298bc61b71a997c7836fb6ac16effd223a96723a6e9ece649
 EBUILD font-adobe-utopia-type1-1.0.4-r2.ebuild 306 BLAKE2B dc2c2467ec0a02d64267b56b5b6dc53953f559dbec140cb3b95288c98515c46fcaf0b846dc77376d074b774d117438511c30db3611aca36c349d9b15d5391133 SHA512 4828def90ed63937980df5a62189535f7e81b40132e5b22f4852eb1d44be19b216474f17671985c894143e977b8be73e4c587ba8a2fa48b842802c1f28256afd
-EBUILD font-adobe-utopia-type1-1.0.5.ebuild 338 BLAKE2B 15ba014c392ed12153f1561c686bc9a36c95fb854c47236d50a9f0d4e301f004a9f430640c5614d1abaa08a949a487f1f17b2bc8b8db87332c18a23414357373 SHA512 3510ab3c559009fa9c919c21900bc6b6968a1d8eeb9c2bc28ad015bd44425e40459a39b8a5ca2d8030f68e25d55686a206a96dcfcac158dc7bbf1cf0ac82e332
+EBUILD font-adobe-utopia-type1-1.0.5.ebuild 335 BLAKE2B a7bc60da0d64d145d633a03ea1611115ecd694a99a87094e1d1fb70b98bcf5d1793c36d2c562489789fc8d934dde15f7fb42d64326d5903358428b4bbdf6fb13 SHA512 0e609ce9084948b9ba196014c23f98199a9168158d2da9e2974d64ed45ee24c07ed2756816e21b030d41375a4781e49b7666cc8ed4d26666d4134a5f15607209
 MISC metadata.xml 350 BLAKE2B b5a231696c069a2bf0868547d1292f8d522237738e4dc05a703a3d81dbffb9ee9a6d1a62f7c84479585d06437d85fec288cff15ecefcf4ed5fdfb65031ba5414 SHA512 99e10e2ca4ab4306eb6b1478ff907d6c205e90de3038ea0eecf9e216b0f725121e129a46d2bcbe31cbbb085aaf6c18a1a1e477058d7571638af0f2e6c6dbdafd
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.5.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.5.ebuild
index 99ed0391e993..1b00d09475cc 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.5.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.5.ebuild
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
 
-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"
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 7cc40915edc1..5b03fe2fd2ce 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1,5 +1,5 @@
 DIST font-alias-1.0.4.tar.bz2 119248 BLAKE2B 40f4fbc7924c57d17cf7166d0d60c4231f83cbb85225c94e6387c0dc72aef106b1e665a1700ec857784047d9ee04eab422cc1f391a952dfdca1b7cd6af2a503a SHA512 c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d
 DIST font-alias-1.0.5.tar.xz 96780 BLAKE2B dd8bfcf3de35babded89ce1b66af357292b5202bf981c44697cd637de026837ee17d5583f8a48b117190c700cf7137011f86d4b63a63e0eb9d2dfc95ed45d151 SHA512 86bffa6b9ff789eeba715c079965157806ed633d44cd3dbf5e2a4bba2b390a0f48db65edc8e3264acbc2368d78a8d7e05bc2e2e3a86ddbf6b08bfe7f5e862bcc
 EBUILD font-alias-1.0.4.ebuild 549 BLAKE2B 3ba56d2685b3a10f290b18723c1f2c7317e416f794f57ba14d50c3f6ad117c31554d50e039b254c6f4308148f3084b63378c83c6078cf41bd235f13bdb12de97 SHA512 6acf3b033bcb99672d7634cc636d183367c3a6c78fb0c2cf29243a860f82d86cac6aa2f3f04f2c802ed4edfa9bdb3bf77d47b41ee10b57c8ee47ac8267c147df
-EBUILD font-alias-1.0.5.ebuild 582 BLAKE2B 5ff6fe61326ef7aa54e3f07dedadbccbdfdf166da7f33e5fff66e58858e563ade60e9b82904ded279d498a51d046b4b90ede572e2981ae4c2f117f91cd81dc47 SHA512 20902618439a46cf6a47fffddea3597bdd5b7dbf621d49c58a558ce356cc4756729c7bb4d164f9992dce0b9cb615bb025121b9ac44336070c85b48259a8af5cc
+EBUILD font-alias-1.0.5.ebuild 578 BLAKE2B a09b4e75090f67005f22264641aa871f83fe7187e7d6ed2047001474f9226b11d15354bbaba747e34e01e0876cbcc4adc83397575b4c8b23d71efab0f8a3ed52 SHA512 d4a149ff4beb4d08a746d6c5b7e94c802eca2590d6e035ba9fe0e7a65db7e446ef9193b9c9f40b7b0a885475ac201d486409105d032c7ba45b7e4870e524da61
 MISC metadata.xml 337 BLAKE2B 7a4202dbc763385b623ee16a9584407dda7da1011b2ec7f80678d75e7346563542475ba40f0a9a9f22c29fbc8130b01251783827dc3e021694f65beb4ca83533 SHA512 4737118a915f00bda509c6025c71e08796f3162d6901e670d44915663fbaac968d266d1324c5c459f70caf646973fd7cd7670edbef8ee4ac077238538e4d9d83
diff --git a/media-fonts/font-alias/font-alias-1.0.5.ebuild b/media-fonts/font-alias/font-alias-1.0.5.ebuild
index dda00232dcdf..1d1e1a628a14 100644
--- a/media-fonts/font-alias/font-alias-1.0.5.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org font aliases"
 
-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 ~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 ~x64-solaris ~x86-solaris"
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/font-arabic-misc/Manifest b/media-fonts/font-arabic-misc/Manifest
index fd33b5c55c53..01de575aaf6d 100644
--- a/media-fonts/font-arabic-misc/Manifest
+++ b/media-fonts/font-arabic-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-arabic-misc-1.0.3.tar.bz2 112136 BLAKE2B 7ccd19008955a016398afcbb1202b9df34e7cfe6937152d443f2ff381564ef1e91dc4bb7dbb4ba6e5931bd7071ac4f570f2d8167dbc58029ee9a88f5ab18a5fb SHA512 46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0
 DIST font-arabic-misc-1.0.4.tar.xz 104644 BLAKE2B b58be869efd943b800989594d14cfd87e5f8b7add99ce27ce419eafe52e1dfb18724720116a962d0e7a67af13f1a41322f0a2b3d12f0d9ed8d2faed8d07c5555 SHA512 afd5fae32440b133c5ee0195af44ad1462d35c2f451dcf4b1c93e0ce245d009b120d39eb5f780b003ae2f572408965e6d149437e9ebbf5738cb69193aaa4d488
 EBUILD font-arabic-misc-1.0.3-r2.ebuild 293 BLAKE2B 95da8ad456b1ebcf9020a70e334867d771dcbd2744cd48026ec2725625f74289d8b2c6e7d01117e254d65ae4a6a5f300b4869e2b0cc0290c81cb39460b882ecd SHA512 5aed3f42f90c76f4029ad91469efa690a51cdbb1fc7de1925f17a3d2d7a7cab87ff6025bfecd54dd8653480f083feeb9c2deaa9392e239191443d5dc15c53c73
-EBUILD font-arabic-misc-1.0.4.ebuild 348 BLAKE2B 23e29651c8edf4aa44903a8eaa7dcf366300f12daad20a3f15647ad8e3a84e2e191c525b10cacfb9f7b8d1f944c0dc7a8773f653ba3fd8460926c586f61251d5 SHA512 c400b1a87903496115e891cdee0cd5f7e352b0d921c585e0ac915230582ba06feaebe7d6a7a5af3a8ad67bceeac7412af817243af715917bb0a6bc1b95abc280
+EBUILD font-arabic-misc-1.0.4.ebuild 345 BLAKE2B 94c53a9e488f0797da28887f80a31e9d7cc8060861350dab601e14739c60bbc6d253ab4a0751fb0177b0de38b07442246d452e8b23c106844d802acd0104e263 SHA512 c31d83cb00f7905afc687d2e15b17e6b9ddb17447492465cd8dee77b1f1755f8d5261757ef8fa1f7e8daf1d43ef64008aa482b6ef29cf23ae1baaad502749739
 MISC metadata.xml 343 BLAKE2B 77512014344483dae48adcde3acfda8f7a81e3226aa7bb8354ac637a98ce8f26ed16eb1162b57963941155d54073642b2fa8b7b43e936628ac11fe89ba7bac16 SHA512 d4b349e73b2ae30aa84261cc463d389b91c8aea932cce026164830c37efbea80fe277fa747e0588ccf540e62a85887f17b07e267e12918784b85b851a444f0a3
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.4.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.4.ebuild
index 2023dc55f673..fd06832135ec 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.4.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org arabic bitmap fonts"
 
-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"
diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index b24d1c9c20cc..532055aeb0d7 100644
--- a/media-fonts/font-bh-100dpi/Manifest
+++ b/media-fonts/font-bh-100dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-100dpi-1.0.3.tar.bz2 713206 BLAKE2B 3433efac96d56d91685cacf3a1ff93fae0378831164381b2e8f16dd216a042c8ed3d0ebd6c622b592b11cefe7822814df57c74e42ee846905a406af208616eca SHA512 60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2
 DIST font-bh-100dpi-1.0.4.tar.xz 569512 BLAKE2B a27b289749b18c776b86bc270d6fbaa55ac1cbe50aef7e5467b7f64848742bb8ee1f0fb324c5359cf75e4cb5e3300cd7d3d25d61103e585d1158b8efadf6c1ce SHA512 5fe2a24df0d0e9109f1c1cb2556f4cdbf07cc16441e565333f01a00815dd4555b6ef0dd689ef3196ddb76db7480bca8f0b501d4244262d6c64d4751d75503b44
 EBUILD font-bh-100dpi-1.0.3-r2.ebuild 369 BLAKE2B 527eb0053cc89382e532d0a2477748936205faf8a8f97a38439e91d06e4bfc6482aec4372d2ab5bc0417bc7caa201f050b06efa4dd20c717dd575fe6273f886c SHA512 f0b09aed478990c7c302866037db72b3b5455da61a2fc1707c64adefea23e94eb643212a702b77286d8195e5fe67f0f31317773a904f7d16d6966c4688e41af3
-EBUILD font-bh-100dpi-1.0.4.ebuild 424 BLAKE2B bab3810815d0bff25ccfe770e44caef136d0d951f1f501387bec7ce129097a7a54459b33e347084f936d09592bc9f75709fa82901681a5a93de9e9152dce4172 SHA512 0e3f9018e841edd5f80c534a70bcc6e0e1171f9fc075009b8210ce5e5748b7118c3d8c5e1aceea19ba341218ca3efdef84b85a3f137a2506fc25133cbac5ba6e
+EBUILD font-bh-100dpi-1.0.4.ebuild 421 BLAKE2B 33827a5024bdac3e734026d284a221961131b956856507d58d06cf23d387283e9d05291dcbf7e3d0a1f96450a5e6741238fbb3c931971918e7ae77b00cb87f09 SHA512 345ddaa09dd83788c5dfdce508945e773d9254aba78585376e08d950ce7de3cfdf72a294b90a2b05b543698830eb9bfca10ebd0947b83f7c06e6d8bb6e14ed31
 MISC metadata.xml 341 BLAKE2B 1e1930e8e5dfd5eab79d0033ceba1296f6e64e617d98b8c639ff9d48c16d411ea8c8e958c05b4c159a08c52ffe5aa8925b41fa2977c2146457df44a9a3a38ad1 SHA512 832af6d13a7c9b59378c28e4a3307513be6b59dc66cfc95848e796387b33db04338886449ea47302d259b67af9b865597e08d8ac0832f684fae3e43b7ebc7ae8
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.4.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.4.ebuild
index 835cc0c8f77c..6661ed62225a 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.4.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.4.ebuild
@@ -10,5 +10,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
 LICENSE="public-domain" # bitmap font, not copyrightable
-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"
 IUSE="nls"
diff --git a/media-fonts/font-bh-75dpi/Manifest b/media-fonts/font-bh-75dpi/Manifest
index 89d08e0efa58..69eb4b9ea7e3 100644
--- a/media-fonts/font-bh-75dpi/Manifest
+++ b/media-fonts/font-bh-75dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-75dpi-1.0.3.tar.bz2 553016 BLAKE2B c39213ad487d577763939507c24709413e56147901d4bda5957004ae4c9b53dba4769e93886a7827da4ea149303d92d780f7c745f7de6cd89b6d69770158a52b SHA512 fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50
 DIST font-bh-75dpi-1.0.4.tar.xz 472540 BLAKE2B 4c3e5aaa5894b9c74ffb6c578bad7ec0c12c8f9592abb30be0586be555db18c062e689d93e854615138d5395cdfbce29a6f12667cd4e0f0cb451c2977bbfefa9 SHA512 8ccc5accdd43b4e1b8007c94e7916c6ee947ff0d57e3b0ce92154b718ef0ac2579659719738a50ef3ab0998a8bcea5b055e6a2e4d72b9fa5755b786143303955
 EBUILD font-bh-75dpi-1.0.3-r2.ebuild 374 BLAKE2B 61e9104abcb3992698267fd40300f20ebc36569818a20d5039bceb113be8d37f3ed7cdefa9bfe8e0bfcc6ee715d8f06fd9b446c725790163469433201bce3ec3 SHA512 8c77a34aedcfab9b555ffa068b6bf76a15200e999a15797efa29c263fd09601172a288a1d84c69b8abd17938cb6102bf4092f9407a05a07452cfbbb514b9f940
-EBUILD font-bh-75dpi-1.0.4.ebuild 429 BLAKE2B 953eb49fe436cb8dce0deb98f454c65d599c637fd3d04005cd9bbf1c333d05a8f59750018abf69f8bff859dc7fe95e13dbb2c4e10ca8ecf775746de1802d45ab SHA512 9c618b1530877979eb94d98b1264e2501728061ca1805f5595155016d1a52e55ae168d3e80a0fcc71211ac6f225c310cb42035df35075519644b978f5fc0406a
+EBUILD font-bh-75dpi-1.0.4.ebuild 426 BLAKE2B 925a2f861fb9f232935792a47bc0a0a2b219a3959d2b247293edf3aba7397d6d17b1958168d5ada9a1b41ed4626ce3891a112491155d5f136d45060eb0108933 SHA512 6594d89f473d3a50f0aa1e49c730c3fc5a385138ecc8bbaa342057026f29cc5f80d75a4000db1168d2e42f3de1c245143ec4bfeb836cc674678338b14bf9e5b0
 MISC metadata.xml 340 BLAKE2B 0a82149bb52ebecb0ed9156c87a60746fb59b62f9404e33465bf55022cee63871b4718fda5f09c9a20c24cd8903bc07ac6fd1cf7c354bb1c6237626f374a4afc SHA512 53a6cc6782a0530469d0ab7639d7df16250a51196daa3e904a5f941f2f5ed9fa93d6de152fb4ae2bfd2cc9b93ff8a7359e8980117d20c28ba9b4980623d2b7c1
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.4.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.4.ebuild
index a3cc86e49c96..7743f8862733 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.4.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.4.ebuild
@@ -10,5 +10,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
 LICENSE="public-domain" # bitmap font, not copyrightable
-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="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
index 1af4660d29fa..afacf0ad6f74 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 245807 BLAKE2B f2cd40b5621aa3940e8047bd6b2ca588fde367512da196ebfa32469be06ea15c87641da8f81f14191a65dd5eb791de1256e26c5cc20e0dab3883834028003665 SHA512 1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f
 DIST font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz 212808 BLAKE2B 569cf4990dc1eb318b7edc0dd8651fc4dbeaec9528657505d60bb3548c6a37a6e45802a2a73692d2c6aa924a2b12b7b958df551da52aac51711877531ac77d5b SHA512 31a4d061430089c5523815dde7d7cf73c9cba768ab79004eb65af8a1684fdd57d0829d9f4249c8e542e733266cc5f83e38eff403423a77a06af15008ce95d2ab
 EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild 394 BLAKE2B fef91b918a13524fba62d00352bcbb1f4b1903ee2a4d86d18397ef397f3842ed2521eaf4993c06570232d8290e9b1c3454d1f0d21470c5e84561ea0767a195c5 SHA512 7f1657b3737de62517cd620c1c0a20bd261fa7c49ac2af2af93012127bab5b4770e3377d4ce514b0b76337eb6c94e3af62d657c4872d3292fdcf838b928c877b
-EBUILD font-bh-lucidatypewriter-100dpi-1.0.4.ebuild 449 BLAKE2B 8a75997c819c4c0ae3f3ee1ee39aeb9e475654bcaaf51076056fe8471d7d33040f71bafc80b6f03269f046b8d26ccb34c83bcd33b069085ed73f15c9997fc196 SHA512 ceee121dc18f3fb4f4263149c5c0a07764f0f178bd99b2cd9eca65119e3adae9537993e7611c920deec5924797ab8450b209a046d1ed64732d429e50b46e164e
+EBUILD font-bh-lucidatypewriter-100dpi-1.0.4.ebuild 446 BLAKE2B 72bcb9bfa6f5e656aa6753fab15cdb5ee4c1526ee3c8b861ddea33e0765cc79608db7b6a9f6d0b1274393d7ab1f0ebac42116478d8bb8d2adb3951d191c9ce34 SHA512 1ee0c2dd506faa3ddee830163257e958aae2ff5ede6e79c9ff459bee5f0469ce99313103baee70f7563985761a678b20244524127989c725f2c8280c8251e226
 MISC metadata.xml 358 BLAKE2B 2242cb64886de970ab535d45c88efe309e5be0e7996352d989705718a5c13ff33d7820517c038766cd5726f5cf5bc775276d5a898ef94073f6f765ae0a7c7a17 SHA512 a4bb994e175612673e09a050a708adce009621e7c29f7bf6feb1d6bacc7e049fa27fc0cb8d4ce0093bb1f467890337669bdb9ee617fe8df8e3295f060072795f
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.4.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.4.ebuild
index 8fcb674264bb..e98781ecec36 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.4.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.4.ebuild
@@ -10,5 +10,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
 LICENSE="public-domain"		# bitmap font, not copyrightable
-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"
 IUSE="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
index bdc4557300ed..b30b143b13f0 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 219511 BLAKE2B fe05029295ef04414dd37fe80d023cfbf423fd3c314d53cb71dc2e4c623634e8e5b911f7a92851f49dd66cc9939d4998d4ec78f705a52908d01e1dcb91f08387 SHA512 2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13
 DIST font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz 189952 BLAKE2B 1347d53ed01622feeac38d578c39381d40e35e174b0cc6641cf7c4852c63077249a20d9da4fa1c5d98e12331d153815331d29c732ea4f634bc9666b79fda5590 SHA512 bfe2776b84533dd23648df42b2c74fb7f49e665e4f2128c6af529425a1569051c9ddadb696dfa7a6bd959a4929f8a75f7e4fbd7da7767d272a0a8a5424a879cf
 EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild 399 BLAKE2B 78ca3e4a38b4bd84ef948daf34a49a56b4fa202cb25662647cb4f473453efe73d7fa74daa6a11f27d914e777acebcdb5d7b15ed496fad0cad6771b3b8ded61b1 SHA512 335dd0813c2fdd102906610f00945db0190c0db830ba20b9874a8822ecd525b2b97ff3ef45ad3cad38622a866ee250507303ea027915e6e0bb8a067b7555c182
-EBUILD font-bh-lucidatypewriter-75dpi-1.0.4.ebuild 454 BLAKE2B 391a0ba45c410b081a23b9795bb0f6b8471081e8a2e5608eb80bc95850bd1f8e8bc6d67cf05b6e1f38a396e43c9dfd7f393822c80337bf3436d5219b97ae426f SHA512 f145539ee96672dffdcedbe52b73dbc35878d7748d5ca8e2f68b8d1a262319c9b4c11483b443a692123a65ab5b5eee2964f077eff492054fdb51aa30efa0f370
+EBUILD font-bh-lucidatypewriter-75dpi-1.0.4.ebuild 451 BLAKE2B 89fbcf60c0bf305ddc45cfe19ae4f7a0df2bcc3dd5c068c143f20b468ff7024992c92d94a5528ded893ed8825f21d02a19bbfb0faefa8212d99d7ebe127e5481 SHA512 3145f08bebe4c6706bd12e14eaf6d4c16a8e657bbcc6665f161b0484514bc2a2bc6e91ae35a9462c553b0a83752a6ef7656c76d986b8d0f84f01eab787efa9bb
 MISC metadata.xml 357 BLAKE2B 79343eb058fc9c8deaf7989fc99fd4dcf5921ddd69f39c6caa78af1b0965b539f3dc8b437ca95ecf2e167e531cf4ad278ef78043d9ffa5dc24f4666a0e7a916c SHA512 a4378a384920b13baf028f5836e114bee74b4b08c8a126ff3cb06b41e73bf1e0649d70b51a4f9a0751ce097a1ab47edc876f5ff68c5051a42ca8ac80e60bf3cf
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.4.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.4.ebuild
index 5757d4d47e29..d41dd8e9954e 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.4.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.4.ebuild
@@ -10,5 +10,5 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
 LICENSE="public-domain"		# bitmap font, not copyrightable
-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="nls"
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index 248858eaf90c..f749c8ed2f22 100644
--- a/media-fonts/font-bh-ttf/Manifest
+++ b/media-fonts/font-bh-ttf/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-ttf-1.0.3.tar.bz2 465351 BLAKE2B 2d508265128262b479f184341862687235af0bec4098dec269f257ad3d2ec94de08ccee4701612c9b747214b38587840a4051dbca2fa1852e859482eb8cf6ecb SHA512 36b5b6bbc2894cd90a372e8131281a462b42d503be3e9af8565edbcd954b336690aa86a0b6fb162d865ba71b65669c5b911658c5b820effcea39d086d485be25
 DIST font-bh-ttf-1.0.4.tar.xz 372012 BLAKE2B c29459ba2ef8aa3821c8f6d500febc5d638ada726597236bbf76d468a12ccac4e23a0787e17af70be3e9eea0163d86846cf69f8eaf23bb2be91fac446a640dfa SHA512 d9d1cfdd3d73157d0253bebb76e91b92c5ffface42dd6aeca40f1deffe03f079a0f9a46d6fb368e5c213e413d0753766e9454ac4222baa3c9898dfcf92718fd0
 EBUILD font-bh-ttf-1.0.3-r2.ebuild 335 BLAKE2B 4499dc99020821c1ed13bb8fcc300012ce338fb8febcfa0efff804c37443e0b9322219074df440a6cbc746f5c7b168e8cdd115715cbbd2de6914462d45945b75 SHA512 e917876b8632a13a7ee91b48a77201a63c395ddf998635352176ddcdc10ed747d02a37aa5a5c10fa5f3427f5f3d7751e638ae493ce35b25c70b98cadcbb9dd10
-EBUILD font-bh-ttf-1.0.4.ebuild 367 BLAKE2B d112f6cf8d5645d302cbac3c1b8258bc00a164704004bad01976e3198e04368de5d8ce1d1740609c24affc44b5c55855c43b6182aa71b3b6f1b68da5ae35322a SHA512 eaf47d5434d8818c65920b70b183bbcab6983e4cc0401c561c02f96f6874990097d7cd321dcfa5eb4a6117a6a55be74fa2b989a67fdf8c6bad70a59844b42b97
+EBUILD font-bh-ttf-1.0.4.ebuild 364 BLAKE2B 574fe6e5411743b13ab22e368e1461d6ca6f14f20a042badd4822a49ae054a368d16270cebc34407638047e0621908cfa6d992b9de302a2472a4b8b07d607eea SHA512 b84be353d31453d5961187e0775523ab9abb8d506847b6e1957f7926fb8ac6d27a30d3df7f2de2303e98068fdfda78435e9383b0dd67b2221c5c96f604f6b25d
 MISC metadata.xml 338 BLAKE2B 353df9a92cdb7dcd02b9b4dd447b2045d5c76116258cd33826bc5b4ffb1f5903e85e05abf782aef2f4a9b0affdfc34153420db0f7fd5c7bf04c1912867cc8ba5 SHA512 a9469ad9f013b3430745f90d9913d166948f199734b98635115a197648850aa6c66c0b3327db30b3da1a349cdb6bee9948daf3b73c5014e7f9df83ee5602368d
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.4.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.4.ebuild
index 5f103d848bc1..66467cf75c57 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.4.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
 LICENSE="bh-luxi"
 
-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"
diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest
index 5a3854711d7e..bbcec06beb28 100644
--- a/media-fonts/font-bh-type1/Manifest
+++ b/media-fonts/font-bh-type1/Manifest
@@ -1,5 +1,5 @@
 DIST font-bh-type1-1.0.3.tar.bz2 637337 BLAKE2B 122df86566d86a8fa85cc1da3f7d1913a2df589c301540b2bdd73e96726dc5fdb16184f80d8a3a58e6bd1ca54e0f4a3a0f266a35747f500065746f0be209484f SHA512 dc6cfe7d78a549ae5368ddd2bb3edc6746648b32e1f22bce87f6adc0845ef4827cd3b2472d0afa17a16a2c384e84f74f1c7d807510798bc69089920fdc5486da
 DIST font-bh-type1-1.0.4.tar.xz 633212 BLAKE2B fa2b80703eaa86eb77726250c7f98af5271f4e24f224e8e88124dab80bc8988f0760d451c6ff9264ed1af083a2ceeec0fa8b8eee636351c44823a825cb92dc22 SHA512 06b0752b67a8109c0173be2ad4b9623940bc0c55e5854dddfd74c4abf96b4ab2f0e4446325c4d6971011231176f87a06b55e906b7472f371b9824d89e3cbee7f
 EBUILD font-bh-type1-1.0.3-r2.ebuild 335 BLAKE2B 1a58c83b29f4790ecb6a9be8f6a88d61e4c85497a33ee3ce9dd7c657f6046b73a37e7984a820bcacaa4e1e72bd4d44401853d7d6074c493276d2798afd002ed0 SHA512 36fad46a28a216703c0dac8f5fc1babf1a301e22fe0323dceef6262b84608fe6b8d5d73cf838be6b719aeb66c2816c11f627cbbb397c8ccbca13ce4cb62b5b48
-EBUILD font-bh-type1-1.0.4.ebuild 367 BLAKE2B f54ac78f3de98998e30a74de0d3c3ada9764ab943a85638ced0316977618829981f7d4876414df4a2a7a97f623c4f7994b6f672d0a5602b9db1357fbc8a0a9d8 SHA512 bf919f26df81d85dbf04e594a75b67ee143a2eb46efe2ef4d101c0d4f64549f57a0cc691b8acd6932bb99720b5d8a7e03e9f9dde4e2e5144f1b8ae1328e66e7e
+EBUILD font-bh-type1-1.0.4.ebuild 364 BLAKE2B 643017007fb19baf6111c6dffcc40c49eecdd7cce05d2965198000f6aa616824bb9f0d08ddc5e44fd1b93b273e38fbfd9324b0a17108d562e02127f1d3cf71da SHA512 db5303834d2e24730536e1e7bcb552e63c6282921d9322489634fae23e48e89ba2ceda353ba68575fd9f2ccaecebdaeea6424e242181f0b7aeb030e7f9221ed3
 MISC metadata.xml 340 BLAKE2B 7745bd7b2bbea9711573d1f836fdb539165109f39234e0860d1a53c903d0cb20b0af4644908012a7cc6cbd72c71fe5e3ab970e1eb0d9e01020212e8e4c0b1b39 SHA512 5555e457025bd9b0086126bc8f3140d37292e30f48448decd18cddcf23d20c3bddd89894f1e8b1921d09e77b9cf2a6e5853bd5cfd0b54f91240e7f0d5f0a955b
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.4.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.4.ebuild
index 5d4e7f7eb756..5a439d750097 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.4.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
 LICENSE="bh-luxi"
 
-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"
diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index 3e43ea198d37..e61b2226c47a 100644
--- a/media-fonts/font-bitstream-100dpi/Manifest
+++ b/media-fonts/font-bitstream-100dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bitstream-100dpi-1.0.3.tar.bz2 200276 BLAKE2B c5e4584642f49c30d8a1a17f3384a9bec8c3363ff7bc2cc1cfea8d04e8ad39e3f44ccffb461cf1508b5dc96b8a7fa6612b754cee6214fc1c6e6689c68e650819 SHA512 10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd
 DIST font-bitstream-100dpi-1.0.4.tar.xz 176520 BLAKE2B 43dad919d77c6d28f918bd8851cd9f72f3a7622c761a861c00777671cf0c57abe602de8b8e8093a81b6c3ab03e8c6d42224d74f3faf4d0132a9834b671bb8216 SHA512 1389681eee8b9e2bbfe0293b0aa1add7c6fa86149ff3cb779195ddcc548b1a519336c2d43b6988c899dc09d44ca30de9ffb5daca24fc3906694ab0fd391eb437
 EBUILD font-bitstream-100dpi-1.0.3-r2.ebuild 301 BLAKE2B bbfafa012b8666a8039c382888633028cf3a12e39036a93daa15bb058d90a02c74cf69902ecae9a3515c17db97c0ac85a5f73a94b8e14a3a8aef786e6180f933 SHA512 a01f46abbaa75c0b92b790865eb246226e1fc7bbe1e680481dd04c81c06d11d8cf40c75bef2fb63de7d97f3c0f84f56d8e38589eef2bb4ac49d371385057cb76
-EBUILD font-bitstream-100dpi-1.0.4.ebuild 356 BLAKE2B 31738e52e6991fa5c603527f507dbec16e251cbdc5a42d06c8ce53cfb4900f67efb410811fcbd571866de091d0a3b78da217394e7c03e8412df898bc7c1614e0 SHA512 781a457627005a1dd552dc6163255a2def1b79e724cce9444462318a2d3d7166deb71e884bac57b7603dfd9e1e01b25530787fb9e30dd238a741f599afb2dcc2
+EBUILD font-bitstream-100dpi-1.0.4.ebuild 353 BLAKE2B d566dce5317c13e243eac6891b7cff6666c02ff25410f7ef6f90a87108c7fce9e31639ee78f59021f6c7241d16922b0a3e7f169f1d66d54afe6e51ca33942cb1 SHA512 5e2cb0f2a5b97703f3dff0a63e4726d525d950d4777062de5d2af1825af9303ac7d126168b0021c7b551ac5708f4a77c15a446bdc7522e94ad5e9ab7d12e9e8f
 MISC metadata.xml 348 BLAKE2B 05d083d2e5a3a381a49ae04090a3a003c46a97212b76c53c558c9aa02f703b213bcb39cc7503d3a9d30f3db87888052d14fa848ea8e8888a32430628d13b101d SHA512 05405ca206ab3c7aba66085dea1e0f7d4672607d54976b6b9d950dec5d20cbef57349abbfce6933bfea85d33f3c020fb3ae69d1b8d7041e117d81765c21e571f
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.4.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.4.ebuild
index 9687cfea0429..9c4ad1dbe2bb 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.4.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-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"
diff --git a/media-fonts/font-bitstream-75dpi/Manifest b/media-fonts/font-bitstream-75dpi/Manifest
index 71e7a60bbf0f..7233d48b5fd3 100644
--- a/media-fonts/font-bitstream-75dpi/Manifest
+++ b/media-fonts/font-bitstream-75dpi/Manifest
@@ -1,5 +1,5 @@
 DIST font-bitstream-75dpi-1.0.3.tar.bz2 174603 BLAKE2B a4d57cff621d57c27830e4ccf870d74fffe699d0ade6df32300a5f4de1237b263e449fca46879ac21329888820e48efd49f057192ce3ac11aae56243bcc3e1c3 SHA512 9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650
 DIST font-bitstream-75dpi-1.0.4.tar.xz 159708 BLAKE2B c9e240839f6365553df3061cb2113c939b3306d70ec321a1cafb232fce7f471a03029dc308370424d932fe6d39a27585fd48fa581486eb63153dc1ab3e0fe806 SHA512 d678c58493696b3a744878991838b329243e5ba7985b1a435b62e9b1a05b5609d0b66d5943d840479ce2c5fc1da1b0633c33f28e3613712d26802fc41ee22c22
 EBUILD font-bitstream-75dpi-1.0.3-r2.ebuild 300 BLAKE2B b570837682ec83b5aa5790a5a17ccf8fd37efc57cdeb3eef7ebc0f338ef74a51b1468a4982d4e8b9da6a2962a62c44bf3f519a27d4bf1fd5aec75e3d1362e908 SHA512 5af22181a6b9d648f684ecf16328180103e479d6d4fe84f3cf74783b35e24109a7cd8063705748903e7590ea7bce8f2cac077ee1170e747e5290a211c4bc3cfe
-EBUILD font-bitstream-75dpi-1.0.4.ebuild 355 BLAKE2B d6e86cc25b374a3efcd69a440c1d9cdde23a9625458625d8b3f4b5a20ae966f0de0a86b809f10fbd1d898e7ba7ae0daba20ae0675b755169354f379dfb046cf2 SHA512 d17badff683179f0c39b05316e81060b2954cf971548617037e34c86db436ad1a0207e372c27577506d2ae3448b8332b024fcc4c0f2a6edc6f1f28c5df63cca7
+EBUILD font-bitstream-75dpi-1.0.4.ebuild 352 BLAKE2B 2ffa8e3574230449e3ff9d3e8a1f73770c3db95024b20084873d5ba817ed95870058ede3443308341091bcc9c069025e03ea2513f76a9d8065732c5ab59b5770 SHA512 9dab963ea9c545863ca6e2fa510cb25501639b27c1b6f140fd3d812a509c4e521624ba86faec78b820f95262b9a6fe45e04449778cb901230fb9a2c31c56f7c8
 MISC metadata.xml 347 BLAKE2B eb23f45d88568bb8a1680ca22a8b1d5015650bd40ec7f2dc3a93226000ffc65fecf4fed51bfb03ec0ca54e6b043d50554c6f36031711860922d5643b8a5730ec SHA512 64d9facb99cce7c754d0b2c8cd57c61b6498c9b33c0e34ac07fbf3a50095aba153bed7f6c18867cc52d453713020fc92897559dc21b3ce1210483e4aa2e99565
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.4.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.4.ebuild
index 7e7fd8b3c85d..ba4fcedc594e 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.4.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-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"
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index b797eb490e91..acb19491fa52 100644
--- a/media-fonts/font-bitstream-type1/Manifest
+++ b/media-fonts/font-bitstream-type1/Manifest
@@ -1,5 +1,5 @@
 DIST font-bitstream-type1-1.0.3.tar.bz2 415980 BLAKE2B 6877549e25cec38f46ef19ee3b34cc3c2b0f3aaaa497ab3d26e8514405ad09a384c87667e82a220d14a85f4ca448a1f939739b618e3ae62c1214b7c7de39a422 SHA512 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61
 DIST font-bitstream-type1-1.0.4.tar.xz 393644 BLAKE2B 7d00778c7179e803ec5f5ffad80c845351bb9633a27b9d92fd82dbe61dac8e5b24c0df19d99533a1b0d064a767990d30a7df934e1f27c05f85e3bb50f3050e62 SHA512 f09d60abb88c9be6227c57f5519f08e5e3c59c916183d32a512d3c2ace0047eaad2b377c3725c8987e8b4c55468eb7821322ff5447f000d4c2be6cb909f6219b
 EBUILD font-bitstream-type1-1.0.3-r2.ebuild 306 BLAKE2B c326316eba8150d5a32e30f67445a37c085b6b2b0b1aa548b962e001d5c59dfd4950d6aebf04fc28b6fa98ce9b21f1cd6bcb3c4c0c786177c72d6b74263838f9 SHA512 5a2f1aa5878d341521395505e1df555943acea3018c6832fe3c2e5f4f7cddc206c1dac1933288997b77c03b71de36b10362dcb2d89d9f382265a50cc2034d001
-EBUILD font-bitstream-type1-1.0.4.ebuild 338 BLAKE2B 505d4306e4f6aad91aa9758587d3b4117f2e8256c17b093edacf7e49001dc5a3740f713a34bf2a938effcd5a45254e9d4248985b2bd4e1cf2a68ede7fa847717 SHA512 f78e4afd59559dc2ba96553e7de0992a3930d2881143f5f28e9a82300c4e0d4a1871ab0eb501f96e3e4581b7f53d681e7618b09e2c4ab2b0ba19e6828464718f
+EBUILD font-bitstream-type1-1.0.4.ebuild 335 BLAKE2B 69eaf3c969f59d3265685af33c62c0748f02101f4496fc49c197fd37a00f787f774d18aedefa83bcdaddf7d4005f1ccfa08ec9a8ba3094c5f03cefdcd64df20b SHA512 873dc9b6f24f479478cf3de3aeb088c0abeeb6c5c140ab1fbfaa3726377cefae86e341bee2691c6d346f98674e046f585b7ceb018ba7acf5ddb43344baa00e66
 MISC metadata.xml 347 BLAKE2B 579c49126358e7d6badf1e146fb4b2ee252332de9d2397b18bfd5e524c2194171394b9dedac9077f2d78b383d6704132a13e58f5944b57ed83ed2567d7789844 SHA512 f4986ee7bfbb3c9e15e2ed65c685d66e2be9fdc7fa9bec23a264b8af901996c81cb554f8afaedaec54e5e7555d2bf095c47f0c2f10c366038107050fa4e0b255
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.4.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.4.ebuild
index 6caf8be5d3b5..4c885d48d16b 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.4.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.4.ebuild
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream Type 1 fonts"
 
-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"
diff --git a/media-fonts/font-cronyx-cyrillic/Manifest b/media-fonts/font-cronyx-cyrillic/Manifest
index 9ce630ed511d..763533da798d 100644
--- a/media-fonts/font-cronyx-cyrillic/Manifest
+++ b/media-fonts/font-cronyx-cyrillic/Manifest
@@ -1,5 +1,5 @@
 DIST font-cronyx-cyrillic-1.0.3.tar.bz2 262896 BLAKE2B 928c67c3adcedc7e507d097bd522493f4f035e43037792f88e7c239f26b955734023c7c4686e51e9f001804f3f0bffc5025cfed50571bad19c27917fc4f92ef9 SHA512 b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456
 DIST font-cronyx-cyrillic-1.0.4.tar.xz 235908 BLAKE2B afaaadfebc31b199ec7d1bfcb93c9041450d85a95f22a641dcaf0e3e06919a8ca46be48e9b34231976a3763810302630b49562fd7144ccf972879265a7de4a98 SHA512 39c0bfc08ac746fd98a668d7545da503e8413d5d66cdb1884489ed7221fa4f09dad8dc997ca39595113e2f12fd65de6d2bfd8eaf1480aa93d5eb961d2e2f7cff
 EBUILD font-cronyx-cyrillic-1.0.3-r2.ebuild 299 BLAKE2B 4cc69411e2d70de1192e496e9b808e8b37b610088ebab4445908e62b698df53eac7e9ee13a7722f1aeeafc7981e9a2fc5b6c69b20ac267e29ed766c6d4a2a58b SHA512 cabc9a3b822cf34b201ecdd9fdb1691f6e12b7fddd69c4cec9616e05138395267429815b070e56039c66ac5bec6c59c93a4b0e40ac992fbbf94bbb8f90dcbe26
-EBUILD font-cronyx-cyrillic-1.0.4.ebuild 354 BLAKE2B 53df5723c1410b4afb0225b2ec1482a4b63a746a4fbeb038befb92a6762d1d7bb661cc27f24a9bc7572e6de6442ab5641a154ead5dc8320833dd46da9295d3cf SHA512 edec31063b8292f4e76c042ed60a5736695f096da6b43a8ff014ceddd0d1ec8903a35f98d623becdc0ec50d612a9b8bb3c7b5d7f2496dea8cd83973f80f0b4e7
+EBUILD font-cronyx-cyrillic-1.0.4.ebuild 351 BLAKE2B 2c2e539004b58fb4cfb8aa93bb68e954c7a12997e1269e43db1de58f2b6498c4f8db2fbc41b72aa98e60edb01c6f136cbd8b035512102e9f686598b0ae79990f SHA512 7741d77ff1813b11de9af32d2bd1d835421ed82131b646a1e4e714f9e19cfa000110b572ea0fcb331a61773f4cd43f03e2fd80cc8b079485f18d591560323039
 MISC metadata.xml 347 BLAKE2B 1c687e90a236e88d541b564f14b9050e748399a17db8e2ff5a1b2de6508bf8266d0ce75995a7449bdf454cdd5943e25d830ef787c6fb107f5aadd9a2e6119512 SHA512 fe088a531729d6806cc0f6ffdad0bf1739c638c804d0c20a5d26e95a48fd9f7864cfc4bcd12cb93def22ab45a44a1b7adf1ae1eed3a6d59c8eae91b13f9b72da
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.4.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.4.ebuild
index 9ede5c1f2ded..86d25922cad7 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.4.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Cronyx cyrillic fonts"
 
-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"
diff --git a/media-fonts/font-cursor-misc/Manifest b/media-fonts/font-cursor-misc/Manifest
index 5b1b7c88779c..e546928f601a 100644
--- a/media-fonts/font-cursor-misc/Manifest
+++ b/media-fonts/font-cursor-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-cursor-misc-1.0.3.tar.bz2 102041 BLAKE2B 13ed204f19b64c0e392664665bf670a497b9ad9efaa748ff521787d8f3f0e170c9361dccf97c4e106be557743b57ebe61fbe346f7e0f71fe733df9c6aa378f14 SHA512 7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83
 DIST font-cursor-misc-1.0.4.tar.xz 97384 BLAKE2B 080d34385b352241de6312554d8896926a761db24a58d3b5946e78f03c55fa246ca1a9750ce057b0f0a5d7edd3778951c05932615eb42be30458fa9e2422205f SHA512 22bd86a81cdfb1e17f885dc3961071c08920171a6f0736ae52d95c8e576b1debc7570aa3b7e1007f474b50435fba411f0eb1847894e8b52f6e6268d91cf9f2db
 EBUILD font-cursor-misc-1.0.3-r2.ebuild 295 BLAKE2B 99c862fa432241cc6553469fb4eb46574c5a582f3b1d22c877fcfeeefb5da0f6384710e54d4c5d6e86d42a07ad7ba488095dd3e98e1005bc564e472b8a2014f8 SHA512 b77a526a35af2e3a43e8ebf5e6cc4d94b50d6df10def5dea5c9069c92f71ae3700a17eb98699b8e4e1b0191bdbecd0a70e9762b90bcdb3534e2ab308c2d743bf
-EBUILD font-cursor-misc-1.0.4.ebuild 351 BLAKE2B 3de002692437208b4ab5a1e017bf43c1188f579b2e821c67d538f3a2968aa772cfcbea379a064b89d034de066a84be9ff9dc1da2439db074cc4995ed86a4ee16 SHA512 8f19169d43a9ca2ed070384a5ab4553a6eb42104e2ed51c4c0e8ba871a31fa5e1dac0233748a47a5ec0ec19c5da39d121944c9e864d4e35d882330a6f311732b
+EBUILD font-cursor-misc-1.0.4.ebuild 347 BLAKE2B 99043ffb965b62ff9b6731ef56289b3cda6332ac57416e3255ab647c12311369c8b64f316f300cc2233f84cd439d1cb1639ca0ad7eb23d7e2d238044308f470e SHA512 058fb5fddea9db066375ab2c04bb8b741a0b410a13b3a7172439eea0157e85cd58808dda1eb61fbcc6fffb3be1aadce42de8a253e4c2904d635a2a1dfc378e59
 MISC metadata.xml 343 BLAKE2B 2184430c19d6c6f239a17656dbb5f675508a47a2f80136b9dd2b00d689c038f896bc78557f95896919656b2574a68f6b21e910991bfb9410633109cf31aa040c SHA512 080a4b55aeb527f40581fcaff03f3d636893e50e731ed6c9289e922bd3da63f4ab262768b0b63375f12ee36710db656a56fc2625aec6744141311f06e74ce624
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild
index 5d583f3d6477..1d0a61f046a2 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org cursor font"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
diff --git a/media-fonts/font-daewoo-misc/Manifest b/media-fonts/font-daewoo-misc/Manifest
index 5f7ccb29ad1d..5017f3ea5b14 100644
--- a/media-fonts/font-daewoo-misc/Manifest
+++ b/media-fonts/font-daewoo-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-daewoo-misc-1.0.3.tar.bz2 723414 BLAKE2B 5edc33bb4b3e870158235bcefebde9bf0858e7c9ab766659e2859c69562338746186d9ff59bd2b6bf50abe2054b4f595cb7b55454cf671780f28a3245d208002 SHA512 7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06
 DIST font-daewoo-misc-1.0.4.tar.xz 493896 BLAKE2B c9839e54fdc5a62c7615e98670e97d8112248294fbf98ac42116fa4ef19900c35637651a43298807cc6fda5a4a84414351f9f8c27f03614b1a0a27d4ec9aee50 SHA512 be9f550e8cb84f9e24afb6b739c357cb159da8a06f8bc2c26c9fbb62320427dd7522e04d10492cec91ab559b2e5dd5067012ff3225695a8337f1cd7db9801f57
 EBUILD font-daewoo-misc-1.0.3-r2.ebuild 286 BLAKE2B 3107f810b6fbce73dcd693d0bf2d9dc7ff9037ae9e84e8c9b697a92b532cacd86599145c31e4995e02e7139804f77d3d33eb46c12aa8e19fab30fc9d0de620e3 SHA512 cb950efbfbef72ba5a277f9665882278db23a9100a8360a4718097d0e5693d7aa60728b231e760f00b979207e26f1235b103f0f0d788c165fcbaaedc8c594951
-EBUILD font-daewoo-misc-1.0.4.ebuild 341 BLAKE2B 9d06a99944f2beeb6bfd36b9fd5d098d4911aea608cf124b087f3caf1e27d040914cd416139fea72f9c463a2b2d4c031a4a68535a720bfcc445ecd1301d046b5 SHA512 935a82cac7d2596e79db0a876b061587b22b9603ac6f61e39d64557142646d9987dea2a193d312a58e3e2ea15a34a7f6d59d5bad8d2d0d346fa3bdafb04ce837
+EBUILD font-daewoo-misc-1.0.4.ebuild 338 BLAKE2B 19e0e979c65cc9122af4d86746a10a0b1659caef6752b5cfa312814cbaa88a03df2ad801491fc7de97f2712180bdd493417a4f678f43aa4dbc20816b03717e87 SHA512 9756996edcf7f8493482a012d9e8559c140f3bd4cf80f4c613c3666c8a85eaf5d7bb99a216df7a7e52a370d35019f0cd2be8362fe12eb9d4d0c8b56f83b18ecf
 MISC metadata.xml 343 BLAKE2B fb3b217983d1d157d59989d953203c041fbd302db820505d5b87a56701ec257684796ce6e4621c7d670f2e0d5e770239b23a713643d909d784fa9fac77905aee SHA512 184890d4a3cbb3f39ef24507ea93391e59d6b23afa30cdcaeb03adb39d377d57166c8ad3e746ee196b2d236e8c041c016a6017894ca9de8af82b50ae018ef5ba
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.4.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.4.ebuild
index 05cae003de87..ac30dcd62168 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.4.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Daewoo fonts"
 
-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"
diff --git a/media-fonts/font-dec-misc/Manifest b/media-fonts/font-dec-misc/Manifest
index 06207641b49e..6e88758d212f 100644
--- a/media-fonts/font-dec-misc/Manifest
+++ b/media-fonts/font-dec-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-dec-misc-1.0.3.tar.bz2 99832 BLAKE2B 930c1435240a485c2bfb55234f767da4aafdccd2fe3d7c5a760acaefc4d145a68bd0cd5757d4daeed61d8f3ef4eb9bc473454402f6eda62d4a298c79bcbdac6c SHA512 af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6
 DIST font-dec-misc-1.0.4.tar.xz 95284 BLAKE2B 2de5f171a67bbc2d37f49774d25058a4b3460a150c44b681aba194a60b4f7b3243ac8752f83bfc2260deecdf47175518060d3322002e9bd25c3129ddcc4591e7 SHA512 bf6c0e4924835346f1f7913a04fa3903a7c55d292317526dd8eaa799dfb3b52eb2157c34692d659b41a18123af8389785dcb4aa0c31fc387cb368642801c3335
 EBUILD font-dec-misc-1.0.3-r2.ebuild 280 BLAKE2B 2125637b9e2d2eb24b46907e00c1b13ac329abb34a5d6ef864f4c7d830777e7531f67c5927d051c94166b2e1d4f26c5a4de13081e1392c3c37f4b0f0e5cea285 SHA512 e95d0cc5653549491b667a4927821fa81a274cd3470d2df116691d2d48e8fb600a58290a874b51f38df8f4e90e5f8a4c7241eb694d74ec449a603a77d55eddb8
-EBUILD font-dec-misc-1.0.4.ebuild 335 BLAKE2B da0bbea5385bdfc4d0f7da95148b99630eecb0641e6699ec187d31f5e66895ce4a915e3ddc95eb586f6bd584066ac4f43886a54f2a4ff179934a766f1792e332 SHA512 58c4499898609557612060765d074a3c453c6bf070cea7ebf01083fa26ce24f411a790c810bcfc02eeaa6681a8fb121d77bad181e7fedb69895a3747d55785f7
+EBUILD font-dec-misc-1.0.4.ebuild 332 BLAKE2B e49a45af5c7de76fee79f94b34144adcc1281539acb5e6232477871b8e009f00d8eeb317e1b18e848d413ee30f094148fac31ff09990da6177fb46fc56785c39 SHA512 f7638fe12cda71135b656eb7857ed5527bda8f0132ae788bc9de31a644712ea32bcc1a8e5fb0bc5479a48cb1b9d8d5cfd031e1f207b8a2c58dd5e33f0e366468
 MISC metadata.xml 340 BLAKE2B 5f6fcb18d216dfefd3560892f553b5b32b80bfcf91660d535b0f353cf8f4bcf5374f1af2e48ab0a46bcbf006d7b2c25a9943dd5bd5499f417a9a76f90a72e461 SHA512 082629349694609620c800048e57e011f50001247ceb42078351961ef5cea0f4e183bc1ff24fc8a86d105ea9054dc935858f5a75a821d96d9628126556649e58
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.4.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.4.ebuild
index 815ff85667cb..1d9e46d69103 100644
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.4.ebuild
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org DEC fonts"
 
-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"
diff --git a/media-fonts/font-ibm-type1/Manifest b/media-fonts/font-ibm-type1/Manifest
index b7707143ee2a..6053c6e67b21 100644
--- a/media-fonts/font-ibm-type1/Manifest
+++ b/media-fonts/font-ibm-type1/Manifest
@@ -1,5 +1,5 @@
 DIST font-ibm-type1-1.0.3.tar.bz2 376985 BLAKE2B c8563fe5fb44975dc6d99f8ab106c3040276280969df6fd33db23470eaa49acffb10224fadf19867d71346d357bce96a2be898d256fa7adc9be66469dd822293 SHA512 cbd179522c936c4f956ff1fbdc48fc3a55990083b4f858c938c6a54c8526641b4f25eb3a6795d774630b75a0f4fbdf9c16e861e88b2cd95f04c524f95d40f90f
 DIST font-ibm-type1-1.0.4.tar.xz 378468 BLAKE2B ed741c5fd646383446073f22f4dae82c08f060ac8fa47c4ee0deb9322c448a7262d444b84e246a50aa153286a6c50b1574079d71e0de51f9f68435fffd3f76d7 SHA512 42ebc9f1b0726a9a1bf3d7c8a3b7102a448e7c6ff0c5ac1dd8a4861bf51c344ddb2e077df41b86e3e896100371a33f997d6df834b4d64b835d81a36dfddfbce3
 EBUILD font-ibm-type1-1.0.3-r2.ebuild 288 BLAKE2B b56ea5ad64cfadbbe4bac1a9ff101ed3db169411059b92d6232b0c12b8cad083d3c2c157a7787458f7c6acdcfc1e60e82cfda72d8e5d10bed45a31b35672f71c SHA512 263e59763b375c4ff09ef0e4ea36db4ecab03489488861a5cf529da0419762f22c8986fc1e79f7927da2290aa61c275028f9bc09d73a00e4a0546069ea43c807
-EBUILD font-ibm-type1-1.0.4.ebuild 320 BLAKE2B b386039e3ccebfcde47a55d83fe6f8f2c63965771c9be33ebe83f8b97d319a215e6fa7a506e2816d968b06c209c0e1be1b9462e8f5b01c306adcd244238dd8ae SHA512 469d1062f9de424ef218b2be526f5bdc1b51f8988e4b194f7f460a7a394e3e3cc1148da1684ab18e2fdf1340c2db8663d74df679abf9e3f3cd29ba792d2bffa4
+EBUILD font-ibm-type1-1.0.4.ebuild 317 BLAKE2B 15df50a62fa5c091104635180f3205c44c28453bd73b40ebabc9de8af13926284d823c571f813b1d919e074823e8e724c6b33564709ee9739a2538d65187be1a SHA512 759b25d69b1809c8a64696cafafabb60ed739e1be47e80fe4611fe6b9230eb37220ef8288a92b2ec98b05862f9a6acccfc9c65febe6ef4a6a25e0b3732d203a4
 MISC metadata.xml 341 BLAKE2B 7f736bf8fe43d9b933b0fa1084695d76065be906682627f1cb71a88dc55ddbb36c338d318f1bba04488d67a487b6e043217081e8cad5bb029292b7cbe58bdbde SHA512 bd06ca8b728936a267b5c31b386c2e405f317d2df5d694e098b2220798908edbf05e3ccebad08e77670d3231a785cf298412117e03e53718679cdb81ed1cec5d
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.4.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.4.ebuild
index 2be4246d42c0..d2874738a7cd 100644
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.4.ebuild
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.4.ebuild
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org IBM Courier font"
 
-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"
diff --git a/media-fonts/font-isas-misc/Manifest b/media-fonts/font-isas-misc/Manifest
index 00823bd343eb..3f0bcc0abddf 100644
--- a/media-fonts/font-isas-misc/Manifest
+++ b/media-fonts/font-isas-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-isas-misc-1.0.3.tar.bz2 845282 BLAKE2B 4c05c83b64617e1f0740d54c53b13b628affb8c9cef43e785f8101ab5a7fa730d9500f2af45a1c4de658e94e2d7c5e467b6e4761fbb27f4767fb8817e77272b1 SHA512 be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b
 DIST font-isas-misc-1.0.4.tar.xz 712068 BLAKE2B 0d42906968da4060a0d4adb38f53f08bdf530bcda6f18dbe03112e687304e063a75679589343e68d485668b89fafbfe7f83920338b5aeaf474c55b4fc3f607c4 SHA512 7c8cc9083600949fff4a0373f9f22df80f6a2c97d8d56bc2c4d03b102d16ad071b984b1ecf547d2d17ede9335e5c3a418512631a18938b7728c66b4339dcedd5
 EBUILD font-isas-misc-1.0.3-r2.ebuild 330 BLAKE2B 39c08b2a7e1a080560b827673e307744a2d48a5460ad2965b18789261467215fe3e35a381192796b5c8edb2c3fd132b0b630dee48c402c6fdb2d551320b2afab SHA512 e5a282b56621a082524deb2ce55b72789a00d875653a1bb5423c22069b127b40fb99ac74d7fc4fdc2d72f2f9cf812a7177c883766a714c574733b50f373a5995
-EBUILD font-isas-misc-1.0.4.ebuild 385 BLAKE2B c7a3fa3c4fc387b686630947215e10f220794b59d13753f653b2a3ffaf19fb7b1f41e1cda1b24b8aa34c943e049641bab6dda3489f440b784a7c0ee9a576ce05 SHA512 22ecb8379f35166fe53a02c123bdd95f5d1d93ed307147c9d939f03fe407fc14dabb1c0a60636593bc8d578b026517318c6bf77f1b5f3502546262d7d54f9871
+EBUILD font-isas-misc-1.0.4.ebuild 382 BLAKE2B 643c58d2c99862ec27f87121234a0e4b4dda5851acb675b1398a4fb28e36409605ef247bb0958f6dba34a6896fb333c8be30fec10d6459c1b9b5031440ddbfa3 SHA512 fbe4d9760a28d47c9c70a020fefbe9aa8c03cc74dd11c9e77045eb7a0d847999848d15a03503842fc83109cf46f38e93946f7197e81476d1692a30f5f4bc1d71
 MISC metadata.xml 341 BLAKE2B 8d3e0e274660769f9b1c063415678d80999b811bb921fa4c19506754f2fe6c62514f59e4e9e0f27a4c94652e818c0b58e6b99ec53cca7237c40851addb576956 SHA512 be7960222dffede9786b15697a3322584be002cbad9790eeda019e154d23f5e43acdb4bd673d0ddd2442a38351a3c5db26b2319507ab9d2e24c4769c83327819
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.4.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.4.ebuild
index 95dffb086571..cb57230d1dc8 100644
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.4.ebuild
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
 
-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"
diff --git a/media-fonts/font-jis-misc/Manifest b/media-fonts/font-jis-misc/Manifest
index 01127b260ba8..f59f703056a0 100644
--- a/media-fonts/font-jis-misc/Manifest
+++ b/media-fonts/font-jis-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-jis-misc-1.0.3.tar.bz2 621946 BLAKE2B e188c7f1d0e0b22912062dc94f1e9dba75c0990a497b88886e365d635621366af940d77ee2e7eb5f687e2ea6296cfbfed14ec45a0aa59c1d803010e7b8a6113c SHA512 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c
 DIST font-jis-misc-1.0.4.tar.xz 514704 BLAKE2B eef0d29fac663e3d60e38cc28e97312939478247071ca3dc592c6443deecbed54ddb0bc894b62bae10d3b02d151366544bfd589c6e964e13b026ae125ca99836 SHA512 c54034205e7bd7a01b311c25c890f9fd1abc25f842315812d5c83d4e4091e5e6c2125a43d4d532b88c79d51cb812b86cfa8e7e4c1a87175746f1bd4e38129440
 EBUILD font-jis-misc-1.0.3-r2.ebuild 290 BLAKE2B dede57359d016b428a4afc6a773d6a0f09fb3e0c913f43c5fcd7fae94b8f96879ea2efa95bdf5b1baaa0ecb27f15268460f8797c6467f3ff3c4a638ea740dbab SHA512 8aeba8cf556e64c0ed3656daacb9a7ddf75fd6abd1098d2d83b3c5f26d28c5d5b6063cc59af31f7766f994a94302f0607d61e04a72f83f2f38195a71ea3b2fb5
-EBUILD font-jis-misc-1.0.4.ebuild 345 BLAKE2B c6bf0b25c0cdc16809da21cc34de04c9501dc52756f4a43a75fb8ef2cdf45755c00c92af56eed2e32b1c730734c774db00ba501777648edfdc06cece83f22bd7 SHA512 dce511c47ca987b05b965f5d832359b7c887ae999625dbde62450a4d09a6e6d37911f555cbe3410a68c72cff1dd236102900e67e3d30d7f4bd9e110f308e2829
+EBUILD font-jis-misc-1.0.4.ebuild 342 BLAKE2B 3f7ebc0109962d54b0b63bb18218876514fffe1da18065940f42b03ec4b800667a1f8fcff2dcd32f0ba58dc591a5439d516c7f196a932ac9d6637eed58584e92 SHA512 9978e6a6b3a36b1b1f49753253e83f1b39ba6718fe178721f2715d61ca500b291169858fd41977f014ed8d766ba67d968eccc6774769cd5db1df0bf8fb96b394
 MISC metadata.xml 340 BLAKE2B a44cb1d8db035442895e648f70877d133e8e7f51794d67e861956f92e1b02a1b1e7ea3f638f2b8959c5d81b8201398a35d0042a1e22e457c4820043b0d813e20 SHA512 6db86dce7e21b48a0326ab8fbd5a85300747e7c6473a6dfa3bc6684252684cc3772949d22f3d0d8ca920087ab8fe15f5aec7ec4ae58abc56bc73543f3c1ce235
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.4.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.4.ebuild
index 1fc059d5ff65..bd4a40f9b266 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.4.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.4.ebuild
@@ -8,4 +8,4 @@ XORG_PACKAGE_NAME="jis-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org JIS (japanese) fonts"
-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"
diff --git a/media-fonts/font-micro-misc/Manifest b/media-fonts/font-micro-misc/Manifest
index b9afb6510c27..c232de756806 100644
--- a/media-fonts/font-micro-misc/Manifest
+++ b/media-fonts/font-micro-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-micro-misc-1.0.3.tar.bz2 98366 BLAKE2B 98e6872807c35d6fb8bda2be46fbd0d23720af967d068a6abdbf20ac364484d8acd9f4217f739d853c9d373f3c86c1519ebc9854ff671adf955c603ede7f4c7a SHA512 7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69
 DIST font-micro-misc-1.0.4.tar.xz 94544 BLAKE2B 347c58af6b699b0845129ee7a20c401f340417f0fa2945815f161037159c9dabb1f809d4234be87bba0f4dffac47b39310d0d01e12f47d583c5ce609d9fdeb85 SHA512 e9a402a5042eef0b618bc30b319256cae9f71f546c167c8b638a780f93cbdc2d61c472203efaee7077acedfac3b3981feefbc1017cfee8512077e61deff42ed3
 EBUILD font-micro-misc-1.0.3-r2.ebuild 312 BLAKE2B 03defb309a37e5bd4aeeda9f3e149fd15c0598aa53326d9d2e111533a5970129c73e3b3b72559e7e7d98858bdcdb1b0c25d3146d5542395961f399f209b5116d SHA512 8ace74d7707300d989bfa5c2828e1df8e8cd1603a1f6128f36ffdb918c9f8547c352ee99e39841a1e418f96fbbed3f7d255cf791946a4590cb911e24b7abea5b
-EBUILD font-micro-misc-1.0.4.ebuild 367 BLAKE2B 7f22c2de17a622a2142ce64100ede9ff0d1aed249eeaf5378c38b59a83369245183aef369078fbd99a0bf0715fca7b4d7ba9bfd3498551be97fe6a4483a6c6f4 SHA512 c9be3350866be2087778f002dcbba00a6c4628fdde99c792f6c80621725b3bab06bd6eb76cf53e44fbacbabffe2bdd76a29431ea47b299a0559a93fe4b740c7d
+EBUILD font-micro-misc-1.0.4.ebuild 364 BLAKE2B 8ab0e8b1e3015fca66d82fa71a0cf4c13c492544f466134cce879eb22df42d94521887c01c7a36a43bda404a07350416d604ec8666226ccffdaa2692f8d0d6f1 SHA512 8808dcd6929381ccf6d5e6bc571087108d20d1a0d07ab76d188728692f9ea818828d11683b0b1ec020364f71223308314473922579415b13328b976fe4a2c549
 MISC metadata.xml 342 BLAKE2B de59111645d249e06f9f9a8a8d639d0eb1ae461c37839f57ee2826aad0dd9bd51ecf2e66d8807b88c4ba1d8b7670e0f74a8d47aaa8ef5084d481c2d538b1658b SHA512 505d32057a077a95832355d4ea08b768d8407b2cec11cbc47ed4f83323475ddb7d9a1a92934a0fb064d46442b78dfd79e3d916e54c390fe4677c242c3b133a43
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.4.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.4.ebuild
index 7c27c77d50a7..b8a84811ba31 100644
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.4.ebuild
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.4.ebuild
@@ -10,4 +10,4 @@ inherit xorg-3
 DESCRIPTION="X.Org micro-misc font"
 LICENSE="public-domain"
 
-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"
diff --git a/media-fonts/font-misc-cyrillic/Manifest b/media-fonts/font-misc-cyrillic/Manifest
index b73c0c58901e..67ae84dd92ec 100644
--- a/media-fonts/font-misc-cyrillic/Manifest
+++ b/media-fonts/font-misc-cyrillic/Manifest
@@ -1,5 +1,5 @@
 DIST font-misc-cyrillic-1.0.3.tar.bz2 125971 BLAKE2B 4b714d9254f00e88537597629944d906766c5f89729fd944a276bbce3c05cb13d5f538e7e046c3bc5651e2a230ccddcb249032228ca5837d04a245fd2a9987f2 SHA512 75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf
 DIST font-misc-cyrillic-1.0.4.tar.xz 124252 BLAKE2B dd4b2f648f30a8ca48fc187e5b8b739cf8adcec25a4453bc4c749ea0dea4f5f954ce860569dda03c56493389730a64aaeda6b72732b4f9041da237cf3813c75f SHA512 fb2102805fedbd04b1533b85abcde79f432b97b72822bcfcdc09f525488d0d0c63815c8c25b79bab864bbe11fa1b72e2c34f5ba7b96eee1b6c84b841bb333353
 EBUILD font-misc-cyrillic-1.0.3-r2.ebuild 295 BLAKE2B 9dc23325c1d9afa52be90da4c92ed4fcfd0cfe878a043727c72d99adbd4e0b1e4c9b3137f2e0ef92318cbbf937fc386df2aae40133ca99d0917035632d8346a2 SHA512 b38e50c7b14450e9951fad0a4ed49af892061d3c9f5bf6cba4907891d428a4b79db4c0c6404ee75ed9fcd1a565986e084997955ca2284a83b35f2c3d2586215b
-EBUILD font-misc-cyrillic-1.0.4.ebuild 350 BLAKE2B ef76695198cba3356f8634aa46dd93db57882322c4c338f1e16136e7f1941268572c19b177f0e172e3b574278235ebde9471c41ea64d33ae8ed7299f65cc5d4b SHA512 2e9fd80b5c7a9b9299c4b5e297d133bdce3e2f10b0bba2f7076eaca40757b5dc55176cdb640dfaa8df9013004156e6d8cbb8f2d9fb3c903ab9d10f6a80a69c23
+EBUILD font-misc-cyrillic-1.0.4.ebuild 347 BLAKE2B 8ac437ff8643d00026794fb06c840c2acab86329bd15faefafd9cfae3fe5bfc3285bee25dc5530bcffbc12f7b4cac0cddc6d41ddf6e0638c24a0084be82b6308 SHA512 527eb9c48edb73b0437a367269a8c54740dd5ba89be55174bd617e8de8815856b678cf8f345dd715b987b51e8555adb523791102ae393165463e41be00d674e8
 MISC metadata.xml 345 BLAKE2B de76977f8b8b33f8028373a807a1a3dbad59e0573d53841349e8f26a015a3fb4508b4eb35da502bbbb3aff07bcab7c8b5321d4b260b5f100ac2624b0e7a16442 SHA512 a3685291b8aaef1449f55259a73a587652bf21db10f14a8ade034ddc9e916ecf64397b53f978142a9c62289fe451fdacd5921d19365372e29c52ae3c86f665e9
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.4.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.4.ebuild
index e2288f7707c6..f93d195d0399 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.4.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org misc-cyrillic fonts"
 
-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"
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index 2461823dc695..0d8842cbd24f 100644
--- a/media-fonts/font-misc-ethiopic/Manifest
+++ b/media-fonts/font-misc-ethiopic/Manifest
@@ -1,5 +1,5 @@
 DIST font-misc-ethiopic-1.0.4.tar.bz2 270076 BLAKE2B b27d188fcb5be3e4e5fed810f26c0f5edf5a51a3532bd51b44e55283518bc1a353054da4f37c5535197eeb6958bfe1567ab54d1d9f428b046b84c5d1233aae21 SHA512 4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5
 DIST font-misc-ethiopic-1.0.5.tar.xz 222624 BLAKE2B 8184f7d6ebc72ac4524073670319ef26dcd09b1667973e46fb4756f61a4752104a974a44a8666d9bd011f56b3502746531ae8e608959e124068e4a3d5539ba16 SHA512 7732a828c005e3762b6383729134c5656fd575ac59288504d047fbe26e9965a80519a37b0cc4c6b89379a85a62160c5ea76017f790447a230c015aa7a9143ba0
 EBUILD font-misc-ethiopic-1.0.4.ebuild 744 BLAKE2B ef067207530c44e2b272a7b521da31bfe6f252ecc4b0ee51bdc5d9b106b74c861501cb1ff883ac1a1386042db8c09ddb856df8c15f2923dffc1498e84c24a699 SHA512 81b63081af7ed36f1003fbdb54713216e443f601924a3af08c9830b2ffbb1bb15577bc676f97d5bcd6fdd4a4fc8ab0b161364d8322afad9e7dbd3bbd288f3702
-EBUILD font-misc-ethiopic-1.0.5.ebuild 775 BLAKE2B b228504944388b08fd9e5be1411a85b60f5e9636b35632eabf141ae51e346d3455ef7ae31a8489241c17a38687c18b6a0582e5ffc2a150ab0b8cddd5cd5dad3f SHA512 42691af6b0a9310d1a1cbc69fb84f682f1216f7c3769f62a8adbe9db9543cbe22b2cba55b5975c0c16b1147f8324c3e0079c470a48b99f415e9848eaa5c8c06f
+EBUILD font-misc-ethiopic-1.0.5.ebuild 772 BLAKE2B 09d192843e083bbcfdb1a7e219afa8fafb4f768bf3fd4dcb80ef5ea87889b63ddf590efe04236a6d0a370f21ec23f873d4775f3011e5ba70ed0eb51cc160db70 SHA512 be945c659ba06a0aae91f3bf6a959ad1952c2662463fcba59370ff1fc01fe08e7efd7f89c86ce14d893e6a2521db0154179307c5b1812556ec8c4ca9bb4f8b98
 MISC metadata.xml 345 BLAKE2B fd2d91ddac540c448d4a5e6033255b74cf20e1cbd0f7116b62bcf93c91f21afbf7bde070b8c4b233fea1499636d6e4f34aa15c45e2a2c50cadddd64b0704d4cd SHA512 64522a3bb3a8dbdd636466b02d9740df8664950076ef72af3673ed57512b9ac1dc9d61f325cf809d25997b3092ace35c5dd15c0bb012046f5ae9fac4fda78387
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.5.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.5.ebuild
index fc918c94867e..ea31330f1525 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.5.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="Miscellaneous Ethiopic fonts"
 
-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"
 
 XORG_CONFIGURE_OPTIONS=(
 	--with-fontrootdir="${EPREFIX}/usr/share/fonts"
diff --git a/media-fonts/font-misc-meltho/Manifest b/media-fonts/font-misc-meltho/Manifest
index c0d1eda26669..4167ff403f7a 100644
--- a/media-fonts/font-misc-meltho/Manifest
+++ b/media-fonts/font-misc-meltho/Manifest
@@ -1,5 +1,5 @@
 DIST font-misc-meltho-1.0.3.tar.bz2 1578992 BLAKE2B e76691a76d1416c7e7188ca53e0ebb639269333f4078fc0de9c1b7ecde69a7985115f7a347e55a3bd86a268b0de36b7a02ebaae343743dd7cc934038928cd7ea SHA512 3f42fe3e127f74259d50754f4bb6d2560cb32d810fecf663bd09fddb34829d29b48f3cbfaf43d02dab70b559afb2f806f321076f83450ff3871604345a0cdb56
 DIST font-misc-meltho-1.0.4.tar.xz 831660 BLAKE2B fa0c8d19f8fe056ab3d9d17b00cf425f2c048253dcb919cc37e221c1b094d55fa297aba0ab55a1d2e14c7b52cc061d08b2e489e30f29828713d725ad90a38f63 SHA512 1391e24b0402f50dfa877d71305ef8c144c489b21db0fdab278668360eef7e5ebd4145d77f52b5fc7225895804f3fc7f0e67ad114d64cde073e642d7ae328a54
 EBUILD font-misc-meltho-1.0.3-r2.ebuild 308 BLAKE2B c9b10b6d34a95f91549be486b6322d38eaf82c0f82f0b0e129c556f411fa5189df15d07aa42cd0c80a739e2cd431fa99b130314b8d0754a29b3caba699974b27 SHA512 c4cedc0198a954aa758091075aaac7d5b8b4184941cd037385e7d372d79b237a7ffe6f0a595865c8c2f62cd70fdb9d5463e8deea755441da6629c50513ca6715
-EBUILD font-misc-meltho-1.0.4.ebuild 339 BLAKE2B 35ddf9aaba1ce856a02dda9602559fd0945e9ea66d156f281b7dcdeaf725c1a1fd303e7d9c8b24785b7ab97cdac84fd8c43bb3ae700e3dd238aaf5a1a17bf4b6 SHA512 4407f8b83564092ec1119c0b296594b7ce278bbd0d6ec9f972648911fde80ed96e82f08b1643da9f99a7bc0432faaaa266e8002c717073b5a05f3a3a787d17fc
+EBUILD font-misc-meltho-1.0.4.ebuild 336 BLAKE2B 4fd1ddec9990e42af53211fdf551c87eec4c8c5902783cea11423a1f6f15026787a5fffa5dadc930f665a79524c9ba486ce59b88fda3ffac13ecfa783ca1cb82 SHA512 a3e6862fc9e5fd4be4a97c17c8f9dbb8ad2de38604546c2399d1055471558089541ec0acacfe5ebedaa769ab8d4724e03e99cdc271a22ce4c64c8788f15e38f4
 MISC metadata.xml 343 BLAKE2B c5c02898b99cc9b63a5eb3cf8deed166a9bfdef3d6dddfbba50fa751df19b6d07b5015bf286cb89f5c822bfa1faa3ed2ee8d543d1a6571bf2dc9fa87449bc8cf SHA512 54388cefe78fed20e05d805374944f182b7d0879c5b889ed34a32c7fe8488d2f4a5ad890a2e97c16ae3caaaa3359d4387a7e9bed8915bb534a641018da0c9e35
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.4.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.4.ebuild
index a90e5abccd58..315f8e8c6710 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.4.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Syriac fonts"
 
-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"
diff --git a/media-fonts/font-misc-misc/Manifest b/media-fonts/font-misc-misc/Manifest
index dc3efb81d328..4a634b82d449 100644
--- a/media-fonts/font-misc-misc/Manifest
+++ b/media-fonts/font-misc-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-misc-misc-1.1.2.tar.bz2 1933789 BLAKE2B ec60ab2f9c18b5dfe272ea48f46d0af064b1d156bbb87e261a4c1ad60f5771e4a2b3464f054e6264c16e978083cfbb3dbc05a8f96f2041c1efc61f4bf4ee0ab6 SHA512 d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74
 DIST font-misc-misc-1.1.3.tar.xz 1563776 BLAKE2B 0b56e86ddcf11623a3e05da2571fec30fbc763fa1916fcbee8a2eac64fb5b1722d5a9da8f192655e88220077763121670618fee9878fa3174ea73fe6d50f6654 SHA512 fac4bfda0e4189d1a9999abc47bdd404f2beeec5301da190d92afc2176cd344789b7223c1b2f4748bd0efe1b9a81fa7f13f7037015d5d800480fa2236f369b48
 EBUILD font-misc-misc-1.1.2-r3.ebuild 417 BLAKE2B 8837f93c7a51c9cab7afa6e43a1e0bc224d1ab00f890bf8175415fec28de7fd8af90db64c2a6f96509b106d47f6778fe90aa8602d66968002967e9e4bdcc5100 SHA512 4d0995f125ba14ea292dea2daba16c816b738c9c41c974ac25911d6870f617c97ae46e3d893298ef3abf19d88734d54116043a4e1f217119ec71fa860c15dcd0
-EBUILD font-misc-misc-1.1.3.ebuild 450 BLAKE2B 5b5c7453bc7f80b2911b6a8b9fa0fba77541ec61e7281fd52d2ef556e1ac3747633568a89edf0ca2f09e409ff9bbefecbecce63775d3038e7e1a8ec460c344d0 SHA512 5a37c8fea4fc593b581675bf3b93b95e206c6d146e7f6c90313aee5a8f22f050e21058bd53479a8c9e87b1b6fabe807316dcc1a02a49408e47e46808a37d2b89
+EBUILD font-misc-misc-1.1.3.ebuild 446 BLAKE2B 40448e947dfe712e381a1d956c978561177390c633ca09a002a8a46c8fe4a67f552828bdbfb547209089e72b2f0d9674e7473c1d1e980f5d70b9e6974a8f3662 SHA512 77aa89afc235397077a1f70171c4c6daed3da543e379ab96bb1de6e247207c9a53144ea256abfc4c97e6368633fef0e3fc942f96db3aded7c4b844e0e45864d7
 MISC metadata.xml 341 BLAKE2B ec40d561e4bc60a47a236bc238303bbbac93d36d2987ae720de78874d306137837937df8a255095effa0c877c59bb9c290c53a91cce853141fc6f61fe2d92f45 SHA512 a5c9b5511d9bca451bce77980a3af80d674c7b638300018754ef513ebf63a825d1b6ddd3ecdf3cc87291239f3c4b24db20ec71aedf3a7907177705919a1b9a59
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild
index 5dd3ed932ef2..7bf82451137c 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.3.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org miscellaneous fonts"
 
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="nls"
diff --git a/media-fonts/font-mutt-misc/Manifest b/media-fonts/font-mutt-misc/Manifest
index 6cb643d39628..3708abbef189 100644
--- a/media-fonts/font-mutt-misc/Manifest
+++ b/media-fonts/font-mutt-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-mutt-misc-1.0.3.tar.bz2 266510 BLAKE2B b3e460b5837accf613c9a4b5285a40f160bbf1b791cd90534cfb58da4f1857c1c5ec659ff4b1b6268573574ce2f4ff7cf6bb5abd7512c27fffd9696fb579869c SHA512 7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db
 DIST font-mutt-misc-1.0.4.tar.xz 220528 BLAKE2B a6e4a20c73638343f157ffb548a081c3b0b8358d23c2703742703dc4fb6d34a50c5e52a91d695f2216c2329041c5457581f754944a7d433b98fba87d5d5c65b2 SHA512 9cbc82e6a519572576cb60f4d6b9795468666d53ac7df17d6736ab04190cb5f58c8b57be61ab509fc9372e1114c6aaa5e0d098ec1fa63dc5d8638916614f7046
 EBUILD font-mutt-misc-1.0.3-r2.ebuild 286 BLAKE2B 47099820ab59fcf390d761e16688323ab4e3464eb977d990e83988f59471e6bb6441ad54314f375bfbaae9671fb9ec31620a3a6c6106e6aee945a1813e025c41 SHA512 5597072724a73f2e5dd9c5dba70c989e88647953de8a02509e44bd910c3750e8351b6a34b6c69536337d715edf6a2d0868b5bf045f2442e5eff4334ec850febf
-EBUILD font-mutt-misc-1.0.4.ebuild 341 BLAKE2B f226062352ce730e3c9082dd6f5d051fb7f9cbabc65746df6164bec68f1037950c7a1f72604402c04a573595be2a6328c55139d28c4db32574f43f2b2daab15e SHA512 58ec1d759721549b2c7d72784911f5fdaf38de3880fc5157ca5ebd7fe9dea0167bdbd01500c6712218502838dccfcf48230eea88989ff71d1623cd1eefd6711c
+EBUILD font-mutt-misc-1.0.4.ebuild 338 BLAKE2B d8a3bd4e873b77a8fe56dade74e9f40ab0e76986097625d943f6c7216963b1630ea1bb8c9b050ba3a2de2f24dadf26ae39667398d03fd6cdc789c3ad8a8e13cb SHA512 aa36f8fdff12d3ea1f27fd80cbebd1413c33fb82995e3aa5e6a948fe72317fb085b98668b1b5dff0c5224a211929997ea7859b439adba23eb7c4855c6c8ee66f
 MISC metadata.xml 341 BLAKE2B ba197b5d1010ddb46809a80ebff1455e91fa3930a7fba30e2e391fbbc0758084169db2d24649a8d4527dd4bd807bba9b804200de38f31a024eb4ca313af459f8 SHA512 e419842a037a546046c4b8318e4d20d24158728ee74c9f1e23d4c98638a8455d4589c3249377b06f67754867984fcc513a53e2062be74ec3612880abc7de5b0b
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.4.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.4.ebuild
index 09f53d8d710a..d5e837bdde45 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.4.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org ClearlyU fonts"
 
-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"
diff --git a/media-fonts/font-schumacher-misc/Manifest b/media-fonts/font-schumacher-misc/Manifest
index aaf1c196f525..22ced1015af3 100644
--- a/media-fonts/font-schumacher-misc/Manifest
+++ b/media-fonts/font-schumacher-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-schumacher-misc-1.1.2.tar.bz2 141170 BLAKE2B 4a71f13cbd81b50e4a71968561a621cb562172ab547f5dec65e28f610a1053067029e4ce5b7d10452ea3426c459049962da8855f9d4e111ff6331bf6e706041b SHA512 f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a
 DIST font-schumacher-misc-1.1.3.tar.xz 128680 BLAKE2B 389cde6ea6f7e0155bdf5686b50e2a9bb4c1bccbbe94da5830a0ddadf6c7f8aaf33cf623d1fe45169b0460b74a771192acf010a27a724f197c07483a21c3f507 SHA512 83b25495535176a5e348269358ac34af8223023a55e2c5c599725ee90ec9ff3ea9ff19cca46b93eeae7ef985da325f9065c83d829a4a8c72d0c3c197242a1b64
 EBUILD font-schumacher-misc-1.1.2-r2.ebuild 305 BLAKE2B a7d600b6753b21695b922ba7e6cf53aeb29b199a056bd9d6abf4afd7d77f3ba914b2268fb779550ad3c95c9926d84f86902791f76ff8bf6d27195bb99e7d1ce7 SHA512 1bc145f02934df44842cc33db54293b3c46ee63ee50b57de0fe9563bb06aa6ff397cebcb59b7557041877279474f4b72b15a49ae9c58b283603a187d2f643b40
-EBUILD font-schumacher-misc-1.1.3.ebuild 360 BLAKE2B 9cdad2cc2d412bf191176b6dd132128b99ecc75bcf2d3e355f4d9426bf54f070e5cdc5c986294a6e62947a7c9777c68840eb482830109e155e965de9b4852ba1 SHA512 b8943be4c3223bfd0d56aff42e9ade0646532798ffde9b6d8bf9a42137c7c3e1b9c304314bf9d3857a8f5e2bc589db591ca9d3407f8449c7656459854938918f
+EBUILD font-schumacher-misc-1.1.3.ebuild 357 BLAKE2B b721acf4de6d46ed8be373922ecf3e394536c6d3a725e56e57715dc6b676015b97b33f339ef089257f323c617c059f890bddb2aa4f937f1b3a980e98c99ce52d SHA512 2bd6195dd97dab2ac07cbdefd482c530df8a90e2353fa82fa231f7eefa07b1a61233542b0eb95ebf7e66e4b2201b32d54aac2cdea8f7ae4cb61f72cf07dc6112
 MISC metadata.xml 347 BLAKE2B 4fd3b82ae0d4f819d9121110a0e9c81a44ce499b390b9d94fa99e2fd21494218aa30c285198302ec53c50bbbbcf540ed06fa5a2d126ee643674cf68adc209116 SHA512 a3fb76f61271bce0986109d6ae0fe5d6ab2aa9a8ca5ebc71511d8e9fa0e7d91a4fc4397477a6694d31bdb44337802974b0aaf0aa715370a5517d1768b73b7ab0
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.3.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.3.ebuild
index 4114f1c2b2b7..2cdbddf4c8dd 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.3.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.3.ebuild
@@ -9,5 +9,5 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Schumacher fonts"
 
-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"
 IUSE="nls"
diff --git a/media-fonts/font-screen-cyrillic/Manifest b/media-fonts/font-screen-cyrillic/Manifest
index 6f42bdf34bd8..b7e0a79322b4 100644
--- a/media-fonts/font-screen-cyrillic/Manifest
+++ b/media-fonts/font-screen-cyrillic/Manifest
@@ -1,5 +1,5 @@
 DIST font-screen-cyrillic-1.0.4.tar.bz2 103168 BLAKE2B 6ef447905bc848dc7e31aae0f0c7649e17dbc46ccbb8a09da60cbd1a232891f0777558febd6e91e7844b66cc25796ad54ad6600ce033ff7f493741099c67b52b SHA512 58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51
 DIST font-screen-cyrillic-1.0.5.tar.xz 98788 BLAKE2B 88c7b1640f4aaebe373107c76c935132d3efe87ed64f60002e4092c6d5ba3c07498c2815668d0fd95417fd1ca967fccb4bea4d572f1172d2f33c086ec39c2e82 SHA512 9f136fc6f6a3621c4b38302af5396789b1e6558b9b4b1b991624945eb9aac8497a6cd415460abc7dbcbaad1ef8ebd23cacfb3448c6e34cc9ba0726e7973c1a99
 EBUILD font-screen-cyrillic-1.0.4-r2.ebuild 299 BLAKE2B 7a1627c7dcd08ab348fda294e36f4c42306b6e7a4dd8c0159bd109ca0dc0816f78f005cba3d2bee81eca6bba1fe0e1f7d5c72aeb36cb6317b30580e72385ec2d SHA512 e69785c383ba58c73e77caa7667b553bcdb885f43ca78f32f292d8659dc1281250e31edbf29a171295265edcb79ff43ae58551eb19d26237437795b3e1521f28
-EBUILD font-screen-cyrillic-1.0.5.ebuild 354 BLAKE2B 6f4b04ae2594fe79ac15b5bad659e6269663dd552a3a098a1e8380c774a8ea8bae321798dca7af9779b20c7297ff73dc8a6519ca0b2a75cc7ef671ff3dd29216 SHA512 750a09b84007679d1532fb132c7d8cf84baa1b5cfed2882b022a9b52f9eb9af13ea11d2c956534513a0f3ebe326ac0061f236b8b7708b02b13335158c61fa7ce
+EBUILD font-screen-cyrillic-1.0.5.ebuild 351 BLAKE2B 06c1e6d4e697798247fb27b7835b9ba5d815ff7f1a94473cbd220960cbdec488e2fbc1afd8a833067195bfa84471b6c0dce07d6388b4b7ac1cce5af42161ab47 SHA512 28b5e430da5cf9f9cc32b3f35ee42b89b72d885ce050ff560e930dc8fac66d11772f6eda29d4f874fb6af73fea6a4f756b6575f3062d72273e90519581f82a9c
 MISC metadata.xml 347 BLAKE2B 2ddd3b9945544506be2e2d16ce94110460bcb534b8f5a1b5c70ca1bf97d5474c1e614d9106d7a532a58b5296d7e26c7969e877be6deab1017a85efb9b1391431 SHA512 370e46a3430dbc0c4bc3fafe82a2b175a0c840b878c7b1b89ded4b93e9c2869354717ba3701f392c993fa3597839bf6fccad25f7e3cc43bd0be85e491a081335
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.5.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.5.ebuild
index bfac9bfa2fb8..d0de0e92625a 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.5.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.5.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Screen cyrillic fonts"
 
-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"
diff --git a/media-fonts/font-sony-misc/Manifest b/media-fonts/font-sony-misc/Manifest
index d32d6c523384..ba345fe53a66 100644
--- a/media-fonts/font-sony-misc/Manifest
+++ b/media-fonts/font-sony-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-sony-misc-1.0.3.tar.bz2 108098 BLAKE2B 7e095c70f6f10e8fa8e65686622ba443ab49704727e8d9e4067f273e160cfd1c0a0a475c720405ac1a5df8e87cf17e8f5ab53ba5baef80f6145d795a2ed419a4 SHA512 c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d
 DIST font-sony-misc-1.0.4.tar.xz 102428 BLAKE2B d78bf15716be7e4e24e42fa766c303e85073c25e94b9cd464d712a967d55bdae5a81402a9dd4f0485ec558a9d88cf28f550ca1006e1f996d08517e8398c83a6a SHA512 f361fca66db2ec80b1467fb6bff57bd2cfc6722473bd7ad119026a97552eef07ff77552c01eb8f98f3299d7fd40c8c2cb3e0d0b01adca2f81c2c2f75581dc113
 EBUILD font-sony-misc-1.0.3-r2.ebuild 282 BLAKE2B a59deb16ebd58dba6d497f42671790d326e25b9bdc205bf2000fdd2845618627636d0c9a845bcdbdf66b87d4759cf32452735a0fc61b2af61025ef4341505151 SHA512 a6b059b961e101b9920170adf083f37fcb6e20d6f48c0683831121e2a06ed6a81e96e38d05e3ff17bfea172ccd3ae13d35fead5b52a9b2d442827fc8d0197561
-EBUILD font-sony-misc-1.0.4.ebuild 337 BLAKE2B 984e8a29e7cdcdc7c07fdfb2894e02d8df7cc502d35e6932075dd320b40bd48484bf0383f9cbef4394372e43e0207bcacc493a8336f2cd483faad6f6c1623985 SHA512 571a071c550d4b7840a68353b5922135f57ce5064f1ace929b0e474bce76d75f44aaf16213ea38cd2f37f08b720f8b2c351f42389dd05247953dc1109521bd45
+EBUILD font-sony-misc-1.0.4.ebuild 334 BLAKE2B 6f524d5d4d3cecb10f592742dd205f0c9a6dd85b89d86ce19cadc67b7845a382b892174e4697c2ccb4f7f921522b561025cfc3e679e27467ad4e2c59a8ab786d SHA512 02ac937cd31805eb7b857c75facd9105fc59725feb5be35ac68c90082595a2d08361ddfa8a5b1be38cd2f42c47222107d74fc3c5cd9396acec6b82cd30a82292
 MISC metadata.xml 341 BLAKE2B d32797229d3819a2bb0f432fc6499cf38437d905a04b243e65d38aacc7962115b7496bddb03686ad1a97c48d5245f2c20cb39ab6f8aaae75bc1de93e288453bc SHA512 1008e795a408f2d1e64c2a38ca1abae368eec607b337dcca87cc64482f1db854e18d50827b48ceab6c03568a8bdf5ebe4462ae5c7ec4dafb2010189ecfe8cfd8
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.4.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.4.ebuild
index 4fd4e1096aaa..21427b4f427f 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.4.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Sony fonts"
 
-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"
diff --git a/media-fonts/font-sun-misc/Manifest b/media-fonts/font-sun-misc/Manifest
index 1b30d178beb3..f861691b4fd8 100644
--- a/media-fonts/font-sun-misc/Manifest
+++ b/media-fonts/font-sun-misc/Manifest
@@ -1,5 +1,5 @@
 DIST font-sun-misc-1.0.3.tar.bz2 116360 BLAKE2B 16ed83ef2fc7007670ac91f8356c8bb75775f78cf0a308fd02c2f702d7d2727702ead24c83d843c267ef4ef636f4fd1f0a59d3ffd0883e55e78f87d9cfabd8a7 SHA512 52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275
 DIST font-sun-misc-1.0.4.tar.xz 109832 BLAKE2B 8d1f67f71a604cd105052e97d0a5e2cdf26be6994f41bead83ec767f1c6e1e5ed81de3fa75e9bdb55603029a7f067ab9cbceca34d865fa8edf61771bee61b131 SHA512 9eeb330c1190557479636119af8aeb49917f1faeaa42d3a93e35d318348ee4247405544107ce9f5a244dbe2c0001c8d34b604b961bd9d92431f84b992fe9739e
 EBUILD font-sun-misc-1.0.3-r2.ebuild 304 BLAKE2B 6a10879295bdf287ca7f1c6feed768d9158826028d2be6f7457ad7bfd7c9164683785386a151a6931e81f893e6bb325b6e0c7903234172d6973be70d4cc952d2 SHA512 cd484e2aeb291be28c44e294e5c1ee19d5598c428974004fe6aa0873d9a7e16b2cbd159b4cae2d57cbe4a3f21d52502d7e0ddfbd5a5c343e6113729506b06002
-EBUILD font-sun-misc-1.0.4.ebuild 359 BLAKE2B dc21ec172d02210e6304b58a1973f36f3dfb12327b0c6f06bc64cb1923b35dd73b96710923386f3944fc2b30848114b914cf2b5512018c9661f40767e0c927c0 SHA512 be9d31bd26bb91bf16ec70ca3d9feb84f9c330a91d046c15ae177161cb95b3a9768ac521eb11ba0ab4d80f18184b124dc21fc0f3c767003897b1aa0d51a597b3
+EBUILD font-sun-misc-1.0.4.ebuild 356 BLAKE2B 43ae7d5872fd94b1c4da451f4d87905a4f524743704f8dfe06804be18d2b334efceb8ae1e46d31fb77f123f9815a6934813519e3ee487a7cdc91a624dfff9388 SHA512 137c382a678f0422ba105b2e754d0084c11ad19036c40fe4a50fb0c08d7daf36f30956dc5fb08dc74d2e6c87cf851855499bd6f5041feda629351411b154e74a
 MISC metadata.xml 340 BLAKE2B 46997a05c1628085c72c1c54239c12ed8acc4cf19a18f740317979127d7cbe9c98f7c217d70f2080d6c304569c8d68dfb7e161faa09ddc3cb5fd3efe2eea3f2e SHA512 1d7ec41e7efe5d2c9cf1160f8b41d4b5d0622b897cbbd27240e48869a910c5070f71d27f61fcfd316d8b2173a64e60d257b63eb0f30da5fe7752cfdc767e9816
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild
index 55e2fcfe239b..dc09cd6d4ea5 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Sun fonts"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index ae6731907349..a2b59356057c 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,5 +1,5 @@
 DIST font-util-1.3.3.tar.xz 142544 BLAKE2B b893159496fb242c33facda98597e200b41d05fbc28c9c1cf04f5214788f421472562a79ad24cffddad72ebf38f751858712a5c7c2904370ea77f501f78ccc77 SHA512 5e1cb8af44fe0bea72b1a6a4e455f50ca49b7531c2f4b605800c0b2b7578b9826ccf17fa195c505ab1d6339fd4ad697c01ba3b9777616f354ab62b23434d47c9
 DIST font-util-1.4.0.tar.xz 142396 BLAKE2B f4efd01c419684969826061b1721f38f477c0a2ee024cf5f5927edd2584061cfb335e1cef6481a1519c51a150a2e1f2e382a8c300e2b8af5d0114276d2f673f8 SHA512 05fff613019718a4bd8537ff7eb270bd85345ffb006c16f81b739d6e8cdbfaa9d6503aef9bc48d6c7f70330bf90ff1a46bacdff3c99e8017191d935c85f73d60
 EBUILD font-util-1.3.3.ebuild 554 BLAKE2B 61d4b30a09745b02e5929eab6fa61355cad610fa9baacb19c7e025aa72fc1f2ebf18043517910863be5dc1bbb221485174355f9b056325412efab4585fabca15 SHA512 cd3c315b3ca60621d209a1d98810c8e11e3d9913c5b22e2445314a1f14f654bd2c3569a349e9dc4bd9303d050490596f608f8a32d67b9e4de6401448fe0bbd15
-EBUILD font-util-1.4.0.ebuild 561 BLAKE2B 8fc304d25051a1feb47822ccbb848b094bce38066183145abf1a7f333a7cb277ffd58c3f165d4ce2bc140414e0408b9d7738a5f1ca25b9252024f2f0d8d06f6b SHA512 d1753bda827fb53d99f1014f6b49f75a59f372c2bbb497c5563e8496f0f54b25a7cd6304f4695133aa711a0233970b5362f138a09a23ab57b10b9bc6f9ee7f53
+EBUILD font-util-1.4.0.ebuild 557 BLAKE2B 15e4a5e94e3cdc735794b632fbae6645027c9e823288b1224db9da6782f7866316b48a202a62317ac37c106405ee7edd89501f911218e527aa9c73c4c986d871 SHA512 a4ae42013d3f7d63c0f6de1e64332e682cbd0567e9d860c84c2fe20eb3aaeb1e4d363f521005bfad2764623af94bf63a4493eb91676b0a0d924ad0a177b4f67c
 MISC metadata.xml 336 BLAKE2B 2576d857840cc0742fee4e2656b24f38543339ccaeb105b6ae4c878b6a3d51642fe1917644338f2a1b6130315406fcf04eaa46ea0c55b8312cea061718c25c0a SHA512 d25c57a37506034155273892e20612dfbc5bbf5c3eff868416e08c96e0f5c00deed63fb89f5278f2a78c57151f8a54a146a223010ce7908b28df7edb9c1081a0
diff --git a/media-fonts/font-util/font-util-1.4.0.ebuild b/media-fonts/font-util/font-util-1.4.0.ebuild
index 8d7e02e3792d..3ce9ea44768a 100644
--- a/media-fonts/font-util/font-util-1.4.0.ebuild
+++ b/media-fonts/font-util/font-util-1.4.0.ebuild
@@ -8,7 +8,7 @@ XORG_PACKAGE_NAME="util"
 inherit xorg-3
 
 DESCRIPTION="X.Org font utilities"
-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"
+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"
 
 XORG_CONFIGURE_OPTIONS=(
 	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
diff --git a/media-fonts/font-winitzki-cyrillic/Manifest b/media-fonts/font-winitzki-cyrillic/Manifest
index 2ec1607b25cc..575ee960b2f7 100644
--- a/media-fonts/font-winitzki-cyrillic/Manifest
+++ b/media-fonts/font-winitzki-cyrillic/Manifest
@@ -1,5 +1,5 @@
 DIST font-winitzki-cyrillic-1.0.3.tar.bz2 100564 BLAKE2B cc2de32277e55a3f7a92be7deec895e23f75efea541e2dcd33a56e1911d7216af149234fe010bd6445952399e246a4bb7123ff2bd220d44874b065a56ac4155e SHA512 f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7
 DIST font-winitzki-cyrillic-1.0.4.tar.xz 96564 BLAKE2B 0ba04018b630c4c73dd8562ffab2dd732d9ed8232d3296081a815b3c9308d18a16255e5185c81dfd1b13d057904d0c454f44b6169a358109fe959e45fdfbcddf SHA512 11e366f96abe65aed9fb6fd087b2bd90af9f60548de0cebfeb348262860957a63a997616e00092d312b8ae9c262a7bb52da69c704a27d34018a45b98a87eb158
 EBUILD font-winitzki-cyrillic-1.0.3-r2.ebuild 302 BLAKE2B 0d1e59a791f0eac795465564ca96f6befc60d7f2261d724728bc417287b6d7ec7c3851d4770807c9fcb9a3861fe8207c2314d852ccba4bc53946948d98c6f1d6 SHA512 a96ab27110b9201472930b61dd40cc2c67c8b09b7c9d9847bac11caf3790e05c27a490fab1c897ebf9be47b1792b26fe5df1969f1eb686c0634beb3e17dec554
-EBUILD font-winitzki-cyrillic-1.0.4.ebuild 357 BLAKE2B 3e6b7af01fedfc207e542bcbc2f7cff9f1ef47d1ee27f0e228088a74854dbb4dcdc2940ca0a74fce5c031050f6e23c8f426293fd6e5021c77ef6512425241a66 SHA512 571322b06c6b58a37c318faa56c1f43b07586b78df98aaeb35af38ade7889c77aa2850386410dcac6c4f8778a24caab23316acf2882f8fa7b519d60963a6c2c0
+EBUILD font-winitzki-cyrillic-1.0.4.ebuild 354 BLAKE2B 5a86b2605b6e552c165c0665df5e506ff62bad7b9cc28af41a43b850fcbcd1508d7010f6ca85c7b08f3b7c072d9d0cb550d5081ec625a797dc9dba847fce9324 SHA512 78463dbef41a5bdf775903394cf44fcb21f1beb8cc1a9cf2edcc23dc6f088df64a6d08952e4dc2f6d21e3e3786f5cc6027ccfdd2ce9b21167764a69dffd97e9b
 MISC metadata.xml 349 BLAKE2B c5f3fcfab465ba9c86f831889d3d9f95655aad88a1fbe9ecafb68a47601f4f74f1e8568dd0d9a0271324abfdf33a79c69ce909c32d6bf5f8acc8d4494dec6408 SHA512 fcdd8455ac32eb07dba4d64ab8a3a1261aeb01881ebc8046a531c516aea0871013a54b3ca70a8977b0364f9158183601423f1a597aa1ec1dc405a47949cb23d1
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.4.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.4.ebuild
index 0bf047a2ad8c..4cbf09361b37 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.4.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.4.ebuild
@@ -9,4 +9,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Winitzki cyrillic font"
 
-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"
diff --git a/media-fonts/font-xfree86-type1/Manifest b/media-fonts/font-xfree86-type1/Manifest
index de22c41340fb..bdd9fed372e3 100644
--- a/media-fonts/font-xfree86-type1/Manifest
+++ b/media-fonts/font-xfree86-type1/Manifest
@@ -1,5 +1,5 @@
 DIST font-xfree86-type1-1.0.4.tar.bz2 126641 BLAKE2B 12588b7cc3a489854695cf0cc6a9edd18840e0048b4e35a76eb6f3642807e208823133368299d6ff65117699bb7312d3664ae9fe8264631051fdeaf8f157b516 SHA512 2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c
 DIST font-xfree86-type1-1.0.5.tar.xz 120500 BLAKE2B 2d5073241ba6d0f966edd1deeac8b5c31f67fb5c1aa9ae49b4447ceb027033dee0001ff9398aa28f98d13cce2f75aa19f746c2396c47c297823711188db76cea SHA512 0a92d911269c5c4d815dfb617bfcc57c3bd54e4cd308eba87f9ec49851369d99dea61950dbd6cdc0f85db92c0c24055da88063b083b4b0cafb3315051bb650ed
 EBUILD font-xfree86-type1-1.0.4-r2.ebuild 295 BLAKE2B 6e99c58f8ac805bf996b02731650c86b63a5cce29886e4506352fdb64d34a44f5fdf077be206b55567df45d80237ae86d7a9538eea7c8b9134d325e44b77fc8d SHA512 b3552ea233a2392dcea43d3915d417934adac3906d6a2b0f212ab3cc10c9aa1ea4612c984806c3060ce0412c6c2663ac2d1fe1aa863eeffc55af3ebb7727bb4a
-EBUILD font-xfree86-type1-1.0.5.ebuild 327 BLAKE2B f4314f92800e485853224a4ee2544b278d1cd61af106398ae919fc570e5b40c1ea843206176e751ee0f32184899da9eef9056a719025e9398281115681e0b24d SHA512 ff690c7a7e27c628531de80dba45834cc7307bdf223496c536cb41141fdcc91d74c639c96f795f52e80c711f07577d91b9fde1da3a4924c1e5ff37790e12443d
+EBUILD font-xfree86-type1-1.0.5.ebuild 324 BLAKE2B 82766e7922ab2d5e623824508e54d0e09791fa3163fbb7fb1f8a77f7ec71b85490cac9cdc49a38083b42edbc25017f977f46d7e688338c7dfe0bb8e43b3bfa24 SHA512 0acf4d604b15cefb1d78fea5df2d2958e339c6c1904efd47d7097905738dcbd364765479901a5d03fb0c3df6735716a264062b9ac4e9ce5114c9b8642dcabe8c
 MISC metadata.xml 345 BLAKE2B 277a98b6f8a3db93936791d0c52bcce90a10aaa4486aa0f56f50f4bccff08fd927ab0e694f650113626c278b7f8f07959f5795bd7fe3086c4d79336bf15f014d SHA512 b4215b79610ef0ad68a59f0e970d2b409778b717ac95ecccd3cbd8c0a85c05cd007c55078884923068f1ec650213a4c57c7ac69dee40e8716f858a8c54a1b5ce
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.5.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.5.ebuild
index db9aea661c59..671c4b929a42 100644
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.5.ebuild
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.5.ebuild
@@ -8,4 +8,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XFree86 Type 1 font"
 
-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"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 39d7386f5e19..d93fe2b74d6b 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index b3b4f98d0808..cdd5092313ca 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -3,6 +3,6 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f1
 DIST kvazaar-2.1.0.tar.gz 605962 BLAKE2B 0d61af55ab0caef2247524e8c564f9c24cfb479fcbd721f43e4409899e1a187a0e6de0b08a052cfb144ea31da906ba1c2160d6712828d6e55f0826d87f5c96ba SHA512 14b29f48908e004cf1b4f1f0c338b7b134a34140edcd58a645b4529c506cd567ebe3d56aa66e469dc417e1baa29bb8a476825b78825e810ac68a029191ad32ec
 DIST kvazaar-2.2.0.tar.gz 617414 BLAKE2B 6ddb88ddea315d80e0af87a13127f235c184ae829492d1ff456899d2a24669b3deca25a320a8bdcf6e2cebc2c24e33c0678ac7bf51d2634a46781f66497bed54 SHA512 476abe251d7f555911851bc5a7dca84a96c0cd243c6a45dd59b808b8adf2b0787f69101a061bd48dfb6fe54a0aea046417f21fc826f14f518cada25c6d22aec4
 EBUILD kvazaar-2.1.0.ebuild 1893 BLAKE2B 4fd421fc771cdef9ad7ce50e7cd4778aae6e1b8a2c18ed061e4a6e3acfce4256080ed2c188d9e66ca72d9a4063d34ad0bd237477a73ce31d51dd8d30a1863071 SHA512 9983889198b20539ab3a2e9a40fccb972be786189463df7bc2187b88a11540cdfbfc2d324369b622e5c7fba7d6cd4fd0126bc77b65bd2f4485286b131dbf35a7
-EBUILD kvazaar-2.2.0.ebuild 1606 BLAKE2B 6316fc87c751ba0c3497e5b8e5269be45c183717b7011129aa7ed4d89a2cd1460024838e33b8d82a2e1c5e58e24d875621c9901517175ea26c431daea5b6bedd SHA512 204bf83ea425755366e02faaf6bc5a9b5ed904571e537652f1818fa26308d9fb965d3578a20856755ac1ea26db40397fb6d85bdafd2b711ceac36895dea09b1c
+EBUILD kvazaar-2.2.0.ebuild 1612 BLAKE2B 2f9ea9cfccdb2d965f4ac9bcefb1e59d32628ebb50dda08dd4bc591a2750bab28eb57d447cc0640b9e026c15dd7ebc54f69f40615081b0e15eaae08f16d0fca8 SHA512 5c1aa669889acdd1fbb78f72404050d8f38f6c282e18c268eb389d45cf889bf4f9cdca7079ad456a4e2036e434499ee07692183a2a8207101c94dd5e5223655e
 EBUILD kvazaar-9999.ebuild 1606 BLAKE2B 6316fc87c751ba0c3497e5b8e5269be45c183717b7011129aa7ed4d89a2cd1460024838e33b8d82a2e1c5e58e24d875621c9901517175ea26c431daea5b6bedd SHA512 204bf83ea425755366e02faaf6bc5a9b5ed904571e537652f1818fa26308d9fb965d3578a20856755ac1ea26db40397fb6d85bdafd2b711ceac36895dea09b1c
 MISC metadata.xml 307 BLAKE2B 712a78cc3cbe9bee1e770452448efd933eb76c6de75e8302e8f61b22aec35a2f43ceb7c3014bf88b81ecf4ff27da4b115ab24605a53fbbba18100896fff12ff8 SHA512 29403efb372cc2ddb9e428be05bb7bf57b0a51a3ab66a0b0bfbdfbcdf6db1b5d357ddafc1b3a77d00109840ea4c610a088e7c8f97a3c0b9cd330a6edd2651ae6
diff --git a/media-libs/kvazaar/kvazaar-2.2.0.ebuild b/media-libs/kvazaar/kvazaar-2.2.0.ebuild
index 404cfe3b1d73..951d0960e9e1 100644
--- a/media-libs/kvazaar/kvazaar-2.2.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.2.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~loong ~mips ~riscv"
+	KEYWORDS="~amd64 ~arm ~ia64 ~loong ~mips ~riscv"
 fi
 inherit autotools flag-o-matic multilib-minimal
 
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 51ea986f8a33..0eceb201e1ba 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -3,7 +3,7 @@ AUX vulkan-layers-1.3.239-Export-symbols.patch 436 BLAKE2B 0e9f86d8d64844fe42d0e
 AUX vulkan-layers-1.3.239-r2-Build-shared-libs.patch 444 BLAKE2B f6db7c8244385560dba4550c63681814ab2cf835364dc3d5e2425d7a3d7ce784822b59b349bb7ef5f1e564d13d118910a87a7e4f1ba8d4c4a42fe940ce002a52 SHA512 e6a3ea885628c3516296118a1489a834ca02400e66430bf5fe6083c6944cf9d2a95aea55f1744d7ed5cfbde08f73ab0d0c6b5feb8e3cff1a55c79e86809666cc
 DIST vulkan-layers-1.3.239.tar.gz 4549587 BLAKE2B b5ac5afade60b048414a336dc130ae2e7c332e1a9e4b86448be9c86f17f7705990b27908721ee2f62e3425f117d3941f47525f8fa0d07e79bc3c68f7e4e48f14 SHA512 4b96951874e5b7c7abbab83b0b85cfe10b13d3ced20148ddcdd9b6e79db5d083b9ee00ae1c3605a72bcea4c3b8f1ab42ed284eb2cbc8f7e98d377108970e884c
 DIST vulkan-layers-1.3.243.tar.gz 4624249 BLAKE2B d358ccf3dbe690d7f30e153271602b4ab14d55a854169fa828a4bc8ffeb688531b4b4703dbe7ea4e038237db650a923ab9f618178a5edf304fc4a3170be57238 SHA512 d2bba9afc2013ccd41953eb699e9568c85f90bb99d1be9866126a8bc18ae492e55970acc2ca4d7b9850b0201b0451acbb5335ea19dcd030dc71d545feb261a19
-EBUILD vulkan-layers-1.3.239-r1.ebuild 1525 BLAKE2B dfb26d17837db94b629d3f4a024e2dc4893f2a273cce48689befe740aac8cd74c1fc08dbd25745626192d4debb7b0c85f0721a3a22b231bcc7f67609ac437774 SHA512 8ba9fcc8788520716524aceaa9bd98d895d72962e0051b8e169e4e51faf76daf434ddd9f553a62d295ac25878d006a0991773ad7f8141474d264ea436e690ddd
+EBUILD vulkan-layers-1.3.239-r1.ebuild 1522 BLAKE2B 375b44f54a2ec3f26e7e861603347295c09b04d23db196804607231f0d995e8e23c71e758cb7790d32a2babad1950a2f9d1e99e081486460c9f545c1523d813c SHA512 a3da34cb2129df6e396cfca58813c3e1cc5622cdd4fa1666ff830546c3eebf9484be15e760a7035f413c1b453ebcfc30779cbfcd26a57809a8d56aada17f88db
 EBUILD vulkan-layers-1.3.239-r2.ebuild 1566 BLAKE2B 31aeaf8d67513bb479b18536fa5a229f0c13f5528b4a8a4e548127f858e354eea144c38c0546e0a0a11961fdb4c4c2013728e1d45100fb771553dfc90d853ebb SHA512 5c3fe2b9f550438791852ed04cdff9a9b58dd07f1d3c41ec2cd6c0534851674a27c8eb80c48adb789d89f46dd5ce9f7d2f9352ddeb9efbdae676fdb350a307c3
 EBUILD vulkan-layers-1.3.239.ebuild 1479 BLAKE2B 830d065c5956333c011b567ad9910b20a7c847d4eb59afee1f3219495a602a91a023a3e1e8d71b08bf2b0f5990a50b5126e41a5cc8917f2bb6cfcaf40bb9b3c1 SHA512 ecf247f0f9ce12744ba0db4f4bc378ed939a912ceea8341776a7553377d9260de36454c3f60195814e16ac6c20fd6400e7fe24e1a68a0be576ddde2d014caa09
 EBUILD vulkan-layers-1.3.243.ebuild 1577 BLAKE2B d4628e7682dac621dd85cc01ea8c32a47ea12746f325a3a3020269672445a27e92403da514c21eac7065f2f7bbfec3f3c1d0c85bbf2fc0cff1557ee01e0e352b SHA512 b5cf84bfe5b2009906a4666bd31bab02bb1851b8b1a7ef51c9e14498808a2cfc3939217e2725515d7abccec558df6432f7db55abd07f352712ef422afc14a91b
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.239-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r1.ebuild
index 77df77e94be3..1fc54cbca9fc 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.239-r1.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 56b09381def6..0198cefecc9b 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,6 +1,6 @@
 DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
 DIST waffle-v1.7.2.tar.bz2 305728 BLAKE2B d78e54857d5fd4a20526d23a9a2edc5abacceaf4a2a6fd21b3432e4b68ef8084c93748592232b7698bd0587db83a5396cf92258f8cbfec2dbc1f6335d89e5bf6 SHA512 015bd82ae592d639403136e91681912827ad81b42400b7dd5353076d6af53ceec8d3cba7e9b076e99676c37a75a9e5f6440c22e14d89c978901b1e3f3d95052f
 EBUILD waffle-1.7.0-r2.ebuild 1606 BLAKE2B e986f97e87ca173d21babe3699a5d56e41aa78c4feb94d97fe7698af76bcdf6ac505f749a5d8c3084279f126d99af1facbdb5b32e19610bbbddd8bf9b21d1f2c SHA512 51caa025dc551ac3928158f477f1241b972b664edc90f5f9278ec67255a51857b347b3a4155cdfb35d72d4da3019d9b4b37b77ab6c0d2360d7572518ac4c1eb3
-EBUILD waffle-1.7.2.ebuild 1810 BLAKE2B c0d62779a18a82cb4e570cb500531199c736a02b448b341568e34f3900e8becbc1d66c13439168f4ff3e3e277502ba3880ed3f798c78817d0306070eff03ebd8 SHA512 88e8335f4499920a8466e9db732b4644f01b0aafc5aaad8285ff312ccb51eca7eb5f47ec04acc759340d4389b3a6c2deefee376ff85058f1f4f13bb4f7d2f3b4
+EBUILD waffle-1.7.2.ebuild 1808 BLAKE2B 635061efed566d7f4c34e6810298e2b66b2b08f02bf69c4d19b88958d61fd0a15d85590ce5d46284273a4c39a207cab572af763dc4a25ba8552b8104a3bea550 SHA512 1c7433e98087d6076ccee0703a7e2704df6951dcf914d7fc7e7d75ddbb3a54f9932acc2640259e7e01d3572f4f9424e043115b8f0cc9841d24d06dd3d6e45c19
 EBUILD waffle-9999.ebuild 1810 BLAKE2B c0d62779a18a82cb4e570cb500531199c736a02b448b341568e34f3900e8becbc1d66c13439168f4ff3e3e277502ba3880ed3f798c78817d0306070eff03ebd8 SHA512 88e8335f4499920a8466e9db732b4644f01b0aafc5aaad8285ff312ccb51eca7eb5f47ec04acc759340d4389b3a6c2deefee376ff85058f1f4f13bb4f7d2f3b4
 MISC metadata.xml 532 BLAKE2B c0c240a536c012ce3eb478dff1af25d8ddb0b9ce0d565df3a5a82941179c661552d3b6616c2851344a8c47c1a3b568b0f042e003e6133218be46313262f47d1f SHA512 d75a395ae334e6d3c364db676a654939560d591cae77c2ccc55d4c44474b168a9922b68c01349243a899feb0214d057c260f64a6a5029ee292cc86f6ade01906
diff --git a/media-libs/waffle/waffle-1.7.2.ebuild b/media-libs/waffle/waffle-1.7.2.ebuild
index 9dd3bad563e3..b1de4e37b135 100644
--- a/media-libs/waffle/waffle-1.7.2.ebuild
+++ b/media-libs/waffle/waffle-1.7.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${PN}-v${PV}
 fi
 inherit meson-multilib multilib ${GIT_ECLASS}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 97641645082a..1e2df397a5fd 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 563196966248..dfef9cb94672 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,5 +1,7 @@
 AUX hydrogen-1.1.0-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
 DIST hydrogen-1.1.1.tar.gz 11417837 BLAKE2B 52f6f61fc6e247875688dcea2290d92eb7bc85910620f0adcb52506d587b02dcaec6e2ecb72c77cf4eb3134534c75fc64bc4dd76a63f886cc6ea07d9b8812089 SHA512 c5e6bd713a0f9ef3b30bf0ae00bc41fea7494c20342c14c9f41ec05d1fdd3be721ffc3ff92bacd011e3b39a68022ea04daf55e60d334f64a00abef17d892cd37
+DIST hydrogen-1.2.0.tar.gz 12911501 BLAKE2B 606bfd977e67a962933e331bd1d4985a898e14c3d72656aa38fc3d50fa1daeb301a00778114e46a4890af548816befc8deb598bbc65a122e8a36694ce7740776 SHA512 610dc292ab26880897030ee7e969caf11e2758e0cccdc15b21711a2114564e12af855b50f0cf13964689b6697255c5f2080e2114c916ea6fbe3909057e7de1df
 EBUILD hydrogen-1.1.1.ebuild 2086 BLAKE2B 41eb6d5b0064e0f3553ead000cbcffc917795e4776af202c7d52853b944225f9e45779584abfb96134c775bb6ee3d767960f0e91da9f560b4815fa1fbacf2e06 SHA512 bcad8cb18fe0ebff4a111ad234c4ebd66c73767430c50f793cbce6236fb7dbbfc8cb9f9e29cefb51937c20aa9ff0c898ce499ed00a603f49c20f84448ab93bd6
-EBUILD hydrogen-9999.ebuild 2089 BLAKE2B be6b21eef24f86704a17e70bf8081bc95ad1a30084fb767b9fb41dda70e79c7dffbc0b4a8c88043e89d9f1a6463e96e990c98ab76f577ab12a50c410da7c6977 SHA512 4a02a8242aa0bc1f552e36238eab10d1ce256bede2c4856f2639295bb7a31c86f6112d3f63a2b5c11e082d835b1c6fbc021190aab3332229668baf1f851dfed1
+EBUILD hydrogen-1.2.0.ebuild 2077 BLAKE2B 4b30d99b5b874485798bda42e28f9a267a69d375ed41f783cdaac84b3e4c692fb9e9b90149ff1e522bbd4441ac67e1c9351e7f334be0633954a630f644907e2e SHA512 c2c8c2a5ce47b3c5643cf989c6bfc6d81ac3dd9880a4237017a026f34c5efa33aea912115f3013ff3d94504602deaad86494a96e875d824147af4fcaeaef4964
+EBUILD hydrogen-9999.ebuild 2077 BLAKE2B 4b30d99b5b874485798bda42e28f9a267a69d375ed41f783cdaac84b3e4c692fb9e9b90149ff1e522bbd4441ac67e1c9351e7f334be0633954a630f644907e2e SHA512 c2c8c2a5ce47b3c5643cf989c6bfc6d81ac3dd9880a4237017a026f34c5efa33aea912115f3013ff3d94504602deaad86494a96e875d824147af4fcaeaef4964
 MISC metadata.xml 478 BLAKE2B bd59feef45263e2f2440696d657c0845f70498b64dec764dc4fff3e0c837a725195f55a2a651498f5c38448ae7c45fdc50def9a8068fe58e93332ad66de7e1ab SHA512 757c7766697ad73293ed281df0079de5775068bc6b899a9dc6bd3a41a36ed024646e01d242177948be1756d407e44cacd2bb2ed7ec0e4698fd358ec0031db3c4
diff --git a/media-sound/hydrogen/hydrogen-1.2.0.ebuild b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
new file mode 100644
index 000000000000..7fc1c8c951be
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.2.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
+else
+	MY_PV=${PV/_/-}
+	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+fi
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
+
+REQUIRED_USE="lash? ( alsa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+CDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/libsndfile-1.0.18
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	!archive? ( dev-libs/libtar )
+	doc? ( dev-texlive/texlive-fontutils )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="
+	${CDEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-gnuinstalldirs.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_CPPUNIT=OFF
+		-DWANT_DEBUG=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_LADSPA=$(usex ladspa)
+		-DWANT_LASH=$(usex lash)
+		-DWANT_LIBARCHIVE=$(usex archive)
+		-DWANT_LRDF=$(usex ladspa)
+		-DWANT_OSC=$(usex osc)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PORTMIDI=$(usex portmidi)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_RUBBERBAND=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index b93c44605a79..7fc1c8c951be 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -39,7 +39,7 @@ CDEPEND="
 	>=media-libs/libsndfile-1.0.18
 	alsa? ( media-libs/alsa-lib )
 	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	!archive? ( dev-libs/libtar )
 	doc? ( dev-texlive/texlive-fontutils )
 	jack? ( virtual/jack )
 	ladspa? ( media-libs/liblrdf )
diff --git a/media-sound/puddletag/Manifest b/media-sound/puddletag/Manifest
index 4d8f444e4ebe..38b89967e495 100644
--- a/media-sound/puddletag/Manifest
+++ b/media-sound/puddletag/Manifest
@@ -1,4 +1,3 @@
 DIST puddletag-2.2.0.tar.gz 14355485 BLAKE2B 712b6c28adea9743476b9908e9c28a3988e88ca598cb7c65580f876a06770442852188fc727c411fc78fa972e68edbe9b1fa53542507b4a1edfd0285af776423 SHA512 92c430f54b49d2f193ffc4168f35bbadb069ca9b41b28250ee1c6dcb84853def20865d6df52940eebff8c5b812c0c8ab6b8971b66d398ff9ac94918e955322bb
 EBUILD puddletag-2.2.0-r1.ebuild 968 BLAKE2B 08845bd3b3a1eca267958c9357ac3143b5186aec3ac75292fe66f90ea66ca4cbfd7dcdd037ef67e09e72d8ddacc221935a6aa8882f070962e4eed46064ded933 SHA512 1b7e42638f574a00f0587bdcff5d613a79e910294a616eb41895a8d43ef55f33e258fe7def3aa57beabfa18aed76faa1a7d64e72d30718ce92e1641d17feccdb
-EBUILD puddletag-2.2.0.ebuild 890 BLAKE2B 5ca7f5c4f9bcd7f9a8ab2ce0af79d1fcf06df1274b0cbbb8de5f065a26f13883fa5ba30c48310f5c5bb17e80a44a94812e2893a8d76f81824293aa080d1e2fbd SHA512 ce3cdcabf91858e006b26ed67df3c9159d170cfc49659db10677bba206204b3568602eaf1249a6dd44cac0869dd39420318840fca8ace1736f54564cc249bda4
 MISC metadata.xml 625 BLAKE2B 53148d8c908987d7bae7246c123e72638270848c8458a18f1839a8046995eb156d25c75b0312d0dfd5b1949d16062362b7c4af09f74843fb3dbf81015f706de5 SHA512 b49b68c45205f4f465263983d94bbb5289412ab7567e210f98b98587bd3103db426a375fecf7c2e99929df623d1bbd603330561fffccdc4bf70170f2312d2769
diff --git a/media-sound/puddletag/puddletag-2.2.0.ebuild b/media-sound/puddletag/puddletag-2.2.0.ebuild
deleted file mode 100644
index 9d61aab27428..000000000000
--- a/media-sound/puddletag/puddletag-2.2.0.ebuild
+++ /dev/null
@@ -1,31 +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,10} )
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="Audio tag editor"
-HOMEPAGE="http://docs.puddletag.net/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acoustid quodlibet"
-
-DEPEND=""
-RDEPEND="
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.9[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.15.6[${PYTHON_USEDEP},svg]
-	>=media-libs/mutagen-1.45.1[${PYTHON_USEDEP}]
-	acoustid? ( >=media-libs/chromaprint-1.5.0 )
-	quodlibet? ( >=media-sound/quodlibet-4.4.0[${PYTHON_USEDEP}] )
-	>=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.9.1[${PYTHON_USEDEP}]
-"
-DOCS=(changelog NEWS THANKS TODO)
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 46aaa1271862..9956b2eba315 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/hevc-hm/Manifest b/media-video/hevc-hm/Manifest
index 29438aaa08b0..847f1bf031a7 100644
--- a/media-video/hevc-hm/Manifest
+++ b/media-video/hevc-hm/Manifest
@@ -1,3 +1,3 @@
 DIST HM-HM-17.0.tar.gz 1692323 BLAKE2B fa620ce66acbc634d9768303fe8d60711759a9d6d1ff91b69680993ae45e4581c9df4f0a4fe36719de9713fd29ba020278cf7ef9a51ebee6b01dc578bfbd8f2f SHA512 e8492ee63326da497d0731ef3f70e9f11043618ab5a7244aed94b248dba3f64e301f0ec2d12447a0ef22cc630cfa425341f65b4cacef184b453ba5125b7f8738
-EBUILD hevc-hm-17.0.ebuild 1124 BLAKE2B 60a8876b4afb3c8ab3c40e068278190bfdf2d8ecf826b537e3d25b1fa53f4552a6715fb7e04c535b8518a25030f7d4f6ded6738edda180265779557b033f4956 SHA512 b77caea0b60cd259e32069ad4e16bba639319a9c849a2f4d6b73281c0d03e7f3b5db59b779922fa17dc31f9344086365f22373a65bfec2b536cec0740c469505
+EBUILD hevc-hm-17.0.ebuild 1130 BLAKE2B 3582b0818b432ab8f6dff7c934a2751fdc44d388f77c887291f61f052d2fc45dac722e349b5cd915346463f1b465147d2e78f0f4bf8f5c7c93e8875e5aeeff1c SHA512 a1eb08a9d71f8807e4eaeb8f1008edadd1949ec464b9acc59673c5d2d0bafe8868f17ec3ee53707aed8dec828dc5c7204011ec6dc71112738eb8a3f59519d493
 MISC metadata.xml 260 BLAKE2B ee10cc021112a6e67381cc76d642cabfe9876b9e2da97243070551179a9f8eb2bcb67d8bf96822d40239c350808a8a129882914f1ce9b5f924c99d16ba1300a6 SHA512 0bc4c52638ab97c96d6e1ea6b8199201567dbdac880349e8ab501de49bbfba142e4f2f60baac9c0bc48df6f5d170d81d641277cc01762d720b720764bb162c1a
diff --git a/media-video/hevc-hm/hevc-hm-17.0.ebuild b/media-video/hevc-hm/hevc-hm-17.0.ebuild
index 3ea17d9de0e0..2c390b562e20 100644
--- a/media-video/hevc-hm/hevc-hm-17.0.ebuild
+++ b/media-video/hevc-hm/hevc-hm-17.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://vcgit.hhi.fraunhofer.de/jvet/HM/-/archive/HM-${PV}/HM-HM-${PV}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~loong ~mips ~riscv"
+KEYWORDS="~amd64 ~arm ~ia64 ~loong ~mips ~riscv"
 
 S="${WORKDIR}/HM-HM-${PV}"
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ff75c2744721..0dfd9ad7dc88 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index aa7637f5e3ca..4eb4202242f7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Apr 2023 04:09:48 +0000
+Sat, 08 Apr 2023 10:09:54 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 87c62e9ce2ca..21555b5e8a87 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-04-08T04:09:51Z
+TIMESTAMP 2023-04-08T10:09:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQw6Q9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQxPXVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBB4g//eq83WCCyczQC/pwy5cNxpZ1mBpelYuRu3NTDe6IrnB3t4nkPHIjyPJe7
-ZdtYDpk+yWgn/8V75C/DHyM6r4hhVrh46jhizcw/T/g6WzkmX8T3APcXwA7WzzpS
-6+KI/UcMIVLP55VW5XCUFuT/NWdCCcfLQO0E7ZszkRmHS9qk78HPnqB7iutF6ylR
-v/NHGv11X1zjlk0a0j15DrvUe1onsXJZyiIe2xRdltVRW44+x++yxmPmzbTFhN+J
-8octkv5S332LEOmwXRLGHQkEP8akZUkVXCUUPJ8m/7Fh064jNgD1nvd+neq01fhm
-D0kpQ4Y4zES00TtujTbxXQrkU3IE4ir0L3cJTxuXkICRDRzsa05M9aPlVdGk9wXt
-T4MyFpNnAqOfYgs5h/Y8x2Nx7amMQiu/XFjjOPmysD/d7X5ofGnfvTmWxsu32v2N
-7ZoD2RNFV7kpgh2mvFPx0kg7AxtYTvOmblDXeNjlWoolwmf9s4tAaq3UD07vN82S
-SPrPA2EAokTuXJO5ql1MDj5q1qEffqGPi9VLjZrGvm8sIkruzhww3lxDZ8afHMAw
-SI11XwMns0rKV8dhhS0O1QoRoB8WBAlswuj+K0Ulz16BlRyGk93iA9W/7o6v3eCy
-Z17qN5lSLXm89absf3aP8fmWGiqLXbb7Zsj7mR709NnDZ5INvD0=
-=V2Fu
+klDrlxAAqXnafLCvsHhEV33jxtPNfRnDfeODguOu4Hc/IGY+g0aceN49jy3ett5o
+yF8O0uZyFg4kXbM8hR+f1NLe10/vlW2L1gUzsyI7AXM3jd9GzL9O0tGiZuVFdjw9
+UKkFU4Qnvm5XVAVaUyAnpBQc/42Ivhr6BlUbZasphKIF4Av3smV/QWp6w6y640cd
+/EUzDLzkSNYWDIYxs//gTGg3f0Qa7bo6RCUHwhuo5RhXpYZ4e9D+cH+DhrpvFJ/a
+D2rUYzXa9HxV+WIsIDCZRYRROTJbHRg4WtFqIAuEd0RtovYXeI83ongolnMH1kW/
+Jkj1oiUf6LNTmaOlLKA0mXv5xF77P2Mm3SKVPfhK/KbtVyH2zN/V69zB9nLvhDvg
+lwJ1CsMSjH2cpfiQF2/DFzczVAusRvJT7Z5mfig71ViA5cSKGyhS8RM+dQsUxBsC
++/Qwvdj848zrEwBsak9a343rtg8MBHU9ez4tmCb77KDy5Kg01wZCMATBZINEZtgX
+LhyDCaGo/XfG8xbmItl9FUe25li8pVmXfmt+EG47Ul6GOZuF5iPqDaSKcbCCRXxw
+Se9Hddl36b6Cez7/fIggVkTDoZrykV186jLKl8HGFGJ8lz4tUa7ILbZEKUP0mSMW
+7sT7mXQljRzySYgQg7yijYZPDj1aWG28XDMjW/0jzVJWiwJno1E=
+=vIeB
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ea266e4dd9bb..4eb4202242f7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Apr 2023 04:09:49 +0000
+Sat, 08 Apr 2023 10:09:54 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b5ef5ed6abf9..29c48284d296 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 706804ec6a26..9fcad74964cc 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.109 b/metadata/md5-cache/app-admin/awscli-1.27.109
new file mode 100644
index 000000000000..ce5aeb3fe82b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.109
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.109[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.109[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin 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=https://github.com/aws/aws-cli/archive/1.27.109.tar.gz -> aws-cli-1.27.109.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/conky-1.18.1 b/metadata/md5-cache/app-admin/conky-1.18.1
deleted file mode 100644
index bc11eaadf55b..000000000000
--- a/metadata/md5-cache/app-admin/conky-1.18.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( virtual/pandoc || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pyyaml[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pyyaml[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pyyaml[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] ) ) ) extras? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pyyaml[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pyyaml[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pyyaml[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wayland? ( dev-libs/wayland x11-libs/pango ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) wayland? ( dev-libs/wayland-protocols )
-DESCRIPTION=An advanced, highly configurable system monitor for X
-EAPI=8
-HOMEPAGE=https://github.com/brndnmtthws/conky
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
-IUSE=apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype wayland webserver wifi X xinerama xmms2 +lua_single_target_lua5-4
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-3 BSD LGPL-2.1 MIT
-RDEPEND=curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wayland? ( dev-libs/wayland x11-libs/pango ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) apcupsd? ( sys-power/apcupsd ) cmus? ( media-sound/cmus ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) extras? ( app-editors/nano || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
-SLOT=0
-SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.18.1.tar.gz -> conky-1.18.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=89ce09d585d00965e1970ae7dd3aedb0
diff --git a/metadata/md5-cache/app-admin/conky-1.18.3 b/metadata/md5-cache/app-admin/conky-1.19.0
index e998078e9043..e84212faa9b7 100644
--- a/metadata/md5-cache/app-admin/conky-1.18.3
+++ b/metadata/md5-cache/app-admin/conky-1.19.0
@@ -12,6 +12,6 @@ LICENSE=GPL-3 BSD LGPL-2.1 MIT
 RDEPEND=curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wayland? ( dev-libs/wayland x11-libs/pango ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) apcupsd? ( sys-power/apcupsd ) cmus? ( media-sound/cmus ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) extras? ( app-editors/nano || ( app-editors/vim app-editors/gvim ) )
 REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
 SLOT=0
-SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.18.3.tar.gz -> conky-1.18.3.tar.gz
+SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.19.0.tar.gz -> conky-1.19.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=953e4beb07c5c9ecc11135b1888f7927
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.13_p3 b/metadata/md5-cache/app-admin/sudo-1.9.13_p3
index 9e792bc103be..9430f9ff3eda 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.13_p3
+++ b/metadata/md5-cache/app-admin/sudo-1.9.13_p3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.sudo.ws/
 INHERIT=pam libtool tmpfiles toolchain-funcs verify-sig
 IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.13p3.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.13p3.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.13p3.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.13p3.tar.gz.sig )
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=d0e481eda4502be9cc11e1c24879a62c
+_md5_=4140e8b7bfd40fb5e098acb6b30df78b
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index bb240b970838..e13370363b41 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/tmate-2.4.0-r2 b/metadata/md5-cache/app-misc/tmate-2.4.0-r2
index af8e87b0b684..0e05d1aae080 100644
--- a/metadata/md5-cache/app-misc/tmate-2.4.0-r2
+++ b/metadata/md5-cache/app-misc/tmate-2.4.0-r2
@@ -7,9 +7,9 @@ HOMEPAGE=https://tmate.io/
 INHERIT=autotools
 IUSE=debug
 KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=ISC
+LICENSE=ISC BSD BSD-2
 RDEPEND=dev-libs/libevent dev-libs/msgpack:= dev-libs/openssl:= >=net-libs/libssh-0.6.0 sys-libs/zlib sys-libs/libutempter
 SLOT=0
 SRC_URI=https://github.com/tmate-io/tmate/archive/2.4.0.tar.gz -> tmate-2.4.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0553f0f040866de686074b9eb42ae3c9
+_md5_=867f8ebf66a6a28ef665f9356df0d097
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index c71deab09c88..76534e0e4313 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/go-1.19.8 b/metadata/md5-cache/dev-lang/go-1.19.8
index 355ba2b68ee5..dbf0b8137425 100644
--- a/metadata/md5-cache/dev-lang/go-1.19.8
+++ b/metadata/md5-cache/dev-lang/go-1.19.8
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
 RESTRICT=strip
 SLOT=0/1.19.8
 SRC_URI=https://storage.googleapis.com/golang/go1.19.8.src.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bb1675d42cb0bec2025a6935d44dec94
+_md5_=1f725cf994775515f3446ab24915650b
diff --git a/metadata/md5-cache/dev-lang/go-1.20.3 b/metadata/md5-cache/dev-lang/go-1.20.3
index 1bc9a0da13d9..3a2f4b26cf2c 100644
--- a/metadata/md5-cache/dev-lang/go-1.20.3
+++ b/metadata/md5-cache/dev-lang/go-1.20.3
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
 RESTRICT=strip
 SLOT=0/1.20.3
 SRC_URI=https://storage.googleapis.com/golang/go1.20.3.src.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bb1675d42cb0bec2025a6935d44dec94
+_md5_=1f725cf994775515f3446ab24915650b
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 6500d2934089..c97d6349f55e 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/clhpp-2023.02.06 b/metadata/md5-cache/dev-libs/clhpp-2023.02.06
index 518ce92802e9..d9be66175447 100644
--- a/metadata/md5-cache/dev-libs/clhpp-2023.02.06
+++ b/metadata/md5-cache/dev-libs/clhpp-2023.02.06
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/OpenCL-CLHPP/
 INHERIT=cmake ruby-ng
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Khronos-CLHPP
 RDEPEND=virtual/opencl
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v2023.02.06.tar.gz -> clhpp-2023.02.06.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8f9ed93f7fa3a675d8825b0991dbdeda
+_md5_=2de9d8f933ba58ee85578da538fff98d
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.02.06 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.02.06
index d5a27305e077..4c16adee15aa 100644
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.02.06
+++ b/metadata/md5-cache/dev-libs/opencl-icd-loader-2023.02.06
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/OpenCL-ICD-Loader
 INHERIT=cmake-multilib
 IUSE=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=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=!dev-libs/ocl-icd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2023.02.06.tar.gz -> opencl-icd-loader-2023.02.06.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a7a3c533605a3e6553309b0b03221378
+_md5_=578db61a6e9a69ae6a36d0d1fc0aa426
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index e044eb38a8aa..6d6a353e21da 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/Nuitka-1.5.1 b/metadata/md5-cache/dev-python/Nuitka-1.5.1
deleted file mode 100644
index 4707ba383207..000000000000
--- a/metadata/md5-cache/dev-python/Nuitka-1.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-util/ccache ) 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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
-INHERIT=distutils-r1 flag-o-matic optfeature pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[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 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-1.5.1.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8cf4127b8da219de3d0ae035e5ea0295
diff --git a/metadata/md5-cache/dev-python/Nuitka-1.5.3 b/metadata/md5-cache/dev-python/Nuitka-1.5.3
deleted file mode 100644
index 2e6c7bfa3a9a..000000000000
--- a/metadata/md5-cache/dev-python/Nuitka-1.5.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-util/ccache ) 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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
-INHERIT=distutils-r1 flag-o-matic optfeature pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[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 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-1.5.3.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8cf4127b8da219de3d0ae035e5ea0295
diff --git a/metadata/md5-cache/dev-python/Nuitka-1.5.4 b/metadata/md5-cache/dev-python/Nuitka-1.5.4
deleted file mode 100644
index bd69b8dc0d81..000000000000
--- a/metadata/md5-cache/dev-python/Nuitka-1.5.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-util/ccache ) 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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
-INHERIT=distutils-r1 flag-o-matic optfeature pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[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 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-1.5.4.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8cf4127b8da219de3d0ae035e5ea0295
diff --git a/metadata/md5-cache/dev-python/accessible-pygments-0.0.3 b/metadata/md5-cache/dev-python/accessible-pygments-0.0.3
deleted file mode 100644
index a6683bf704d4..000000000000
--- a/metadata/md5-cache/dev-python/accessible-pygments-0.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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/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 collection of accessible pygments styles
-EAPI=8
-HOMEPAGE=https://pypi.org/project/accessible-pygments/ https://github.com/Quansight-Labs/accessible-pygments/
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/pygments-1.5[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/Quansight-Labs/accessible-pygments/archive/v0.0.3.tar.gz -> accessible-pygments-0.0.3.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=db43266cfd6866bfc7ec0aa9c6628d48
diff --git a/metadata/md5-cache/dev-python/aiosqlite-0.18.0 b/metadata/md5-cache/dev-python/aiosqlite-0.18.0
index d0da960cd350..0014c1d1b97d 100644
--- a/metadata/md5-cache/dev-python/aiosqlite-0.18.0
+++ b/metadata/md5-cache/dev-python/aiosqlite-0.18.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://aiosqlite.omnilib.dev https://pypi.org/project/aiosqlite/ https://github.com/omnilib/aiosqlite
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
 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://files.pythonhosted.org/packages/source/a/aiosqlite/aiosqlite-0.18.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=16923811c4f2cdb191b2eb599c603cd8
+_md5_=a5fde7713e240b18999a83ceac6895c6
diff --git a/metadata/md5-cache/dev-python/alembic-1.10.2 b/metadata/md5-cache/dev-python/alembic-1.10.2
index 0146f7698756..fb071feec2fc 100644
--- a/metadata/md5-cache/dev-python/alembic-1.10.2
+++ b/metadata/md5-cache/dev-python/alembic-1.10.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+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(-)?] >=dev-python/typing-extensions-4[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/a/alembic/alembic-1.10.2.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9b28797c4ca290702c6db29402dbd106
+_md5_=a8d50261db0b5ce4f9ef9bc48d5cd145
diff --git a/metadata/md5-cache/dev-python/asyncstdlib-3.10.5 b/metadata/md5-cache/dev-python/asyncstdlib-3.10.5
deleted file mode 100644
index 09fa3cc586de..000000000000
--- a/metadata/md5-cache/dev-python/asyncstdlib-3.10.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The missing async toolbox
-EAPI=8
-HOMEPAGE=https://github.com/maxfischer2781/asyncstdlib/ https://pypi.org/project/asyncstdlib/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-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/maxfischer2781/asyncstdlib/archive/v3.10.5.tar.gz -> asyncstdlib-3.10.5.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a78f731db2ba20819264b458ebf232ca
diff --git a/metadata/md5-cache/dev-python/awxkit-21.13.0 b/metadata/md5-cache/dev-python/awxkit-21.13.0
deleted file mode 100644
index 9cbe653df5be..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-21.13.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=8
-HOMEPAGE=https://github.com/ansible/awx/ https://pypi.org/project/awxkit/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ansible/awx/archive/21.13.0.tar.gz -> awx-21.13.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7a723da6273f8995d4e83a2d256a8e04
diff --git a/metadata/md5-cache/dev-python/awxkit-21.14.0 b/metadata/md5-cache/dev-python/awxkit-21.14.0
deleted file mode 100644
index 290be5198bc7..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-21.14.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=8
-HOMEPAGE=https://github.com/ansible/awx/ https://pypi.org/project/awxkit/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ansible/awx/archive/21.14.0.tar.gz -> awx-21.14.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7a723da6273f8995d4e83a2d256a8e04
diff --git a/metadata/md5-cache/dev-python/bareos-21.1.7 b/metadata/md5-cache/dev-python/bareos-21.1.7
deleted file mode 100644
index dc9325ace943..000000000000
--- a/metadata/md5-cache/dev-python/bareos-21.1.7
+++ /dev/null
@@ -1,16 +0,0 @@
-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/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/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 bareos network backup suite
-EAPI=7
-HOMEPAGE=https://www.bareos.com/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-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=mirror test
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/21.1.7.tar.gz -> bareos-21.1.7.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=485aa52d5f4a59de7f551c168af02ce8
diff --git a/metadata/md5-cache/dev-python/beautifulsoup4-4.12.2 b/metadata/md5-cache/dev-python/beautifulsoup4-4.12.2
new file mode 100644
index 000000000000..0d575c293dc5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/beautifulsoup4-4.12.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( || ( dev-python/cchardet[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/soupsieve-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[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(-)?] ) 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(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) 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/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree
+EAPI=8
+HOMEPAGE=https://www.crummy.com/software/BeautifulSoup/bs4/
+INHERIT=distutils-r1 pypi
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/soupsieve-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[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://files.pythonhosted.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.12.2.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=a005251ffa49e370032a1a5a9121a7e5
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.109 b/metadata/md5-cache/dev-python/boto3-1.26.109
new file mode 100644
index 000000000000..c8747b1ba51a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.109
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.109[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.109[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[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 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.26.109.tar.gz -> boto3-1.26.109.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=19c6bcfc191ce918489bff494ff185c2
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.109 b/metadata/md5-cache/dev-python/botocore-1.29.109
new file mode 100644
index 000000000000..db0a4c7f4c0f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.109
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[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 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.29.109.tar.gz -> botocore-1.29.109.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=fdf90804b518aea7cdc6e38fa5f2e79b
diff --git a/metadata/md5-cache/dev-python/bottleneck-1.3.7 b/metadata/md5-cache/dev-python/bottleneck-1.3.7
index 926511f16505..446e02f81050 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.3.7
+++ b/metadata/md5-cache/dev-python/bottleneck-1.3.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pydata/bottleneck/ https://pypi.org/project/Bottleneck/
 INHERIT=distutils-r1 pypi
 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.9.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://files.pythonhosted.org/packages/source/B/Bottleneck/Bottleneck-1.3.7.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=df57f15dab71a78b3e9f723a6fb973f0
+_md5_=bdb7ece67f1bd11ed1502cb672e02476
diff --git a/metadata/md5-cache/dev-python/bracex-2.3_p1 b/metadata/md5-cache/dev-python/bracex-2.3_p1
index 7807dc3d5d16..ec5b85215b1d 100644
--- a/metadata/md5-cache/dev-python/bracex-2.3_p1
+++ b/metadata/md5-cache/dev-python/bracex-2.3_p1
@@ -1,9 +1,9 @@
-BDEPEND=test? ( dev-vcs/git ) 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/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_11(-)] dev-python/pyspelling[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ) )
+BDEPEND=test? ( dev-vcs/git ) 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/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-pymdownx-material-extras[python_targets_python3_11(-)] dev-python/pyspelling[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-pymdownx-material-extras[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-pymdownx-material-extras[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ) )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Bash style brace expansion for Python
 EAPI=8
 HOMEPAGE=https://github.com/facelessuser/bracex/ https://pypi.org/project/bracex/
-INHERIT=distutils-r1 docs
+INHERIT=distutils-r1 docs pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/facelessuser/bracex/archive/2.3.post1.tar.gz -> bracex-2.3_p1.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c3f6ddf40c7c0529bda2bf65d6f4a6aa
+SRC_URI=https://files.pythonhosted.org/packages/source/b/bracex/bracex-2.3.post1.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=238fe31f0e26c8640c1e6b22208bfb70
diff --git a/metadata/md5-cache/dev-python/braintree-4.18.1 b/metadata/md5-cache/dev-python/braintree-4.18.1
deleted file mode 100644
index 9620e288740f..000000000000
--- a/metadata/md5-cache/dev-python/braintree-4.18.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/requests-0.11.1[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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Braintree Python Library
-EAPI=8
-HOMEPAGE=https://developer.paypal.com/braintree/docs/reference/overview/ https://github.com/braintree/braintree_python/ https://pypi.org/project/braintree/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/requests-0.11.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/braintree/braintree_python/archive/4.18.1.tar.gz -> braintree_python-4.18.1.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0e8f73c061409eefe7f73a5358be05a9
diff --git a/metadata/md5-cache/dev-python/croniter-1.3.10 b/metadata/md5-cache/dev-python/croniter-1.3.10
new file mode 100644
index 000000000000..9e3b08965d58
--- /dev/null
+++ b/metadata/md5-cache/dev-python/croniter-1.3.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tzlocal[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/python-dateutil[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/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 module to provide iteration for datetime object
+EAPI=8
+HOMEPAGE=https://github.com/kiorky/croniter/ https://pypi.org/project/croniter/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[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/c/croniter/croniter-1.3.10.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=bf0f82d9072996c343e961606c33c7f2
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-4.1.0 b/metadata/md5-cache/dev-python/django-auth-ldap-4.1.0
deleted file mode 100644
index c50e1b2f0e67..000000000000
--- a/metadata/md5-cache/dev-python/django-auth-ldap-4.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) net-nds/openldap[-minimal] ) doc? ( >=dev-python/sphinx-5.3.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_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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django LDAP authentication backend
-EAPI=8
-HOMEPAGE=https://github.com/django-auth-ldap/django-auth-ldap/ https://pypi.org/project/django-auth-ldap/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-ldap-3.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/django-auth-ldap/django-auth-ldap/archive/4.1.0.tar.gz -> django-auth-ldap-4.1.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=670fe984412046b5306190d0839fe0f2
diff --git a/metadata/md5-cache/dev-python/django-filter-22.1 b/metadata/md5-cache/dev-python/django-filter-22.1
deleted file mode 100644
index b29b412f655c..000000000000
--- a/metadata/md5-cache/dev-python/django-filter-22.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/django-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/coreapi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/djangorestframework[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django app allowing declarative dynamic QuerySet filtering from URL parameters
-EAPI=8
-HOMEPAGE=https://github.com/carltongibson/django-filter/ https://pypi.org/project/django-filter/
-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/django-3.2[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/carltongibson/django-filter/archive/22.1.tar.gz -> django-filter-22.1.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d80656ce0569e852743478a4565a01a9
diff --git a/metadata/md5-cache/dev-python/flask-babel-3.1.0 b/metadata/md5-cache/dev-python/flask-babel-3.1.0
new file mode 100644
index 000000000000..e3bf94c03830
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-babel-3.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_pypy3(-)?,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/pallets-sphinx-themes[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/pallets-sphinx-themes[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/pallets-sphinx-themes[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/Babel-2.12[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flask-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2022.7[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[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=i18n and l10n support for Flask based on Babel and pytz
+EAPI=8
+HOMEPAGE=https://python-babel.github.io/flask-babel/ https://github.com/python-babel/flask-babel/ https://pypi.org/project/flask-babel/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/Babel-2.12[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flask-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2022.7[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[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/python-babel/flask-babel/archive/refs/tags/v3.1.0.tar.gz -> flask-babel-3.1.0.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=8274c52902a9e22efc7b6d852879a417
diff --git a/metadata/md5-cache/dev-python/fonttools-4.39.3 b/metadata/md5-cache/dev-python/fonttools-4.39.3
index 200e326a6f17..dcce0ffa36b9 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.39.3
+++ b/metadata/md5-cache/dev-python/fonttools-4.39.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fonttools/fonttools/ https://pypi.org/project/fonttools/
 INHERIT=distutils-r1 virtualx
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/fs-2.4.9[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[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
 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=https://github.com/fonttools/fonttools/archive/4.39.3.tar.gz -> fonttools-4.39.3.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=00480b422e6e6376f67f8081c1050866
+_md5_=288b63166de5315f7aab105ef48a37a6
diff --git a/metadata/md5-cache/dev-python/genson-1.1.0 b/metadata/md5-cache/dev-python/genson-1.1.0
deleted file mode 100644
index 38939aa0633b..000000000000
--- a/metadata/md5-cache/dev-python/genson-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( 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/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=GenSON is a powerful, user-friendly JSON Schema generator built in Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/genson/ https://github.com/wolverdude/GenSON/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-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 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/g/genson/genson-1.1.0.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3c09fbfb88023fb8a3edb1417cadae38
diff --git a/metadata/md5-cache/dev-python/genson-1.1.0-r1 b/metadata/md5-cache/dev-python/genson-1.1.0-r1
deleted file mode 100644
index a8b607548c3a..000000000000
--- a/metadata/md5-cache/dev-python/genson-1.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( 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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=GenSON is a powerful, user-friendly JSON Schema generator built in Python
-EAPI=8
-HOMEPAGE=https://github.com/wolverdude/GenSON/ https://pypi.org/project/genson/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-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://files.pythonhosted.org/packages/source/g/genson/genson-1.1.0.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=44f808727c1b12b55f00dc717725b357
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.71.0 b/metadata/md5-cache/dev-python/hypothesis-6.71.0
new file mode 100644
index 000000000000..f56aa99d56ee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.71.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[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/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[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=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=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/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli 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=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
+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/HypothesisWorks/hypothesis/archive/hypothesis-python-6.71.0.tar.gz -> hypothesis-6.71.0.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=d24acb6f6f27019938b39608b6ce5f4e
diff --git a/metadata/md5-cache/dev-python/imageio-2.26.0 b/metadata/md5-cache/dev-python/imageio-2.26.0
deleted file mode 100644
index d5e11649c893..000000000000
--- a/metadata/md5-cache/dev-python/imageio-2.26.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/fsspec[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imageio-ffmpeg[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tifffile[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freeimage >=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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for reading and writing image data
-EAPI=8
-HOMEPAGE=https://imageio.readthedocs.io/en/stable/ https://github.com/imageio/imageio/ https://pypi.org/project/imageio/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PROPERTIES=test_network
-RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freeimage 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? ( test )
-SLOT=0
-SRC_URI=https://github.com/imageio/imageio/archive/v2.26.0.tar.gz -> imageio-2.26.0.gh.tar.gz test? ( https://github.com/imageio/imageio-binaries/raw/224074bca448815e421a59266864c23041531a42/images/chelsea.png -> imageio-chelsea.png https://github.com/imageio/imageio-binaries/raw/224074bca448815e421a59266864c23041531a42/images/cockatoo.mp4 -> imageio-cockatoo.mp4 )
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7eb39bfb3c57aa58cef2245de2a393f4
diff --git a/metadata/md5-cache/dev-python/imageio-2.26.1 b/metadata/md5-cache/dev-python/imageio-2.26.1
deleted file mode 100644
index 0aaba7df118f..000000000000
--- a/metadata/md5-cache/dev-python/imageio-2.26.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/fsspec[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imageio-ffmpeg[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tifffile[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freeimage >=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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for reading and writing image data
-EAPI=8
-HOMEPAGE=https://imageio.readthedocs.io/en/stable/ https://github.com/imageio/imageio/ https://pypi.org/project/imageio/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PROPERTIES=test_network
-RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freeimage 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? ( test )
-SLOT=0
-SRC_URI=https://github.com/imageio/imageio/archive/v2.26.1.tar.gz -> imageio-2.26.1.gh.tar.gz test? ( https://github.com/imageio/imageio-binaries/raw/224074bca448815e421a59266864c23041531a42/images/chelsea.png -> imageio-chelsea.png https://github.com/imageio/imageio-binaries/raw/224074bca448815e421a59266864c23041531a42/images/cockatoo.mp4 -> imageio-cockatoo.mp4 )
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7eb39bfb3c57aa58cef2245de2a393f4
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-6.2.0 b/metadata/md5-cache/dev-python/importlib_metadata-6.2.0
new file mode 100644
index 000000000000..3f3b5e993de2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_metadata-6.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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/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=Read metadata from Python packages
+EAPI=7
+HOMEPAGE=https://github.com/python/importlib_metadata/ https://pypi.org/project/importlib-metadata/
+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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-python/zipp[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://files.pythonhosted.org/packages/source/i/importlib_metadata/importlib_metadata-6.2.0.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=ae68081e0e7476f0b50da8aa1e7eb5eb
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-1.7.0 b/metadata/md5-cache/dev-python/indexed_gzip-1.7.0
deleted file mode 100644
index 191db493bcc7..000000000000
--- a/metadata/md5-cache/dev-python/indexed_gzip-1.7.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( sys-libs/zlib:= >=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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib:=
-DESCRIPTION=Fast random access of gzip files in Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/indexed-gzip/ https://github.com/pauldmccarthy/indexed_gzip/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=sys-libs/zlib:= 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/pauldmccarthy/indexed_gzip/archive/v1.7.0.tar.gz -> indexed_gzip-1.7.0.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8ab677f9ab12a1a2166807201f388924
diff --git a/metadata/md5-cache/dev-python/jc-1.23.0 b/metadata/md5-cache/dev-python/jc-1.23.0
deleted file mode 100644
index 30c3c898dc4a..000000000000
--- a/metadata/md5-cache/dev-python/jc-1.23.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[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/xmltodict[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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Converts the output of popular command-line tools and file-types to JSON
-EAPI=8
-HOMEPAGE=https://github.com/kellyjonbrazil/jc/ https://pypi.org/project/jc/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64
-LICENSE=MIT
-RDEPEND=dev-python/pygments[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/xmltodict[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/kellyjonbrazil/jc/archive/v1.23.0.tar.gz -> jc-1.23.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4d38debd191577e669bc84cb217f07da
diff --git a/metadata/md5-cache/dev-python/jupyter-lsp-1.5.1 b/metadata/md5-cache/dev-python/jupyter-lsp-1.5.1
deleted file mode 100644
index 9e053521bb9a..000000000000
--- a/metadata/md5-cache/dev-python/jupyter-lsp-1.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/entrypoints[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.1.2[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(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab
-EAPI=8
-HOMEPAGE=https://github.com/krassowski/jupyterlab-lsp
-INHERIT=distutils-r1 optfeature pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.1.2[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? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-lsp/jupyter-lsp-1.5.1.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=708071e110f2dee4556942982efe6c8e
diff --git a/metadata/md5-cache/dev-python/jupyter-server-fileid-0.8.0 b/metadata/md5-cache/dev-python/jupyter-server-fileid-0.8.0
index c10e15e67e73..209d5e1ee0a4 100644
--- a/metadata/md5-cache/dev-python/jupyter-server-fileid-0.8.0
+++ b/metadata/md5-cache/dev-python/jupyter-server-fileid-0.8.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server_fileid/ https://pypi.org/project/jupyter-server-fileid/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/jupyter_events-0.5.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-server-fileid/jupyter_server_fileid-0.8.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cc4f676fc02afd5f2adad484b836c5de
+_md5_=e80de17f38be218d3dd24a46408525cb
diff --git a/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.6.1 b/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.6.1
deleted file mode 100644
index ba217565c74a..000000000000
--- a/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( 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(-)?] ) test? ( <dev-python/jupyter_ydoc-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/ypy-websocket-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-fileid-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/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Jupyter Server Extension Providing Y Documents
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server_ydoc/ https://pypi.org/project/jupyter-server-ydoc/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=<dev-python/jupyter_ydoc-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/ypy-websocket-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-fileid-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://files.pythonhosted.org/packages/source/j/jupyter-server-ydoc/jupyter_server_ydoc-0.6.1.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8edf20beb90b4507b785668908349f7d
diff --git a/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.8.0 b/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.8.0
index 52aa2c2af1d1..2dbb08edcc17 100644
--- a/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.8.0
+++ b/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.8.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server_ydoc/ https://pypi.org/project/jupyter-server-ydoc/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/jupyter_ydoc[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ypy-websocket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server-fileid[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://files.pythonhosted.org/packages/source/j/jupyter-server-ydoc/jupyter_server_ydoc-0.8.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=11553d51cd9fa1ee813392b065705e9b
+_md5_=dce18802f2d64842cb30eb96b803f6ac
diff --git a/metadata/md5-cache/dev-python/jupyter_ydoc-0.2.2 b/metadata/md5-cache/dev-python/jupyter_ydoc-0.2.2
deleted file mode 100644
index 5b0b3d797938..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_ydoc-0.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websockets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ypy-websocket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/y-py-0.6.0[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=Document structures for collaborative editing using Ypy
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_ydoc/ https://pypi.org/project/jupyter-ydoc/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=<dev-python/y-py-0.6.0[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? ( test )
-SLOT=0
-SRC_URI=https://github.com/jupyter-server/jupyter_ydoc/archive/refs/tags/v0.2.2.tar.gz -> jupyter_ydoc-0.2.2.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=27fcfedd035cf46d624334abee0836a3
diff --git a/metadata/md5-cache/dev-python/jupyter_ydoc-0.3.4 b/metadata/md5-cache/dev-python/jupyter_ydoc-0.3.4
deleted file mode 100644
index 9ae9c8fb85af..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_ydoc-0.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websockets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ypy-websocket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/y-py[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=Document structures for collaborative editing using Ypy
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_ydoc/ https://pypi.org/project/jupyter-ydoc/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/y-py[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? ( test )
-SLOT=0
-SRC_URI=https://github.com/jupyter-server/jupyter_ydoc/archive/refs/tags/v0.3.4.tar.gz -> jupyter_ydoc-0.3.4.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=567425ee88d8b3b015c97a48508fd1ba
diff --git a/metadata/md5-cache/dev-python/jupyter_ydoc-1.0.0 b/metadata/md5-cache/dev-python/jupyter_ydoc-1.0.0
index 9cd01a07c4f2..2c94a427e6c5 100644
--- a/metadata/md5-cache/dev-python/jupyter_ydoc-1.0.0
+++ b/metadata/md5-cache/dev-python/jupyter_ydoc-1.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_ydoc/ https://pypi.org/project/jupyter-ydoc/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/y-py-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[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 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter-server/jupyter_ydoc/archive/refs/tags/v1.0.0.tar.gz -> jupyter_ydoc-1.0.0.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ddbe51ac7ad7f020302d53aac4e1661f
+_md5_=4cfd11c57f56b5e40f9122b7780cd6d2
diff --git a/metadata/md5-cache/dev-python/jupyterlab-3.6.1-r1 b/metadata/md5-cache/dev-python/jupyterlab-3.6.1-r1
deleted file mode 100644
index 460f4bcb617e..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab-3.6.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/check-manifest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openapi-core[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-console-scripts[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/requests[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/requests-cache[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/virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ipython[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/jupyter-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/jupyter_ydoc-0.2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-ydoc-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-ydoc-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs >=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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JupyterLab computational environment
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab/ https://pypi.org/project/jupyterlab/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=BSD MIT GPL-3 Apache-2.0
-RDEPEND=dev-python/ipython[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/jupyter-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/jupyter_ydoc-0.2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-ydoc-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-ydoc-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs 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/j/jupyterlab/jupyterlab-3.6.1.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d5fc6e34fa729bb9193db442664dbeea
diff --git a/metadata/md5-cache/dev-python/jupyterlab-3.6.2 b/metadata/md5-cache/dev-python/jupyterlab-3.6.2
deleted file mode 100644
index a1e475d79d69..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab-3.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/check-manifest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openapi-core[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-console-scripts[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/requests[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/requests-cache[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/virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ipython[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/jupyter-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.16[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(-)?] >=dev-python/jupyter_ydoc-0.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-ydoc-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs >=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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JupyterLab computational environment
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab/ https://pypi.org/project/jupyterlab/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=BSD MIT GPL-3 Apache-2.0
-RDEPEND=dev-python/ipython[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/jupyter-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.16[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(-)?] >=dev-python/jupyter_ydoc-0.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-ydoc-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs 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/j/jupyterlab/jupyterlab-3.6.2.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8817ec7150affbd7271e884ab79e712b
diff --git a/metadata/md5-cache/dev-python/jupyterlab-3.6.3 b/metadata/md5-cache/dev-python/jupyterlab-3.6.3
index 1f8b087f1599..d749b4bf7acb 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-3.6.3
+++ b/metadata/md5-cache/dev-python/jupyterlab-3.6.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab/ https://pypi.org/project/jupyterlab/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD MIT GPL-3 Apache-2.0
 RDEPEND=dev-python/ipython[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/jupyter-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.16[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(-)?] >=dev-python/jupyter_ydoc-0.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-ydoc-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs 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://files.pythonhosted.org/packages/source/j/jupyterlab/jupyterlab-3.6.3.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8817ec7150affbd7271e884ab79e712b
+_md5_=6b74831d25162f172262ddaf2450c862
diff --git a/metadata/md5-cache/dev-python/jupyterlab-lsp-3.10.2 b/metadata/md5-cache/dev-python/jupyterlab-lsp-3.10.2
deleted file mode 100644
index 5c6afd37fe9d..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab-lsp-3.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-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/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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Coding assistance for JupyterLab with Language Server Protocol
-EAPI=8
-HOMEPAGE=https://github.com/jupyter-lsp/jupyterlab-lsp
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-python/jupyterlab-3.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyterlab-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-lsp-1.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 ) 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=https://files.pythonhosted.org/packages/source/j/jupyterlab-lsp/jupyterlab-lsp-3.10.2.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=099eb209322f0c5d37ba899c84dea345
diff --git a/metadata/md5-cache/dev-python/jupyterlab-server-2.20.0 b/metadata/md5-cache/dev-python/jupyterlab-server-2.20.0
deleted file mode 100644
index 091b8e6c1cb8..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab-server-2.20.0
+++ /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.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-core-0.16.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5.1[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 pypi
-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=https://files.pythonhosted.org/packages/source/j/jupyterlab-server/jupyterlab_server-2.20.0.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c54aa689f2b2b8aadbbe2d6e9779624b
diff --git a/metadata/md5-cache/dev-python/jupyterlab-server-2.21.0 b/metadata/md5-cache/dev-python/jupyterlab-server-2.21.0
deleted file mode 100644
index 8e46ca9db789..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab-server-2.21.0
+++ /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.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-core-0.16.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5.1[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 pypi
-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=https://files.pythonhosted.org/packages/source/j/jupyterlab-server/jupyterlab_server-2.21.0.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c54aa689f2b2b8aadbbe2d6e9779624b
diff --git a/metadata/md5-cache/dev-python/keep-2.10.1-r2 b/metadata/md5-cache/dev-python/keep-2.10.1-r2
index 074178cf2279..79d6599aeb4d 100644
--- a/metadata/md5-cache/dev-python/keep-2.10.1-r2
+++ b/metadata/md5-cache/dev-python/keep-2.10.1-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/keep/ https://github.com/orkohunter/keep
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyGithub[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/terminaltables[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 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/k/keep/keep-2.10.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c915dbb0a4cac10982d8ab9f32ef7785
+_md5_=55991c2e53597437f1f014a6a3bf85ff
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-9.1.5 b/metadata/md5-cache/dev-python/mkdocs-material-9.1.5
index ee5935da2268..9f1ea0925085 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-9.1.5
+++ b/metadata/md5-cache/dev-python/mkdocs-material-9.1.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
 INHERIT=distutils-r1 docs
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=~amd64 ~arm ~ppc ~riscv ~x86
+KEYWORDS=amd64 ~arm ~ppc ~riscv x86
 LICENSE=MIT
 PDEPEND=>=dev-python/mkdocs-material-extensions-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 RDEPEND=>=dev-python/jinja-3.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.9.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 )
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 SLOT=0
 SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/9.1.5.tar.gz -> mkdocs-material-9.1.5.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=15cf58e9868e9720b6733da8a0dbc6f2
+_md5_=8243f67a04a8335858a0ca00b77569a8
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-9.1.6 b/metadata/md5-cache/dev-python/mkdocs-material-9.1.6
new file mode 100644
index 000000000000..3fca8610cc7c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-9.1.6
@@ -0,0 +1,16 @@
+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/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(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material-extensions[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-redirects[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material-extensions[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material-extensions[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
+INHERIT=distutils-r1 docs
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
+KEYWORDS=~amd64 ~arm ~ppc ~riscv ~x86
+LICENSE=MIT
+PDEPEND=>=dev-python/mkdocs-material-extensions-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/jinja-3.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.9.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 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/9.1.6.tar.gz -> mkdocs-material-9.1.6.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=15cf58e9868e9720b6733da8a0dbc6f2
diff --git a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-2.4.2 b/metadata/md5-cache/dev-python/mkdocs-pymdownx-material-extras-2.4.2
index c3672b61fad4..4b7558ce35ac 100644
--- a/metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-2.4.2
+++ b/metadata/md5-cache/dev-python/mkdocs-pymdownx-material-extras-2.4.2
@@ -10,6 +10,6 @@ LICENSE=MIT
 RDEPEND=>=dev-python/mkdocs-material-8.3.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 )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/m/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.4.2.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/m/mkdocs-pymdownx-material-extras/mkdocs_pymdownx_material_extras-2.4.2.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=5b11965f40821632b75a57d71dacd90a
diff --git a/metadata/md5-cache/dev-python/types-docutils-0.19.1.6 b/metadata/md5-cache/dev-python/mkdocs-pymdownx-material-extras-2.4.3
index c6899b938b61..0d4e9f455a5e 100644
--- a/metadata/md5-cache/dev-python/types-docutils-0.19.1.6
+++ b/metadata/md5-cache/dev-python/mkdocs-pymdownx-material-extras-2.4.3
@@ -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 ) 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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Typing stubs for docutils
+DESCRIPTION=Custom alterations based on Mkdocs-Material
 EAPI=8
-HOMEPAGE=https://pypi.org/project/types-docutils/
+HOMEPAGE=https://github.com/facelessuser/mkdocs_pymdownx_material_extras/ https://pypi.org/project/mkdocs-pymdownx-material-extras/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.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 )
+KEYWORDS=~amd64 ~arm ~ppc ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/mkdocs-material-8.3.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 )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-docutils/types-docutils-0.19.1.6.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/m/mkdocs-pymdownx-material-extras/mkdocs_pymdownx_material_extras-2.4.3.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=48b086ac13278876c7c2a611eebf882a
+_md5_=3ab18525ec608752dfd6a676e4c5a9a6
diff --git a/metadata/md5-cache/dev-python/moto-4.1.6 b/metadata/md5-cache/dev-python/moto-4.1.6
index d9c3e281194f..8effa1094200 100644
--- a/metadata/md5-cache/dev-python/moto-4.1.6
+++ b/metadata/md5-cache/dev-python/moto-4.1.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/getmoto/moto/ https://pypi.org/project/moto/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cfn-lint-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cookies[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docker-py-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/botocore[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask-cors[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretty-yaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-jose[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-sshpubkeys[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/responses-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zipp[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 )
 REQUIRED_USE=|| ( 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/m/moto/moto-4.1.6.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5baed961ab629c4928cb2cad81f60e01
+_md5_=1f39d90a6ff37bb1fd7fd2dba9f3e73c
diff --git a/metadata/md5-cache/dev-python/msgpack-1.0.5 b/metadata/md5-cache/dev-python/msgpack-1.0.5
index fed988d836e5..a72bcaa38722 100644
--- a/metadata/md5-cache/dev-python/msgpack-1.0.5
+++ b/metadata/md5-cache/dev-python/msgpack-1.0.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-python/ https://pypi.org/project/msgpack/
 INHERIT=distutils-r1 pypi
 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~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://files.pythonhosted.org/packages/source/m/msgpack/msgpack-1.0.5.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=29b8b6615dbb6346f3931d372d845b3a
+_md5_=b24da33e009ac96f05b54931a135f1cf
diff --git a/metadata/md5-cache/dev-python/mypy-1.1.1 b/metadata/md5-cache/dev-python/mypy-1.1.1
index 34ecebb4908f..b4c25e68a12f 100644
--- a/metadata/md5-cache/dev-python/mypy-1.1.1
+++ b/metadata/md5-cache/dev-python/mypy-1.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.mypy-lang.org/ https://github.com/python/mypy/ https://pypi.org/project/mypy/
 INHERIT=distutils-r1 multiprocessing
 IUSE=doc test 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=MIT
 RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typed-ast-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mypy_extensions-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[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 ) 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/python/mypy/archive/v1.1.1.tar.gz -> mypy-1.1.1.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d87b898a2cd62d2b50f79d17a1d131de
+_md5_=4f8cc1de9ce5a17ca313993b5a87f5e7
diff --git a/metadata/md5-cache/dev-python/nbclassic-0.5.1 b/metadata/md5-cache/dev-python/nbclassic-0.5.1
deleted file mode 100644
index e76d642d0ce0..000000000000
--- a/metadata/md5-cache/dev-python/nbclassic-0.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( 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/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-unixsocket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( virtual/pandoc ) test? ( dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.17.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook_shim-0.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/send2trash-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[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-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[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-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/nbsphinx[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] dev-python/ipython_genutils[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-python/nbsphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] dev-python/ipython_genutils[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(-)] dev-python/nbsphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/myst-parser[python_targets_python3_9(-)] dev-python/ipython_genutils[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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=Jupyter Notebook as a Jupyter Server Extension
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbclassic/ https://pypi.org/project/nbclassic/
-INHERIT=distutils-r1 xdg-utils
-IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.17.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook_shim-0.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/send2trash-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[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-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[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/n/nbclassic/nbclassic-0.5.1.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=87ea011ca0b84088d5580622bf091b42
diff --git a/metadata/md5-cache/dev-python/nbclassic-0.5.3-r1 b/metadata/md5-cache/dev-python/nbclassic-0.5.3-r1
deleted file mode 100644
index 887b12f35d98..000000000000
--- a/metadata/md5-cache/dev-python/nbclassic-0.5.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/jupyter-server-terminals[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/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-unixsocket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( virtual/pandoc ) test? ( dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook_shim-0.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/send2trash-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[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-4.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(-)?] ) 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-python/nbsphinx[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] dev-python/ipython_genutils[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-python/nbsphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] dev-python/ipython_genutils[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(-)] dev-python/nbsphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/myst-parser[python_targets_python3_9(-)] dev-python/ipython_genutils[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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=Jupyter Notebook as a Jupyter Server Extension
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbclassic/ https://pypi.org/project/nbclassic/
-INHERIT=distutils-r1 pypi xdg-utils
-IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86
-LICENSE=BSD
-PDEPEND=<dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook_shim-0.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/send2trash-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[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-4.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://files.pythonhosted.org/packages/source/n/nbclassic/nbclassic-0.5.3.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ea4377b83bd3f2adf2ccde9d59daf59a
diff --git a/metadata/md5-cache/dev-python/nbclassic-0.5.4 b/metadata/md5-cache/dev-python/nbclassic-0.5.4
deleted file mode 100644
index 627f1d1e82c6..000000000000
--- a/metadata/md5-cache/dev-python/nbclassic-0.5.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/jupyter-server-terminals[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/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-unixsocket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( virtual/pandoc ) test? ( dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook_shim-0.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/send2trash-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[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-4.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(-)?] ) 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-python/nbsphinx[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] dev-python/ipython_genutils[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-python/nbsphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] dev-python/ipython_genutils[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(-)] dev-python/nbsphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/myst-parser[python_targets_python3_9(-)] dev-python/ipython_genutils[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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=Jupyter Notebook as a Jupyter Server Extension
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbclassic/ https://pypi.org/project/nbclassic/
-INHERIT=distutils-r1 pypi xdg-utils
-IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86
-LICENSE=BSD
-PDEPEND=<dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook_shim-0.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/send2trash-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[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-4.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://files.pythonhosted.org/packages/source/n/nbclassic/nbclassic-0.5.4.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ea4377b83bd3f2adf2ccde9d59daf59a
diff --git a/metadata/md5-cache/dev-python/openapi-core-0.17.0 b/metadata/md5-cache/dev-python/openapi-core-0.17.0
deleted file mode 100644
index 0947db41e51c..000000000000
--- a/metadata/md5-cache/dev-python/openapi-core-0.17.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/asgiref[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.23.0[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/starlette-0.21.0[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/pathable-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[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/parse[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[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/werkzeug[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=Client-side and server-side support for the OpenAPI Specification v3
-EAPI=8
-HOMEPAGE=https://github.com/python-openapi/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/pathable-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[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/parse[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[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/werkzeug[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/python-openapi/openapi-core/archive/0.17.0.tar.gz -> openapi-core-0.17.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2a079d40cdcfbad0adba76535603d004
diff --git a/metadata/md5-cache/dev-python/plotly-5.13.1 b/metadata/md5-cache/dev-python/plotly-5.13.1
deleted file mode 100644
index 3608b0534e21..000000000000
--- a/metadata/md5-cache/dev-python/plotly-5.13.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/shapely[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/statsmodels[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xarray[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/scikit-image[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tenacity-6.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Browser-based graphing library for Python
-EAPI=8
-HOMEPAGE=https://plotly.com/python/ https://github.com/plotly/plotly.py/ https://pypi.org/project/plotly/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tenacity-6.2.0[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 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/plotly/plotly.py/archive/refs/tags/v5.13.1.tar.gz -> plotly.py-5.13.1.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e8ca67d14cee024d15451631ac042227
diff --git a/metadata/md5-cache/dev-python/plotly-5.14.0 b/metadata/md5-cache/dev-python/plotly-5.14.0
deleted file mode 100644
index 39202e591eef..000000000000
--- a/metadata/md5-cache/dev-python/plotly-5.14.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/shapely[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/statsmodels[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xarray[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/scikit-image[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tenacity-6.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Browser-based graphing library for Python
-EAPI=8
-HOMEPAGE=https://plotly.com/python/ https://github.com/plotly/plotly.py/ https://pypi.org/project/plotly/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tenacity-6.2.0[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 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/plotly/plotly.py/archive/refs/tags/v5.14.0.tar.gz -> plotly.py-5.14.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=70dc3afd13c1b06704a48b5a18fe068c
diff --git a/metadata/md5-cache/dev-python/pyaudio-0.2.13 b/metadata/md5-cache/dev-python/pyaudio-0.2.13
index a4815e8afd71..85a9a2993187 100644
--- a/metadata/md5-cache/dev-python/pyaudio-0.2.13
+++ b/metadata/md5-cache/dev-python/pyaudio-0.2.13
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://people.csail.mit.edu/hubert/pyaudio/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=media-libs/portaudio 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? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyAudio/PyAudio-0.2.13.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=600b33648d19b979e4d1b998c87aefd7
+_md5_=c5651b007556f071a15bef06c44110c7
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.59 b/metadata/md5-cache/dev-python/pyghmi-1.5.59
deleted file mode 100644
index 59f709020478..000000000000
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.59
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/cryptography-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pbr[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[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/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 implementation of IPMI protocol
-EAPI=8
-HOMEPAGE=https://opendev.org/x/pyghmi/ https://pypi.org/project/pyghmi/
-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/cryptography-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pbr[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.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://files.pythonhosted.org/packages/source/p/pyghmi/pyghmi-1.5.59.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4893bdefd718fbf6ac96359609e05253
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-9.10 b/metadata/md5-cache/dev-python/pymdown-extensions-9.10
index 1bba63b77c5b..7c60f3dd0976 100644
--- a/metadata/md5-cache/dev-python/pymdown-extensions-9.10
+++ b/metadata/md5-cache/dev-python/pymdown-extensions-9.10
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
 INHERIT=distutils-r1 docs
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=~amd64 ~arm ~ppc ~riscv ~x86
+KEYWORDS=amd64 ~arm ~ppc ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[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/facelessuser/pymdown-extensions/archive/9.10.tar.gz -> pymdown-extensions-9.10.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=51bce3bb751944dc8145fa5be9bc9d8d
+_md5_=b7db4000a314a6e187eb42d55074a97b
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-9.11 b/metadata/md5-cache/dev-python/pymdown-extensions-9.11
new file mode 100644
index 000000000000..b203546af670
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymdown-extensions-9.11
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pygments-2.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/markdown-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[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/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/pymdown-lexers[python_targets_python3_11(-)] dev-python/pyspelling[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/pymdown-lexers[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/pymdown-lexers[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ) dev-vcs/git )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extensions for Python Markdown
+EAPI=8
+HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
+INHERIT=distutils-r1 docs
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
+KEYWORDS=~amd64 ~arm ~ppc ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[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/facelessuser/pymdown-extensions/archive/9.11.tar.gz -> pymdown-extensions-9.11.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=51bce3bb751944dc8145fa5be9bc9d8d
diff --git a/metadata/md5-cache/dev-python/pyside6-6.4.2-r1 b/metadata/md5-cache/dev-python/pyside6-6.4.2-r1
deleted file mode 100644
index 03c474f75112..000000000000
--- a/metadata/md5-cache/dev-python/pyside6-6.4.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=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 prepare test
-DEPEND=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/shiboken6-6.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-qt/qtbase-6.4*:6[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] charts? ( =dev-qt/qtcharts-6.4*:6 ) designer? ( =dev-qt/qttools-6.4*:6[designer] ) gui? ( =dev-qt/qtbase-6.4*:6[gui,jpeg] x11-libs/libxkbcommon ) help? ( =dev-qt/qttools-6.4*:6[assistant] ) multimedia? ( =dev-qt/qtmultimedia-6.4*:6 ) network-auth? ( =dev-qt/qtnetworkauth-6.4*:6 ) positioning? ( =dev-qt/qtpositioning-6.4*:6 ) printsupport? ( =dev-qt/qtbase-6.4*:6[gui,widgets] ) qml? ( =dev-qt/qtdeclarative-6.4*:6[widgets?] ) quick3d? ( =dev-qt/qtquick3d-6.4*:6 ) serialport? ( =dev-qt/qtserialport-6.4*:6 ) svg? ( =dev-qt/qtsvg-6.4*:6 ) testlib? ( =dev-qt/qtbase-6.4*:6[gui] ) webchannel? ( =dev-qt/qtwebchannel-6.4*:6 ) webengine? ( =dev-qt/qtwebengine-6.4*:6[widgets?] ) websockets? ( =dev-qt/qtwebsockets-6.4*:6 ) test? ( =dev-qt/qtbase-6.4*:6[gui] )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=8
-HOMEPAGE=https://wiki.qt.io/PySide6
-INHERIT=cmake python-r1 virtualx
-IUSE=+dbus charts +concurrent designer gles2-only +gui help multimedia +network network-auth +opengl positioning +printsupport qml quick quick3d serialport +sql svg test +testlib webchannel webengine websockets +widgets +xml python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
-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 ) ~dev-python/shiboken6-6.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-qt/qtbase-6.4*:6[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] charts? ( =dev-qt/qtcharts-6.4*:6 ) designer? ( =dev-qt/qttools-6.4*:6[designer] ) gui? ( =dev-qt/qtbase-6.4*:6[gui,jpeg] x11-libs/libxkbcommon ) help? ( =dev-qt/qttools-6.4*:6[assistant] ) multimedia? ( =dev-qt/qtmultimedia-6.4*:6 ) network-auth? ( =dev-qt/qtnetworkauth-6.4*:6 ) positioning? ( =dev-qt/qtpositioning-6.4*:6 ) printsupport? ( =dev-qt/qtbase-6.4*:6[gui,widgets] ) qml? ( =dev-qt/qtdeclarative-6.4*:6[widgets?] ) quick3d? ( =dev-qt/qtquick3d-6.4*:6 ) serialport? ( =dev-qt/qtserialport-6.4*:6 ) svg? ( =dev-qt/qtsvg-6.4*:6 ) testlib? ( =dev-qt/qtbase-6.4*:6[gui] ) webchannel? ( =dev-qt/qtwebchannel-6.4*:6 ) webengine? ( =dev-qt/qtwebengine-6.4*:6[widgets?] ) websockets? ( =dev-qt/qtwebsockets-6.4*:6 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) charts? ( gui widgets ) designer? ( widgets ) gles2-only? ( gui ) gui? ( dbus opengl ) help? ( network sql widgets ) multimedia? ( gui network ) network-auth? ( network ) opengl? ( gui ) printsupport? ( widgets ) qml? ( network ) quick? ( gui network opengl qml ) quick3d? ( gui network opengl qml quick ) sql? ( widgets ) svg? ( gui ) testlib? ( widgets ) webchannel? ( qml ) webengine? ( network gui printsupport quick webchannel ) websockets? ( network ) widgets? ( gui )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.4.2-src/pyside-setup-opensource-src-6.4.2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4b1f4f567d194779d48c6d486acbdf44
diff --git a/metadata/md5-cache/dev-python/pyside6-tools-6.4.2 b/metadata/md5-cache/dev-python/pyside6-tools-6.4.2
deleted file mode 100644
index 1e2d96b19d01..000000000000
--- a/metadata/md5-cache/dev-python/pyside6-tools-6.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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/pyside6-6.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DESCRIPTION=PySide development tools (pyside6-lupdate with support for Python)
-EAPI=8
-HOMEPAGE=https://wiki.qt.io/PySide6
-INHERIT=cmake python-r1
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=GPL-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 ) ~dev-python/pyside6-6.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.4.2-src/pyside-setup-opensource-src-6.4.2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6b2759127faf499972fb8cc23e1d4b7b
diff --git a/metadata/md5-cache/dev-python/pyspelling-2.8.2 b/metadata/md5-cache/dev-python/pyspelling-2.8.2
index 3556cca48401..8b68c152d8d1 100644
--- a/metadata/md5-cache/dev-python/pyspelling-2.8.2
+++ b/metadata/md5-cache/dev-python/pyspelling-2.8.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-vcs/git ) test? ( || ( app-text/aspell app-text/hunspell ) dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/html5lib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/soupsieve-1.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wcmatch-6.0.3[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/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] >=dev-python/mkdocs_pymdownx_material_extras-2.1[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] >=dev-python/mkdocs_pymdownx_material_extras-2.1[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] >=dev-python/mkdocs_pymdownx_material_extras-2.1[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] ) ) )
+BDEPEND=test? ( dev-vcs/git ) test? ( || ( app-text/aspell app-text/hunspell ) dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/html5lib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/soupsieve-1.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wcmatch-6.0.3[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/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] >=dev-python/mkdocs-pymdownx-material-extras-2.1[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] >=dev-python/mkdocs-pymdownx-material-extras-2.1[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] >=dev-python/mkdocs-pymdownx-material-extras-2.1[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] ) ) )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Spell checker automation tool
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/pyspelling/archive/2.8.2.tar.gz -> pyspelling-2.8.2.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=908f5a0ef34f560b80d98ef623392e16
+_md5_=10a63af5ac5167155872714aa2007008
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.3.4 b/metadata/md5-cache/dev-python/python-engineio-4.3.4
deleted file mode 100644
index 6db8935e04ac..000000000000
--- a/metadata/md5-cache/dev-python/python-engineio-4.3.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/tornado[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websockets[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[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/alabaster[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 ) >=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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python implementation of the Engine.IO realtime server
-EAPI=8
-HOMEPAGE=https://python-engineio.readthedocs.io/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/aiohttp[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/miguelgrinberg/python-engineio/archive/v4.3.4.tar.gz -> python-engineio-4.3.4.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=278c61df02a9015f87cf70c540184f07
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.5.0 b/metadata/md5-cache/dev-python/python-gnupg-0.5.0
index 0b67de5165ff..d56b4fd479ea 100644
--- a/metadata/md5-cache/dev-python/python-gnupg-0.5.0
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.5.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://docs.red-dove.com/python-gnupg/
 INHERIT=distutils-r1 verify-sig
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=app-crypt/gnupg[nls] 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=https://github.com/vsajip/python-gnupg/releases/download/0.5.0/python-gnupg-0.5.0.tar.gz verify-sig? ( https://github.com/vsajip/python-gnupg/releases/download/0.5.0/python-gnupg-0.5.0.tar.gz.asc )
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=21baafad1bf025f033f7cd4dec6f9c40
+_md5_=ddd4979c67d1a9556437866880738691
diff --git a/metadata/md5-cache/dev-python/pywlroots-0.16.1 b/metadata/md5-cache/dev-python/pywlroots-0.16.1
deleted file mode 100644
index 59f9d7b7456b..000000000000
--- a/metadata/md5-cache/dev-python/pywlroots-0.16.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/pywayland-0.4.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xkbcommon-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =gui-libs/wlroots-0.16*:= >=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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pywayland-0.4.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xkbcommon-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =gui-libs/wlroots-0.16*:=
-DESCRIPTION=Python binding to the wlroots library using cffi
-EAPI=8
-HOMEPAGE=https://github.com/flacjacket/pywlroots/ https://pypi.org/project/pywlroots/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/pywayland-0.4.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xkbcommon-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =gui-libs/wlroots-0.16*:= 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/flacjacket/pywlroots/archive/v0.16.1.tar.gz -> pywlroots-0.16.1.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0db1df051faa2a4183229ddd66f05c72
diff --git a/metadata/md5-cache/dev-python/pywlroots-0.16.2 b/metadata/md5-cache/dev-python/pywlroots-0.16.2
deleted file mode 100644
index c716bb59269d..000000000000
--- a/metadata/md5-cache/dev-python/pywlroots-0.16.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/pywayland-0.4.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xkbcommon-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =gui-libs/wlroots-0.16*:= >=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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pywayland-0.4.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xkbcommon-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =gui-libs/wlroots-0.16*:=
-DESCRIPTION=Python binding to the wlroots library using cffi
-EAPI=8
-HOMEPAGE=https://github.com/flacjacket/pywlroots/ https://pypi.org/project/pywlroots/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/pywayland-0.4.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xkbcommon-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =gui-libs/wlroots-0.16*:= 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/flacjacket/pywlroots/archive/v0.16.2.tar.gz -> pywlroots-0.16.2.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0db1df051faa2a4183229ddd66f05c72
diff --git a/metadata/md5-cache/dev-python/qiskit-terra-0.23.2-r1 b/metadata/md5-cache/dev-python/qiskit-terra-0.23.2-r1
deleted file mode 100644
index ae18bb264e3d..000000000000
--- a/metadata/md5-cache/dev-python/qiskit-terra-0.23.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/cython-0.27.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-text/poppler[png] >=dev-python/ddt-1.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-4.24.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/networkx-2.2[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/qiskit-aer[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sci-libs/scikit-learn-0.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/rustworkx-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ply-3.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dill-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-constraint-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/symengine-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] visualization? ( >=dev-python/matplotlib-3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pylatexenc-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/seaborn-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4[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(-)?] ) >=virtual/rust-1.53 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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DESCRIPTION=Terra is the foundation on which Qiskit is built
-EAPI=8
-HOMEPAGE=https://github.com/Qiskit/qiskit-terra/ https://pypi.org/project/qiskit-terra/
-INHERIT=cargo distutils-r1 multiprocessing optfeature
-IUSE=+visualization test debug python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT Unicode-DFS-2016 || ( LGPL-3 MPL-2.0 )
-RDEPEND=>=dev-python/rustworkx-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ply-3.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dill-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-constraint-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/symengine-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] visualization? ( >=dev-python/matplotlib-3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-4.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pylatexenc-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/seaborn-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4[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/Qiskit/qiskit-terra/archive/0.23.2.tar.gz -> qiskit-terra-0.23.2.gh.tar.gz https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/ahash/0.8.0/download -> ahash-0.8.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.11/download -> crossbeam-epoch-0.9.11.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.12/download -> crossbeam-utils-0.8.12.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/fixedbitset/0.4.2/download -> fixedbitset-0.4.2.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/libm/0.2.5/download -> libm-0.2.5.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/matrixmultiply/0.3.2/download -> matrixmultiply-0.3.2.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/ndarray/0.15.6/download -> ndarray-0.15.6.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/numpy/0.18.0/download -> numpy-0.18.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/petgraph/0.6.2/download -> petgraph-0.6.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/priority-queue/1.2.0/download -> priority-queue-1.2.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/pyo3/0.18.1/download -> pyo3-0.18.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.1/download -> pyo3-build-config-0.18.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.1/download -> pyo3-ffi-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.1/download -> pyo3-macros-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.1/download -> pyo3-macros-backend-0.18.1.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rand_distr/0.4.3/download -> rand_distr-0.4.3.crate https://crates.io/api/v1/crates/rand_pcg/0.3.1/download -> rand_pcg-0.3.1.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.6.0/download -> rayon-1.6.0.crate https://crates.io/api/v1/crates/rayon-core/1.10.1/download -> rayon-core-1.10.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustworkx-core/0.12.1/download -> rustworkx-core-0.12.1.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate
-_eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f7f763c4ade7282a5085519f939a0774
diff --git a/metadata/md5-cache/dev-python/reno-4.0.0 b/metadata/md5-cache/dev-python/reno-4.0.0
index d7efd3544238..18c66e7c3c34 100644
--- a/metadata/md5-cache/dev-python/reno-4.0.0
+++ b/metadata/md5-cache/dev-python/reno-4.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/reno/ https://github.com/openstack/reno/ https://pypi.org/project/reno/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pbr[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[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(-)?] >=dev-python/packaging-20.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docutils-0.11[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-2.1.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/reno/reno-4.0.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=420fe70791bb1e7b8129735aaef2135e
+_md5_=87379d1c642d4d44d71011938d00696f
diff --git a/metadata/md5-cache/dev-python/resolvelib-1.0.1 b/metadata/md5-cache/dev-python/resolvelib-1.0.1
index 3627f43fae91..86eee71abdf2 100644
--- a/metadata/md5-cache/dev-python/resolvelib-1.0.1
+++ b/metadata/md5-cache/dev-python/resolvelib-1.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sarugaku/resolvelib/ https://pypi.org/project/resolvelib/
 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
+KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~riscv ~x86
 LICENSE=ISC
 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/sarugaku/resolvelib/archive/1.0.1.tar.gz -> resolvelib-1.0.1.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=54791efed5ebe96148a96baca6790c18
+_md5_=4dc2f41b07a1f26e8ce8defcd70cb772
diff --git a/metadata/md5-cache/dev-python/semver-2.13.0-r1 b/metadata/md5-cache/dev-python/semver-2.13.0-r1
deleted file mode 100644
index afb85371a3e6..000000000000
--- a/metadata/md5-cache/dev-python/semver-2.13.0-r1
+++ /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/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 Python module for semantic versioning
-EAPI=8
-HOMEPAGE=https://github.com/python-semver/python-semver
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-semver/python-semver/archive/2.13.0.tar.gz -> semver-2.13.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=17d80cd9369aad34caf90441ad3c8336
diff --git a/metadata/md5-cache/dev-python/shiboken6-6.4.2 b/metadata/md5-cache/dev-python/shiboken6-6.4.2
deleted file mode 100644
index 8230cfc122a1..000000000000
--- a/metadata/md5-cache/dev-python/shiboken6-6.4.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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-qt/qtbase-6.4*:6 <sys-devel/clang-16:= <sys-devel/clang-runtime-16:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 ) numpy? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) vulkan? ( dev-util/vulkan-headers ) test? ( =dev-qt/qtbase-6.4*:6[gui] ) !!sys-devel/llvm:0
-DESCRIPTION=Python binding generator for C++ libraries
-EAPI=8
-HOMEPAGE=https://wiki.qt.io/PySide6
-INHERIT=cmake llvm python-r1 toolchain-funcs
-IUSE=+docstrings numpy test vulkan python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
-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 ) =dev-qt/qtbase-6.4*:6 <sys-devel/clang-16:= <sys-devel/clang-runtime-16:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 ) numpy? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) vulkan? ( dev-util/vulkan-headers )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.4.2-src/pyside-setup-opensource-src-6.4.2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=69b37832f7d9454a33b21c83e04c7d7d
diff --git a/metadata/md5-cache/dev-python/sphinx-gallery-0.12.2 b/metadata/md5-cache/dev-python/sphinx-gallery-0.12.2
index fe71ca2d947d..d1522e5183da 100644
--- a/metadata/md5-cache/dev-python/sphinx-gallery-0.12.2
+++ b/metadata/md5-cache/dev-python/sphinx-gallery-0.12.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sphinx-gallery/sphinx-gallery/ https://sphinx-gallery.github.io/ https://pypi.org/project/sphinx-gallery/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[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://files.pythonhosted.org/packages/source/s/sphinx-gallery/sphinx-gallery-0.12.2.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=24856c8744777e047d630373c7cdcaff
+_md5_=b6d07b0c2eec46535c99d095c9f32bd1
diff --git a/metadata/md5-cache/dev-python/spyder-notebook-0.4.0 b/metadata/md5-cache/dev-python/spyder-notebook-0.4.1
index dbae8a133283..74dc3cb19830 100644
--- a/metadata/md5-cache/dev-python/spyder-notebook-0.4.0
+++ b/metadata/md5-cache/dev-python/spyder-notebook-0.4.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-qt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook-4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qdarkstyle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/QtPy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/spyder-5.3.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/spyder-6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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/setuptools-65.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-qt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook-4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qdarkstyle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/QtPy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/spyder-5.4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/spyder-6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Jupyter notebook integration with Spyder
 EAPI=8
 HOMEPAGE=https://github.com/spyder-ide/spyder-notebook
-INHERIT=distutils-r1 virtualx
+INHERIT=distutils-r1 pypi virtualx
 IUSE=test python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook-4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qdarkstyle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/QtPy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/spyder-5.3.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/spyder-6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[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 )
+RDEPEND=dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook-4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qdarkstyle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/QtPy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/spyder-5.4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/spyder-6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[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 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test !test? ( test ) !test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder-notebook/archive/v0.4.0.tar.gz -> spyder-notebook-0.4.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=e695dc3398f0381b5de1185104e6ad64
+SRC_URI=https://files.pythonhosted.org/packages/source/s/spyder-notebook/spyder-notebook-0.4.1.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
+_md5_=1411ecc10905ce5ed33a8f850731bd7a
diff --git a/metadata/md5-cache/dev-python/stomp-py-8.1.0 b/metadata/md5-cache/dev-python/stomp-py-8.1.0
index 8be5efe63dbd..c926231da15a 100644
--- a/metadata/md5-cache/dev-python/stomp-py-8.1.0
+++ b/metadata/md5-cache/dev-python/stomp-py-8.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/stomp.py/ https://github.com/jasonrbriggs/stomp.py/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/docopt-0.7.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 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/stomp.py/stomp.py-8.1.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0b0873306acbefb15e96726efe7840b8
+_md5_=e6a0808498091d2e2fefc5236d29a216
diff --git a/metadata/md5-cache/dev-python/structlog-22.3.0 b/metadata/md5-cache/dev-python/structlog-22.3.0
deleted file mode 100644
index f6fea89b39a5..000000000000
--- a/metadata/md5-cache/dev-python/structlog-22.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-fancy-pypi-readme[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hatch-vcs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/freezegun[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretend[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[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/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Structured Logging for Python
-EAPI=8
-HOMEPAGE=https://github.com/hynek/structlog
-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 MIT
-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://files.pythonhosted.org/packages/source/s/structlog/structlog-22.3.0.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3ee1a0fedf363ed66f8c887e0033743f
diff --git a/metadata/md5-cache/dev-python/tifffile-2023.3.15 b/metadata/md5-cache/dev-python/tifffile-2023.3.15
deleted file mode 100644
index 893368c8298b..000000000000
--- a/metadata/md5-cache/dev-python/tifffile-2023.3.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/dask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-2021.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xarray[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.19.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read and write TIFF files
-EAPI=8
-HOMEPAGE=https://pypi.org/project/tifffile/ https://github.com/cgohlke/tifffile/ https://www.cgohlke.com/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.19.2[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 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cgohlke/tifffile/archive/v2023.3.15.tar.gz -> tifffile-2023.3.15.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=370c3656c1a5d5faf2640e054a650f9d
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.8.6-r1 b/metadata/md5-cache/dev-python/translate-toolkit-3.8.6-r1
index 8cd2ffaea038..5245a4745f97 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.8.6-r1
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.8.6-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/translate/translate/ https://pypi.org/project/translate-toolkit/
 INHERIT=distutils-r1
 IUSE=+html +ical +ini +subtitles +yaml test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[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(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[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[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
 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/translate/translate/archive/3.8.6.tar.gz -> translate-3.8.6.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=609f51b8b79a37beee7c01fe3eeee6dd
+_md5_=b82354ba2affda33d7bb656f2b35e3c2
diff --git a/metadata/md5-cache/dev-python/trio-websocket-0.10.0 b/metadata/md5-cache/dev-python/trio-websocket-0.10.0
deleted file mode 100644
index 5cb39f6b03c2..000000000000
--- a/metadata/md5-cache/dev-python/trio-websocket-0.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-trio-0.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/exceptiongroup[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.11[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wsproto-0.14[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/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=WebSocket client and server implementation for Python Trio
-EAPI=8
-HOMEPAGE=https://github.com/HyperionGray/trio-websocket/ https://pypi.org/project/trio-websocket/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/exceptiongroup[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.11[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wsproto-0.14[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/HyperionGray/trio-websocket/archive/0.10.0.tar.gz -> trio-websocket-0.10.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a555604790aa0e64dfa5a45a73b45ef2
diff --git a/metadata/md5-cache/dev-python/trio-websocket-0.10.1 b/metadata/md5-cache/dev-python/trio-websocket-0.10.1
deleted file mode 100644
index 11f3436f73fe..000000000000
--- a/metadata/md5-cache/dev-python/trio-websocket-0.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-trio-0.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/exceptiongroup[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.11[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wsproto-0.14[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/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=WebSocket client and server implementation for Python Trio
-EAPI=8
-HOMEPAGE=https://github.com/HyperionGray/trio-websocket/ https://pypi.org/project/trio-websocket/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/exceptiongroup[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trio-0.11[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wsproto-0.14[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/HyperionGray/trio-websocket/archive/0.10.1.tar.gz -> trio-websocket-0.10.1.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a555604790aa0e64dfa5a45a73b45ef2
diff --git a/metadata/md5-cache/dev-python/watchfiles-0.18.1 b/metadata/md5-cache/dev-python/watchfiles-0.18.1
deleted file mode 100644
index 25ae10661fa3..000000000000
--- a/metadata/md5-cache/dev-python/watchfiles-0.18.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/dirty-equals[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( =dev-python/anyio-3*[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(-)?] ) >=virtual/rust-1.53 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-util/maturin-0.14.10[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Simple, modern file watching and code reload in Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/watchfiles/ https://github.com/samuelcolvin/watchfiles/
-INHERIT=cargo distutils-r1
-IUSE=test debug python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 CC0-1.0 ISC MIT Unlicense
-RDEPEND==dev-python/anyio-3*[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/samuelcolvin/watchfiles/archive/v0.18.1.tar.gz -> watchfiles-0.18.1.gh.tar.gz https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/fsevent-sys/4.1.0/download -> fsevent-sys-4.1.0.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/inotify/0.9.6/download -> inotify-0.9.6.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/kqueue/1.0.5/download -> kqueue-1.0.5.crate https://crates.io/api/v1/crates/kqueue-sys/1.0.3/download -> kqueue-sys-1.0.3.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.124/download -> libc-0.2.124.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.16/download -> log-0.4.16.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mio/0.8.2/download -> mio-0.8.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/notify/5.0.0/download -> notify-5.0.0.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.2/download -> parking_lot_core-0.9.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.37/download -> proc-macro2-1.0.37.crate https://crates.io/api/v1/crates/pyo3/0.17.3/download -> pyo3-0.17.3.crate https://crates.io/api/v1/crates/pyo3-build-config/0.17.3/download -> pyo3-build-config-0.17.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.17.3/download -> pyo3-ffi-0.17.3.crate https://crates.io/api/v1/crates/pyo3-macros/0.17.3/download -> pyo3-macros-0.17.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.17.3/download -> pyo3-macros-backend-0.17.3.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/syn/1.0.91/download -> syn-1.0.91.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.34.0/download -> windows-sys-0.34.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.34.0/download -> windows_aarch64_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.34.0/download -> windows_i686_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.34.0/download -> windows_i686_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.34.0/download -> windows_x86_64_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.34.0/download -> windows_x86_64_msvc-0.34.0.crate
-_eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a2b47f3144a2f4166870e8319bdc8493
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.4.1 b/metadata/md5-cache/dev-python/wcmatch-8.4.1
index 2ff53c8d20c8..15e65cd20b91 100644
--- a/metadata/md5-cache/dev-python/wcmatch-8.4.1
+++ b/metadata/md5-cache/dev-python/wcmatch-8.4.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-vcs/git ) test? ( >=dev-python/bracex-2.1.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/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] >=dev-python/mkdocs_pymdownx_material_extras-2.0[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/pyspelling[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] >=dev-python/mkdocs_pymdownx_material_extras-2.0[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] >=dev-python/mkdocs_pymdownx_material_extras-2.0[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ) )
+BDEPEND=test? ( dev-vcs/git ) test? ( >=dev-python/bracex-2.1.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/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] >=dev-python/mkdocs-pymdownx-material-extras-2.0[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/pyspelling[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] >=dev-python/mkdocs-pymdownx-material-extras-2.0[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] >=dev-python/mkdocs-pymdownx-material-extras-2.0[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ) )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Wildcard/glob file name matcher
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/wcmatch/archive/8.4.1.tar.gz -> wcmatch-8.4.1.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9102b47c90a8cb6be6a9afb863246742
+_md5_=52e509e61d2a3266fd8735c1980a7506
diff --git a/metadata/md5-cache/dev-python/y-py-0.5.5 b/metadata/md5-cache/dev-python/y-py-0.5.5
deleted file mode 100644
index 38f03727b506..000000000000
--- a/metadata/md5-cache/dev-python/y-py-0.5.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( virtual/rust >=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-python/furo[python_targets_python3_11(-)] dev-python/sphinx-autoapi[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/furo[python_targets_python3_10(-)] dev-python/sphinx-autoapi[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/furo[python_targets_python3_9(-)] dev-python/sphinx-autoapi[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-util/maturin-0.14.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/rust
-DESCRIPTION=Python bindings to y-crdt
-EAPI=8
-HOMEPAGE=https://pypi.org/project/y-py/ https://github.com/y-crdt/ypy
-INHERIT=cargo distutils-r1
-IUSE=test doc debug python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016 MIT
-RDEPEND=virtual/rust 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/y/y-py/y_py-0.5.5.tar.gz https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.11.1/download -> bumpalo-3.11.1.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/lib0/0.12.2/download -> lib0-0.12.2.crate https://crates.io/api/v1/crates/libc/0.2.138/download -> libc-0.2.138.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.5/download -> parking_lot_core-0.9.5.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/pyo3/0.16.6/download -> pyo3-0.16.6.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.6/download -> pyo3-build-config-0.16.6.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.6/download -> pyo3-ffi-0.16.6.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.6/download -> pyo3-macros-0.16.6.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.6/download -> pyo3-macros-backend-0.16.6.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallstr/0.2.0/download -> smallstr-0.2.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.105/download -> syn-1.0.105.crate https://crates.io/api/v1/crates/target-lexicon/0.12.5/download -> target-lexicon-0.12.5.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate https://crates.io/api/v1/crates/yrs/0.12.2/download -> yrs-0.12.2.crate
-_eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f0baac9e8bca1e0743080ded59142bb1
diff --git a/metadata/md5-cache/dev-python/y-py-0.6.0 b/metadata/md5-cache/dev-python/y-py-0.6.0
index da474d64332d..9e791afcafc1 100644
--- a/metadata/md5-cache/dev-python/y-py-0.6.0
+++ b/metadata/md5-cache/dev-python/y-py-0.6.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/y-py/ https://github.com/y-crdt/ypy
 INHERIT=cargo distutils-r1 pypi
 IUSE=test doc debug python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
 RDEPEND=virtual/rust 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://files.pythonhosted.org/packages/source/y/y-py/y_py-0.6.0.tar.gz https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/indoc/1.0.9/download -> indoc-1.0.9.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/lib0/0.12.2/download -> lib0-0.12.2.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.7/download -> parking_lot_core-0.9.7.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/pyo3/0.16.6/download -> pyo3-0.16.6.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.6/download -> pyo3-build-config-0.16.6.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.6/download -> pyo3-ffi-0.16.6.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.6/download -> pyo3-macros-0.16.6.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.6/download -> pyo3-macros-backend-0.16.6.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallstr/0.2.0/download -> smallstr-0.2.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/target-lexicon/0.12.6/download -> target-lexicon-0.12.6.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.1/download -> windows-targets-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/yrs/0.12.2/download -> yrs-0.12.2.crate
 _eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0448a122abd0bc91fb26f6d30186fd04
+_md5_=e91f2022a35b23478ebeb568e4be6fb2
diff --git a/metadata/md5-cache/dev-python/yamlpath-3.7.0 b/metadata/md5-cache/dev-python/yamlpath-3.7.0
deleted file mode 100644
index 8d5bfee5a875..000000000000
--- a/metadata/md5-cache/dev-python/yamlpath-3.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-console-scripts[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ruamel-yaml[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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command-line processors for YAML/JSON/Compatible data
-EAPI=8
-HOMEPAGE=https://github.com/wwkimball/yamlpath/ https://github.com/wwkimball/yamlpath/wiki
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-python/ruamel-yaml[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/wwkimball/yamlpath/archive/v3.7.0.tar.gz -> yamlpath-3.7.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ff3aa30320f6a5f1c914cb611f64700c
diff --git a/metadata/md5-cache/dev-python/ypy-websocket-0.8.4 b/metadata/md5-cache/dev-python/ypy-websocket-0.8.4
index 93e22e0c8fea..2bee54a6c5e3 100644
--- a/metadata/md5-cache/dev-python/ypy-websocket-0.8.4
+++ b/metadata/md5-cache/dev-python/ypy-websocket-0.8.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ypy-websocket/ https://github.com/y-crdt/ypy-websocket/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=<dev-python/aiofiles-23[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/aiosqlite[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/y-py-0.6.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/y-crdt/ypy-websocket/archive/v0.8.4.tar.gz -> ypy-websocket-0.8.4.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9b1f4a93e838e671aa642494b0ab395e
+_md5_=04ccbbcc05c2a25314f27f2b3774f9d7
diff --git a/metadata/md5-cache/dev-python/ypy-websocket-0.9.0 b/metadata/md5-cache/dev-python/ypy-websocket-0.9.0
index 475a3194696f..f3ff49d61f32 100644
--- a/metadata/md5-cache/dev-python/ypy-websocket-0.9.0
+++ b/metadata/md5-cache/dev-python/ypy-websocket-0.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ypy-websocket/ https://github.com/y-crdt/ypy-websocket/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=<dev-python/anyio-4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiosqlite-1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosqlite-0.18.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/y-py-0.6.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/y-crdt/ypy-websocket/archive/v0.9.0.tar.gz -> ypy-websocket-0.9.0.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=74c90f5c8e381c067280aeadf6477675
+_md5_=3b9521cfe7511bf03146687dfeab6f5e
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.56.0 b/metadata/md5-cache/dev-python/zeroconf-0.56.0
new file mode 100644
index 000000000000..b287f544cacb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.56.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.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_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=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
+EAPI=8
+HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.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 ) 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/z/zeroconf/zeroconf-0.56.0.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=152fa021562410281ccaf7caa8e8f363
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 555703ef61d3..876e37585c9f 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.5-r1 b/metadata/md5-cache/dev-ruby/ammeter-1.1.5-r1
new file mode 100644
index 000000000000..ce3474c3fbae
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.5-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-3.0:*[ruby_targets_ruby30(-)] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-3.0:*[ruby_targets_ruby31(-)] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby27(-)] >=dev-ruby/uglifier-1.3[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.10[ruby_targets_ruby27(-)] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby27(-)] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby27(-)] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby27(-)] dev-util/cucumber[ruby_targets_ruby27(-)] dev-util/aruba[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby30(-)] >=dev-ruby/uglifier-1.3[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.10[ruby_targets_ruby30(-)] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby30(-)] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby30(-)] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby30(-)] dev-util/cucumber[ruby_targets_ruby30(-)] dev-util/aruba[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby31(-)] >=dev-ruby/uglifier-1.3[ruby_targets_ruby31(-)] >=dev-ruby/rake-0.10[ruby_targets_ruby31(-)] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby31(-)] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby31(-)] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby31(-)] dev-util/cucumber[ruby_targets_ruby31(-)] dev-util/aruba[ruby_targets_ruby31(-)] dev-ruby/sqlite3[ruby_targets_ruby31(-)] dev-ruby/bundler[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Write specs for your Rails 3+ generators
+EAPI=8
+HOMEPAGE=https://github.com/alexrothenberg/ammeter
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-3.0:*[ruby_targets_ruby30(-)] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-3.0:*[ruby_targets_ruby31(-)] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/ammeter-1.1.5.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=86097fa0e3ecf2e6c520ca70d29b5f89
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1
index 99d2684909ab..93b54d2ff197 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5-r1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby27(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby30(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby27(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby30(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby31(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby32(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick[png,postscript] media-gfx/graphviz media-sound/lilypond sci-visualization/gnuplot ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=test? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick[png,postscript] media-gfx/graphviz media-sound/lilypond sci-visualization/gnuplot ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=A set of Asciidoctor extensions that enable you to add diagrams
 EAPI=8
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor-diagram
 INHERIT=multilib ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=virtual/jre ruby_targets_ruby27? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby27(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby30(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=virtual/jre ruby_targets_ruby27? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby27(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby30(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby31(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/asciidoctor-1.5.7[ruby_targets_ruby32(-)] <dev-ruby/asciidoctor-3[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v2.0.5.tar.gz -> asciidoctor-diagram-2.0.5.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=28077fbbf947d77b0767962249e24c9c
+_md5_=99ff5011e6df5c15a8edb09aa0e92944
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0
deleted file mode 100644
index 21caba035576..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.4.7.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/execjs[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/execjs[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rspec-rails[ruby_targets_ruby27(-)] dev-ruby/sprockets-rails[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/rspec-rails[ruby_targets_ruby30(-)] dev-ruby/sprockets-rails[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( net-libs/nodejs ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=8
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/execjs[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/execjs[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=10
-SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.4.7.0.tar.gz -> autoprefixer-rails-10.4.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=63a0e5fdeafac14870a9189ed4e31b3d
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.10 b/metadata/md5-cache/dev-ruby/bindata-2.4.10
deleted file mode 100644
index 1e1cc18481dd..000000000000
--- a/metadata/md5-cache/dev-ruby/bindata-2.4.10
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Parsing Binary Data in Ruby
-EAPI=8
-HOMEPAGE=https://github.com/dmendel/bindata
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/bindata-2.4.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=21f7c40d87a0bed9d38c5d7a4237c1a4
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1 b/metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1
deleted file mode 100644
index a1c228c8101a..000000000000
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.9.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/thor:1[ruby_targets_ruby27(-)] dev-ruby/bundler:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thor:1[ruby_targets_ruby30(-)] dev-ruby/bundler:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Provides patch-level verification for Bundled apps
-EAPI=8
-HOMEPAGE=https://github.com/rubysec/bundler-audit
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/thor:1[ruby_targets_ruby27(-)] dev-ruby/bundler:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thor:1[ruby_targets_ruby30(-)] dev-ruby/bundler:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/bundler-audit-0.9.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bbe7252eddae4622000fb12155130a80
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.9.1 b/metadata/md5-cache/dev-ruby/bundler-audit-0.9.1
index 45ed67aa39ab..ffd49ffc7081 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.9.1
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.9.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/thor:1[ruby_targets_ruby27(-)] dev-ruby/bundler:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thor:1[ruby_targets_ruby30(-)] dev-ruby/bundler:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/thor:1[ruby_targets_ruby31(-)] dev-ruby/bundler:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/thor:1[ruby_targets_ruby27(-)] dev-ruby/bundler:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thor:1[ruby_targets_ruby30(-)] dev-ruby/bundler:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/thor:1[ruby_targets_ruby31(-)] dev-ruby/bundler:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/thor:1[ruby_targets_ruby32(-)] dev-ruby/bundler:2[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Provides patch-level verification for Bundled apps
 EAPI=8
 HOMEPAGE=https://github.com/rubysec/bundler-audit
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/thor:1[ruby_targets_ruby27(-)] dev-ruby/bundler:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thor:1[ruby_targets_ruby30(-)] dev-ruby/bundler:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/thor:1[ruby_targets_ruby31(-)] dev-ruby/bundler:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/thor:1[ruby_targets_ruby27(-)] dev-ruby/bundler:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/thor:1[ruby_targets_ruby30(-)] dev-ruby/bundler:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/thor:1[ruby_targets_ruby31(-)] dev-ruby/bundler:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/thor:1[ruby_targets_ruby32(-)] dev-ruby/bundler:2[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bundler-audit-0.9.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ba3b09f0ec787c8fa6d47f0a1e63ae91
+_md5_=6e6ed96ba76cdfb42bad05c28352fd39
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.19.0 b/metadata/md5-cache/dev-ruby/bunny-2.19.0
deleted file mode 100644
index 17aa8fa94a9c..000000000000
--- a/metadata/md5-cache/dev-ruby/bunny-2.19.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/amq-protocol-2.3.1:2[ruby_targets_ruby27(-)] >=dev-ruby/sorted_set-1.0.2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/amq-protocol-2.3.1:2[ruby_targets_ruby30(-)] >=dev-ruby/sorted_set-1.0.2:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Another synchronous Ruby AMQP client
-EAPI=8
-HOMEPAGE=https://github.com/ruby-amqp/bunny
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/amq-protocol-2.3.1:2[ruby_targets_ruby27(-)] >=dev-ruby/sorted_set-1.0.2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/amq-protocol-2.3.1:2[ruby_targets_ruby30(-)] >=dev-ruby/sorted_set-1.0.2:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby-amqp/bunny/archive/2.19.0.tar.gz -> bunny-2.19.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b15c420e09fc180f75ce3c56b3445b56
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.20.3 b/metadata/md5-cache/dev-ruby/bunny-2.20.3
new file mode 100644
index 000000000000..80ed631751cf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bunny-2.20.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/amq-protocol-2.3.1:2[ruby_targets_ruby27(-)] >=dev-ruby/sorted_set-1.0.2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/amq-protocol-2.3.1:2[ruby_targets_ruby30(-)] >=dev-ruby/sorted_set-1.0.2:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/amq-protocol-2.3.1:2[ruby_targets_ruby31(-)] >=dev-ruby/sorted_set-1.0.2:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Another synchronous Ruby AMQP client
+EAPI=8
+HOMEPAGE=https://github.com/ruby-amqp/bunny
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/amq-protocol-2.3.1:2[ruby_targets_ruby27(-)] >=dev-ruby/sorted_set-1.0.2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/amq-protocol-2.3.1:2[ruby_targets_ruby30(-)] >=dev-ruby/sorted_set-1.0.2:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/amq-protocol-2.3.1:2[ruby_targets_ruby31(-)] >=dev-ruby/sorted_set-1.0.2:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby-amqp/bunny/archive/2.20.3.tar.gz -> bunny-2.20.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c630b7f90b4c24d187e63f4d8869b8da
diff --git a/metadata/md5-cache/dev-ruby/digest-3.1.1 b/metadata/md5-cache/dev-ruby/digest-3.1.1
index 647b97a4e5c6..a346d624de6e 100644
--- a/metadata/md5-cache/dev-ruby/digest-3.1.1
+++ b/metadata/md5-cache/dev-ruby/digest-3.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/digest
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/digest/archive/v3.1.1.tar.gz -> digest-3.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1e225dd32ef16a5035eadf22e3b00907
+_md5_=a74a299f860b3d7dfca2e46bd76bfc33
diff --git a/metadata/md5-cache/dev-ruby/hashie-5.0.0 b/metadata/md5-cache/dev-ruby/hashie-5.0.0
index f20512791001..c86b1a01d96c 100644
--- a/metadata/md5-cache/dev-ruby/hashie-5.0.0
+++ b/metadata/md5-cache/dev-ruby/hashie-5.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/intridea/hashie/archive/v5.0.0.tar.gz -> hashie-5.0.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=28d37dad498dc85b88a5193ee36e7c80
+_md5_=7f3fb84b0829fd4be749a73cd47fdf51
diff --git a/metadata/md5-cache/dev-ruby/mail-2.8.1 b/metadata/md5-cache/dev-ruby/mail-2.8.1
index 18645642134d..6e8ad152811e 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.8.1
+++ b/metadata/md5-cache/dev-ruby/mail-2.8.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mikel/mail
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby30(-)] dev-ruby/net-imap[ruby_targets_ruby30(-)] dev-ruby/net-pop[ruby_targets_ruby30(-)] dev-ruby/net-smtp[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby31(-)] dev-ruby/net-imap[ruby_targets_ruby31(-)] dev-ruby/net-pop[ruby_targets_ruby31(-)] dev-ruby/net-smtp[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby32(-)] dev-ruby/net-imap[ruby_targets_ruby32(-)] dev-ruby/net-pop[ruby_targets_ruby32(-)] dev-ruby/net-smtp[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.8
 SRC_URI=https://github.com/mikel/mail/archive/2.8.1.tar.gz -> mail-2.8.1-git.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=171a0574808e86c16020c6e162570c4e
+_md5_=64d793828148670a0b7c383feffe9a4a
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.9.0 b/metadata/md5-cache/dev-ruby/mechanize-2.9.0
new file mode 100644
index 000000000000..7536fca9cbe4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.9.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby27(-)] test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby30(-)] test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby31(-)] test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] ) ) test? ( ruby_targets_ruby27? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby27(-)] >=dev-ruby/domain_name-0.5.20190701:0[ruby_targets_ruby27(-)] >=dev-ruby/http-cookie-1.0.3:0[ruby_targets_ruby27(-)] dev-ruby/mime-types:3[ruby_targets_ruby27(-)] >=dev-ruby/net-http-digest_auth-1.4.1:0[ruby_targets_ruby27(-)] || ( dev-ruby/net-http-persistent:4[ruby_targets_ruby27(-)] dev-ruby/net-http-persistent:3[ruby_targets_ruby27(-)] ) >=dev-ruby/nokogiri-1.11.2:0[ruby_targets_ruby27(-)] >=dev-ruby/rubyntlm-0.6.3:0[ruby_targets_ruby27(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby27(-)] >=dev-ruby/webrobots-0.1.2[ruby_targets_ruby27(-)] =dev-ruby/webrobots-0.1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby30(-)] >=dev-ruby/domain_name-0.5.20190701:0[ruby_targets_ruby30(-)] >=dev-ruby/http-cookie-1.0.3:0[ruby_targets_ruby30(-)] dev-ruby/mime-types:3[ruby_targets_ruby30(-)] >=dev-ruby/net-http-digest_auth-1.4.1:0[ruby_targets_ruby30(-)] || ( dev-ruby/net-http-persistent:4[ruby_targets_ruby30(-)] dev-ruby/net-http-persistent:3[ruby_targets_ruby30(-)] ) >=dev-ruby/nokogiri-1.11.2:0[ruby_targets_ruby30(-)] >=dev-ruby/rubyntlm-0.6.3:0[ruby_targets_ruby30(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby30(-)] >=dev-ruby/webrobots-0.1.2[ruby_targets_ruby30(-)] =dev-ruby/webrobots-0.1*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby31(-)] >=dev-ruby/domain_name-0.5.20190701:0[ruby_targets_ruby31(-)] >=dev-ruby/http-cookie-1.0.3:0[ruby_targets_ruby31(-)] dev-ruby/mime-types:3[ruby_targets_ruby31(-)] >=dev-ruby/net-http-digest_auth-1.4.1:0[ruby_targets_ruby31(-)] || ( dev-ruby/net-http-persistent:4[ruby_targets_ruby31(-)] dev-ruby/net-http-persistent:3[ruby_targets_ruby31(-)] ) >=dev-ruby/nokogiri-1.11.2:0[ruby_targets_ruby31(-)] >=dev-ruby/rubyntlm-0.6.3:0[ruby_targets_ruby31(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby31(-)] >=dev-ruby/webrobots-0.1.2[ruby_targets_ruby31(-)] =dev-ruby/webrobots-0.1*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A Ruby library used for automating interaction with websites
+EAPI=8
+HOMEPAGE=https://github.com/sparklemotion/mechanize
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby27(-)] >=dev-ruby/domain_name-0.5.20190701:0[ruby_targets_ruby27(-)] >=dev-ruby/http-cookie-1.0.3:0[ruby_targets_ruby27(-)] dev-ruby/mime-types:3[ruby_targets_ruby27(-)] >=dev-ruby/net-http-digest_auth-1.4.1:0[ruby_targets_ruby27(-)] || ( dev-ruby/net-http-persistent:4[ruby_targets_ruby27(-)] dev-ruby/net-http-persistent:3[ruby_targets_ruby27(-)] ) >=dev-ruby/nokogiri-1.11.2:0[ruby_targets_ruby27(-)] >=dev-ruby/rubyntlm-0.6.3:0[ruby_targets_ruby27(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby27(-)] >=dev-ruby/webrobots-0.1.2[ruby_targets_ruby27(-)] =dev-ruby/webrobots-0.1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby30(-)] >=dev-ruby/domain_name-0.5.20190701:0[ruby_targets_ruby30(-)] >=dev-ruby/http-cookie-1.0.3:0[ruby_targets_ruby30(-)] dev-ruby/mime-types:3[ruby_targets_ruby30(-)] >=dev-ruby/net-http-digest_auth-1.4.1:0[ruby_targets_ruby30(-)] || ( dev-ruby/net-http-persistent:4[ruby_targets_ruby30(-)] dev-ruby/net-http-persistent:3[ruby_targets_ruby30(-)] ) >=dev-ruby/nokogiri-1.11.2:0[ruby_targets_ruby30(-)] >=dev-ruby/rubyntlm-0.6.3:0[ruby_targets_ruby30(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby30(-)] >=dev-ruby/webrobots-0.1.2[ruby_targets_ruby30(-)] =dev-ruby/webrobots-0.1*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/addressable-2.8:0[ruby_targets_ruby31(-)] >=dev-ruby/domain_name-0.5.20190701:0[ruby_targets_ruby31(-)] >=dev-ruby/http-cookie-1.0.3:0[ruby_targets_ruby31(-)] dev-ruby/mime-types:3[ruby_targets_ruby31(-)] >=dev-ruby/net-http-digest_auth-1.4.1:0[ruby_targets_ruby31(-)] || ( dev-ruby/net-http-persistent:4[ruby_targets_ruby31(-)] dev-ruby/net-http-persistent:3[ruby_targets_ruby31(-)] ) >=dev-ruby/nokogiri-1.11.2:0[ruby_targets_ruby31(-)] >=dev-ruby/rubyntlm-0.6.3:0[ruby_targets_ruby31(-)] >=dev-ruby/webrick-1.7:0[ruby_targets_ruby31(-)] >=dev-ruby/webrobots-0.1.2[ruby_targets_ruby31(-)] =dev-ruby/webrobots-0.1*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/mechanize-2.9.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3eeec81ac530e4f5e57bbb3b84e2783c
diff --git a/metadata/md5-cache/dev-ruby/net-imap-0.3.4 b/metadata/md5-cache/dev-ruby/net-imap-0.3.4
index 6bd9b3dd00c4..3a64863d1310 100644
--- a/metadata/md5-cache/dev-ruby/net-imap-0.3.4
+++ b/metadata/md5-cache/dev-ruby/net-imap-0.3.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/net-imap
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/date[ruby_targets_ruby27(-)] dev-ruby/net-protocol[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/date[ruby_targets_ruby30(-)] dev-ruby/net-protocol[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/date[ruby_targets_ruby31(-)] dev-ruby/net-protocol[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/date[ruby_targets_ruby32(-)] dev-ruby/net-protocol[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-imap/archive/v0.3.4.tar.gz -> net-imap-0.3.4.tar.gz test? ( https://www.rfc-editor.org/rfc/rfc3454.txt )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f4aef4a385e35bafa300d68fe72311f4
+_md5_=20dfea5be56bcf32f1204d6e3d89ab67
diff --git a/metadata/md5-cache/dev-ruby/net-pop-0.1.2 b/metadata/md5-cache/dev-ruby/net-pop-0.1.2
index 3cd2115b195e..08d165fb71f7 100644
--- a/metadata/md5-cache/dev-ruby/net-pop-0.1.2
+++ b/metadata/md5-cache/dev-ruby/net-pop-0.1.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/net-pop
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/net-protocol[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/net-protocol[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/net-protocol[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/net-protocol[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-pop/archive/v0.1.2.tar.gz -> net-pop-0.1.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9cff2395507e64f3ce8d181ac63ac012
+_md5_=ce4e26b39d937727c10d41f5f9b1e97a
diff --git a/metadata/md5-cache/dev-ruby/net-smtp-0.3.3 b/metadata/md5-cache/dev-ruby/net-smtp-0.3.3
index 207139f48aea..065b566c7cd0 100644
--- a/metadata/md5-cache/dev-ruby/net-smtp-0.3.3
+++ b/metadata/md5-cache/dev-ruby/net-smtp-0.3.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/net-smtp
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/net-protocol[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/net-protocol[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/net-protocol[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/net-protocol[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-smtp/archive/v0.3.3.tar.gz -> net-smtp-0.3.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bf98344e5c4ff5e475be991e80fcf343
+_md5_=7c139183e7febda9def4f01efb647abb
diff --git a/metadata/md5-cache/dev-ruby/rbtree-0.4.6 b/metadata/md5-cache/dev-ruby/rbtree-0.4.6
index 408e145135c0..0e284d2a327e 100644
--- a/metadata/md5-cache/dev-ruby/rbtree-0.4.6
+++ b/metadata/md5-cache/dev-ruby/rbtree-0.4.6
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ) virtual/pkgconfig
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=A sorted associative collection that is implemented with a Red-Black Tree
 EAPI=8
 HOMEPAGE=https://rubygems.org/gems/rbtree
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rbtree-0.4.6.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7b86d38402862b31aa391276e09690ad
+_md5_=9ee06b3b4e6e1ae399991f3c00c1a07b
diff --git a/metadata/md5-cache/dev-ruby/ruby_version-1.0.3 b/metadata/md5-cache/dev-ruby/ruby_version-1.0.3
new file mode 100644
index 000000000000..1550bf51ec28
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby_version-1.0.3
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=A class which offers a convenient DSL for checking for the right Ruby version
+EAPI=8
+HOMEPAGE=https://github.com/janlelis/ruby_version
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://rubygems.org/gems/ruby_version-1.0.3.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=127db10dede443c25f909b4a21c04d9f
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.1.0-r1 b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0-r1
new file mode 100644
index 000000000000..0aead47b8da0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby27(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby27(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby27(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby27(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby30(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby30(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby30(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby30(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby31(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby31(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Official Ruby-on-Rails Integration with Sass
+EAPI=8
+HOMEPAGE=https://github.com/rails/sass-rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby27(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby27(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby27(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby27(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby30(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby30(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby30(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby30(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby31(-)] =dev-ruby/sass-3*:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.2.0[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-rails-4:*[ruby_targets_ruby31(-)] >=dev-ruby/sprockets-2.8:*[ruby_targets_ruby31(-)] <dev-ruby/sprockets-4:*[ruby_targets_ruby31(-)] >=dev-ruby/tilt-1.1:*[ruby_targets_ruby31(-)] <dev-ruby/tilt-3:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
+SLOT=5.1
+SRC_URI=https://github.com/rails/sass-rails/archive/v5.1.0.tar.gz -> sass-rails-5.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=2faef1fac0b369390f5530ebff5ea3b0
diff --git a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r3 b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r3
new file mode 100644
index 000000000000..43baeb6be917
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby27(-)] dev-ruby/tilt:*[ruby_targets_ruby27(-)] || ( dev-ruby/railties:7.0[ruby_targets_ruby27(-)] dev-ruby/railties:6.0[ruby_targets_ruby27(-)] dev-ruby/railties:6.1[ruby_targets_ruby27(-)] ) >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby27(-)] dev-ruby/sprockets-rails:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby30(-)] dev-ruby/tilt:*[ruby_targets_ruby30(-)] || ( dev-ruby/railties:7.0[ruby_targets_ruby30(-)] dev-ruby/railties:6.0[ruby_targets_ruby30(-)] dev-ruby/railties:6.1[ruby_targets_ruby30(-)] ) >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby30(-)] dev-ruby/sprockets-rails:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby31(-)] dev-ruby/tilt:*[ruby_targets_ruby31(-)] || ( dev-ruby/railties:7.0[ruby_targets_ruby31(-)] dev-ruby/railties:6.0[ruby_targets_ruby31(-)] dev-ruby/railties:6.1[ruby_targets_ruby31(-)] ) >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby31(-)] dev-ruby/sprockets-rails:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Integrate SassC-Ruby with Rails
+EAPI=8
+HOMEPAGE=https://github.com/sass/sassc-rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby27(-)] dev-ruby/tilt:*[ruby_targets_ruby27(-)] || ( dev-ruby/railties:7.0[ruby_targets_ruby27(-)] dev-ruby/railties:6.0[ruby_targets_ruby27(-)] dev-ruby/railties:6.1[ruby_targets_ruby27(-)] ) >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby27(-)] dev-ruby/sprockets-rails:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby30(-)] dev-ruby/tilt:*[ruby_targets_ruby30(-)] || ( dev-ruby/railties:7.0[ruby_targets_ruby30(-)] dev-ruby/railties:6.0[ruby_targets_ruby30(-)] dev-ruby/railties:6.1[ruby_targets_ruby30(-)] ) >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby30(-)] dev-ruby/sprockets-rails:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/sassc-2.0[ruby_targets_ruby31(-)] dev-ruby/tilt:*[ruby_targets_ruby31(-)] || ( dev-ruby/railties:7.0[ruby_targets_ruby31(-)] dev-ruby/railties:6.0[ruby_targets_ruby31(-)] dev-ruby/railties:6.1[ruby_targets_ruby31(-)] ) >=dev-ruby/sprockets-3.0:*[ruby_targets_ruby31(-)] dev-ruby/sprockets-rails:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/sassc-rails-2.1.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=aa212482327872266c0c51847cab1230
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0
index 60459247672a..a4800b5f8761 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.1.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=8
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v5.1.0.tar.gz -> shoulda-matchers-5.1.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4a63d89a82027488b4809d9a5d1fca85
+_md5_=7ef61a95221966922a760521935387a7
diff --git a/metadata/md5-cache/dev-ruby/sinatra-3.0.5 b/metadata/md5-cache/dev-ruby/sinatra-3.0.5
index 41c1f2239a8d..42f24a6a12b6 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-3.0.5
+++ b/metadata/md5-cache/dev-ruby/sinatra-3.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://sinatrarb.com/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/mustermann:3[ruby_targets_ruby27(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby27(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby27(-)] dev-ruby/tilt:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/mustermann:3[ruby_targets_ruby30(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby30(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby30(-)] dev-ruby/tilt:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/mustermann:3[ruby_targets_ruby31(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby31(-)] ~dev-ruby/rack-protection-3.0.5[ruby_targets_ruby31(-)] dev-ruby/tilt:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/sinatra/sinatra/archive/v3.0.5.tar.gz -> sinatra-3.0.5.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2105f38184c6ec39d9e8d58dd06483fc
+_md5_=a2e8a5d690cacc3d4fd4790c29c14018
diff --git a/metadata/md5-cache/dev-ruby/sorted_set-1.0.3 b/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
index 6ea801ff51d9..ea058659daea 100644
--- a/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
+++ b/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rbtree[ruby_targets_ruby27(-)] dev-ruby/set:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rbtree[ruby_targets_ruby30(-)] dev-ruby/set:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rbtree[ruby_targets_ruby27(-)] dev-ruby/set:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rbtree[ruby_targets_ruby30(-)] dev-ruby/set:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rbtree[ruby_targets_ruby31(-)] dev-ruby/set:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/rbtree[ruby_targets_ruby32(-)] dev-ruby/set:0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Implements a variant of Set whose elements are sorted in ascending order
 EAPI=8
 HOMEPAGE=https://github.com/knu/sorted_set
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/rbtree[ruby_targets_ruby27(-)] dev-ruby/set:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rbtree[ruby_targets_ruby30(-)] dev-ruby/set:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/rbtree[ruby_targets_ruby27(-)] dev-ruby/set:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rbtree[ruby_targets_ruby30(-)] dev-ruby/set:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rbtree[ruby_targets_ruby31(-)] dev-ruby/set:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/rbtree[ruby_targets_ruby32(-)] dev-ruby/set:0[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/knu/sorted_set/archive/v1.0.3.tar.gz -> sorted_set-1.0.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3380235e4ce5f9f88145df5f012c1604
+_md5_=275b04b5fc534c69b00e95a374f101d2
diff --git a/metadata/md5-cache/dev-ruby/strscan-3.0.6 b/metadata/md5-cache/dev-ruby/strscan-3.0.6
index 011399240aff..7b1c78926af2 100644
--- a/metadata/md5-cache/dev-ruby/strscan-3.0.6
+++ b/metadata/md5-cache/dev-ruby/strscan-3.0.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/strscan
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ~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=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/strscan/archive/v3.0.6.tar.gz -> strscan-3.0.6.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1324d325919bbf481e846b375d86c197
+_md5_=80b55bdeaf32edf1e3c0b581d08cb5b5
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4da9509363e3..6150cf9d166d 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/directx-headers-1.608.2b b/metadata/md5-cache/dev-util/directx-headers-1.608.2b
index f158d72f0d6f..a56d3811911d 100644
--- a/metadata/md5-cache/dev-util/directx-headers-1.608.2b
+++ b/metadata/md5-cache/dev-util/directx-headers-1.608.2b
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/microsoft/DirectX-Headers
 INHERIT=meson-multilib
 IUSE=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=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.608.2b.tar.gz -> directx-headers-1.608.2b.tar.gz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a6320fedf9fbfaa743426a2cc8416485
+_md5_=4e3ca8ced7b95021df31ec3e6aa25048
diff --git a/metadata/md5-cache/dev-util/opencl-headers-2023.02.06 b/metadata/md5-cache/dev-util/opencl-headers-2023.02.06
index 40742e44c682..2f0832968962 100644
--- a/metadata/md5-cache/dev-util/opencl-headers-2023.02.06
+++ b/metadata/md5-cache/dev-util/opencl-headers-2023.02.06
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/OpenCL-Headers
 INHERIT=cmake
 IUSE=test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags/v2023.02.06.tar.gz -> opencl-headers-2023.02.06.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4ffddc684af4aeb8e2370925ab583eb7
+_md5_=78a53afbca24bf929169f30ada0473ed
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.22-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.10.22-r1
deleted file mode 100644
index 7fbc327e16a5..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.22-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[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/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) dev-python/wheel test? ( dev-python/pytest[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-vcs/git ) test? ( >=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[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/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) >=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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=8
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-INHERIT=elisp-common distutils-r1 optfeature pypi
-IUSE=emacs test 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
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[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/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) 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/pkgcheck/pkgcheck-0.10.22.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	elisp-common	1d6e8d43be4713f04a441f721d890d48	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7e6a2ef20d795090e5808194bd41f00e
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index c25b8c7a8e51..f22113b59178 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/encodings-1.0.7 b/metadata/md5-cache/media-fonts/encodings-1.0.7
index 8de40885108c..6fba3a1f03c5 100644
--- a/metadata/md5-cache/media-fonts/encodings-1.0.7
+++ b/metadata/md5-cache/media-fonts/encodings-1.0.7
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org font encodings
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/encodings
 INHERIT=font xorg-3
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/encodings-1.0.7.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=1def5cb536ef1d1367133ae6391e0d1b
+_md5_=603f760d769822de114c9bf3f4ef4830
diff --git a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.4
index a5bf042a200b..362269a8d15d 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-100dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-100dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=024926fe14ab24c0437de0b948743de8
+_md5_=b3b92a1ac5b41a4364b63845ae371ca4
diff --git a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.4
index fe270106fd5c..f11529f458eb 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-75dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-75dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=6b15b99fd1b0550a5d71ffb2fcd7486e
+_md5_=eb895d4cd7da8ab0f2346d617dc5289d
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.5 b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.5
index 7444424ae321..c211396a36e2 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-utopia-100dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=05fbae5c3f9bd7f26da0ac87838bc4d1
+_md5_=29503d0690fd7d917c344b0f5aafd387
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.5 b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.5
index 883db54f2e59..8c395af9b3a2 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-utopia-75dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=46648d625a10b8524d6d30a50ce36b25
+_md5_=38495dfcf5af446f63cffca733336c7e
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.5 b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.5
index b20e1869c94b..ccca20775cd9 100644
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/adobe-utopia-type1
 INHERIT=xorg-3
 IUSE=X
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=6e53ab037d2e3376a3de3cd33dbb0002
+_md5_=7fc473b53ab2f66398495ea21f54f509
diff --git a/metadata/md5-cache/media-fonts/font-alias-1.0.5 b/metadata/md5-cache/media-fonts/font-alias-1.0.5
index 9d12c85305c2..0f916b7c3f67 100644
--- a/metadata/md5-cache/media-fonts/font-alias-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-alias-1.0.5
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org font aliases
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/alias
 INHERIT=xorg-3
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-alias-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=093bec5bc9515e249c993a62bc697f4b
+_md5_=6c98f237bec5bda7a85f9bf6c4bb1995
diff --git a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.4
index e5f0fa1c6031..855b52ec5407 100644
--- a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/arabic-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-arabic-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=120be052caa946b6044cdb94f111ee9f
+_md5_=a727192004810f56629f959ac77ec2aa
diff --git a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.4
index f765fb77a3f9..fda2a2cb7d47 100644
--- a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-100dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-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=public-domain
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-100dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=f0c61eb42d24e37b08e412264b2d02f5
+_md5_=bbb97bf846f4c1ff0c5462f4be8b0079
diff --git a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.4
index 24d4fa909f27..0378156c271a 100644
--- a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-75dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-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=public-domain
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-75dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=39b1166000f88a4180fa3af6130ca9d2
+_md5_=3b834a57339acfe934be49a0ec12382f
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.4
index 6e87aa54f826..b92a3e532fa3 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-100dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-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=public-domain
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=1f1d873d29b2fa30db1deb790368e995
+_md5_=2970008c85408e390b68f9021140a95a
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.4
index dc4e030fd251..2bbfc35325da 100644
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-75dpi
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-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=public-domain
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=459dfde221d067349ee07599e63224d5
+_md5_=e9b417d018e95744c3f69871aab8500e
diff --git a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.4
index 2eb7476bf7ac..5b7c6d7ac284 100644
--- a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-ttf
 INHERIT=xorg-3
 IUSE=X
-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=bh-luxi
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-ttf-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=95b8aa1bdcee5eac4578e357e33d92b5
+_md5_=9bd0dd0e311670bad21d973d87da1487
diff --git a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.4
index 3516da68f8a3..64556a2365bf 100644
--- a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bh-type1
 INHERIT=xorg-3
 IUSE=X
-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=bh-luxi
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-type1-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=6854d498e17cadda2a367d98b808ec55
+_md5_=eaba5b5773c743331bbc7e156b46f003
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.4
index be96889200aa..0193e6c32aeb 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bitstream-100dpi
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-100dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=3d082aa358e322dd4b482db0206eac4e
+_md5_=10f09046f641a027665e081beaf51fec
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.4 b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.4
index 7bca88112a83..f57263a3b69b 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bitstream-75dpi
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=9187b1a339d2776e98ea15fb2ef177d7
+_md5_=d640d5e11d5fc3766e3c713def097363
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.4
index c32534c049a6..92b3f9378249 100644
--- a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/bitstream-type1
 INHERIT=xorg-3
 IUSE=X
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-type1-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=d2735bdf150efec843355a1ce4d5d690
+_md5_=048dd91c80a492313dec930371090941
diff --git a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.4
index e188c3edd670..f27ca0c0ef0a 100644
--- a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/cronyx-cyrillic
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-cronyx-cyrillic-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=5e57cbb39968df0de94190db4b9e19ba
+_md5_=7aa4ea572237e93bfdbd972601e37153
diff --git a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.4
index 1b9770081d3a..bcf43d82b21b 100644
--- a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/cursor-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-cursor-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=10ea220df43aef66ed76c5e2a18e55e8
+_md5_=ee79720b67ae8a49fa3664b9c33ffb0b
diff --git a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.4
index 98b40a0030f4..31345bcc1720 100644
--- a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/daewoo-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-daewoo-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=94d9496640f3f84709dabfeb97bc55ec
+_md5_=501e0ce230342538ce3e4d58856449c0
diff --git a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.4
index 96cc365a7c5c..8c2f7e2cf4b3 100644
--- a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/dec-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-dec-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=6eefe8a1900765d13fc4efe58628401f
+_md5_=8ae4697ca20701cab6d7c0bd92d6b139
diff --git a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.4 b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.4
index b6c86c57343e..d7cb24dbfbe6 100644
--- a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/ibm-type1
 INHERIT=xorg-3
 IUSE=X
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-ibm-type1-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=a05019d7a58548ed59899633b49e751d
+_md5_=e6fea50906aa8022625ef592b15f7e2e
diff --git a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.4
index 0d950566ced5..94191a5dd451 100644
--- a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/isas-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-isas-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=d1abee1d08c81c867fca337ac70b6102
+_md5_=9c2945b15c04ee8901dcefed16c698b6
diff --git a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.4
index 96c12161b48a..724e105a3d32 100644
--- a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/jis-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-jis-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=2f54a87656dbd65f79d79c5374336f32
+_md5_=921c6c9cd61cc5b34029c011ccc1ee87
diff --git a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.4
index 37ad2c1100d4..b3be28c51c1f 100644
--- a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/micro-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=public-domain
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-micro-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=25fe0d19d40a8a46359e42e7212a5be8
+_md5_=6bcd3642ab30c270386c8b78043e54da
diff --git a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.4
index 3731fcf65032..50e7c7e5e191 100644
--- a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-cyrillic
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-cyrillic-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=f65eccb4ec8d22433ba210a730ad6756
+_md5_=4656e2780090d894b1a7df06fd31a5b1
diff --git a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.5 b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.5
index 8872ab863eb3..1281fd44b0ea 100644
--- a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-ethiopic
 INHERIT=xorg-3
 IUSE=X
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=6382386f6788dc822d0893d0b9ad18f5
+_md5_=c3ed10e38b574255a464aca33c1c5ce8
diff --git a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.4 b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.4
index cc2703045ccd..f96cdb4370cd 100644
--- a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-meltho
 INHERIT=xorg-3
 IUSE=X
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-meltho-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=5b88608c2e8d4795b9235a49632702f9
+_md5_=2de305883c8d1cc47df1701df489b03f
diff --git a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.3 b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.3
index 480facaad5fb..7e459f0d26b6 100644
--- a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.3
+++ b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/misc-misc
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-misc-1.1.3.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=0571bf968272ccd7d96606c582074e74
+_md5_=7fa81523bd4abd1716935ad03aa1fa8a
diff --git a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.4
index 03f97b6dead9..b665beec3627 100644
--- a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/mutt-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-mutt-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=9019150960dcdad898c2d975766fcbbe
+_md5_=c4109da7ac1c6a69af9dd9620768cc37
diff --git a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.3 b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.3
index b737e3e6b189..b5eff856aec7 100644
--- a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.3
+++ b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/schumacher-misc
 INHERIT=xorg-3
 IUSE=nls X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-schumacher-misc-1.1.3.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=4b9ffcfc2a6d6b9d8897352be31230f3
+_md5_=4f60221e4ca5c6a432be6fe5b51450f1
diff --git a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.5 b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.5
index 8161ff96d296..136f093a23a4 100644
--- a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/screen-cyrillic
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-screen-cyrillic-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=8b3a4129a90cd1b79057abbd4dd14ba3
+_md5_=a5ca8a2e6ec78bbce55b1c159a21eef1
diff --git a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.4
index 056986c92ad4..18d789826896 100644
--- a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/sony-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-sony-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=29b3b1541a65db16f7a47726d0cdd5f6
+_md5_=597b04c4f68fb30122414178b5594e39
diff --git a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.4 b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.4
index 4a8e4d929d0f..b75fef661602 100644
--- a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/sun-misc
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-sun-misc-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=9550c2d6fa8d26b9f40adf9994f0a91d
+_md5_=5a939941c020bad1174fbb9e55838024
diff --git a/metadata/md5-cache/media-fonts/font-util-1.4.0 b/metadata/md5-cache/media-fonts/font-util-1.4.0
index 72ccbe990194..777efc3da756 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.4.0
+++ b/metadata/md5-cache/media-fonts/font-util-1.4.0
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org font utilities
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util
 INHERIT=xorg-3
-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
+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
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-util-1.4.0.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=4c1b8752e93b220e88168d76cce35963
+_md5_=9aca87b04f2ed32f96ce1351e61f6f7a
diff --git a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.4 b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.4
index f26a4d3bd8ae..f2272c1bc554 100644
--- a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.4
+++ b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/winitzki-cyrillic
 INHERIT=xorg-3
 IUSE=X +opentype-compat
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=63b1dcaa037eeff52921c2ceefbb1f6b
+_md5_=0d07d5c7235dd374ce6d0121a4195d35
diff --git a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.5 b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.5
index d438c31e4a6a..82605ea39d93 100644
--- a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.5
+++ b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/xfree86-type1
 INHERIT=xorg-3
 IUSE=X
-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=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-xfree86-type1-1.0.5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=d2c2c71275872c30734e5a52ae2ff9ba
+_md5_=51f2ae1e1f0ff55c02a7ac421eabad47
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index ba376dc3f065..3273ed06a53c 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/kvazaar-2.2.0 b/metadata/md5-cache/media-libs/kvazaar-2.2.0
index 7f11fae94c64..baafbe70b845 100644
--- a/metadata/md5-cache/media-libs/kvazaar-2.2.0
+++ b/metadata/md5-cache/media-libs/kvazaar-2.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar
 INHERIT=autotools flag-o-matic multilib-minimal
 IUSE=static-libs 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=~amd64 ~arm ~loong ~mips ~riscv
+KEYWORDS=~amd64 ~arm ~ia64 ~loong ~mips ~riscv
 LICENSE=LGPL-2.1
 REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/ultravideo/kvazaar/archive/v2.2.0.tar.gz -> kvazaar-2.2.0.tar.gz test? ( https://github.com/silentbicycle/greatest/archive/v1.2.1.tar.gz -> greatest-1.2.1.tar.gz )
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1068270e578235e0637f10962ad97a2f
+_md5_=09b8bff063913d81ccddf4973834295d
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.3.239-r1 b/metadata/md5-cache/media-libs/vulkan-layers-1.3.239-r1
index 2d0ae07cdc71..5dadb71e637c 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.3.239-r1
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.3.239-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
 INHERIT=cmake-multilib python-any-r1
 IUSE=wayland X 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=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=~dev-util/spirv-tools-1.3.239:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.3.239.0.tar.gz -> vulkan-layers-1.3.239.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ae5472d8abb89ea7cd970ece8be81392
+_md5_=fbd20dc8bd6a588f7af5b6751b0e780a
diff --git a/metadata/md5-cache/media-libs/waffle-1.7.2 b/metadata/md5-cache/media-libs/waffle-1.7.2
index 8d5166d68bb0..d89387b991c1 100644
--- a/metadata/md5-cache/media-libs/waffle-1.7.2
+++ b/metadata/md5-cache/media-libs/waffle-1.7.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle
 INHERIT=meson-multilib multilib
 IUSE=doc +egl +gbm wayland X 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=>=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxcb-1.9.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(-)?] ) gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[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
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/mesa/waffle/-/archive/v1.7.2/waffle-v1.7.2.tar.bz2
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ba41cdca50696a069ff55ca72253b5ed
+_md5_=e388564a8b769e0e196c84f453112dfc
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 25eb5980e590..812edf94ab94 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/hydrogen-1.2.0 b/metadata/md5-cache/media-sound/hydrogen-1.2.0
new file mode 100644
index 000000000000..4f86e7a28c80
--- /dev/null
+++ b/metadata/md5-cache/media-sound/hydrogen-1.2.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5
+DESCRIPTION=Advanced drum machine
+EAPI=8
+HOMEPAGE=http://www.hydrogen-music.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake xdg
+IUSE=alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 ZLIB
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=lash? ( alsa )
+SLOT=0
+SRC_URI=https://github.com/hydrogen-music/hydrogen/archive/1.2.0.tar.gz -> hydrogen-1.2.0.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6c2d49aadb1f88add22b3df7f40361fe
diff --git a/metadata/md5-cache/media-sound/hydrogen-9999 b/metadata/md5-cache/media-sound/hydrogen-9999
index 56dba4b526d1..cc95f66117f8 100644
--- a/metadata/md5-cache/media-sound/hydrogen-9999
+++ b/metadata/md5-cache/media-sound/hydrogen-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-doc/doxygen ) >=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 postinst postrm preinst prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5
 DESCRIPTION=Advanced drum machine
 EAPI=8
 HOMEPAGE=http://www.hydrogen-music.org/
@@ -9,8 +9,8 @@ INHERIT=cmake xdg git-r3
 IUSE=alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio
 LICENSE=GPL-2 ZLIB
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( dev-libs/libtar ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=250bc2eb11dae3b77003cb9ca31d2d9d
+_md5_=6c2d49aadb1f88add22b3df7f40361fe
diff --git a/metadata/md5-cache/media-sound/puddletag-2.2.0 b/metadata/md5-cache/media-sound/puddletag-2.2.0
deleted file mode 100644
index d1c2294aa683..000000000000
--- a/metadata/md5-cache/media-sound/puddletag-2.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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/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/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DESCRIPTION=Audio tag editor
-EAPI=8
-HOMEPAGE=http://docs.puddletag.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 xdg
-IUSE=acoustid quodlibet python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 GPL-3
-RDEPEND=>=dev-python/configobj-5.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3.0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-5.15.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,svg] >=media-libs/mutagen-1.45.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] acoustid? ( >=media-libs/chromaprint-1.5.0 ) quodlibet? ( >=media-sound/quodlibet-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/sip-4.19.22:0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.9.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 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/puddletag/puddletag/archive/refs/tags/2.2.0.tar.gz -> puddletag-2.2.0.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7c79b9f25ff5dcd0e70e5fdcc68746fe
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 6a310c59c80f..f99dad389dd4 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/hevc-hm-17.0 b/metadata/md5-cache/media-video/hevc-hm-17.0
index 50010cf064a9..9d1b3ec00585 100644
--- a/metadata/md5-cache/media-video/hevc-hm-17.0
+++ b/metadata/md5-cache/media-video/hevc-hm-17.0
@@ -4,9 +4,9 @@ DESCRIPTION=HEVC HM reference software
 EAPI=8
 HOMEPAGE=https://hevc.hhi.fraunhofer.de/
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~loong ~mips ~riscv
+KEYWORDS=~amd64 ~arm ~ia64 ~loong ~mips ~riscv
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://vcgit.hhi.fraunhofer.de/jvet/HM/-/archive/HM-17.0/HM-HM-17.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=13f73a8561e8237790cf3a375a707b6e
+_md5_=fee1583bcc021d5c44a03a3d754959f5
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index fe9f9e77397b..f432ac8bbaf1 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/curl-7.88.1-r2 b/metadata/md5-cache/net-misc/curl-7.88.1-r2
index 3cc19adecaae..168c681e8726 100644
--- a/metadata/md5-cache/net-misc/curl-7.88.1-r2
+++ b/metadata/md5-cache/net-misc/curl-7.88.1-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://curl.se/
 INHERIT=autotools multilib-minimal prefix verify-sig
 IUSE=+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls nghttp3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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
 LICENSE=curl
 RDEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:=[static-libs?,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/nettle:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nss? ( dev-libs/nss: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(-)?] dev-libs/nss-pem app-misc/ca-certificates ) rustls? ( net-libs/rustls-ffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[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/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_rustls ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-7.88.1.tar.xz verify-sig? ( https://curl.se/download/curl-7.88.1.tar.xz.asc )
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=e9f7d68e925eded94e048cb2ffa95e34
+_md5_=86d06bd502feeff21543183d276483e5
diff --git a/metadata/md5-cache/net-misc/mikutter-4.1.7 b/metadata/md5-cache/net-misc/mikutter-4.1.7
deleted file mode 100644
index b35607d0203c..000000000000
--- a/metadata/md5-cache/net-misc/mikutter-4.1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DESCRIPTION=Simple, powerful and moeful twitter client
-EAPI=7
-HOMEPAGE=https://mikutter.hachune.net/
-INHERIT=desktop ruby-ng
-IUSE=+libnotify test ruby_targets_ruby27
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby27? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://mikutter.hachune.net/bin/mikutter-4.1.7.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4359e975b69eea9e47baeafee4933588
diff --git a/metadata/md5-cache/net-misc/mikutter-5.0.4 b/metadata/md5-cache/net-misc/mikutter-5.0.4
new file mode 100644
index 000000000000..37f93d85ace2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mikutter-5.0.4
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby30? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby30(-)] >=dev-ruby/delayer-1.2.1[ruby_targets_ruby30(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby30(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby30(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby30(-)] >=dev-ruby/diva-2.0.1[ruby_targets_ruby30(-)] !>=dev-ruby/diva-3.0[ruby_targets_ruby30(-)] dev-ruby/httpclient[ruby_targets_ruby30(-)] dev-ruby/json:2[ruby_targets_ruby30(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby30(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby30(-)] dev-ruby/moneta[ruby_targets_ruby30(-)] dev-ruby/nokogiri[ruby_targets_ruby30(-)] >=dev-ruby/oauth-0.5.8[ruby_targets_ruby30(-)] >=dev-ruby/pluggaloid-1.7.0[ruby_targets_ruby30(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby30(-)] =dev-ruby/prime-0.1.2*[ruby_targets_ruby30(-)] dev-ruby/rcairo[ruby_targets_ruby30(-)] >=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby30(-)] !>=dev-ruby/ruby-gettext-3.5[ruby_targets_ruby30(-)] dev-ruby/ruby-gtk3[ruby_targets_ruby30(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby30(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby30(-)] dev-ruby/twitter-text[ruby_targets_ruby30(-)] virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby31(-)] >=dev-ruby/delayer-1.2.1[ruby_targets_ruby31(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby31(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby31(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby31(-)] >=dev-ruby/diva-2.0.1[ruby_targets_ruby31(-)] !>=dev-ruby/diva-3.0[ruby_targets_ruby31(-)] dev-ruby/httpclient[ruby_targets_ruby31(-)] dev-ruby/json:2[ruby_targets_ruby31(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby31(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby31(-)] dev-ruby/moneta[ruby_targets_ruby31(-)] dev-ruby/nokogiri[ruby_targets_ruby31(-)] >=dev-ruby/oauth-0.5.8[ruby_targets_ruby31(-)] >=dev-ruby/pluggaloid-1.7.0[ruby_targets_ruby31(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby31(-)] =dev-ruby/prime-0.1.2*[ruby_targets_ruby31(-)] dev-ruby/rcairo[ruby_targets_ruby31(-)] >=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby31(-)] !>=dev-ruby/ruby-gettext-3.5[ruby_targets_ruby31(-)] dev-ruby/ruby-gtk3[ruby_targets_ruby31(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby31(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby31(-)] dev-ruby/twitter-text[ruby_targets_ruby31(-)] virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+DESCRIPTION=Simple, powerful and moeful twitter client
+EAPI=7
+HOMEPAGE=https://mikutter.hachune.net/
+INHERIT=desktop ruby-ng
+IUSE=+libnotify test ruby_targets_ruby30 ruby_targets_ruby31
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby30? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby30(-)] >=dev-ruby/delayer-1.2.1[ruby_targets_ruby30(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby30(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby30(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby30(-)] >=dev-ruby/diva-2.0.1[ruby_targets_ruby30(-)] !>=dev-ruby/diva-3.0[ruby_targets_ruby30(-)] dev-ruby/httpclient[ruby_targets_ruby30(-)] dev-ruby/json:2[ruby_targets_ruby30(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby30(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby30(-)] dev-ruby/moneta[ruby_targets_ruby30(-)] dev-ruby/nokogiri[ruby_targets_ruby30(-)] >=dev-ruby/oauth-0.5.8[ruby_targets_ruby30(-)] >=dev-ruby/pluggaloid-1.7.0[ruby_targets_ruby30(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby30(-)] =dev-ruby/prime-0.1.2*[ruby_targets_ruby30(-)] dev-ruby/rcairo[ruby_targets_ruby30(-)] >=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby30(-)] !>=dev-ruby/ruby-gettext-3.5[ruby_targets_ruby30(-)] dev-ruby/ruby-gtk3[ruby_targets_ruby30(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby30(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby30(-)] dev-ruby/twitter-text[ruby_targets_ruby30(-)] virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby31(-)] >=dev-ruby/delayer-1.2.1[ruby_targets_ruby31(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby31(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby31(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby31(-)] >=dev-ruby/diva-2.0.1[ruby_targets_ruby31(-)] !>=dev-ruby/diva-3.0[ruby_targets_ruby31(-)] dev-ruby/httpclient[ruby_targets_ruby31(-)] dev-ruby/json:2[ruby_targets_ruby31(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby31(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby31(-)] dev-ruby/moneta[ruby_targets_ruby31(-)] dev-ruby/nokogiri[ruby_targets_ruby31(-)] >=dev-ruby/oauth-0.5.8[ruby_targets_ruby31(-)] >=dev-ruby/pluggaloid-1.7.0[ruby_targets_ruby31(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby31(-)] =dev-ruby/prime-0.1.2*[ruby_targets_ruby31(-)] dev-ruby/rcairo[ruby_targets_ruby31(-)] >=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby31(-)] !>=dev-ruby/ruby-gettext-3.5[ruby_targets_ruby31(-)] dev-ruby/ruby-gtk3[ruby_targets_ruby31(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby31(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby31(-)] dev-ruby/twitter-text[ruby_targets_ruby31(-)] virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://mikutter.hachune.net/bin/mikutter-5.0.4.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6be21c609f5ce1fc674e7d211bc06fbc
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index 12fb9821bea3..86429424edcc 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( ruby_targets_ruby30? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby30(-)] >=dev-ruby/delayer-1.2.1[ruby_targets_ruby30(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby30(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby30(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby30(-)] >=dev-ruby/diva-2.0.1[ruby_targets_ruby30(-)] !>=dev-ruby/diva-3.0[ruby_targets_ruby30(-)] dev-ruby/httpclient[ruby_targets_ruby30(-)] dev-ruby/json:2[ruby_targets_ruby30(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby30(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby30(-)] dev-ruby/moneta[ruby_targets_ruby30(-)] dev-ruby/nokogiri[ruby_targets_ruby30(-)] >=dev-ruby/oauth-0.5.8[ruby_targets_ruby30(-)] >=dev-ruby/pluggaloid-1.7.0[ruby_targets_ruby30(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby30(-)] =dev-ruby/prime-0.1.2*[ruby_targets_ruby30(-)] dev-ruby/rcairo[ruby_targets_ruby30(-)] >=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby30(-)] !>=dev-ruby/ruby-gettext-3.5[ruby_targets_ruby30(-)] dev-ruby/ruby-gtk3[ruby_targets_ruby30(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby30(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby30(-)] dev-ruby/twitter-text[ruby_targets_ruby30(-)] virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby31(-)] >=dev-ruby/delayer-1.2.1[ruby_targets_ruby31(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby31(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby31(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby31(-)] >=dev-ruby/diva-2.0.1[ruby_targets_ruby31(-)] !>=dev-ruby/diva-3.0[ruby_targets_ruby31(-)] dev-ruby/httpclient[ruby_targets_ruby31(-)] dev-ruby/json:2[ruby_targets_ruby31(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby31(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby31(-)] dev-ruby/moneta[ruby_targets_ruby31(-)] dev-ruby/nokogiri[ruby_targets_ruby31(-)] >=dev-ruby/oauth-0.5.8[ruby_targets_ruby31(-)] >=dev-ruby/pluggaloid-1.7.0[ruby_targets_ruby31(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby31(-)] =dev-ruby/prime-0.1.2*[ruby_targets_ruby31(-)] dev-ruby/rcairo[ruby_targets_ruby31(-)] >=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby31(-)] !>=dev-ruby/ruby-gettext-3.5[ruby_targets_ruby31(-)] dev-ruby/ruby-gtk3[ruby_targets_ruby31(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby31(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby31(-)] dev-ruby/twitter-text[ruby_targets_ruby31(-)] virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
 DESCRIPTION=Simple, powerful and moeful twitter client
 EAPI=7
 HOMEPAGE=https://mikutter.hachune.net/
 INHERIT=desktop ruby-ng git-r3
-IUSE=+libnotify test ruby_targets_ruby27
+IUSE=+libnotify test ruby_targets_ruby30 ruby_targets_ruby31
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby27? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
+RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby30? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby30(-)] >=dev-ruby/delayer-1.2.1[ruby_targets_ruby30(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby30(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby30(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby30(-)] >=dev-ruby/diva-2.0.1[ruby_targets_ruby30(-)] !>=dev-ruby/diva-3.0[ruby_targets_ruby30(-)] dev-ruby/httpclient[ruby_targets_ruby30(-)] dev-ruby/json:2[ruby_targets_ruby30(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby30(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby30(-)] dev-ruby/moneta[ruby_targets_ruby30(-)] dev-ruby/nokogiri[ruby_targets_ruby30(-)] >=dev-ruby/oauth-0.5.8[ruby_targets_ruby30(-)] >=dev-ruby/pluggaloid-1.7.0[ruby_targets_ruby30(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby30(-)] =dev-ruby/prime-0.1.2*[ruby_targets_ruby30(-)] dev-ruby/rcairo[ruby_targets_ruby30(-)] >=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby30(-)] !>=dev-ruby/ruby-gettext-3.5[ruby_targets_ruby30(-)] dev-ruby/ruby-gtk3[ruby_targets_ruby30(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby30(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby30(-)] dev-ruby/twitter-text[ruby_targets_ruby30(-)] virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby31(-)] >=dev-ruby/delayer-1.2.1[ruby_targets_ruby31(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby31(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby31(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby31(-)] >=dev-ruby/diva-2.0.1[ruby_targets_ruby31(-)] !>=dev-ruby/diva-3.0[ruby_targets_ruby31(-)] dev-ruby/httpclient[ruby_targets_ruby31(-)] dev-ruby/json:2[ruby_targets_ruby31(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby31(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby31(-)] dev-ruby/moneta[ruby_targets_ruby31(-)] dev-ruby/nokogiri[ruby_targets_ruby31(-)] >=dev-ruby/oauth-0.5.8[ruby_targets_ruby31(-)] >=dev-ruby/pluggaloid-1.7.0[ruby_targets_ruby31(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby31(-)] =dev-ruby/prime-0.1.2*[ruby_targets_ruby31(-)] dev-ruby/rcairo[ruby_targets_ruby31(-)] >=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby31(-)] !>=dev-ruby/ruby-gettext-3.5[ruby_targets_ruby31(-)] dev-ruby/ruby-gtk3[ruby_targets_ruby31(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby31(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby31(-)] dev-ruby/twitter-text[ruby_targets_ruby31(-)] virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=46a05265b3dc559c3e166e3f611cd3b0
+_md5_=6be21c609f5ce1fc674e7d211bc06fbc
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index bc578abbd490..dac3c0ba1a0c 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/hplip-3.22.10-r1 b/metadata/md5-cache/net-print/hplip-3.23.3
index d5114cbbcc9a..defce708ddf3 100644
--- a/metadata/md5-cache/net-print/hplip-3.22.10-r1
+++ b/metadata/md5-cache/net-print/hplip-3.23.3
@@ -11,6 +11,6 @@ LICENSE=GPL-2
 RDEPEND=net-print/cups sys-apps/dbus media-libs/libjpeg-turbo:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),xml(+)] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:=[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] net-dns/avahi[dbus,python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_9? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] fax? ( dev-python/reportlab[python_targets_python3_9(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_9(-)] libnotify? ( dev-python/notify2[python_targets_python3_9(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_9(-)] >=dev-python/pillow-3.1.1[python_targets_python3_9(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_10? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] fax? ( dev-python/reportlab[python_targets_python3_10(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_10(-)] libnotify? ( dev-python/notify2[python_targets_python3_10(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_10(-)] >=dev-python/pillow-3.1.1[python_targets_python3_10(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_11? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] fax? ( dev-python/reportlab[python_targets_python3_11(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_11(-)] libnotify? ( dev-python/notify2[python_targets_python3_11(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_11(-)] >=dev-python/pillow-3.1.1[python_targets_python3_11(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
-SRC_URI=mirror://sourceforge/hplip/hplip-3.22.10.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.22.6-patches-1.tar.xz
+SRC_URI=mirror://sourceforge/hplip/hplip-3.23.3.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.22.6-patches-1.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=d472e92d14f56dc078f3fb2779fe827f
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.22.6 b/metadata/md5-cache/net-print/hplip-plugin-3.22.6
index 9d0fd7a90f17..0cf34072b40e 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.22.6
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.22.6
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.22.6-plugin.run
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
-_md5_=9d4ea5d40a80a215d82692d872fb5ec2
+_md5_=b85881af374eb3d9091ff3b051fdd1ff
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index b3d7ad115d1b..d0f0da9bebff 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/rtree-1.0.0 b/metadata/md5-cache/sci-libs/rtree-1.0.0
index 370d9f904842..fe32a63cd74f 100644
--- a/metadata/md5-cache/sci-libs/rtree-1.0.0
+++ b/metadata/md5-cache/sci-libs/rtree-1.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://rtree.readthedocs.io
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=sci-libs/libspatialindex dev-python/typing-extensions[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://files.pythonhosted.org/packages/source/R/Rtree/Rtree-1.0.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fa9071d9e026a2993d273ac4e621b07a
+_md5_=835bab8cae5cc080407fefce851f6a44
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 5ffdf14dcb19..a839412d3f7c 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403
index a7e0f1816a4d..dae93041da1a 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.gentoo.org/downloads/signatures/
 INHERIT=edo python-any-r1
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=public-domain
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230403.gpg -> openpgp-keys-gentoo-developers-20230403-active-devs.gpg
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f1445caae6f2f6dc9e7d68e376ab2c17
+_md5_=6926976edac2e064f13865d97bb24617
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 08735e0a6489..10e5909e018b 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.19 b/metadata/md5-cache/sys-apps/pkgcore-0.12.19
deleted file mode 100644
index ca6fc12ab7c9..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.19
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/flit_core-3.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-vcs/git ) test? ( >=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.10.4[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(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a framework for package management
-EAPI=8
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-INHERIT=distutils-r1 pypi
-IUSE=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 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.10.4[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/pkgcore/pkgcore-0.12.19.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=624d486772e502322017e7c61598b489
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index aad9c007ca68..61595878d6c3 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/cairo-1.17.8 b/metadata/md5-cache/x11-libs/cairo-1.17.8
index bbdc9de6c55b..b127f328302d 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.17.8
+++ b/metadata/md5-cache/x11-libs/cairo-1.17.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo
 INHERIT=meson-multilib
 IUSE=X aqua debug +glib 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 ~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=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=dev-libs/lzo-2.06-r1: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(-)?] >=media-libs/fontconfig-2.10.92[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/freetype-2.5.0.1:2[png,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/libpng-1.6.10: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(-)?] >=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(-)?] >=x11-libs/pixman-0.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debug? ( sys-libs/binutils-libs: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(-)?] ) glib? ( >=dev-libs/glib-2.34.3: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(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.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(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxcb-1.9.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(-)?] )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/cairo/cairo/-/archive/1.17.8/cairo-1.17.8.tar.bz2
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7b46a89409254b094582a2d3bc9299ec
+_md5_=592770c628ef09fe0e06530c70ac2100
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.15 b/metadata/md5-cache/x11-libs/libXaw-1.0.15
index 84a963beacf9..1599b41fc849 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.15
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.15
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXaw
 INHERIT=xorg-3
 IUSE=deprecated abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-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
+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
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXext-1.3.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(-)?] >=x11-libs/libXmu-1.1.1-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(-)?] >=x11-libs/libXpm-3.5.10-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(-)?] >=x11-libs/libXt-1.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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXaw-1.0.15.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=135eb52ae71960696310e88a6f536b48
+_md5_=174774671c3cbeb414ec3525f11030ad
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 5aaf139078bf..3bc4aa1518e3 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/xbitmaps-1.1.3 b/metadata/md5-cache/x11-misc/xbitmaps-1.1.3
index f3160265e3e4..60523e933dd8 100644
--- a/metadata/md5-cache/x11-misc/xbitmaps-1.1.3
+++ b/metadata/md5-cache/x11-misc/xbitmaps-1.1.3
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org bitmaps data
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/data/xbitmaps
 INHERIT=xorg-3
-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 ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xbitmaps-1.1.3.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=e78e205c230bb7f1c3b532868d4f977b
+_md5_=edeab50789ad62800f6bfe0116ce37e1
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.38 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.38
index b26b8d9cc2f1..e3623fc972ab 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.38
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.38
@@ -4,9 +4,9 @@ DESCRIPTION=X keyboard configuration database
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
 INHERIT=meson python-any-r1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-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 ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.38.tar.xz
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=077109571759e8bc65893f356f3fe651
+_md5_=89b91e7e81a88cbaa4004ab27c6388f1
diff --git a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.8 b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.8
index 7de56527f5cd..07ba00e2dc0c 100644
--- a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.8
+++ b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.8
@@ -3,8 +3,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Old Imake-related build files
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf
-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=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/xorg-cf-files-1.0.8.tar.xz
-_md5_=d67a169491fc4aef08a4eabc008e705a
+_md5_=73eef95f9e649409e53411c9310cf225
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 8111643f5589..ef54d8c02e89 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.7 b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.7
index df9a1b9da784..a914a5c68233 100644
--- a/metadata/md5-cache/x11-themes/xcursor-themes-1.0.7
+++ b/metadata/md5-cache/x11-themes/xcursor-themes-1.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org cursor themes: whiteglass, redglass and handhelds
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/data/xcursor-themes
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcursor
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xcursor-themes-1.0.7.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=378ed10a8da96d785a38b6740291ad08
+_md5_=e265ec34a41427a41f7a359d45bd0932
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index cd3a297faadc..f121902d04c5 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-04-08T04:09:51Z
+TIMESTAMP 2023-04-08T10:09:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQw6Q9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQxPXVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC2Dg/8C0i77rHpA3mcNiuZz20AFMnjFpDmhJ76C1tt6cZSMxMByoPLgKMfk6Oy
-paoDWLvtJ59kfML3nV1IysVRUyOF5kxILXS1Zmu1oacGbNj7Q7ptl0FnqW+aj8Kr
-A1Lh+5rO5+8arxDsvDiymbfqMFqeb8ecmMuZlKsLjufkhzqBfkTHD++74TCYgXbg
-NOyilY07CeKjQ5vJjXD0MHt/4rY+soSsZvdVB6nZnTXmvKqsN57fw/djjKFpLQiT
-lI/nOB0tLIALnol1id2lpd68yUywtCRlA4gzuACDTbv1BXiE0PR+Ftcw8rvLwmnM
-ENX5ZaeQEhWjK3vCCDN2xBiIV01OmzAOysM9PI1eiL/uloQFXsWExZHTVas/17rh
-mvzFAImQ9J1YnsrF3ZIXjEM+KbXZ2UOB0zadPRkPH9mMhEUTHy4WLRv7gP8B4zMO
-ivpo9Qsi0quu8IEe4mHBoUubAfeg/ExWJ0D3vcb08imlsO7dzx9QXGjn91V6/j+8
-cvNsRZ1nG00sRxiOJrj7Xj8xl0mv26k2GVXccikrvIyibCx4EgmXGU6Pu1/0b8Ps
-6WMu1ZnhT9WRu2Jq3SyZ1bXaVeWgywvsh+P1l4kZK0FS65DyZq4YKEVqGYZWQLUM
-habB7ZyET3Uf2huWtt4ywu268Hv9nIbLG0jdBSRzY4D31ArnHm8=
-=59Ya
+klCJTQ/+OoTjF3lovB4pG6RsO0dPZL3ru3f8hC/8BfKJXliVgcDHvQcm7tJUt5cS
+nXO+oBHISmC9mGclfOnad1nYWdLZF61EopcK5inkqj5o/gaAY1M4d1UGKv9n2aqD
+1ucU1GMc8ZLSKoFg4i4KJzOpe8Rx7BfK34dLdijdFmpKR6zSyjMRi/kWr7E7n9Fs
+fx1bLsgTQ3lm8UtHtZSk8oxAw0zUlBgxoWiq2GTjaWCpIzvVOIUkE6HaLFQ9hOYj
+SQo5nHFfBLfV7ReizEk6SWnkDxIWSXcs7iKmMS/eijYItLIYtI1lRMq61Ub/p9Ye
+Bea8NjzuWfx/owqSqKglMT/e5QaYZYnaRLh12In4bmbyJqcna0XRyFQNMxVIDLd1
+Rf1ZrGj28XRR4fcppSsQdjDg3aHzXK0D78jgTIspBhM5zoGtsplYCoccx8lxNZyw
+qOpYi8MucXNdBo8L39ZQML/BQxMbnaOFDcz7gCtUczXGZ6lIe+MKs4NxroF7UE1p
+XyejOiJhHBFyuK2K9SI8p9Nna0vNYPcFqpZlwYMR8OfUzyDesvPIHYnEeYw5Gted
+2zUE1ajurYaAvj/2cu3+kkqtUWEkt+6sqDUt1VnjQS/e0uRbD8uA9We0GptqPzSn
+GxH15dmQ6+Cj+T32k/YSRAP13NQodLEmTAElIJ3//LN+N6qIAU0=
+=7Aib
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ea266e4dd9bb..4eb4202242f7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Apr 2023 04:09:49 +0000
+Sat, 08 Apr 2023 10:09:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 14e26273bd63..2a6d715ec2aa 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Apr  8 04:09:48 AM UTC 2023
+Sat Apr  8 10:09:54 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 844bfbcaa18e..c700ce4017e4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Apr 2023 04:15:01 +0000
+Sat, 08 Apr 2023 10:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index cd43e30cdb6f..9fd9516ea304 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-32df66059ef7f888962368d698f5172c9ddb15ea 1680924127 2023-04-08T03:22:07+00:00
+a10d285a4f17a9e549aeeee2f598c3a7f128322a 1680948066 2023-04-08T10:01:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3e9600996523..bbc677ff0e7e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1680927001 Sat 08 Apr 2023 04:10:01 AM UTC
+1680948602 Sat 08 Apr 2023 10:10:02 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index aa7637f5e3ca..4eb4202242f7 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 08 Apr 2023 04:09:48 +0000
+Sat, 08 Apr 2023 10:09:54 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 170fd91181aa..6d44894eb806 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 33bc32f6bda3..af23ea82d57b 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -15,6 +15,6 @@ DIST curl-8.0.1.tar.xz 2575544 BLAKE2B 67d82e9d71f0a351b5c2ed3ad5eab02e367ded872
 DIST curl-8.0.1.tar.xz.asc 488 BLAKE2B 452e1bebe1028e7621bbf8829e50cf56e254cd63a8cf2a4c0332176b9f18fb2821304ae556a203996d273c986bddbd04db2218c18fd34dee66e9155861ba50ce SHA512 92c6a0570e9a8a708fe2f717b8b37a68dcb9cd4520ca50c9baafec5891bda103bce2d2dcb67f1387bf11bd7e51e0e64ccd52d196e61d58b598ad3aa1960386cf
 EBUILD curl-7.87.0-r2.ebuild 8660 BLAKE2B ce66897406af36dfd872020b5db67428a65954392393529da1678d0b9dec061d05bf52c7debe03d7dab8c051936ab7634f73dea443e094048cd052c76a0f89cb SHA512 b3a9805fab31995d9162f1bdb6159af9f69532c48c6a966be1b08c8a3c21ac3e7ff7f0513a8c33d2973173e1e5400d6e34abca1aa79581fad178e6a98c375adf
 EBUILD curl-7.88.1-r1.ebuild 8920 BLAKE2B aa8637babf557ce91f241349e9d3a4fbe0b3ef7d9824fb3e5f6f0cf89575ee8e04737514042af603e0134d6e069f37b157d0b2bef56d9e329b0001bdd6f0fb02 SHA512 0c71830b5c859144abc2e36414105531376f9d38acea5e997fcd585c2fa6ef99dc686d6ddf2d769303ff179e0bdb704775329ce6de29e5ff7507afa3f637d601
-EBUILD curl-7.88.1-r2.ebuild 8958 BLAKE2B 6361211302c9b3248369c5ad5449be57df50d1db8c4de7beeb4efaa831300f3ed24806c79571f48891dc1428128531e80087a1000cbf5e4ad671cd3e3fc3fb93 SHA512 39b3cc21041cd42657ac9ffecaa28004893f715114e48de4d0e72ed3291d001945a24a6fde94323ab4da37754f01c39682c2df7303be9111ad9ac88c06f3a1c5
+EBUILD curl-7.88.1-r2.ebuild 8955 BLAKE2B af0a7944234567965d15704fc6a8c953e64c3b0da347524c7df1f23441579101184a0582af5f36f060689f6a42a903de2967446e465f167e459e711babe51c9d SHA512 ff4aa0a2e8f68be0e7fd20846e67a57584b42bc234d95f1101c66cb602faa333e8ac3ddf5d0350054d54b78a8cc257067c5f558a72ded91df47dd4bac428da13
 EBUILD curl-8.0.1.ebuild 8761 BLAKE2B 9695c59f383d7b5c4adddf46c7db18879ac18018632c83d15f27463a3ac9202e5580ee982d49d2d5703d2cbc55154e3131fa13188f68db1fc589d664bee5e474 SHA512 8035e7c5d8fe40d05930b3dbdd793999d32cc00df510458b7e724a0cf9a4fb0e26622e5fbfc53546077934ed26e1e74d071f5baab4a59796c36f13abd3171c68
 MISC metadata.xml 2289 BLAKE2B a351f315d1913abff2fec9c559b2b74ddc0a60bfb293d20a62e20a2072e820f88295dc88ab32a622855cd962b90b739b0270ba88e097ca6b41c21f7f4f72987b SHA512 45cafa3eac6aaf777de55e025ef64ac039e6d300a760fc86b2eb1b77153f5242181a09082e443e525923e30e804a9ae90e902fb7f252a24214ac88929c3b89fe
diff --git a/net-misc/curl/curl-7.88.1-r2.ebuild b/net-misc/curl/curl-7.88.1-r2.ebuild
index 528ecbb2d290..5335c727518a 100644
--- a/net-misc/curl/curl-7.88.1-r2.ebuild
+++ b/net-misc/curl/curl-7.88.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.se/download/${P}.tar.xz
 
 LICENSE="curl"
 SLOT="0"
-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"
+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"
 IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls"
 IUSE+=" nghttp3"
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 409840b2607d..5bc53a1ff946 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,6 +1,6 @@
 AUX mikutter 137 BLAKE2B f76eb22d6492f8737ce7de92068f551ece304a7d983a922555db1d6bd36ad895376c7812840afe579959a122c7619ef02c209cb7dc06da1011bc95b9b8d9fe74 SHA512 bbf70ab03b994f9593ea3854d1911f23d1a78d155e6aa755b2456f138ef6f7f2ca5ad7aea477beca487dac43a2e5472ca7f2e7d1503a57aaa93f41f06cafccba
-DIST mikutter-4.1.7.tar.gz 2331574 BLAKE2B a60918f2bfe3a56087536c0b3313f454cdee61fd4c988008581f8a9e3373a76d78e8c93d051ff21b45874e9d4944522c2feafc4ec06fd669e7568b8f9864911c SHA512 bb7fa2ebb22484e6244c2ac6747b811d0ebc1eadca9997c9b272c6378149f63f01b9f1b5c30b36150b38997c973233b8f7b9c3f310c5e36e3ee23edec67eddc5
+DIST mikutter-5.0.4.tar.gz 2378972 BLAKE2B 58101e91a8d8aeaf71e2bc58a421d0543f864c66c5ea313734ca242bce8115c70a036f6db109670cdb76cbd698d6d0569872c16eeb9eed15d1fd951aabccb35a SHA512 30e8b24af56e38fabeb454d4ea3f6a20b11e7836527f68e61f26f164fed0c2028b29db20c21397b2203fe23fceaef2e92a481d734692da3869dfcedcae2a58e0
 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
-EBUILD mikutter-4.1.7.ebuild 2913 BLAKE2B dfc8f3bb9fd6b6efcfc0d7402d7353ba1d768fea5432b86f1b8142ca261692b344da6a5a24828fa5f9c7f687e79d1bdeb50f453a6cfb92bf62f98f4a087cfc53 SHA512 2a29585d3dad2935c9c20c5ab40c50e41dd3b90d9c559c542cba3502510718de1d61ea21c8700bc19da57439ad15a0f12e6ca9b54fa8e5ab2d7041b1e6f69bcf
-EBUILD mikutter-9999.ebuild 2913 BLAKE2B 36e99d05b7da8ad19460a0c079406228125a17363609c4887e5053b8ffb058e09c01c3780dc75b1eb43eadf6d66287c3d95d36985593b9b6133291a233088e0c SHA512 595a6d4cb91b9358574002382b1dc26afc46e4d6bef44c824a078aafe5248916f8ae8fc78062c312aabb85a55cf40ebf02feecb1e261543cabb2b2e4cff32938
+EBUILD mikutter-5.0.4.ebuild 2936 BLAKE2B 13a85a773f4f800f6c708ad4a871fa277387dc19f165f771f7bf99dbb64d157a80fee11c0ec3945f86d2b6695f4d5f0b08d09622b9dee1e255b73c65b418df3f SHA512 bb35d982249de266fd169da6f6079896fa7b798a7eafed9f9ddd31d51c0b06c2023f0670438f637ea39182a5584d83e26d48e0e73d776baa458d9a95df7fb9b9
+EBUILD mikutter-9999.ebuild 2936 BLAKE2B 13a85a773f4f800f6c708ad4a871fa277387dc19f165f771f7bf99dbb64d157a80fee11c0ec3945f86d2b6695f4d5f0b08d09622b9dee1e255b73c65b418df3f SHA512 bb35d982249de266fd169da6f6079896fa7b798a7eafed9f9ddd31d51c0b06c2023f0670438f637ea39182a5584d83e26d48e0e73d776baa458d9a95df7fb9b9
 MISC metadata.xml 245 BLAKE2B 679c2c8c096017f4eefa915d06fde493784875e685ee5078252f57a24df6fba8f9829261929f1fee146c10b30485fb81c2fa93614b8348548844658774193f61 SHA512 0d85fefe9769a0241748160f3e73644a81f68d578d392f1c443c2f56d5f05faef7458c8d1380804bbac9280626e95207de32f493be5910a9f7f678bc0fbf5cb9
diff --git a/net-misc/mikutter/mikutter-4.1.7.ebuild b/net-misc/mikutter/mikutter-5.0.4.ebuild
index fef69687c79d..c09e571b2a2b 100644
--- a/net-misc/mikutter/mikutter-4.1.7.ebuild
+++ b/net-misc/mikutter/mikutter-5.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby27"
+USE_RUBY="ruby30 ruby31"
 
 inherit desktop ruby-ng
 
@@ -34,25 +34,26 @@ RDEPEND="
 	media-sound/alsa-utils"
 
 ruby_add_rdepend "=dev-ruby/addressable-2.8*
-	>=dev-ruby/delayer-1.1.2
+	>=dev-ruby/delayer-1.2.1
 	!>=dev-ruby/delayer-2.0
 	>=dev-ruby/delayer-deferred-2.2.0
 	!>=dev-ruby/delayer-deferred-3.0
-	>=dev-ruby/diva-1.0.2
-	!>=dev-ruby/diva-2.0
+	>=dev-ruby/diva-2.0.1
+	!>=dev-ruby/diva-3.0
 	dev-ruby/httpclient
 	dev-ruby/json:2
 	>=dev-ruby/memoist-0.16.2
 	!>=dev-ruby/memoist-0.17
 	dev-ruby/moneta
 	dev-ruby/nokogiri
-	>=dev-ruby/oauth-0.5.4
-	>=dev-ruby/pluggaloid-1.5.0
+	>=dev-ruby/oauth-0.5.8
+	>=dev-ruby/pluggaloid-1.7.0
 	!>=dev-ruby/pluggaloid-2.0
+	=dev-ruby/prime-0.1.2*
 	dev-ruby/rcairo
-	>=dev-ruby/ruby-gettext-3.3.5
-	!>=dev-ruby/ruby-gettext-3.4
-	=dev-ruby/ruby-gtk2-3.4*
+	>=dev-ruby/ruby-gettext-3.4
+	!>=dev-ruby/ruby-gettext-3.5
+	dev-ruby/ruby-gtk3
 	>=dev-ruby/typed-array-0.1.2
 	!>=dev-ruby/typed-array-0.2
 	dev-ruby/twitter-text
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index e6080f7b5c7a..c09e571b2a2b 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby30 ruby31"
 
 inherit desktop ruby-ng
 
@@ -18,7 +18,7 @@ if [ "${PV}" = "9999" ]; then
 else
 	SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
 		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~riscv"
 fi
 
 DESCRIPTION="Simple, powerful and moeful twitter client"
@@ -34,25 +34,26 @@ RDEPEND="
 	media-sound/alsa-utils"
 
 ruby_add_rdepend "=dev-ruby/addressable-2.8*
-	>=dev-ruby/delayer-1.1.2
+	>=dev-ruby/delayer-1.2.1
 	!>=dev-ruby/delayer-2.0
 	>=dev-ruby/delayer-deferred-2.2.0
 	!>=dev-ruby/delayer-deferred-3.0
-	>=dev-ruby/diva-1.0.2
-	!>=dev-ruby/diva-2.0
+	>=dev-ruby/diva-2.0.1
+	!>=dev-ruby/diva-3.0
 	dev-ruby/httpclient
 	dev-ruby/json:2
 	>=dev-ruby/memoist-0.16.2
 	!>=dev-ruby/memoist-0.17
 	dev-ruby/moneta
 	dev-ruby/nokogiri
-	>=dev-ruby/oauth-0.5.4
-	>=dev-ruby/pluggaloid-1.5.0
+	>=dev-ruby/oauth-0.5.8
+	>=dev-ruby/pluggaloid-1.7.0
 	!>=dev-ruby/pluggaloid-2.0
+	=dev-ruby/prime-0.1.2*
 	dev-ruby/rcairo
-	>=dev-ruby/ruby-gettext-3.3.5
-	!>=dev-ruby/ruby-gettext-3.4
-	=dev-ruby/ruby-gtk2-3.4*
+	>=dev-ruby/ruby-gettext-3.4
+	!>=dev-ruby/ruby-gettext-3.5
+	dev-ruby/ruby-gtk3
 	>=dev-ruby/typed-array-0.1.2
 	!>=dev-ruby/typed-array-0.2
 	dev-ruby/twitter-text
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 7ac685a14304..3e65cedb0b7c 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index fcf4aa5d458a..4d66693a96f7 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST hplip-3.22.10-plugin.run 11494258 BLAKE2B c9cca80349af4f04f1b1d055083fea451d079a08179fe29fb8ca056c76a36847a58cdc526080d16620a7ab7b8650ccc46f15b3a63447964a6f6006e54b316905 SHA512 dfedc343898fb7b9e951de9a09578627b208f7d0652666eb05d5926ad3ec220bd049d6bee1fb211c72f2e484925e48a665c3133aeeca9d19032fd95e0c3711fa
 DIST hplip-3.22.6-plugin.run 11493966 BLAKE2B 9346625c665c25c5c065462269fba4764ef6728a5a351fc0ca81d5fbd3af41185d18cbee88bc9ae0c40909ed1dd412c5f53486676daf0459b79a612c7d65c257 SHA512 6eafe71f88a012bc95ecdf5bf70756e08074208964183b057f299167030b9d228c934c08955c400333b88b46d7d55ed25eb0792a8ed24b4df97a61dddca64585
 EBUILD hplip-plugin-3.22.10.ebuild 1487 BLAKE2B e80cf0d84b6a8bd542f60eb43a7ba99908913a25d9158c10d3c25e829d47bb74edbb4342bcd57891cfa6293c9fd8c95c186fab6e9afa5cec1b8a6d8bff32608f SHA512 3666cfece271f4e9f04f1b7bb5f34580f42867c070b08c3282cbe80df34a2885640e6b150afc977c3c3498e3b083c4ed96a5995ce46f66eb3d39493196c9e4fd
-EBUILD hplip-plugin-3.22.6.ebuild 1484 BLAKE2B 00d10feb206b7c70c6523e5c8757a4a1d4846d20be7d1b34e0d4ceda452d686404abee5a01d76b6cf9ba5510ecdb79e87807a4635c19cdce79ab9a3999e5faec SHA512 e6947d194de5aee27f8253d104ddc0d1ba82d83f54fee6106b4f5937c2d05e26fa78306dee8cfd208c84add673f953bd73462c8e64413ffc32979456eeba9260
+EBUILD hplip-plugin-3.22.6.ebuild 1484 BLAKE2B 5011c142fc0b59a7c7f6e3df3d4acc72ae2b2b9e429657f6522bbd4262ffa443e725808b488920612f9c55589d1f27c9a00ded514b0683ef700a04db562cf2bf SHA512 9607c6e5aa0ba7d8135465f3f4b9af86232d1c7e4302a11a584165fd7de9d316d89979217565ca276dee021fd9450801dbe29cce1078b3c801840214c8111256
 MISC metadata.xml 523 BLAKE2B 396a3e3f19f1929ac628fd3301f7de077e34d80b88f0f65dd4035a55b8ff16be6a89dc94b47085dafc7a8a2def19353aa52996a12e51e94154a61ba1329f8c91 SHA512 9d5abebbd6fdac76142c70aa911c4ac55eb5388fd39e010d72e8e6253f51a7924eda2a675cd8ce3475fea76b307805644cf8f7140b265e66b4fcd65a8546fd96
diff --git a/net-print/hplip-plugin/hplip-plugin-3.22.6.ebuild b/net-print/hplip-plugin/hplip-plugin-3.22.6.ebuild
index 5f684cc91dfd..9885b6f1574b 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.22.6.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.22.6.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
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index a99f29b75c71..9133a46bb7c5 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,7 +1,8 @@
 DIST hplip-3.22.10.tar.gz 29333247 BLAKE2B 484f470cb1ca639f6bbfa380230e94d8d219c2bc65a145e410e0be6c47ac82e7ac177d5d12a1ef9401682da2db6c7eba97424c2b2f9a2435b17f3a9ab4114e83 SHA512 0be9cd48cddebffb2472f36669ba92edbcf9019cb3b561a9630457949a6e6f13eab552582027b02468b4732e376f17321929502ad4d1f6bb4d5ea1262b171ef7
 DIST hplip-3.22.6-patches-1.tar.xz 17948 BLAKE2B ab6f0482dfebba2a1974cf6adb8037846a7e8990f15a74641af4db73d363b02d7c37baf958a8a9e83eebfc8bcccd058959c3cee448a832b26fd8a2097614c4fd SHA512 a6e3921d15ab75386f71a5e4a1aab48a014279cffd5141b152a7c1e985c7685892fd555eeb5578ab5f266ce8763c98d30d4630c3ec69ba1209a9856d6d5b0ead
 DIST hplip-3.22.6.tar.gz 29331408 BLAKE2B 7f2bc09ab2d7950d8e84b4c23d35fd5370ddc51d1d61c674fad0ce1667f8ecf9c25e0b57c155b688d932db583d3c6af528da86348ebe64ce8da9c8d051b2be34 SHA512 cb25c07c767d3d8921468429ef154401a4df9d2fdf87ead3ab18f0d06e1bd3de610843b8131641a1af8d920c7e15e290a0923405bf609cdc0a3fba9df93ddb5e
-EBUILD hplip-3.22.10-r1.ebuild 8284 BLAKE2B 12d50a0b6c1cab76ff6ddbc7cea2deb6b83226991928a3850e3d8245e38edbfa2bd860fc26c9662fbe8e1da314de7daec336f1008e2f6b557fef7eb725470aec SHA512 027fbccd774a63808dcc0fd835831e21f8242e4285abe04fde7e8d3832577c7ee14001d5fd6944a27be9d63e976e2da96a5dd326852ac678c408d11f2fd5399a
+DIST hplip-3.23.3.tar.gz 29438944 BLAKE2B c11e3f4114ae65f26cc6d4072f039179035c910175ae24b384b2e1919ddeb5fcc424aa678b54ea18b0b86aa1fd185e6103657e54eae41ad25f93ce190460d078 SHA512 b3c061d59ec4c4b8c2cb5a90a66a706439a75362d19bc7a14b6a8656812334f6de4358cfa8d5ef37e597eaaabf914f9a00f69c5b68e61bc1aac6e71521eee8a8
 EBUILD hplip-3.22.10.ebuild 8238 BLAKE2B 182e52dcd51fc2ae896db48812e1dc79186dbf50dbf24bf0b3d1727f2b353d60666ca51104b0fd3f77f62a97aaa2a192d53fd1ff4a5ac6bf6248808a816613ef SHA512 a5ff0a6ea75fe57a968aa3a52e06dbb13566c5e11f9565173d74d8d2bd0ba7f2d8d7fe2b3a369c96e1a31e1a52d30ee42e6a15d0af05db2d775aae0b4d008d32
 EBUILD hplip-3.22.6.ebuild 8238 BLAKE2B 182e52dcd51fc2ae896db48812e1dc79186dbf50dbf24bf0b3d1727f2b353d60666ca51104b0fd3f77f62a97aaa2a192d53fd1ff4a5ac6bf6248808a816613ef SHA512 a5ff0a6ea75fe57a968aa3a52e06dbb13566c5e11f9565173d74d8d2bd0ba7f2d8d7fe2b3a369c96e1a31e1a52d30ee42e6a15d0af05db2d775aae0b4d008d32
+EBUILD hplip-3.23.3.ebuild 8284 BLAKE2B 12d50a0b6c1cab76ff6ddbc7cea2deb6b83226991928a3850e3d8245e38edbfa2bd860fc26c9662fbe8e1da314de7daec336f1008e2f6b557fef7eb725470aec SHA512 027fbccd774a63808dcc0fd835831e21f8242e4285abe04fde7e8d3832577c7ee14001d5fd6944a27be9d63e976e2da96a5dd326852ac678c408d11f2fd5399a
 MISC metadata.xml 1849 BLAKE2B 381cc0d0fe08d072487850a5f5ac6e264cb4ee5db8722b6f83ad9d4e6e78948a7768e80ea2a8a2313bdca1029b59a02d8c3ca309d9438d5e4d63585f7a6b2a83 SHA512 0f5f42b561099e943d99dc5e50cfd42577582b31590c0cd98f276e5acc364fb31f4a48cf91b33e923d24daa77b7b3a6bc54a0c24d9ebff9e3ec82c957a5671e3
diff --git a/net-print/hplip/hplip-3.22.10-r1.ebuild b/net-print/hplip/hplip-3.23.3.ebuild
index 21c445fe9ca4..21c445fe9ca4 100644
--- a/net-print/hplip/hplip-3.22.10-r1.ebuild
+++ b/net-print/hplip/hplip-3.23.3.ebuild
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 4385b6103069..967848e8725c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/features/big-endian/package.mask b/profiles/features/big-endian/package.mask
index 0edd6a8fa129..cd57f4d0c893 100644
--- a/profiles/features/big-endian/package.mask
+++ b/profiles/features/big-endian/package.mask
@@ -1,9 +1,17 @@
 # Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2022-04-07)
+# Fails tests on BE (#896138)
+# https://github.com/cisco/openh264/issues/3634
+media-libs/openh264
+# revdeps
+media-libs/tg_owt
+
 # matoro <matoro_gentoo@matoro.tk> (2022-03-20)
 # Broken on big-endian (#861710)
 # https://github.com/trendmicro/tlsh/issues/131
 dev-libs/tlsh
+# revdeps
 dev-python/tlsh
 dev-util/diffoscope
diff --git a/profiles/features/big-endian/package.use.mask b/profiles/features/big-endian/package.use.mask
new file mode 100644
index 000000000000..ac4d7dcd6801
--- /dev/null
+++ b/profiles/features/big-endian/package.use.mask
@@ -0,0 +1,7 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# matoro <matoro_gentoo@matoro.tk> (2023-04-07)
+# media-libs/openh264 casualties (#896138)
+# https://github.com/cisco/openh264/issues/3634
+media-libs/libtgvoip dsp
diff --git a/profiles/features/big-endian/use.mask b/profiles/features/big-endian/use.mask
index 142ce6b3a20f..e79bcdf23566 100644
--- a/profiles/features/big-endian/use.mask
+++ b/profiles/features/big-endian/use.mask
@@ -1,6 +1,11 @@
 # Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2023-04-07)
+# media-libs/openh264 casualties (#896138)
+# https://github.com/cisco/openh264/issues/3634
+openh264
+
 # James Le Cuirot <chewi@gentoo.org> (2017-06-29)
 # Unmask as this profile is big endian.
 -big-endian
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 19a303ae4e69..1038c6db36d1 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -29,7 +29,7 @@ dev-python/libcloud
 dev-python/moto
 dev-python/mkdocs-redirects
 dev-python/mkdocs-material
-dev-python/mkdocs_pymdownx_material_extras
+dev-python/mkdocs-pymdownx-material-extras
 dev-python/mkdocs-git-authors-plugin
 dev-python/mkdocs-i18n
 dev-python/mkdocs-material-extensions
diff --git a/profiles/package.mask b/profiles/package.mask
index 87451103f62a..90d13e480a4a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2023-04-08)
+# Last release in 2008. Upstream is gone. No reverse dependencies. No tests.
+# Removal on 2023-05-08
+dev-ruby/allison
+
 # Michał Górny <mgorny@gentoo.org> (2023-04-07)
 # No Python 3.11 support and the ebuild is not running the test suite.
 # Still uses deprecated dev-python/toml (upstream).  No revdeps.
@@ -156,11 +161,6 @@ dev-ruby/flickraw
 # Removal on 2023-04-28.
 kde-apps/kross-interpreters
 
-# Sam James <sam@gentoo.org> (2023-03-29)
-# Only supports imminently-EOL ruby27.
-# Removal on 2023-04-28.  Bug #903499.
-net-misc/mikutter
-
 # Hans de Graaff <graaff@gentoo.org> (2023-03-29)
 # ruby27-only package. app-text/ronn-ng is a drop-in replacement.  it is
 # also the only consumer of dev-ruby/hpricot which has a ruby30 target
diff --git a/profiles/updates/2Q-2023 b/profiles/updates/2Q-2023
index 99b8b2e7212b..ca7c29a989d3 100644
--- a/profiles/updates/2Q-2023
+++ b/profiles/updates/2Q-2023
@@ -1 +1,2 @@
 move dev-python/jupyter_core dev-python/jupyter-core
+move dev-python/mkdocs_pymdownx_material_extras dev-python/mkdocs-pymdownx-material-extras
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 9c8dedd12385..71b3dc489381 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/rtree/Manifest b/sci-libs/rtree/Manifest
index 6814b13345c2..5021cc657535 100644
--- a/sci-libs/rtree/Manifest
+++ b/sci-libs/rtree/Manifest
@@ -1,5 +1,5 @@
 DIST Rtree-0.9.7.tar.gz 44877 BLAKE2B 4ee5ad4c478ada448a8faa5ba29bdfbb67bc2f688cb8c6f465f4637fbd890cbd997f24573b25a936b7ceb503cc0b7684a1932e6ac91a85e4c37730ee9a6d39f0 SHA512 35b39e29f6d2b9cf4e774191bed69ade515680d07213f0ba74748da11ba916b41c93dfc4f489d7320855f3722ac8b5b58bac4614ea95e6230fcffe33f4332607
 DIST Rtree-1.0.0.tar.gz 48837 BLAKE2B 60e516155e7e48158494b7ea4720dc71ece2111fb94e320976a6dd691d2458b8586c2bf8109a37d86db211ac342d77877b435bdb54627a94c898642e8520a071 SHA512 9a414cd65b27ba35313dd7185dece83f5d7235867f6f0c72c2902d7ffd72808138dbf30d8fe11c8bbf0ec463072e5f6112d75b5fdd5a1dab7720c56d3632d576
 EBUILD rtree-0.9.7.ebuild 642 BLAKE2B c2952e8c4672151c395e48fc4d200ec718c1b186daa0890ff1a36bc5725738c56518e117c94fab3e2cad357c87a930c1e9abdcee78383c976b1199a7b3d42c07 SHA512 06845e7d4f28724018c0e92a93b7056a44255878664a8da4c37f30e72f5d6784fcd6cd2eb00d496152961d51dc2a0f011ea7945069d0114887218d32f508dfe7
-EBUILD rtree-1.0.0.ebuild 599 BLAKE2B 89a7f1eca57903759a4f92a5293fbe1c14b1f63c0c278cc81752aa8adea2c35fec5b4a788c5b354e09a8b844840bed18abe4ae32b0cf4554fbd5ec01d15da807 SHA512 618018460f0c1c63cdc3a671a3fc9fd94f4bf6336817398fe104a7e6536f0d3e8d2ec85f359497ea1754f1ce6b1ddfcdc334a136dcff171522e4c25969e25d89
+EBUILD rtree-1.0.0.ebuild 598 BLAKE2B 1c4cb9bd3c47a5a1b87a8e5a2e2faa6d2e1a4de0ade522b821c124987ceedbd54c693d61d61b028eb0a0505649f73e4b069a153885976031e47d7636165e7a6d SHA512 8d85f519da947c5066db30bb4b15025f3e99352cdcdd273503ba7a23db51277afc101b2d95d3fafd5729f155edf6a48b111563902d8c1b2714d99d357dde427d
 MISC metadata.xml 839 BLAKE2B 1a948191fec4142d6c2731639ff99c4185a58231d22683f0541ec557b6b0650d2b4cb1c54238a0d5d6baf1cd7a7fe24722f832306050179b5f6c0a168ffc18ac SHA512 b63ea233bec3285bda6008728a82799c97f7ea544e1800952a53f480e4eedb8a59a2e9e77901785d93ab46eb79ea397d8829c16210bb3bd84820c87a54c7d287
diff --git a/sci-libs/rtree/rtree-1.0.0.ebuild b/sci-libs/rtree/rtree-1.0.0.ebuild
index c30e40df1d5a..2892a9c457f2 100644
--- a/sci-libs/rtree/rtree-1.0.0.ebuild
+++ b/sci-libs/rtree/rtree-1.0.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://rtree.readthedocs.io"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	sci-libs/libspatialindex
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 456383b37579..c89fee8d423a 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-gentoo-developers/Manifest b/sec-keys/openpgp-keys-gentoo-developers/Manifest
index a15d61dcba67..3dad165192c7 100644
--- a/sec-keys/openpgp-keys-gentoo-developers/Manifest
+++ b/sec-keys/openpgp-keys-gentoo-developers/Manifest
@@ -2,6 +2,6 @@ AUX keyring-mangler.py 3005 BLAKE2B e5435432b79156c26120af950f46f9a916af7261a78b
 DIST openpgp-keys-gentoo-developers-20230327-active-devs.gpg 3134134 BLAKE2B 31a06e5552253c494cdb8defdc81198fa55d1d2e33950415125edeff0075243ce170243188c5b016e4ecf4184c99d072d79a8b0de49a642bcdd1b4d01971ff47 SHA512 9b67b485a323f08786552a0e6dcc378cbe331accc2960b7121c344275629933733e5e268d3d5d96b70c40a541a1b6447c983fc11caadc1455d0b7609d9360b9c
 DIST openpgp-keys-gentoo-developers-20230403-active-devs.gpg 3033398 BLAKE2B 233549fa600d855df1f4130224c63b10d0df3312886bef1c0486553db3025554a4fff7af104a3f0869390d53837a8d0182d830432e855273da28c753ea579d7e SHA512 33264b9ef002656f5c58dc2b2ff568d01b624c68e2e42db0d388b9a99b45c2d605df0d5db7b5029c0946f524fa7168252ba87908336e6f9ad0717c20d43cd112
 EBUILD openpgp-keys-gentoo-developers-20230327.ebuild 7516 BLAKE2B 43511ae0601dba57fd74cacdcb54d8524daa8b7dcedfaed9db28743ba2a73fef0387be91a7d960bb1070dfa3d5cd5989f7625c7aa45a4bc66fb9936ac824f7e3 SHA512 ed9783038397f41655917fd354aca496f9bfa8b4ca54b736d5173d17308b056aa0ef87d2d9984a709fee3fc42c3d9fa2b36dc88058c2e86261989c7b47b84bf5
-EBUILD openpgp-keys-gentoo-developers-20230403.ebuild 7524 BLAKE2B b25f55fc15605a7ae98ea6c232c3c52c522478eef6e7c0454560874de41639b9af22b569b45e5363481ce5b1f0e55b0fae92c9be98fdd9cdd5a7a2c1b4cbd195 SHA512 59df2a70e59e2c029f383c971e0a00cd10c11fa8c8eaaf692fca4c11645a5877f0c0a4d121257fee42442b1f9252b497ba625e1ab1c4fd4d08aaaf59d91eff1d
+EBUILD openpgp-keys-gentoo-developers-20230403.ebuild 7530 BLAKE2B a43990c1c1441f877c04ddeb45d3a96cb829c223d26986129f520219afe2e8dd43e67f9878e666fc71fbac357dc77e54426a20cc352029ed199e3374e958feb3 SHA512 9a896722504447f82d1e3431b4f9a38ac523a08c4f6e4cbb798e75133b20a2b54d4abe220b6ba5c7848804fb3b0aad9f02ede441acd36f11cd988d45c87eda50
 EBUILD openpgp-keys-gentoo-developers-99999999.ebuild 7524 BLAKE2B b25f55fc15605a7ae98ea6c232c3c52c522478eef6e7c0454560874de41639b9af22b569b45e5363481ce5b1f0e55b0fae92c9be98fdd9cdd5a7a2c1b4cbd195 SHA512 59df2a70e59e2c029f383c971e0a00cd10c11fa8c8eaaf692fca4c11645a5877f0c0a4d121257fee42442b1f9252b497ba625e1ab1c4fd4d08aaaf59d91eff1d
 MISC metadata.xml 264 BLAKE2B 630ac0044f623dc63de725aae23da036b649a2d65331c06fbe9eb66d18ad1a4d3fd804cdffc4703500662b01272063af346680d2550f2fb6a262d6acee8c6789 SHA512 3cf1981080b4a7634537d20a3e837fa802c52ae5ee750531cc4aa3f8478cda78579375602bc058abbd75f9393f9681b79603c3ddd9af809a1e72f7336a708056
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild
index 19dd6bb3b88d..efd0694ab707 100644
--- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then
 	BDEPEND="net-misc/curl"
 else
 	SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 S="${WORKDIR}"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4e2f5ee7a9a3..7b174883a71d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 827a1db6b8a0..e5415abcaff1 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcore-0.12.19.tar.gz 631185 BLAKE2B e088e187bb261c2db29d3d2b830a71552dc8982f30ca6e82baff325fae2c00168f10228145588a05ce0c0fa9aa773206acfecf1c831482917b4e3ca386dfb097 SHA512 9fd6c86370dea4c67a31551216b6d372ae0793c5122472a56a103c42029268dc2c0a23b5071d3fefb6bbea73f5e590a1f03b81d2c63e51a0275c18c3082e92dd
 DIST pkgcore-0.12.20.tar.gz 629420 BLAKE2B d98f992fd37bb6487aaaab39dd15101bddabb24597c2ea05cdf29f3024f0362609701315e3683ac67ce0e5bb64ebc4e348a65f4e74925456bff8c197149c179f SHA512 9ceb254998a522b4a1d519798e6ebb0ea728a20c6d9e5a9e9da7dde0916cf5746b9d22093b5b14b21ccdd177f5e4d23e6c8d069230685bc4476d5a07478aae4d
-EBUILD pkgcore-0.12.19.ebuild 1092 BLAKE2B c9cead3dd36473e51ba111e271d3954d2a566d0f310f52837adb9266718312b571e343efd2e62aea02e19c8b60b4e69acbd3b8eb85eb62e4adcf9ec3a48d2bba SHA512 bb632942eb8d9237e37593f8560fb461918ea0159fad653d76c66a4c7d1aff146e48334bdf1b85a010ca7e3768a9d14f5c4d928d32d21bc6f1712cede82a92b4
 EBUILD pkgcore-0.12.20.ebuild 1092 BLAKE2B c9cead3dd36473e51ba111e271d3954d2a566d0f310f52837adb9266718312b571e343efd2e62aea02e19c8b60b4e69acbd3b8eb85eb62e4adcf9ec3a48d2bba SHA512 bb632942eb8d9237e37593f8560fb461918ea0159fad653d76c66a4c7d1aff146e48334bdf1b85a010ca7e3768a9d14f5c4d928d32d21bc6f1712cede82a92b4
 EBUILD pkgcore-9999.ebuild 1100 BLAKE2B 9cb3966a18841d6fbd626d7ee1695e51c8cbbfe749eb11d27ad89d2163e7712b5973d6153d3677b31f9021d65247ea853c2caf9056a3db2426874563bcd3c678 SHA512 88912644af368f25d4535d05c8e597f5ef407d5e8ed259d1ea8b3eba0301ae275b72cd00f12f3415a42569394d47b6c6869e32a97ae66652a476c543ce9ec5f2
 MISC metadata.xml 392 BLAKE2B 98797b18321d3133dceaf79389bd35b26344a342c55c477b178359d731c46fa209adbdcf1d14eb009d57c8c20db8b898651dd45d5bcfc6bb3009ceffa1436650 SHA512 097710cc6c1df7455328a1d3feb223e324162ff20ef03964de4682eec7acf4e2d08fa64d3ac4946783f4c2587455d90ee5aa628f637f3a48386d9c9e6b7362e1
diff --git a/sys-apps/pkgcore/pkgcore-0.12.19.ebuild b/sys-apps/pkgcore/pkgcore-0.12.19.ebuild
deleted file mode 100644
index 52850a2cac17..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.19.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcore.git
-		https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	inherit pypi
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
-	>=app-shells/bash-5.0
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	>=dev-python/flit_core-3.8[${PYTHON_USEDEP}]
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman build/sphinx/man/*
-	distutils-r1_python_install_all
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 61f3e2534784..7fdc79e1e184 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index c67562e4c066..8b3b7a935873 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,6 +3,6 @@ AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0
 DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 SHA512 1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
 DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B 6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9 SHA512 86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
 EBUILD cairo-1.17.6-r1.ebuild 2374 BLAKE2B 9f1428010f734e2d902feec3ef187cd954b7e90a3f770cc63dd6a9310709e44c99a949ad7e00566a738df53ef33cf28952ed5ae770cb2240908e0d59e2571fbe SHA512 879083cbf4ff217a41739e1f5654d2f4370f77f6028f46aa51d70d9791553c31337bbe626bc60ce0127c23ef3ac68066d42c190f8acc019e14dabb5f502b2652
-EBUILD cairo-1.17.8.ebuild 2804 BLAKE2B e86658ef948512e52d4da52b5bd844242751ab954c874031b882b72fb0a81b14a68906423101c15876359f607098d8b0b1b83e4d225d7454e16f2663eebe3dfb SHA512 0a34512c43b3a7cddccc0f6e3bc9b612266a6f365bb026e0d4c2421c2e6e9ef12a15ccba9f3d97c00c57222ab198e8e24f63ac667bcb80190db8c69b0c1fde4f
+EBUILD cairo-1.17.8.ebuild 2800 BLAKE2B 28ec261fb5543ce9105c647da9788f724cbfef144c6a8bd238f7fa2e5e34f72c83eca3257cbd02cf055384d6282f99d315db4186801bebc4e67c7ff6dd6b7ffc SHA512 002c5ba0d1f6fdcf3a4c2ac1271cf56dd7155e966837d71d27cb6728cbb302917276f4f776a12c29b93a0f870ddefe3d8b918595f3d0cadf216288e10ba8406f
 EBUILD cairo-9999.ebuild 2695 BLAKE2B 77008265dbae681086744ed2b2d9186a361bd8f187219d3e6e680bf894721aca99e9752a3e9cc99b42e4f5d984173ab4e661d2af1a741e477c52b2de2fcc1886 SHA512 d45274ec4a45a87c4c0618a2d3221bf2d98f3dad0c0647ae0311fe15a95b8cb9cb211ad3b7aa2c0be083772e9fcef9a4cd6cfcc6153289f1ae707a615a18bee4
 MISC metadata.xml 484 BLAKE2B 44ea5fe06e0b252b5d0cf71ccf53f76ca6f1f29432886ac0a66af9df19ed72358b91c6ff399ba418d051b5fa5380ff281647ffd050f1471578699ddfa87085ab SHA512 a575a5e6f807ac4527dbcf62e6e4a70c0e6012a6b52d7772ab167ffc29a55718bd35e52b1d0bf61be89ed82f38959e63e7ef198e7b2c1f48889df9dd2c4c8988
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild b/x11-libs/cairo/cairo-1.17.8.ebuild
index edc9523e91bc..3564eb4fc891 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
-	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"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 25ba8fe379e0..58bd69eab853 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,5 +1,5 @@
 DIST libXaw-1.0.14.tar.bz2 690994 BLAKE2B 9beaf5ad47b300b3bd57c85ce4c54996db824cb10377472bab8b4ec446458ce162b21e19c4e3ed8d48f10d0bddb695509e73d3274326bdd59916dfbb3c63120e SHA512 29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4
 DIST libXaw-1.0.15.tar.xz 589832 BLAKE2B a176b59fbbd7555e7ec2f114a31e9ed804c0ee9e2f7f0efc1ed836caa280947bbe1c66dc4b5155f983a91b649a6303730377b5203d17dcd6af8dfdfa51e7784c SHA512 8edbf280b7b24b9040c291545053c1251d6af7e7f56da43a6065a1848245863eb52bdfc28c2f18dbb6597a4064394a44f4df5d8596a1a467549ccc9ce50a7821
 EBUILD libXaw-1.0.14.ebuild 884 BLAKE2B 376a003a6262cb0d01b0d0640c398f57198166f96e85edebd16636c2527bb66d26f65a5a884884c06ce48f7b65ab14f546a808bf7cf45d5c47b66155ddbe6e66 SHA512 f5c48e4791a5d413691f377cb15d5d6a52cb1c39e8580ce0ce9cda12967b943cb6ebfbe4d35fb1964c497dbfaa54f18aa752d27ff55c2cb77503bbc58344dde4
-EBUILD libXaw-1.0.15.ebuild 916 BLAKE2B ae0965f65fa3ad4ab73950097f9f5d85853d288ea03d64674501c58b6ede56ca3710c56d089e892704a8fd5a481b3f8426b7db0a756490f35183c4a5119d2c33 SHA512 e9f1f385d334b45d53811cf65d18f5dd9f56f07852c3f9148b51a3953cd5626b904247a7adf45d6f3ccdd561c06a9ffe5868147e1b88c0b9cebeb044d6517556
+EBUILD libXaw-1.0.15.ebuild 913 BLAKE2B 6994b8c156104db88de63bfaaf4f78e544ed476228435880ff6570d2e8945c18be3edf8efa28abfd3ab1e9daf17821721701603a2cb3e05d19ee8b2b88486e64 SHA512 13e3247cd41624a06d6523214b10a614f4aa34b2203128a0f211d1cf4afa05c9972321969f77162d8c1755d0a9118273876d7e09eafc67e34e5060a0cbbaf935
 MISC metadata.xml 422 BLAKE2B b5d0b66e0f4638f8e8969f8fe1c02f4d83195f11529b266e2f79f18b71f2407102545a4e55b318c4a0957cbf00570586626a9a8ce3cda99bc463c0246ed7bcce SHA512 56d9ac54daf5febd8fc3df76ce86974b6ab37130bdb80d84ad07b59d985d6d1337afff0b36bafadad9ba464e7cbd45a7d6f71f697be3b66f9db907b317d9c2a8
diff --git a/x11-libs/libXaw/libXaw-1.0.15.ebuild b/x11-libs/libXaw/libXaw-1.0.15.ebuild
index 9cd7d07a7490..87d04907edce 100644
--- a/x11-libs/libXaw/libXaw-1.0.15.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.15.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xaw library"
 
-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"
+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"
 IUSE="deprecated"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index abb77e223173..e384321eacac 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index c21f9895d026..1bc6971727d2 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,5 +1,5 @@
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
 DIST xbitmaps-1.1.3.tar.xz 109772 BLAKE2B e5ffeed910131fafe7346bc26920dc27a9ef55b069a36cc969183cc7b02a732a781e1fd295ec2577fbb472efc566f18aa2d534e18e94d4a8abc66db0177bd26e SHA512 b9a7340385fcce2dcd0204f14a462685b14b72ff58f3ec53cd76695bef2b02af902bdac809622dcb27fd4075d5ba13587b5d059530aff502cd5288d161352814
 EBUILD xbitmaps-1.1.2-r1.ebuild 671 BLAKE2B 83521f2dcd6ce6562c5c0531ac3ef54488267548c34134be2691ef08e5fc7a486407f4329885c7a01567297c78f33e959a82f4ca1243e85bb2c77c550bac3fc2 SHA512 c5d30a306a38bce69475e6f2af4a69bc94244b50182efaab8c043dd9f468d8ae07412a417c2fe7cd7c6f917f20527b5504fa6681ec030aa3f5905ac4b228f45f
-EBUILD xbitmaps-1.1.3.ebuild 574 BLAKE2B 0ae1767f891cf9888c7e88aef222fccf198df752a86243714f32c75b7d1ecf27695dede2c2616c7d1659563035a9c1cbab6fbb22fbd9706f7d9eecfe05027fb3 SHA512 9d4461f5eadeba901b11e2fb2fa86dbb805a17e6b5e4f8af2509fee05fa691c11c126a00a5a245dcdf3a4f514428633bda3cd53cd92d49704528b4174fd4a54f
+EBUILD xbitmaps-1.1.3.ebuild 570 BLAKE2B 73f77eca9cc7ee6b3e09010dd84783e1b9de55ccdeeefa222ab3c5fa590851866ae335a16fb8e93ba801a29b3efbb8401b27161d3399fd1907f2a05e89866922 SHA512 27bb928edd3ec13679ccfb062c8174aff55b5a7c58567cdd1cfb964d1041fdb38f7ce5615ace4886ad8a6a9130111787d931ced795ce1e5771bffc49a3bce1c1
 MISC metadata.xml 322 BLAKE2B ebf88c647c8d6a49be6116a66d6c6b9e5a0609752c31d0ef96daedc9064b57fb25051f0e02dc171c20afe78b050d6c8f4218c2408003feff98275576a7265853 SHA512 a3e122f01de815db03f2cd96d588e0b37313e224e837356affd162825ceddcebc62c435f0d0beb378fa8eaabdf41b2a5fac6f2ad5d7105bae1a12ffe55e14712
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
index 7c17c02385bc..24c57bfc8112 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild
@@ -8,7 +8,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="X.Org bitmaps data"
-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 ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x64-solaris ~x86-solaris ~x86-winnt"
 
 # there is nothing to compile for this package, all its contents are produced by
 # configure. the only make job that matters is make install
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 6f30272b0b21..87d103e962aa 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,6 @@
 DIST xkeyboard-config-2.37.tar.xz 879744 BLAKE2B 58cc62d48a857b0935bfe7415b4a28921d02218402ca0125e8644be04a14f897e357a224fed12f9a85c6d147b4fa659241004bf49ac16c19b7f5fceb2b6d3295 SHA512 3b2da77996d48bf7b6a5f5784bbcb62070ba6ab8eabb6f255d1addd7fa58080a329464010050e894c9acc901e42e3669333db2966140c78802efb8a86620ac0e
 DIST xkeyboard-config-2.38.tar.xz 884988 BLAKE2B 058543eb04917c785bbb02b5a11a2492c4ad3e1910e764f476e04fd2405e4c158d7e4942da00693efc683a39dd9fe11e55003c1c9ce10cc802744e98ebcd269d SHA512 20848a5a10cfa58265518add796fd97ddd2e39e7a87b18170cd9ebc3ec87268e92641f2cd8aaed1ed80cdbe3801b65a8a916321ffc20a419511b3d2a85b0dd2a
 EBUILD xkeyboard-config-2.37.ebuild 1030 BLAKE2B 588df3178d21a49dba7aea0dd2548e5bfca82a577312c48e3c4801cb0336304a8703f25180723b3568ee78204b021bbdb5b94ba2cf9281a4700a1395194e4582 SHA512 15a1e6710515c6bf31bb5e066116dbf88efa74fdbd2cea110388443fcfa2d179ec2a0105c04308d42336cd94c3b1ea37aa4cebece873a304230716b79467f159
-EBUILD xkeyboard-config-2.38.ebuild 1038 BLAKE2B 16968cc62920ac7c11aed1a2d1a34d84ae1c8e6fd90f539cbb893b948718263c575128f1cebe00f8f86fc8ef282a10769eda2ca8a2f3f1784f7d48617bac1e88 SHA512 0f968e419291bf5f1a64dad2870aa6efabc33e662fddcf437899b4edef2969ba6be4a2aa1ff7a0a2742dab65c17b35b585cdbf9be43fa6420e466ec410c4b67c
+EBUILD xkeyboard-config-2.38.ebuild 1034 BLAKE2B ca874108b4de890c272d05194ec4edd55e695673d73d543bbaafc7643c4f0ffa2d3d49bbe0a9d5f80aa387957bb94923935513baf1a7f94a96b81f1553cb947b SHA512 f333bf184ab68e105ca65dd31bc84afc2cee00c3bd15b8502fefd3387007db900f112b1c529aee0bbfe50ec7b641f5fd4e55efdf4b3d730f5571aa81fdf575df
 EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B 16968cc62920ac7c11aed1a2d1a34d84ae1c8e6fd90f539cbb893b948718263c575128f1cebe00f8f86fc8ef282a10769eda2ca8a2f3f1784f7d48617bac1e88 SHA512 0f968e419291bf5f1a64dad2870aa6efabc33e662fddcf437899b4edef2969ba6be4a2aa1ff7a0a2742dab65c17b35b585cdbf9be43fa6420e466ec410c4b67c
 MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild
index a73d92e50be9..e06733f93916 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 0536fe640594..a45aa85aeaa7 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -3,5 +3,5 @@ DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb690776
 DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531 SHA512 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
 DIST xorg-cf-files-1.0.8.tar.xz 290280 BLAKE2B b822839f2effa091d7e60aa82e0356dc6770116566d9c78a6c0915b8f9e89eb4a3bf78a3bd5380607b3b3e4c1670fb1c6ef0b3ac8ca342cfc1ef141a925c927d SHA512 cc633af889cd82346c3098df9185245c21aa9db7484343f8be9719f6e0b1fc0a9b09afb13b9b864668aa51944f2da797bbe896c807f629e89fc91506e6e63fb9
 EBUILD xorg-cf-files-1.0.7-r1.ebuild 2004 BLAKE2B 1a0f5259763e1ccc38882b12924b8142fe007479f6bc46def7c7394096893740ce23a32a4cbfd891f06eb12c34dcc743a154dae2853b21e632b69be72488b7c6 SHA512 f350610b4819fce39c94ade96e140406fde15467bfd80afaa73dc5fb27f7efd9d767050741a3eda0557f7bbddaa45f39dd6e638e2db875db151de47db389ea74
-EBUILD xorg-cf-files-1.0.8.ebuild 1805 BLAKE2B 6b9b955eb3eeeace140c2f832d08b7f9824f31c406d91e83936ad0b7e1eea4f78afff42e1aa9d07775b2a2d5e9dfce67c5c39b65bf5d530f8d32f2d2014c55a5 SHA512 d6c69dde2fca5ed55cfe5b8d27a63865ca9c11dc4f704174fba301f7934150901a76e8009e969bc8bf93b9599fde4a49b38f3666d9a1871997f8c4379bf6292e
+EBUILD xorg-cf-files-1.0.8.ebuild 1802 BLAKE2B 4749c310f066d8df842a8a3d4cfb45116a38fefeb4748443a415d3633ea4565b6d8e9e3d50556a80d0da470ddbee837d69ec67a873b6563f0e1ea5946f9bedee SHA512 707d3e5919797ca76294c78f19f08d8efe2ab49bd1a78fc2f5650affc8305f1c979f0e3e048825e4f98b5d85bf46ddfc7eeb1f3ce388bac9b274eeb37e907b62
 MISC metadata.xml 334 BLAKE2B bfeac5f26d8a7b4b290924b5fcc1e4e2c7663978d74891fdfed46698b5940a42a12b7aaa03bb66d990313754aec756c67185005916bd44a802689ebc4b9452e5 SHA512 e2d7b04dda68d9435374c1726a10cf23ce02a400c71156ac84d544b908c69d40a232b0fef925f205292b74b56a84f0fd2d64b4a6e76e718546dd2a169838633a
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
index 14f2f7efe1b1..0263dfa4ec0f 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-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"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 0edc8afff4ec..ff79f6a9e1bd 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/xcursor-themes/Manifest b/x11-themes/xcursor-themes/Manifest
index 624592c1424e..8f6b6d743ae6 100644
--- a/x11-themes/xcursor-themes/Manifest
+++ b/x11-themes/xcursor-themes/Manifest
@@ -1,5 +1,5 @@
 DIST xcursor-themes-1.0.6.tar.bz2 2363089 BLAKE2B faf6041152d9b42f37ab4d9691f4f11c6b5be52f968f57f88348c0630fb5d5f42ee866ba7ee6072bb4b5ff9121ac36bf49a524b3ceee7e069707dec72767e723 SHA512 2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3
 DIST xcursor-themes-1.0.7.tar.xz 1490616 BLAKE2B d759f4ad2cfa50feace45aef1a3f0e0b561e48ad7c4d47e1f36bee26ad1c95a52aacce989ab6e4127d5a3412948fa08ef0129cc60d0788c19d0b52cb1fde0346 SHA512 910925dd17c576028ae0d9dfe5683888648b941806b53cd9ff74ed18ff2de537664b07ab4c647a55290aeba37f6051f322b29e8ecd54f348e32abe2ccea1c902
 EBUILD xcursor-themes-1.0.6-r1.ebuild 380 BLAKE2B 4893daf7b83baf9843b6b27b5f0dbaaefb230be37e6f635a3f6d03be9c95933a0483fca86ebc8fddd1a70f117c60b200eb535a4c7cde6b51d3a9add5fc23f6d2 SHA512 d5aff60632b60438c982716ae1e41fa25f3c2d08a40db8b1fde997a7c36676362a2f5365b61f71b0c1a88c6d9d33e400304721db442c9331795b40c375d92901
-EBUILD xcursor-themes-1.0.7.ebuild 412 BLAKE2B 8fc9590d8d40c297285d628c229402869fd527a3b95123a87aa7f25967dd4dbb17ff1997c517f7c98cf6a0bec580b6e049689381228770ec94a00578257c1637 SHA512 59548431d1b448e4d507adeee5eaadc6ef33c21e988c6ffa7ddc16d3328bfbf4edfe76ac1c93220a916a66e6d9911807fd2c627ef7ac5ee59becb3db7eae7b76
+EBUILD xcursor-themes-1.0.7.ebuild 409 BLAKE2B 9089f3cc32292019903094711f1e32dbc02afed1dc2fae22f55d4fe9d382621205facd03837bde007ad12845cfd38845fd83793a6664e5a1b759b4bf73be4536 SHA512 79e5271467a3ef06f1373e79beeae5fd41d995b35c984188c443d73aab1bb86b5f3c675ed926a24c40af182edfa02a970bc73d37b0355d8d29a12dba21f4e275
 MISC metadata.xml 322 BLAKE2B 0e8fc67edc246490dfff50c55f15f2187a1eb9d8b94bf84c6e6d9c8958beb050774c9b75310d1074fedff06a9ea89f363406dc7dce431e4b1048f74fb38f77b3 SHA512 9c3ea6d90bdc383209572f66e92222d0c5df0e49e2038086e95735f4595afef882f737012cda33a379101c4b84d346bc14bdc952de18bb451c057fb14e4c6d48
diff --git a/x11-themes/xcursor-themes/xcursor-themes-1.0.7.ebuild b/x11-themes/xcursor-themes/xcursor-themes-1.0.7.ebuild
index ef071db6178f..ec680c19c0dd 100644
--- a/x11-themes/xcursor-themes/xcursor-themes-1.0.7.ebuild
+++ b/x11-themes/xcursor-themes/xcursor-themes-1.0.7.ebuild
@@ -8,7 +8,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="X.Org cursor themes: whiteglass, redglass and handhelds"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	x11-apps/xcursorgen
author	V3n3RiX <venerix@koprulu.sector>	2023-04-08 11:32:01 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-04-08 11:32:01 +0100
commit	74cd29ea4467291ea2c34971de87d6bdc21233e9 (patch)
tree	d7039021b01e3b7bb7d02edc26d71052836b7832
parent	cb861ca8e611e651d4203590e0a9c3c4c2196bd4 (diff)