gentoo auto-resync : 07:04:2023 - 11:29:55

author: V3n3RiX <venerix@koprulu.sector> 2023-04-07 11:29:55 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-04-07 11:29:55 +0100
commit: a17b25a10359070f9527893d861369d378021aa9 (patch)
tree: 02188942c1da9eb507b509fbd36c9b7a5aff86c8
parent: efbb52742172c497c5245486906aade0fb6220e8 (diff)
359 files changed, 3155 insertions, 1254 deletions
diff --git a/Manifest b/Manifest
index 7749c9108cca..1a23064e0b2d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29446 BLAKE2B a27d3317f4e8263897f2aaf41291b940211cf5deee131bd84071a6f45657c574ef69055e19e5792ce400d4696811c860b9d93895be0b367361f85259300fd445 SHA512 7d18d119e3a64837433f7a754339b17f53cb69feef17e333a74146527f6b9144c194eacccbc621fa5772773d4e74eb2a552a1a70049671711386d94d9edbb49f
-TIMESTAMP 2023-04-07T03:39:54Z
+MANIFEST Manifest.files.gz 29440 BLAKE2B 1369d134803761d1833be76faafebdee023bd780f2cd0f1bd4dcfa3eaf252a37ff165bbcc098f1c8c5185df818f1b30828e8028d85b2ab0908b0b1664e34323f SHA512 939f525cc404fbc8d0961a51d848b7e6a39c6f77b71ab9832d0669aa16e0c75409e7ccc2d52ad963288d0d8024d17045504962dffd892851f0f97c861b44b660
+TIMESTAMP 2023-04-07T09:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQvkIpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQv5OhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC8NxAAmUvqpbSrRdHzfGG8k8w2m4y1a7Apd+wa0HvW1ht3BC7gTQTf+WZhxXWg
-f/cELA8Der+oW1XCrxoqFcmM2r8UgYT1T1NCtFs5GH8c+7UK89LR4p+V/UykP28N
-EYtLKRiNF9DSnF48ahJ30wbVH3hm8Zyl6h3WFfKQ+jsXHCawEWeqXdhZVjDtzR9P
-8tz2S5Lf3KiJp2gOOtpx9NF0OdK0qN5FjfdKq4rH+6k8tRADLKgaBG6rzwYUpbw0
-45qWYW7QXpRYZKeB/iTLEsl/PlB90+i4jKhxgr6hMozgdJ1vYE3DWqQkg4y0STWA
-N9ctm7ulEfLlKHn9ZMRlWQo1TIWU3O5oe6zfO+5Yep+3QLNXBQlelZFNr9NPuqll
-VEigyuPkPtuEtaNK/smhrcS0BxDgvsrWPX2ThCGjYf95CxDAV9xvxtA0siZ2Hu/q
-2khaZvdawAzYfXP/rkSfC46tRgXXQUJvL83BCDs3oNsD4JAAjy1kqP0nXjJ2E4Op
-QmG5aU7esf6LFv46YDj80D55HRPe29XlwV0HUwWyINLifOy2gsYCMO5YaTwOIbVg
-lLnC3ZexWbveOMoLlDIrtZvovDcpdueb7yymdWv7hKVwjJmBS51Awz2qLRCbto2A
-mUC6dD6Ckd9YdiqFImSYooa9LfANxtQRwv4XPkKGmogbikcBsCo=
-=U+Yy
+klCSrQ/+Lz1pLcxAmZ9m9gDqG71vbKJETffgjLpvYG1CKc+8aBfCCsbedszCiY7Q
+Mk2h+RVaU9cmfFWm2/IhpQ9X1fJn8+Pdx5dJ/wZ+G0udVspDWvvb2cfL8wcJMss8
+1D+9E1VeUIxxxHekcteuLW6e47qMQx7rlQr68kUkLaoByYgaXY13bCWQq6JXlfDz
+VvSsGKd9jz4qkl0ZdvyptA1x5YjCyyOee98bjxLYcnU2sN9QuV7K0TNaNbzfttpe
+Jz7LuY+iI3Yk7NzjE3+D5VcxYSs9NCE59pPATgEjtuPzcUrbFgIvroCDt4eWZbPd
+XfcQC1NR4ChZ8mJUXstulO8V24x7PmdaVfivPylXWb++ma/XLhhJ2LgqbRZOWmIV
+QL/l0z0wM4SAviin0ObgiuBIh1/XSLN2qdQa0VhQO0jkuuD00H4NUE45ti8++q1k
+OY0yFchs0ih1680Zo4EvBfjXUoxZpc++vLKeCs4aoJLBYaSFxLBxsCEJPeZa0aX1
+29J7F5BG05j41gLIrQaAPmPbyDKz/6feuAoF7bkZdLCSw2mXJAW04DlT/hYPUZsg
+d8sEALPKCdDGFl0765IPXRpKTnwHf4CEuF+7L2H6C/JZGSos3DjHE7pN4XV0hI8U
+P0L4clE5PAcjigmsT5OwBkVrevtfO/5bgVtAMfU5OZ2mQ0iw4jw=
+=BU6H
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 942b766268dc..6101874e5e21 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 89d4dce406ff..a0fb9b28b0e6 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 8c592d33d4ea..70f9f542c44e 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,9 +1,11 @@
 DIST aws-cli-1.27.104.gh.tar.gz 2392876 BLAKE2B 860f0d8ddf4c283d7b4e98ded1c9ca66b23e6a63107be0810b1ec3a513a05196aaa3d613a0597af84f4637621b05ab30e89f221bd47478342693611be5ee306d SHA512 57e26dcca866ab7c30abf0c2e15ea7ce617c0abe123a983157ab188c6c7c8d217d8515f1c9e329ae1fd53561e6aa6711e2ee50d9258fe3aadeca7a9b5de92ac4
 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.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.99.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.108.ebuild b/app-admin/awscli/awscli-1.27.108.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.108.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/sudo/Manifest b/app-admin/sudo/Manifest
index 9c8a13bb4680..b8ae05320699 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 7421 BLAKE2B cee8094fde2c0433194af49bd6dfb66ab545bb6243a16800ac908df4c55e7d6e6166cd975897f7941c46b6d0bf459dfaaee18b49b613d0c896e98ec45a95882e SHA512 ad6f3af68a0e2a15f96012fca004e157a32d06b5b79082b174b4b21e145cd98f8edb86ec4bf93cb88293768e496fc44b6009518990bcfd92583d8f73e745331e
+EBUILD sudo-1.9.13_p3.ebuild 7415 BLAKE2B 6fc567a3d8719666e966993575ca2397e8701719b903e30e73b1fe4cbe4dc2e85713970e6362217d9cdad995d3b511d714da8102a9109341cfb78ec868c7ffd8 SHA512 594b370db24e1a4bf9efd5a459afbcb37fdb5412bfb7e25e723f6a92a6fe7267122e293c5b07f85a8b8a316b6529072a3651806fc8881dbc9678bb2abb8c4ee3
 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 2d77e6863bd9..8a87cf1be355 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-containers/Manifest.gz b/app-containers/Manifest.gz
index fa9ca73e6e72..e3eb99c6002f 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/docker-buildx/Manifest b/app-containers/docker-buildx/Manifest
index 54bbd2b132ae..7b361b41d71c 100644
--- a/app-containers/docker-buildx/Manifest
+++ b/app-containers/docker-buildx/Manifest
@@ -1,6 +1,7 @@
 DIST docker-buildx-0.10.2.tar.gz 9187634 BLAKE2B 9a43a7bcb224f33d718928ef3070449cac4db87c951f4337368d0c994f211d4c3db3a5e9c309ce10e357ab24746bed2507e2867c9fdab3b51a5423787362fee1 SHA512 ba6b8baae1a8e24bf9ddc58d5e2451270fa6e3891bae83112ca00ae56b7a4842b45ec970898ec27a2123e312885bf0d8c58cc600d8462787242eb878f45cd877
 DIST docker-buildx-0.10.4.tar.gz 9184825 BLAKE2B f0e71c0f6dda5f02da4cf0b0514f67f5d339ba10359afc69aae25abf907447fd22fe3d92427299bc67aeaa6a84e748a8a5cbd86151b2baba2dd01f25cc04a793 SHA512 f82b89b8dd4e45524c8d353c4d7588f47b1c7b7ecf759fd9605247c1c7aa0ca152c3ecdec0e0b62b5eef05e6b65d2ca1f5ccab6d75819b92fc92ff62b44105b7
 EBUILD docker-buildx-0.10.2.ebuild 1419 BLAKE2B 9270f5131fc4ff742928ad8308a6017d5ec96dca156b50992d3df77477af5d302be5457b9745026e14f7129aaefb0a0aef6e1ddf3778f2157c73c26adce1f4b7 SHA512 b57cabd264c6e89158107691581ede6fab15cc108c7a7c3248f38c12d3137dd8d610bec6e2757f4c7863bfbebc43a68c6cd82d19d4e3c2ad8b5aefccf0d8b0bd
+EBUILD docker-buildx-0.10.4-r1.ebuild 1509 BLAKE2B 6249c41dd3a487486299280496241ddc5a10aad213ab74ad14588f04f7ff65698411cb22c740804b35861f2d0eebfd4f7fb4119fb10c5c4b5d501e3a87bbe751 SHA512 cae6418005c70a6175452db13be6dae93157e07b9faec4bbf08cd911887b13847cdf7894b2c9fe49951b3323db8e751f9256566e5f1a499b2b337d03bf888901
 EBUILD docker-buildx-0.10.4.ebuild 1542 BLAKE2B 857e629af0ccf5f975884902bb58561aa9dfc65abc4613c7619925e2b0fbbf7b5a26cd073efaac44c61390506e32acf06b4b143812742faf064df07c3bde1d92 SHA512 a8db926dca24e0501448fd951d4bf5f151baf65da1b49ea6fbd5c3e7c50344b5a753f78438344b877535e421f8e5651508bec8e14d0406116865c035756956be
-EBUILD docker-buildx-9999.ebuild 1521 BLAKE2B 1947c4345adb1d3c642f88733330fee5a7e2cfcabe1ed68a8f9dd02f7cc8478d197ccec328a3ab3b206b8b7dfc9bb5a62900d27dc7ea96c82a7b280c905fe4da SHA512 c8559990538a01f78345f2f10650edeb18d89220be9e1125a7f24a5f3ac1d32a6ceda757d39cf30d6fd58bad8f21a2466364f1933cf10fcf64f8ab859b0635dc
+EBUILD docker-buildx-9999.ebuild 1512 BLAKE2B 4ddf44f9fd348b374cc961c2dced227d31b7c915eb513edb14c9f3332cc0f7b3d42ba4e970b2caa99069205f9949853cb68905bd619351527e621c898ec7663d SHA512 8facddba40493ab8b7256fb6d488b37ddfb84fb75abc4c2dcec4fbe1cd6dbdc41a82137ad3a6f1a3439997083f24d206a302c133abb68e0f4a7d6d3166df11e1
 MISC metadata.xml 710 BLAKE2B e54ba5993825b2fa455c7ad33dc37d3edddbf74f19cc2e8ce3260fdac0d581c3c719d5f7252b7836d263efd020b4d3d90d717c3873531055418dbb556f02288c SHA512 f217f1f7f8ac31cbf5516630eea107a686394efc960384c67a216f80b57c61323b6b02b5dd1ae458817a851b9f166c684087790079e48b7d4a2a78130dc2a411
diff --git a/app-containers/docker-buildx/docker-buildx-0.10.4-r1.ebuild b/app-containers/docker-buildx/docker-buildx-0.10.4-r1.ebuild
new file mode 100644
index 000000000000..982bd439623f
--- /dev/null
+++ b/app-containers/docker-buildx/docker-buildx-0.10.4-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+MY_PN="buildx"
+DESCRIPTION="Docker CLI plugin for extended build capabilities with BuildKit"
+HOMEPAGE="https://github.com/docker/buildx"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/docker/buildx.git"
+else
+	SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# This gives us the ability to neatly `-skip` tests.
+# not required once ::gentoo is all > 1.20
+RESTRICT="!test? ( test )"
+IUSE="test"
+
+BDEPEND="
+	test? ( >=dev-lang/go-1.20 )
+"
+RDEPEND="app-containers/docker-cli"
+
+src_compile() {
+	local _buildx_r='github.com/docker/buildx'
+	local version=${PV}
+	if [[ ${PV} == 9999 ]]; then
+		version="$(git rev-parse --short HEAD)"
+	fi
+	ego build -o docker-buildx \
+		-ldflags "-linkmode=external
+		-X $_buildx_r/version.Version=${version}
+		-X $_buildx_r/version.Revision=$(date -u +%FT%T%z)
+		-X $_buildx_r/version.Package=$_buildx_r" \
+		./cmd/buildx
+}
+
+src_test() {
+	# TestGit can't work in a source tarball; TestReadTargets fails seemingly due to parallelism.
+	if [[ ${PV} == 9999 ]]; then
+		ego test ./... -skip "TestReadTargets"
+	else
+		ego test ./... -skip "TestGit|TestReadTargets"
+	fi
+}
+
+src_install() {
+	exeinto /usr/libexec/docker/cli-plugins
+	doexe docker-buildx
+
+	dodoc README.md
+}
diff --git a/app-containers/docker-buildx/docker-buildx-9999.ebuild b/app-containers/docker-buildx/docker-buildx-9999.ebuild
index e46ea450eaef..48941a07ce98 100644
--- a/app-containers/docker-buildx/docker-buildx-9999.ebuild
+++ b/app-containers/docker-buildx/docker-buildx-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/docker/buildx.git"
 else
 	SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
@@ -28,8 +28,7 @@ IUSE="test"
 BDEPEND="
 	test? ( >=dev-lang/go-1.20 )
 "
-DEPEND="app-containers/docker"
-RDEPEND="${DEPEND}"
+RDEPEND="app-containers/docker-cli"
 
 src_compile() {
 	local _buildx_r='github.com/docker/buildx'
@@ -37,10 +36,10 @@ src_compile() {
 	if [[ ${PV} == 9999 ]]; then
 		version="$(git rev-parse --short HEAD)"
 	fi
-	ego build -mod=vendor -o docker-buildx \
-		-ldflags "-linkmode=external \
-		-X $_buildx_r/version.Version=${version} \
-		-X $_buildx_r/version.Revision=$(date -u +%FT%T%z) \
+	ego build -o docker-buildx \
+		-ldflags "-linkmode=external
+		-X $_buildx_r/version.Version=${version}
+		-X $_buildx_r/version.Revision=$(date -u +%FT%T%z)
 		-X $_buildx_r/version.Package=$_buildx_r" \
 		./cmd/buildx
 }
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 902122fea0ce..b5ccc9c9ff70 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -5,9 +5,12 @@ DIST docker-compose-2.12.2-deps.tar.xz 139592724 BLAKE2B fd0e375e9cefe802d6d5577
 DIST docker-compose-2.12.2.tar.gz 305198 BLAKE2B a39a0c2266abc442f1c65ac00da9dd380df85d2aaa9429898461f12138fe64a7a6c74a45b3bb734419b7093ec69a44b49dfc57ff264a2d3cb576a78a0720db03 SHA512 dfb82ecc5a984d7193da164924c1e430d07b6378028dac7264b8084da2e315e5c5091803a5db79fe27ed06b002c62b295d873b9371bd19d4550a37a28f8ec952
 DIST docker-compose-2.16.0-deps.tar.xz 194381032 BLAKE2B 69f06124ac0b2e520b9948e4aab48c0ee9a9c5bef62ca70d70695dfe2ea3c51f69ec2b45f3e1b180b314d520a5d7028d81d5b2d760a747cb2c935c9621be374b SHA512 fd552426ac6befc55efd7dd505dc70a512dd736f12395cf7f107bdd508f95d4bf37d78ebf05e9daa4ac25fce0139c988ffd90cf2822fea8d7cf6666b6b834f8e
 DIST docker-compose-2.16.0.tar.gz 302946 BLAKE2B 3f2e03151be62982749c884af574f13798c2a85ffdf2736641a1df165fcd80c29fa611ad55a0655de6c5cf911783cd3b98392ddc4375b09da0179d774eea4959 SHA512 2158c829de298529e3192cb8e201c554f89fa7554a81eae858470db30b41d03925aa4dce9ef6d22c295625abf67ab181f851f05818dc76e2a5d6c46554d5ca3f
+DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a935977a35edd80d013b6face813ac9622345ffa1ed8e090537ad990c4ee488ecccfe0575f92bb17f8baa0b8dc2104f75d18fac3877 SHA512 4649405eb0e49641265e514ef89cdae47806958611014ab9a9479848e857d85a5c3352ab44ff9ec39af1ca6fab67b6a2ae6c457d44690c1c1bcc3824aeb6fc07
+DIST docker-compose-2.17.2.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
 EBUILD docker-compose-1.29.2-r1.ebuild 1918 BLAKE2B bf3402c6139087a39c13b23710b981f36d7e6f8802ae40d9fabc7360109b2332c8b6d9042c46248c75655aded07ad6ea6a9a69a25c1fcf43a0f53999adf54c25 SHA512 86b1860c5414c7ae77f41e8b4d379332762f10bf5000d944d04ea4384b1baa1d4e9653c98bef32aa8baae4d0c520b5fe23b54fe44286a14c4210e447399a6186
 EBUILD docker-compose-1.29.2-r2.ebuild 1969 BLAKE2B 1b64296bae273bb6ff90991988d94b6470fafe365915183d52e8d56106702fc30d856dc6e23eb7c094bbc4f12bee70ead77d03a31512dd89fed6824ae3151c43 SHA512 43f0a4ab7009a6a4516f30a7432a9a11c60b33a8e845eb9ad0d64f1e9f091cb2fbb32baa04cbdc034d9fa23709ec79cfe2dba12d19588b5b33326c4696d595bc
 EBUILD docker-compose-1.29.2-r3.ebuild 2003 BLAKE2B d1e7de7c5a30ba4bf7d0de36de4da1778e66f20c761cd4edc8801d093dec2c5f882d9997ad60ab039ac048c1692af628a0c3bda94c0989e04f6c269c5caa73cb SHA512 acae66015644f268d94778edc88565016e6a171cc8e4185a9c9607375efc775dc866b8354296db03e2bdfc0dd11691c09ea76f2244618c075e7777dd664ad55e
 EBUILD docker-compose-2.12.2.ebuild 1143 BLAKE2B 65406f19f5454c903ac34ce63653083ec4533707c5e507e56c767f8529b1fdf397573cac69efef2981c77314feced2b5a7723cd6ded71ecd422787b5ad0347ed SHA512 5ba4e727da997ecc072a8ee09b60d5986f7313c8b6c097680c07b67c156cc59f912256b99075de1c0b91f66e81ded4a0411099f89585a7f3c4f26bd0a2a6aa4f
 EBUILD docker-compose-2.16.0.ebuild 1142 BLAKE2B b1889ef6e4657930147d8541a0c6a53eb013f9a81b756d0898617cfe4cb74c2bdb493c34a2707ccef44da87f37273d9cde3e6aacc33d61575155d2acdb7d238e SHA512 921964225e698658fbc716cbde486d3a8e9f062fe11a220aadc7e14a535a0e8a39820af50c228b4ed7b18bcc064a76c270c20f5db0e56d14190538551062383b
+EBUILD docker-compose-2.17.2.ebuild 1158 BLAKE2B e2ee9eb582a2558a1f7cf82a15205184cef7774cc1269fafc389deda3e7b042b46588a52d9f94fef5f3afaabd1c31918ba1e5bbade867e412645bd284c191dea SHA512 2fd7c2e56a6935d4c3f294bbeb4f18d8951060f9f385ce976c2ef8edcb734cfb104788f258e30a32f4c31d101f6010dd595c4da8bcfa1868e71963767e34da12
 MISC metadata.xml 544 BLAKE2B d515d07ee7d2045db1d4a2a0e8f0e797e23b01dea7ab164d9bffc85bc00ddc18a050f296db0a80df8a65c9c554d6e189218a1939b07b29ea823e5eea65d803e6 SHA512 17c3b4e7be1318a36aa744e185d7f7d5571107cecc98eed8fce07b4d905273409b95a202129440082f29be57d6a44eabda43730e8f47cc7c63c04d6d0ed05645
diff --git a/app-containers/docker-compose/docker-compose-2.17.2.ebuild b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
new file mode 100644
index 000000000000..a47ff4eb91c7
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+RESTRICT="test"
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+	default
+	# do not strip
+	sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+	emake VERSION=v${PV}
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	exeinto /usr/libexec/docker/cli-plugins
+	doexe bin/build/docker-compose
+	dodoc README.md
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "docker-compose 2.x is a sub command of docker"
+	ewarn "Use 'docker compose' from the command line instead of"
+	ewarn "'docker-compose'"
+	ewarn "If you need to keep 1.x around, please run the following"
+	ewarn "command before your next --depclean"
+	ewarn "# emerge --noreplace docker-compose:0"
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 6923f691db74..5350af1bf61e 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 42ce300932bd..233c67f45829 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -5,6 +5,6 @@ DIST binwalk-2.3.3.tar.gz 39723775 BLAKE2B d29b709dae0ae406e0ef6142e878a2bbbf0dd
 DIST binwalk-2.3.4.tar.gz 39723471 BLAKE2B a5eac4242402c5034c293432131950bed9aff762c5db86b200a1f555bdfeeb1c6fda225393149f7beca2923141f2ae7930738038f2d039513cb06dfae9601b81 SHA512 5a5e16035dfc05b94ae4ee3969a337336c550606b71e20fcb1f150c4b38ef2084b6a823ce2a8050f4b41616b7d7c31cfb04bf43e7f2c977ab1a634aba9d67fec
 EBUILD binwalk-2.3.3-r1.ebuild 1091 BLAKE2B b970025bc2afe574178ad731f459c8d2f22178bc085bba909a409541d89e3f92434170ac1ac965839c0aab32ebfd2f6c68eb67cb7461c3b67fb68cdf9a8eaaa6 SHA512 5ce189511bc8005632da1ac0edfc0de1cbb4f94b1fb52f7d4df3fce24ef7ee60dcc05b6d4092a7f9ffb89232dc02e2ac0b1a18268d4299bfe24ca478f3a9e82e
 EBUILD binwalk-2.3.3.ebuild 1060 BLAKE2B b73814236722e21dac4b91f62c38007f27d7fbd28065a1586811fab5c0f0a7b56dc1c9170e251720a6c84984821f563108d13876a88474bb6b6aaf737d4eff72 SHA512 5c1c1be8e21351864318b81eb896e3df20a105fbb02df89ca15c41687429e57c57494bcdc3d7988f3e226a539aa375f5fb3493d61824824a92d0691cc6330e22
-EBUILD binwalk-2.3.4.ebuild 1095 BLAKE2B c7a5cd3d3028c8504904a75a4dc20c77c86be09a0e092cb064fa216bebabf39df0ff3c7a299f2db190f0c153b3b32c4050f99add2614c3d728fb8a5e9840cc3b SHA512 d01e7a41f4bc6dc8468457f20a327661f66f9986623a26e8041c31a42732e9e9b2080b32880c3d08ffbf76395bda58efca58eb86dde7bccdcc5ec072a8b63f26
+EBUILD binwalk-2.3.4.ebuild 1091 BLAKE2B b970025bc2afe574178ad731f459c8d2f22178bc085bba909a409541d89e3f92434170ac1ac965839c0aab32ebfd2f6c68eb67cb7461c3b67fb68cdf9a8eaaa6 SHA512 5ce189511bc8005632da1ac0edfc0de1cbb4f94b1fb52f7d4df3fce24ef7ee60dcc05b6d4092a7f9ffb89232dc02e2ac0b1a18268d4299bfe24ca478f3a9e82e
 EBUILD binwalk-9999.ebuild 1095 BLAKE2B c7a5cd3d3028c8504904a75a4dc20c77c86be09a0e092cb064fa216bebabf39df0ff3c7a299f2db190f0c153b3b32c4050f99add2614c3d728fb8a5e9840cc3b SHA512 d01e7a41f4bc6dc8468457f20a327661f66f9986623a26e8041c31a42732e9e9b2080b32880c3d08ffbf76395bda58efca58eb86dde7bccdcc5ec072a8b63f26
 MISC metadata.xml 911 BLAKE2B 6487e4f869597e44106ca7041da5881e8e9c1e2ee4231dfbe3606bcc51257818da35b77a425a815ae7fbc39b71915985559510331f70b2d8b7162599328977c9 SHA512 49e0ad3a76def389ac5657aec056d48d6534d66376623c9cde4751e7e8d52a15b4edb300f07c507ef9e54b4e84d7ec51f5f205d25440f8b1f562980b797ef255
diff --git a/app-misc/binwalk/binwalk-2.3.4.ebuild b/app-misc/binwalk/binwalk-2.3.4.ebuild
index b21509dda458..49bb4746edb9 100644
--- a/app-misc/binwalk/binwalk-2.3.4.ebuild
+++ b/app-misc/binwalk/binwalk-2.3.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 5c3c9b90009f..faafd4a960b1 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/dfu-programmer/Manifest b/dev-embedded/dfu-programmer/Manifest
index 50029327e8fc..4ea970c349de 100644
--- a/dev-embedded/dfu-programmer/Manifest
+++ b/dev-embedded/dfu-programmer/Manifest
@@ -1,5 +1,3 @@
-DIST dfu-programmer-0.7.2.tar.gz 146613 BLAKE2B 85222185bdbfdb90c06ece2a284f6f6e15fe5118a1934948a0bca6364902743a86429ea13d5aabc2a948f6f2ce41177b6021ae85a8ad22b75a026507253380d8 SHA512 429b89192bb5a9653ad8678dfc182bfc30eb057d0d1f72fe88efdf85005d3ad557e0f572f4fad3346f1f1078cd273a289f4bba2663bb1f840e6bf724d5293db4
 DIST dfu-programmer-1.0.0.tar.gz 78504 BLAKE2B ae05a92c95a17ee9b5e2266e380c43d0cdadb3be76e481eb5de321116aa1d930c733ad3a086e239b817a475d36185157715e7907d564c2001a9ce25df01d46c6 SHA512 abb73970e10017f111b118c5be0b98a3fe7ef8c95794b5ca701f21b5a40f518f46ff8a392f09e7eea2ad9a4eb6c43ecc9514bee817c01acf0d6135a5f8f9048f
-EBUILD dfu-programmer-0.7.2-r1.ebuild 1272 BLAKE2B e396e4aeeda24b974a914dd3bfd4fae76a727845246e17c5c2d0b630b353e384f2bffecd5424e761ba6828d9346b279184ef4c09963a66a55442508eb3fc183b SHA512 dfb3a40db708e16e4e80b10f1fd614f8e0be80ae40335493f2cd900b5f51f6e1ef1aca97803662773b23ebb8fa84d7862db4a67af3622f829a3ce7ec62f3015e
 EBUILD dfu-programmer-1.0.0.ebuild 1207 BLAKE2B 02a61e67db0ee04d73598eaca86f1f8041efb3561b62aa33bdb3c5d4b55090a1a93ab896179f082a328f3609113e929ef4f4b1565f035f1ea7fdcf4e085ae2e1 SHA512 563fe1549fba6933af9f6fd7bea5b5ad1ef78d44c5ecb31b752ef7464b9f0e16b542d5e2c04377a850f9c24f6277955f3733c971c539a023ed9045dd5d197206
 MISC metadata.xml 405 BLAKE2B 2df0f01b21eced13afb92b9e0c07d4a6f984c86a82013d60e2a1fd93cfc216c89b4b6464bd25dbf59f572147da411a8ddaa7fcb6d1fb7feb47d3b124491505a7 SHA512 d7e43077a6c74c5fd982a084abaca6de9995658d05fc9a0617a39228202cbd62ffcf382f7b0969113b6a7bdb0d65a150c7fdd75df09c9734d8ea23e20db13a1a
diff --git a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild b/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
deleted file mode 100644
index fc823eeb789a..000000000000
--- a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="A Device Firmware Update based USB programmer for Atmel chips"
-HOMEPAGE="http://dfu-programmer.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64"
-IUSE=""
-
-RDEPEND="
-	acct-group/plugdev
-	virtual/libusb:1
-	virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Upstream has fixed this in their configure already.
-	tc-export CPP PKG_CONFIG
-	sed -i \
-		-e "/LIBUSB_1_0_CFLAGS=/s:=.*:='$(${PKG_CONFIG} --cflags libusb-1.0)':" \
-		-e "/LIBUSB_1_0_LIBS=/s:=.*:='$(${PKG_CONFIG} --libs libusb-1.0)':" \
-		configure || die
-}
-
-src_install() {
-	default
-
-	cat <<-EOF > 70-dfu-programmer.rules
-	#
-	# do not edit this file, it will be overwritten on update
-	#
-	EOF
-	printf 'SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="%s", MODE="660", GROUP="plugdev", SYMLINK+="dfu-%%n"\n' \
-		2ff{a,b,9,7,4,3} >> 70-dfu-programmer.rules
-
-	udev_dorules 70-dfu-programmer.rules
-}
-
-pkg_postinst() {
-	elog "To update device firmware as user you must be in the plugdev group:"
-	elog
-	elog "usermod -aG plugdev <user>"
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9fee0f5ee2d6..8d187a1c6562 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 4d19cebd8a30..e8f96636cd1b 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,3 @@
-AUX batik-squiggle.desktop 177 BLAKE2B 7f4fbc31f31f6ddbdb7802ad4ea6b87c21b39b83cec2caf5f8b68634693b05c66e3f7da6d2cf69f5da6defa2d44fa4c5a0eba4af13308b8f18fb666be86b1d40 SHA512 7e7be90a0a779752cf04bbb1e702f5f3ca773129f7dfebcc3352e55f81cad2d65f6067e07c075f730b7f11235529804856fc226703b5e213216bc110dd978d8e
 DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab SHA512 024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250
 DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03 SHA512 7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea
 EBUILD batik-1.16-r1.ebuild 6520 BLAKE2B 168b507f647f73db2e51ee899269cf737602fde22bc8f9c6d1eed8546283cedbdc3d1e61d3394995b49499c3f3d7da7b3e96d8834c35d4082bee34ee698fed8e SHA512 ea78c70ab833ed6fec2c64f13d89bd4f26f6c53ee5bab5cfed03df6e104aa8d3b96c28fe9d88742c7381de60b360cfe6e7f77c5869fea0066ab90d7e55c41286
diff --git a/dev-java/batik/files/batik-squiggle.desktop b/dev-java/batik/files/batik-squiggle.desktop
deleted file mode 100644
index 95bb990177c7..000000000000
--- a/dev-java/batik/files/batik-squiggle.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Squiggle
-Comment=SVG browser
-Exec=batik-squiggle-1.14
-Icon=init
-Terminal=false
-Type=Application
-Categories=Graphics;VectorGraphics;
-MimeType=image/svg+xml;
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 95ee32ee2057..1eb29628b511 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,4 +1,8 @@
+AUX fop-2.8-skip-failing-tests.patch 2005 BLAKE2B 09e9d3625bce2422aa24a7af5e395f9e92a830a2630010478082591bf1a9f12b04a8667107f40b084bda1d431c0dd665bf2355be1d61155cebaa75fecec64373 SHA512 fb18b67c8c70a0c87d818ae9f73eabfe0747932a12df3cb378441a67937e2f84e9eb885bb6981abde97863f861beec6013cad183da8d2e372cafadc18c6401ee
 DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
 DIST fop-2.8-src.tar.gz 22855369 BLAKE2B 183649f531068b8f7513613c89f9f66a48894ab97a659e110b91853d5dffc1664d3830a8ced9ba221e22ca02fc51aed991ddee0e927cab59b9160a504f6dab02 SHA512 22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357
+DIST fop-2.8-src.tar.gz.asc 833 BLAKE2B f761b427bac89249ab4ab5f2194468e44f997e28ed77392a785764fb60dd2fbbc716ef881e2009a3dbad416ef195fc8ae4d2ebdbd63c3fb3f47d355acab8389b SHA512 c25e94ac4a72c9ff9bfa487369ee1510ab5b19a6178f14f5076b9cf0548044e79eca707025e962c63d268d0f48661cc7110f604036957e447f8413cdb582d3de
+DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3
+EBUILD fop-2.8-r1.ebuild 5406 BLAKE2B fcb10267ec55275224deadf206f60a2a983b61ed35750ade82c5f5e5f959e7dc1da390034fcaaa422adb154afc2681f6452a1cabb27b1b8b16ef573df2172998 SHA512 4d2c53a6692f33191d5a9857efd6bb3857b8152212a56e5cfa2a398cb21ba4365d41a1c4c6ef1135e36d0ae5df598590cfb5dba29016947dd39638cf8f493301
 EBUILD fop-2.8.ebuild 4393 BLAKE2B 7c5aa2c102b5300d830f5d6e35441050eeffbf2f1e5d3532c765c56cad3d5015a4b50b643cb55dd60bd02572b6e21ae68d7d26713bf3a05b5213cc392cb3f9cf SHA512 1f0778c3411a729120de6d56cfe73f701a28c8849588c606fb5e091949f1d7a87330369bb7bf1336abef9a01c3e054139fec62c989687079da6b82aae44733fa
 MISC metadata.xml 449 BLAKE2B 91dd2fd3b50581a408755aade7aa37406c527e9298bd0156cb18d363fef88cf60eb85f259ba443022fbd6c5377be0e0fc990cb2826d418347dc92bf7b6ff5ca9 SHA512 cf49f03d1ed992a7df7deebb7c00721895be45ff144da8c4b1777aecba5e17d86a7353a83ad8df8b356f70afda5fadcdc53350b2c5732a0f0469b18f501959d4
diff --git a/dev-java/fop/files/fop-2.8-skip-failing-tests.patch b/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
new file mode 100644
index 000000000000..729795e93fd2
--- /dev/null
+++ b/dev-java/fop/files/fop-2.8-skip-failing-tests.patch
@@ -0,0 +1,48 @@
+# https://bugs.gentoo.org/903880
+--- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
++++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
+@@ -43,6 +43,7 @@ import javax.xml.transform.stream.StreamSource;
+ 
+ import org.custommonkey.xmlunit.Diff;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.w3c.dom.Document;
+ import org.xml.sax.SAXException;
+ import org.xml.sax.helpers.AttributesImpl;
+@@ -144,7 +145,7 @@ public class FO2StructureTreeConverterTestCase {
+         assertNull(d.getStructureTreeEventHandler().startNode("table-body", null, null));
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testRemoveBlocks() throws Exception {
+         keepEmptyTags = false;
+         compare("<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">\n"
+@@ -180,7 +181,7 @@ public class FO2StructureTreeConverterTestCase {
+                         + "</structure-tree-sequence>\n");
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void testRemoveTableHeader() throws Exception {
+         keepEmptyTags = false;
+         String fo = IOUtils.toString(getResource("table-artifact.fo"), "utf8").replace("role=\"artifact\"", "");
+--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
++++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
+@@ -25,6 +25,7 @@ import java.io.File;
+ import java.io.IOException;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.xml.sax.SAXException;
+ 
+ import static org.junit.Assert.assertEquals;
+@@ -61,7 +62,7 @@ public class PDFEncodingTestCase extends BasePDFTest {
+      * Test using a standard FOP font
+      * @throws Exception checkstyle wants a comment here, even a silly one
+      */
+-    @Test
++    @Test @Ignore
+     public void testPDFEncodingWithStandardFont() throws Exception {
+ 
+         /*  If the PDF encoding is correct, a text dump of the generated PDF file contains this (excerpts)
diff --git a/dev-java/fop/fop-2.8-r1.ebuild b/dev-java/fop/fop-2.8-r1.ebuild
new file mode 100644
index 000000000000..487cd4d7cade
--- /dev/null
+++ b/dev-java/fop/fop-2.8-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:fop:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="XML Graphics Format Object Processor All-In-One"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/"
+SRC_URI="
+	mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
+	https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz
+	verify-sig? ( https://www.apache.org/dist/xmlgraphics/fop/source/${P}-src.tar.gz.asc )
+	test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
+"
+S="${WORKDIR}/fop-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="2.8"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/batik:1.16
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+	dev-java/fontbox:0
+	dev-java/qdox:1.12
+	dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/ant-core:0
+	dev-java/javax-servlet-api:2.2
+	dev-java/sun-jai-bin:0
+	test? (
+		dev-java/mockito:2
+		dev-java/pdfbox:0
+		dev-java/xmlunit:1
+	)
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="dev-java/xalan:0"
+
+DOCS=( NOTICE README )
+
+PATCHES=( "${FILESDIR}/fop-2.8-skip-failing-tests.patch" )
+
+JAVA_CLASSPATH_EXTRA="
+	ant-core
+	javax-servlet-api-2.2
+	sun-jai-bin
+"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xmlgraphics-fop.apache.org.asc"
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	java-pkg_clean
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() {
+	JAVA_JAR_FILENAME="fop-util.jar"
+	JAVA_SRC_DIR="fop-util/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
+	rm -r target || die
+
+	JAVA_JAR_FILENAME="fop-events.jar"
+	JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
+	JAVA_SRC_DIR="fop-events/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
+	rm -r target || die
+
+	JAVA_JAR_FILENAME="fop-core.jar"
+	JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml )
+	JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
+	JAVA_SRC_DIR="fop-core/src/main/java"
+	# Code generation according to
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L156-L225
+	pushd fop-core/src/main/codegen/fonts > /dev/null || die
+		local fonts=$(find . -name "Courier*.xml" \
+			-o -name "Helvetica*.xml" \
+			-o -name "Times*.xml" \
+			-o -name "Symbol.xml" \
+			-o -name "ZapfDingbats.xml"
+			)
+		for font in ${fonts}; do \
+			xalan -XSLTC \
+				-IN $font \
+				-XSL font-file.xsl \
+				-OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
+		done
+		xalan -XSLTC \
+			-IN encodings.xml \
+			-XSL code-point-mapping.xsl \
+			-OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
+	popd > /dev/null || die
+	java-pkg-simple_src_compile
+
+	# Update "fop-core.jar" with "event-mode.xml" files produced manually
+	# by running "mvn package".
+	# Upstream does this with maven-antrun-plugin:
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L269-L290
+	mkdir event-model && pushd $_ > /dev/null || die
+		jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar"
+	popd > /dev/null || die
+
+	jar -uf "fop-core.jar" -C event-model . || die
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar"
+	rm -r target || die
+
+	if use doc; then \
+		JAVA_SRC_DIR=(
+			"fop-util/src/main/java"
+			"fop-events/src/main/java"
+			"fop-core/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2,pdfbox,xmlunit-1"
+
+	einfo "Testing fop-events"
+	JAVA_TEST_EXCLUDES="org.apache.fop.events.TestEventProducer"
+	JAVA_TEST_SRC_DIR="fop-events/src/test/java"
+	# This jar file was created manually from the output of "mvn test".
+	# Upstream does this with maven-antrun-plugin
+	jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
+	java-pkg-simple_src_test
+
+	einfo "Testing fop-core"
+	pushd fop-core/src/test/java > /dev/null || die
+		# Excluding one test, see https://bugs.gentoo.org/903880
+		local JAVA_TEST_RUN_ONLY=$(find * -type f \
+			-name "*TestCase.java" \
+			! -name 'MissingLanguageWarningTestCase.java' \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd > /dev/null || die
+	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_8/fop-core/pom.xml#L297-L307
+	# <workingDirectory>../fop</workingDirectory>
+	pushd fop > /dev/null || die
+		JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/fop-hyph-2.0.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-util.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-events.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":../fop-core.jar"
+		JAVA_TEST_RESOURCE_DIRS="../fop-core/src/test/resources"
+		JAVA_TEST_SRC_DIR="../fop-core/src/test/java"
+		java-pkg-simple_src_test
+	popd > /dev/null || die
+}
+
+src_install() {
+	local module
+	for module in fop-util fop-events fop-core ; do
+		java-pkg_dojar "${module}.jar"
+		if use source; then
+			java-pkg_dosrc "${module}/src/main/java/*"
+		fi
+	done
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+	java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
+	einstalldocs
+}
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 341c61a86ac2..ca8d3a3d1bd2 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,5 +1,8 @@
+AUX mockito-2.28.2-skip-failing-tests.patch 2622 BLAKE2B 70862d1fe8376ad2514fa53c15e1f6e83dde17d7ff1a8a09701897d89b27ca6a339c532b2615436da727b10c8ec69a0fadda5c841ebb64be12fbd8e8ded6b5ad SHA512 646649ec712b958f02c862ee8d2a52259e5458812f838d9d2622544154c35270a5f5a731c8193850fc804ede87fde1a7d54abef8d4136b5619ac01664f9539e8
+DIST mockito-2.28.2.tar.gz 875085 BLAKE2B d0aab378c028530724156f999700506fe64f5bf19371dc9b957e34924d3d17b8191f093054c6dde4f5879d61ddf9614a60b1fd597aae09b92abf559c08fbcdf7 SHA512 9921fe9ffbdff4d7a9a8de56aa5078e68eb6bee38f379f58059dcc42da07a59b7e5953309d646e1fb760f7135f5076e201529370cc5df56d685f7acb08311ea5
 DIST mockito-4.11.0.tar.gz 1050218 BLAKE2B 7f7298e233c9cdb0b475aa201300a1063fd8efc587f3a4de0cb1caedd6f6506a32f8e9b0548fa5898892515ec96625153a1a2ad65fc8070b7dc6c254206fbbfd SHA512 b1de01c8e9b2fc4eef0013af562efeac7e22babdebbd8c7842ecd55071627e11c5e6ab575436990ea70d4ceefb56fc260333278c8d4b833e454956bf89841fc5
 DIST mockito-core-1.9.5-sources.jar 723074 BLAKE2B e553a923542a1a2574ee0cda5979d168cc3e9644dbbc9fceed2301ae1bac150c4e35dbc4432d50e2479efea2a6cd35ec19c62c3598f61709f1f5dc8959cc0155 SHA512 271e626c3b5be9a7d7c82a2f0bf44077aabd51924b0956a88633ace7fe8c134d8cd1f89ce348ce0d15ccce55a50027e303836d2d2f430500317b6136d308d3d4
 EBUILD mockito-1.9.5-r3.ebuild 713 BLAKE2B d46334ba15f68eef38b979b4c8bd84ad51fdfd61f2d33f77f3230876802c753a6fdbbb0422edae5de79f931b314c7bfbc63266de9dabbc9327ed7b1a302d517a SHA512 73886d139804085b34e67902a67af34358c7abd1083bbd2e21d6cec7b149d273307312d42351236fe6628e237685c4e1f62bcfc7333e1af32017fb97183e7f34
+EBUILD mockito-2.28.2.ebuild 3325 BLAKE2B 482449d78d6f9f254ace1d669981f766423e5d38351d4c794b38875bdd6b80668db8fd6a636f0d3202b7216cb70fda81ebd587dc2f9bf60cf9f23561d336cce2 SHA512 ac0109f40d058dd98975478d420f95a85f9bee75fbc24e5fa630a89aaca1871f696876434cebacdbda380f2f64c607742948193e93751fdb0c3a98e9b326e9e2
 EBUILD mockito-4.11.0.ebuild 1237 BLAKE2B baf80f24433502cae15d281ca1f2f020c22c3dd82d8a4e0068ceb6f82e0c336b2b6fc65ea77e3eab305c3402d73326886d8a166de38c2b67a5a5c121ff6d1fba SHA512 e23720020cfd5047ae59927a66dc8d2a709b50f47b71035493e06ec1fc2b83dac08bbdacd06fb131d610047e7f55f91cefcff1be28ec8b65f08407b2eb1647a5
 MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b
diff --git a/dev-java/mockito/files/mockito-2.28.2-skip-failing-tests.patch b/dev-java/mockito/files/mockito-2.28.2-skip-failing-tests.patch
new file mode 100644
index 000000000000..06bf5bcd6346
--- /dev/null
+++ b/dev-java/mockito/files/mockito-2.28.2-skip-failing-tests.patch
@@ -0,0 +1,82 @@
+# https://bugs.gentoo.org/903897
+--- a/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java
++++ b/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java
+@@ -6,6 +6,7 @@ package org.mockito.internal.creation.bytebuddy;
+ 
+ import net.bytebuddy.ByteBuddy;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.mockito.Mockito;
+ import org.mockito.internal.creation.MockSettingsImpl;
+ import org.mockito.internal.handler.MockHandlerImpl;
+@@ -134,7 +135,7 @@ public abstract class AbstractByteBuddyMockMakerTest<MM extends MockMaker> {
+         }
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void instantiate_fine_when_objenesis_on_the_classpath() throws Exception {
+         // given
+         ClassLoader classpath_with_objenesis = ClassLoaders.excludingClassLoader()
+--- a/src/test/java/org/mockitousage/matchers/VarargsTest.java
++++ b/src/test/java/org/mockitousage/matchers/VarargsTest.java
+@@ -19,6 +19,7 @@ import org.assertj.core.api.ObjectAssert;
+ import org.junit.Ignore;
+ import org.junit.Rule;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.rules.ExpectedException;
+ import org.mockito.ArgumentCaptor;
+ import org.mockito.Captor;
+@@ -78,7 +79,7 @@ public class VarargsTest {
+         verify(mock).varargs((String[]) isNotNull());
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_oneNullArg_eqNull() {
+         Object arg = null;
+         mock.varargs(arg);
+@@ -86,7 +87,7 @@ public class VarargsTest {
+         verify(mock).varargs(eq(null));
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_oneNullArg_isNull() {
+         Object arg = null;
+         mock.varargs(arg);
+@@ -94,7 +95,7 @@ public class VarargsTest {
+         verify(mock).varargs(isNull());
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_nullArrayArg() {
+         Object[] argArray = null;
+         mock.varargs(argArray);
+@@ -118,21 +119,21 @@ public class VarargsTest {
+         verify(mock).varargs((String[])any()); // any() -> VarargMatcher
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_oneArgsOneAnyMatcher() {
+         mock.varargs(1);
+ 
+         verify(mock).varargs(any()); // any() -> VarargMatcher
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_twoArgsOneAnyMatcher() {
+         mock.varargs(1, 2);
+ 
+         verify(mock).varargs(any()); // any() -> VarargMatcher
+     }
+ 
+-    @Test
++    @Test @Ignore
+     public void shouldMatchVarArgs_twoArgsTwoAnyMatcher() {
+         mock.varargs(1, 2);
+ 
diff --git a/dev-java/mockito/mockito-2.28.2.ebuild b/dev-java/mockito/mockito-2.28.2.ebuild
new file mode 100644
index 000000000000..c055b2705a67
--- /dev/null
+++ b/dev-java/mockito/mockito-2.28.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.mockito:mockito-core:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Mockito mock objects library core API and implementation"
+HOMEPAGE="https://github.com/mockito/mockito"
+SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/asm:9
+	dev-java/byte-buddy:0
+	dev-java/objenesis:0
+"
+
+DEPEND="
+	dev-java/junit:4
+	dev-java/opentest4j:0
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? ( dev-java/assertj-core:3 )
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+# see https://bugs.gentoo.org/903897
+PATCHES=( "${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch" )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
+JAVA_CLASSPATH_EXTRA="junit-4 opentest4j"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_EXCLUDES=(
+	org.mockito.internal.junit.JUnitRuleTest # We run it in JAVA_TEST_RUN_ONLY
+	org.mockito.internal.util.reflection.DummyClassForTests # No runnable methods
+	org.mockito.internal.util.reflection.DummyParentClassForTests # No runnable methods
+	org.mockito.junit.TestableJUnitRunner # No runnable methods
+	org.mockitoutil.TestBase #  No runnable methods
+)
+JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4"
+JAVA_TEST_RUN_ONLY=(
+	# This needs to run separately, otherwise one of its 4 tests would fail.
+	org.mockito.internal.junit.JUnitRuleTest
+)
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	default
+	# dev-java/byte-buddy is built from byte-buddy-dep without shaded stuff.
+	sed \
+		-e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \
+		-i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \
+		-i src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	mv target/classes/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.{class,raw} || die
+	jar ufv mockito.jar -C target/classes org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.raw || die
+}
+
+src_test() {
+	# Increasing number of test failures with higher Java versions
+	# Test failures are documented in https://bugs.gentoo.org/903897
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 11; then
+		JAVA_TEST_EXCLUDES+=(
+			org.mockito.internal.stubbing.defaultanswers.ReturnsMocksTest
+			org.mockitousage.bugs.GenericsMockitoAnnotationsTest
+		)
+	fi
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXCLUDES+=(
+			org.concurrentmockito.ThreadsRunAllTestsHalfManualTest
+			org.mockitousage.matchers.InvalidUseOfMatchersTest
+			org.mockitousage.serialization.DeepStubsSerializableTest
+			org.mockitousage.stubbing.StubbingWithDelegateTest
+		)
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED )
+	fi
+	# First run what needs to run separately
+	java-pkg-simple_src_test
+	# And then the other tests
+	JAVA_TEST_RUN_ONLY=""
+	java-pkg-simple_src_test
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 542651a0ec4c..9fa2b00c1ec3 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 8eedea37a3b6..d1a3b7640e20 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,5 +1,5 @@
 AUX zig-0.10.0-build-dir-install-stage3.patch 1430 BLAKE2B cca909207cadfe1c9b31b9481a705882506363aaf41db7672f42cc66937f85f7b2f2b53346d29a4d748d1aef05e77efcc6e668ac498a7d172a6d8654034d5c4a SHA512 6704adb1f146ed78c8030aad2c739e30d0ec7ffda40273b5520914b16cc67d497afd9b1b59a1acfbb0097d7f5b0a5517973c45ef43ccbc35d8af051500577117
 DIST zig-0.10.1.tar.xz 15143112 BLAKE2B 4954d95ad763000eedf73a78e62bc0e99d65bba91c7127cdf1ea4503eb67817265daf572f645b7efbe9e24087e690b2768f0b2bc6c43b5fd76eab33143e964fe SHA512 d443adf61556bc95470537c6b0371a0ac99d19a06b15635cf1e5055ae7849039680c9006105e06e1bd6ba0fc12da14c54c1d28ac597c7dee17ee3a5cd9cf79f8
 EBUILD zig-0.10.1-r2.ebuild 5020 BLAKE2B e1bd6c9a3f256bd6a0a8d3ed3ef0313a30b1570f14e838d496ce618f6104af570b201d88bd6f31711ef55eb94d96796be230ae7c1d04b9eb7a0dd1ffc5188be0 SHA512 ad280c38779573a03b29b182a7b61aa98b3260811240c3ce19716e98b13b1dd9dc4865a265d5bfc048b1ae38026aded35bc25b2ffbbddb6aff7e181f5694c850
-EBUILD zig-9999.ebuild 3730 BLAKE2B 3f292991c40971e0e9430684b97956d548dde7dbd283b726017418a0df7c43c93b8d78e5f0bef316097e3e6be7b986cf0c41ee327ba6d0290c2eb22a99a5a941 SHA512 71a1d22b46fd774ad444becde28ba321e7fd676c2e6431d9fa31a863e425018352921594e9873adfd6f77bead1d72a75b80e3854a04b985b7ae0d8ace06b854a
+EBUILD zig-9999.ebuild 3730 BLAKE2B f50bbad9233d63114c2dda8b54d0f2d082f8be26a0562e72cad8fc5148af99900b6c3621c6f82d2c042cd92d078686cb693b7356c3b44c69fab4fbf9db81e1a2 SHA512 628a39830028519868017083b11f0194c0144a7ebb4ca4f762230454577b80f1e360420dd2d8832d42808b1028e66aedbd039699b5e8d394a2c46f4c1e1a7eab
 MISC metadata.xml 541 BLAKE2B 6f5c7fbf759f0430f69073a17a0dae4b8bebf335b54c3b43da6b24104dc3de05a3b686cddbbd31e4dae1fc31695a2f08d000d22437ed6f1847de8fa95e3b1952 SHA512 d49cf0a8ad76ac9a6f6fb091effddbbcd812b56f91df6d3c782e15197cb4ff4423fb1076671a232aabcb9833af19ef8c820ad6df312a1e4d72e665680314c083
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
index f0ac403fd612..2fbe3863ef40 100644
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_MAX_SLOT=15
+LLVM_MAX_SLOT=16
 inherit edo cmake llvm check-reqs toolchain-funcs
 
 DESCRIPTION="A robust, optimal, and maintainable programming language"
diff --git a/dev-python/Faker/Faker-18.4.0.ebuild b/dev-python/Faker/Faker-18.4.0.ebuild
new file mode 100644
index 000000000000..f1e5f5fe409a
--- /dev/null
+++ b/dev-python/Faker/Faker-18.4.0.ebuild
@@ -0,0 +1,34 @@
+# 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="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 6b57d428e9b0..ad5caee85d39 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -4,10 +4,12 @@ DIST Faker-18.3.0.tar.gz 1662268 BLAKE2B 072dcb435712e0aee52bf0c1fa381ddefe3cd06
 DIST Faker-18.3.1.tar.gz 1662197 BLAKE2B 7daad7b60e7ff3db6cd1480b2f32a26f6bf40b092ea878cdc0d1ebc8d2a5b4e8fedb17bb97f98e95721d09b8fab9975cbb07f3564726a77d3fb10e8726ad3ca6 SHA512 a0ee73140f87a13b6e9ab38b346d91016b45d07845373955ed50eb3e2f10cd3755d488d80b30409c5548845bb56478764661f809231be07afdae5d7f981a536d
 DIST Faker-18.3.2.tar.gz 1649241 BLAKE2B e4defb3df2b344effa67769a2b7a28fd3c69a0d7c5b6ace0c495fed1dcd4594989c635679152f6eb4b1f53aa0cc7aa3b5343b02901863ed97b52e128b3aeeae6 SHA512 f0cadd36b40aaa81d2108d674d6b5504918bd0a75cddaccdcd3acb8f290edb15d4797ca35a7f3f747801907dff60e5e69dfb25937fdef6c0b9c527fe9be370d1
 DIST Faker-18.3.4.tar.gz 1662937 BLAKE2B 2212c2a005fe5644a8357324ace3ece1570046231907650c115c63b392e4d607e6361cd1b92e9829572955a342208e5a238f771dd2d54f5361e3b3754ae002fe SHA512 90ac99eab6b55d3c8989266e5dc6dc20a749cf798df331132fb1f85fcf77ecc2c87538e0a80ba89b5ca6e39b8ac407372fb5e5442489d23daaacd66303defdee
+DIST Faker-18.4.0.tar.gz 1664014 BLAKE2B daf3ea7f05bdaab27a70d72b26042a0a205963d56848b97d45ad8a4e04dfbbffecc1ffb94dc0570fca7ea339df9e28a6cde85b879589f4619eccddd71fc5b686 SHA512 a0c0d1b5eb087dfe160248c4ecc0fe7ea037aad715f62621f9d4764cadc684741db025b39af511b38577818f9087ba11950962f618dfd18d08f30b18d89b1b56
 EBUILD Faker-17.6.0.ebuild 682 BLAKE2B 6e4f513383d927ae62995083ce32a75635a14844754fcaaa52313a7aaa98118e82f018a82c381a5347a2df0ddf9e7bc68f78438fbd4336b8cd51562bf335b9d8 SHA512 83e54f767935b0a45f0f50b4df871213cf7cd968fd73c9c1502895fe4fe1d0f533fb249c478aa89b78414f8198b6b2d123931c0096e1582fa5e8a76bf3767069
 EBUILD Faker-18.2.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 EBUILD Faker-18.3.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 EBUILD Faker-18.3.1.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 EBUILD Faker-18.3.2.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 EBUILD Faker-18.3.4.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
+EBUILD Faker-18.4.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 972fdb9a7ae0..6844e128dc60 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 095f4d63917a..54ae9f6fb098 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,7 @@
 DIST serverless-application-model-1.62.0.gh.tar.gz 5177544 BLAKE2B ad0fdca32821e9b5dab86d03e65ad1a458493ecba0e75f6b2dc8b9978a6085ae5269496e231a2f09cd228e6bd2a66b3803953d2ca5aa7c265fa1019305aa1a9c SHA512 42f1d3ff352a02ab73f5a16cfeb800a80852986b09f71d9468b23c22b8dafff3a20e8ac92956020280884e4318bd80369b5b04ea6e9f0a28067dd792f1623747
 DIST serverless-application-model-1.63.0.gh.tar.gz 5213667 BLAKE2B b75315d1c28789e9f0b8aa4774292ff2531806c1d59a8c16ab683fee439d188025c9cc62c2de037f2d947ad3b7eaa8bb4fbe8a5507ef1a4f3619f758cdf2eadc SHA512 eb6dc0f545550f726b59a2ea1994f8dfcc8eaf7a1fbca6ab12bfbe891813b208d869e25c0b320411aa6476dcf8c86fb19db9e13ddf0419d90d3c3403bd57485c
+DIST serverless-application-model-1.64.0.gh.tar.gz 5231257 BLAKE2B 53eeb37d69ae0f133b936eb8bb20005ecdad5d71956becd61a9e9080be9bead1bebe98b89d0f67604ac74731b2ac7061f74fae67f0c8e12bf10f7a9dfc40eb3e SHA512 9584657026ca7c260fb9851e8669b19c896a88a4455c6e50e734c1d9b375b69d5cf85b64f960fa0987e8a34823343de3e8c8080413da07fcfb69dc491e72c761
 EBUILD aws-sam-translator-1.62.0.ebuild 1544 BLAKE2B 9572110682a5bfaeee90d69c6026a0130cacda3efb2d2da2952d675f5764745fb8fa7e7b1e586b2b029f5d8b955d9934228210734b060af23abdde9b2e18c487 SHA512 48956aabc1cd71db9d3cddb180c37387c8e5e4e314411a41f3ad791bbe6b2435208c9e045dead45d6e10944271b7f9954e2d1ae9290a3078d1e35391c0f52512
 EBUILD aws-sam-translator-1.63.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
+EBUILD aws-sam-translator-1.64.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.64.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.64.0.ebuild
new file mode 100644
index 000000000000..5a83e871d7a8
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.64.0.ebuild
@@ -0,0 +1,60 @@
+# 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
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 1e12a4bdd447..1d12e9e6f2f4 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,10 +1,12 @@
 DIST boto3-1.26.104.gh.tar.gz 630394 BLAKE2B 8444d5c3d0c60db0a77d7d96d518ffd6d10a62075a774173e990077b6e8a29ddc202eec997c0c7f4efbad5eb4235bc47b9a8144419a9d4d48006c1240732baea SHA512 cf456b10474e50d666582c585a350bf6abb80f4357938909444a6795206e513655d1f63178851c33a73bce428c0f5de5bd252707cf959a6c92aaa4f5130a1550
 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.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.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.108.ebuild b/dev-python/boto3/boto3-1.26.108.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.108.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 62c02b5f5b11..c7cb7af61f13 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,10 +1,12 @@
 DIST botocore-1.29.104.gh.tar.gz 11360726 BLAKE2B f051024952f137e42a544d60cefbcf4f359a4b68bfad332060703db6e04ff448b6b501541bc1d372aa6d9f30be6931110a02b40505d3fb2de77560bddc0e0d88 SHA512 c97b01240c5502a94d9afaea061e47155efb8a9c11f86778ef3c1595f40cf24f600116a5728025df3af6ed3466115fb94a046dc2e0fb2ed47a1233ffa0def027
 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.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.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.108.ebuild b/dev-python/botocore/botocore-1.29.108.ebuild
new file mode 100644
index 000000000000..491b6bbc21f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.108.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/braintree/Manifest b/dev-python/braintree/Manifest
index 0a5a5b33a3f5..60923a6ae8a3 100644
--- a/dev-python/braintree/Manifest
+++ b/dev-python/braintree/Manifest
@@ -1,3 +1,5 @@
 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.19.0.ebuild b/dev-python/braintree/braintree-4.19.0.ebuild
new file mode 100644
index 000000000000..cac06c3579d5
--- /dev/null
+++ b/dev-python/braintree/braintree-4.19.0.ebuild
@@ -0,0 +1,39 @@
+# 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/
+"
+# no tests in sdist, as of 4.19.0
+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/coverage/Manifest b/dev-python/coverage/Manifest
index 9b3b52413f3d..d30e9ff81b6f 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,3 +1,5 @@
 DIST coverage-7.2.2.tar.gz 812407 BLAKE2B 901ed01eb8411e01c3386dcecccf975f4ac0e46c14fd2c6086bcf83647ff7e26deccb3926f173a207ef2851c0f8c5f99874659a1ba2e16f85b6eb9a1ac23142c SHA512 7d2ba6540ca42c3a72b65343348a64c58156bac915434249fd8740a6727ebf034590f62a5557f6b2f76e67ed1adc2a153ce61eee71f3bc903538c440e080e3e7
+DIST coverage-7.2.3.tar.gz 757154 BLAKE2B eb2d7e9e52dd9480f806556fbb73864884365215834640a1458c06d137706d3a5ca818c0418ecc6646b0722fd23a0348eddb97521a7cd024c218b872072661ea SHA512 2710424b04f812299777497e526d259a3ac35205b425a53973954c8e51cd39e75c30f8be9d60656e7369d3fa2decd810a8cb395dd433381495db4f6a7cd9a600
 EBUILD coverage-7.2.2.ebuild 1832 BLAKE2B 5a4540dc4b17fe66765bca0408a099d0ca734b625757c70049af7cc2f30d4092b0fc70e161270d6644b776b7c622ee21878bad0d91b96603fab1f8b96b586e7d SHA512 b84e6b6b431d2b3f48ccb28ad2fca97f46eb9f7c5e1427a58d1184c3a185bb1fe92aded01eb7b4180b3726e6a6855d7d595e00ed6f7b058c72b6858cee96fd6d
+EBUILD coverage-7.2.3.ebuild 2017 BLAKE2B 0a3d2fddc33eced59689210c85871e4f7d0b434d3aa0825ed4be96fa1d1758b5be8d54d63ce4497fdc8c7fb19f3359a11865e5d6a5aec0204b341df460ff5140 SHA512 38735dc1b9c3ddd43acaca3ed1f4539a4dad4ccac41d61efefcb349b846571ee5a6450a7d981cc66e436b4064999f974c7f4af8fe225620da41338dadec9fc52
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.2.3.ebuild b/dev-python/coverage/coverage-7.2.3.ebuild
new file mode 100644
index 000000000000..ed972c003934
--- /dev/null
+++ b/dev-python/coverage/coverage-7.2.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/s:-q -n auto::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: fails because of additional "Terminated" print on SIGTERM
+		tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data
+	)
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index b9ea7ff32dbd..5630a65e5764 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,17 +2,21 @@ AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152
 AUX django-3.2.18-py311.patch 6716 BLAKE2B 6937c7dad0b4435906923cf08c47198d1d2046efbdc98dbcd914e66a6d72ea1d80393df71632e97f4f8aa3fdbc0e9cd63f4036dfc21833d9ce62de49986f76b9 SHA512 fb8c57bc1bcac563a6572ba54c2cb8ee98e6290ac44d75a380c841c048021e464aa85e60a41652d58094e21ec5b4ec4d677bbf9ce686fcbf1ea3e0999fe92c13
 AUX django-4.0-bashcomp.patch 2021 BLAKE2B f04c83b500a92ea8ef9609225191e38a41b3349a295beca8f8575ab05395d0cf37e1aefe295004b11c1bcf34cce9074ac7d274034cb50e1ae43e2fcb5d6952b2 SHA512 2215dca4120023b0fd839738bd602443c49e9adaa98d182bc74081ebe70613649c2dc11e2b5f6242701dceac25755adb8605774895091360b56ed1195a7e629e
 AUX django-4.0.5-py311.patch 9279 BLAKE2B 3082f4f9da3f127807402a55655b059019787143dd8c2cb14b1a27d2fbf66464179c2f08381284340fccb4e6bc1c25a1e36291a0dd8cbd83c754ee1f78d220b8 SHA512 d48f29fa5fe9e434a4220825d1592a03a0667d956db4e6c4119e74f91524b8d02b295a5a600516a993adc2dd3e1f5ca4bde83acd8a6a8e0838382116d2703a28
+AUX django-4.1.8-py311.patch 668 BLAKE2B d9ddd4e78775576aff0bda993fda23dec2ba412028c42ad58a85a62ebdf9dc57f11d5e6b4aaf3161cb8d350ed605f7251683a3f412c96ef2fba8fa3cb6b0f800 SHA512 a22394cdcd2724a0aa7a9acbbc1b9d1fd3d5364439829ae1bef1b2ad2d5180d2ee217e346f72b5f32a69c3d2c59c6d74b0bebcf30f270bcff9458ee21865c1fa
 DIST Django-3.2.18.checksum.txt 2563 BLAKE2B 8deb25cdc9f3a859b68925b7c8615bf3bf955f0c5db7558818fc9177c2a5d5f588b848bb15094d5f2d1f9a92693204ddc753ef25411d328e8c7f755f93184b54 SHA512 b5fb24a525c10bbb1f82074b9637e4ddd68ec8bd80c3676f326f4be41a81643cb539c13123447895f6a3639d8938f70f009de31752eb5753ca1dc3dd162d9f92
 DIST Django-3.2.18.tar.gz 9848949 BLAKE2B cf42d306d506addb43f725d5896be7bba41e37633fab0173d9e0bc76894b7c5a26fa945edb85e33f7b356d1d36b3ea9e7c85b5ec6efda5541639bc425230e8ff SHA512 dbcf8daa4edf3666bfcb366b09e1c3de12a4176770ab2e6cd22b459ff77aa4cdbd72c445f53e7b23a907f663dc37b07c15d5d0d67e63fdec98eb4832dcc57d6d
 DIST Django-4.0.10.checksum.txt 2563 BLAKE2B 1ec93751204e80d75f5f4f15086cfd9aabe65e392359f82edb234f2b86802bd1078e00575379c1956dfca8e6c60ddc6209079ae7e99450aa000b22c3312a89f4 SHA512 67b335f184ce02395efba3a4bec7d8087735ef8816eda70867faf9c02242c11c95f30fc36db6abd30996098dd567ef53f6dd467567c5405f34cb2bff7cd2a23c
 DIST Django-4.0.10.tar.gz 10430363 BLAKE2B d36aefd5d00023e5c4e34dda2b283e9a82d9e3b82576ce00cef7d9b75837ffdbf56327ad21ccefb02b79e8db93f12cf850541f4cb1d01b3dd28bdea0c73cb9d6 SHA512 04d1b207af21067c22c120486ff57ea602b3436adf1871f691735825afb30c3ed62f1cbc98d92fa70e9a818bcf50db70d949ab0c460f48f6027b75df9eba56c7
 DIST Django-4.1.7.checksum.txt 2554 BLAKE2B 5a82eca5edb5b5d90c629c6d42414725b32ed55fc137cfb3fc9c5bfd392dc0fcc3f6b99eea64a16a88002a521bf910464a6fe11d9079d68e056acded3432be38 SHA512 4244abf4e81aec1f8daa7815f57483963e94cf67571f0c2f6ab67507515c7f6f72f86412a17c8e1e73170e1ed7d3d4503c5adba36c66d0b8f015350c81348116
 DIST Django-4.1.7.tar.gz 10520415 BLAKE2B 88b66fea737f6fb1661a6987b9d6cecb84d58d675655a0ea5bed60ee28252edd11d8025498b7bc854b9c0c4814148bdc3bcdf59014dd040b5c424c3cd1711e46 SHA512 e34b0b05209297164d6cb84e7edf4740a2d638496c3107c06c0e773db292e9b02e6abbd8c3da347addaf17d9c9a56ef4873eb9edc5f1164e3d13d7f3ef083844
+DIST Django-4.1.8.checksum.txt 2550 BLAKE2B 9a4b37655a75ed1e18fd4219b7480afbcc4bde7aaef0ca4865451714cc4bcd123fc7bd69bbbe70bdab375a64bc12b3b6410f24dca0eecdcbb3b2a4d4df2611ec SHA512 415a0c9173d9e96e5360e6bf27b33c699eb952654bde3a1cd8229ac1c5b5b5ac131d3c1b168fe945f525de63e08c2ad9097e1a9eeadcc2b76a96b999acb5feda
+DIST Django-4.1.8.tar.gz 10511976 BLAKE2B f269fb4d0047913fd0842daa67839d736b0d1b141081590beb2ffa2d0c535f992dab3820a9c5784caf2bb1ba1a7237b395a87d059ef2e4600341afb17bdafee2 SHA512 73910394a83e84522a41e98958701fab85ca71ed426c3cac549d1bd5eb2740106da9d2e3fba1ad8defaa2c7130c24e278558dd93e84afe8a66aa81686755ebc9
 DIST Django-4.2.checksum.txt 2530 BLAKE2B 06ebf87ce44d32fd2491d600cbf4a74b32426dadc0096fe3a34933ba55ddcfed082e85021c9c4e525122e6be8aa3ff6a2bb282fa24fb29a732ea744d4fa1dd1a SHA512 6078fe14d8b356477bd163eca67ca9038b24f78b706bdd8fc2c4ebdbda5024c5014b333a820910dbfb075ff944b78789f7c745eec3a2724898b7b2620f40a6dd
 DIST Django-4.2.tar.gz 10415665 BLAKE2B 05faa1476f9bbbea93f33c0f35914b0893006ebbdfac98e347f886db0a39b263046dc149cbf41eeee982ef46138b835379f8384b5f8eb7ef77e16d338307830e SHA512 22a61943eb99cae81a99d84795155d5fecf5e1ec5d76be145b86d5ae1d4fb6a71be8bb62e58b935dedc846c8fd3f1e6fe68cbcc7fa1603a3c4753e69d61b7af4
 EBUILD django-3.2.18-r1.ebuild 3109 BLAKE2B 8967ad33dff40ddd1612b05961e6645209ccd32d54ccabc54b742e2d3fa433b75c4db8be2f5a45ad2871ff3b9e5a6456ff04ba3c4dd5c48273bf7638bf03e4ea SHA512 2d4ceadad34853196663694f33afd6ec317892f55247d5c448a53e37ecbabe02094d1041d64b4814ead805646c12477a1cb4bc9634344bbda38e5d225bc37af0
 EBUILD django-3.2.18.ebuild 3064 BLAKE2B 9870d944334ad12adc96f2701d6e72edcd684312f6dea6eeb10bc7e5f78278f819fd053e7ba5de8cf35998e962b2a05f4529b6177818336afc7825b9cd393a0b SHA512 0ca7d17d5b52120f9589a0b9e9802749603b2cdcf58a5697c55341e63a626bf95810daaf2e4ac4821113d39fbd4a0cba9657969f5d740d91080a2fe4d1aeff05
 EBUILD django-4.0.10.ebuild 3028 BLAKE2B 062bd71385c3ea131706367b812f5102e1e8f82dcbd0b51f07b4a4ebf900cdb5c77451ea22ef79703831276f2f6b4dd71aac6817c59b78e90aae2c362fd0efce SHA512 02870c3cb88491fabd91553acf07f95afd3a2d133603de01320c5607337ed5466ab6efa3459ef2cae3d9d7736e39f70d1a449ebf7d9eaafcdd499f36c30f9ad4
 EBUILD django-4.1.7.ebuild 2881 BLAKE2B 27dcb7fcad3b27c80714598b17dbc1b32f1ec13494f070cd44922ce72739ade4b2345594bae780eec5dc97dd8e2c58755ebe582aa4b5145e5556ffd6ce2df903 SHA512 1e0a4eacd93b27b2812ab210911b2f94d3e21f7f0ae987c107e56deb1df9ed4caefc071a5a10bf5f39e66550e70ac8bfc1ee5024cbf1653b0954a9fbb1c6d51d
-EBUILD django-4.2.ebuild 2802 BLAKE2B 6f2bb671710c131cbe869e091a192b92049e1750aca75da5b93f258232e156856c6870b729b246825c2714c4cba5ec1eae0edfa947002c11539a9f3fb132b18b SHA512 c64e171527b6140e6020f153d5d242d9bfe746d2f2dde8d2a7dbd477329dda2316f18b4a3d4af33f9e1f8acb6679dd629676cd526b14fb3af080ea049a2bf3ba
+EBUILD django-4.1.8.ebuild 2924 BLAKE2B 1e0506ce1b22fc5c79139cb68820e764be32a7be2d677a271d452a0ad32c13742bea1f3691fc11319faa713b4be38e142218a95e3d92fc25eb88e2b99e03c7b9 SHA512 bdd1411e48e79448f6d61243bc890aa7b488b931d17d7e31c673eeb850e8ac32c087edfed0556b31e53397ba949623afff733ce61c3ab6a838d25f2740f0a387
+EBUILD django-4.2.ebuild 2841 BLAKE2B 946d2d4c35075431124f7a287101d0598e975b95bc7840de33b56593841b7550bdbd124db93dc5e16f7d3b7d9035d400a6934e5a2c69c882d04df858a726989a SHA512 10fac20179993356010da23cbd0285bc977cfd6b9d0cb430a103e733f20b6e17a9c4557fcea085a692894983bba1dce8064857a743f6f671b797e904a30f9388
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-4.1.8.ebuild b/dev-python/django/django-4.1.8.ebuild
new file mode 100644
index 000000000000..0bde99238c4f
--- /dev/null
+++ b/dev-python/django/django-4.1.8.ebuild
@@ -0,0 +1,104 @@
+# 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} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
+"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+	"${FILESDIR}"/${PN}-4.1.8-py311.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-4.2.ebuild b/dev-python/django/django-4.2.ebuild
index b1adedc95829..a5153c56732e 100644
--- a/dev-python/django/django-4.2.ebuild
+++ b/dev-python/django/django-4.2.ebuild
@@ -56,6 +56,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+	"${FILESDIR}"/${PN}-4.1.8-py311.patch
 )
 
 distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/django/files/django-4.1.8-py311.patch b/dev-python/django/files/django-4.1.8-py311.patch
new file mode 100644
index 000000000000..043b31a2c780
--- /dev/null
+++ b/dev-python/django/files/django-4.1.8-py311.patch
@@ -0,0 +1,16 @@
+https://code.djangoproject.com/ticket/34118#comment:11
+https://github.com/python/cpython/issues/102549
+https://github.com/django/django/commit/38e63c9e61152682f3ff982c85a73793ab6d3267
+
+Skip the test for now until upstream adapt it to the fix backported to Python 3.11 too.
+--- a/tests/model_enums/tests.py
++++ b/tests/model_enums/tests.py
+@@ -310,7 +310,7 @@ class CustomChoicesTests(SimpleTestCase):
+             class Timezone(datetime.timezone, models.Choices):
+                 pass
+ 
+-    def test_uuid_unsupported(self):
++    def _test_uuid_unsupported(self):
+         msg = "UUID objects are immutable"
+         with self.assertRaisesMessage(TypeError, msg):
+ 
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index d2902569176b..59b99994fc80 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,9 +1,11 @@
 DIST filelock-3.10.6.tar.gz 10478 BLAKE2B dfb9fdc81da83b99833d5412a09ac697ee2488815672f12d798a88c7211d1d9cfe7a7300f35ce2ae6fa018784b0227a79c9ed4a3f96c881c117a6fe3b9d6c03f SHA512 82b962ee2d22788d272f6149bef3587fa2213cce4fad1c843911fcb28f1bbb529c93e09ad854a5abff5dabea0375bd9b797be4dc141b8633f590954c257173b3
 DIST filelock-3.10.7.tar.gz 10481 BLAKE2B f47f79c829154d24b12489e1ef25f500fbc49fd773de1170af168a49fbad7bfcedd89ca9dc151e6705ed0cae10c009293a175b8bded19fc69255faef7823a9ad SHA512 4ccdc6bc7d731b3854773bcc9cba47d3457ed531ca8eb41dbdbd0e10aa5f64b1f53a6dac536506c782cb93e4c354f2c815407b1514cb16b4d8f02957c9f159bd
+DIST filelock-3.11.0.tar.gz 10792 BLAKE2B d2a3bfe948251136237ba216f375592f406372622005d14ba5a9e8c88b8589738db9ddbfba8b595d7252d78a2b9f18cc3c00459f9b1b8b316f943e6c07417771 SHA512 aa95176d3870a8a5bba033e3893bdc8ad61665c64137cfa35fbaff725edea30a4ab4fb70e902387fc5ec359c3c0b101777451a0e96e38522d13df3e95db0e244
 DIST filelock-3.9.1.tar.gz 9720 BLAKE2B 4225d718f5c6e7c81e5db5d6ac2af42ce78a6c61b59f85bf8c2aafd71509b4811542e7a7648ffa2b14f3b3e762d975296c095e322e6c6ccf8fa5f1839213531d SHA512 7a240b0014a6570099106c72b376c47b7b23cddc3e70f78e2560ccccfcee31d1078d894c2e3ec6fed2f983859543a84cac03f8834df9e64fcb0a966308f7503e
 DIST py-filelock-3.9.0.gh.tar.gz 205047 BLAKE2B 3995f7ad27bb09ca75310c4ada7645f2dd16c09ddb39663394f315443851037f2f9cf08eecb507eba521479696ad1004978d3fdd300a7128ac3354fce2e57d5f SHA512 1235ae9ebdb4c84b0c30e68be91e01eb1acbfcd15c85202fa54a3b91e4e507f221926f8886e1ec91acd4f71d2d88c08f536529b4cebfd2de4fb90118f5dc242e
 EBUILD filelock-3.10.6.ebuild 691 BLAKE2B a161ee66b6eda2646b813d86ac8206688c86fe14e57c8a4571d5e1fc7efb2326ae793a506a2917193b5ce0d228e615833df64aee3ee02e1cfe2741800e85d8e9 SHA512 69e2f2e3ee1a3a2fc7efd4a629ff6ba79bab20aa800828439f5b6c655f7d3848a10395617ef83a3969e75c68b378488ecd85bb330fe44beb35ce511b917515bc
 EBUILD filelock-3.10.7.ebuild 691 BLAKE2B a161ee66b6eda2646b813d86ac8206688c86fe14e57c8a4571d5e1fc7efb2326ae793a506a2917193b5ce0d228e615833df64aee3ee02e1cfe2741800e85d8e9 SHA512 69e2f2e3ee1a3a2fc7efd4a629ff6ba79bab20aa800828439f5b6c655f7d3848a10395617ef83a3969e75c68b378488ecd85bb330fe44beb35ce511b917515bc
+EBUILD filelock-3.11.0.ebuild 691 BLAKE2B a161ee66b6eda2646b813d86ac8206688c86fe14e57c8a4571d5e1fc7efb2326ae793a506a2917193b5ce0d228e615833df64aee3ee02e1cfe2741800e85d8e9 SHA512 69e2f2e3ee1a3a2fc7efd4a629ff6ba79bab20aa800828439f5b6c655f7d3848a10395617ef83a3969e75c68b378488ecd85bb330fe44beb35ce511b917515bc
 EBUILD filelock-3.9.0.ebuild 822 BLAKE2B 0e0322504b49fe5b908e501962680d1c90f0413dcdb17b37ac0785af85f9308bc805d0daf47b9758af85de08d05e78ce8e001984aa222c7514d65b9aa99e257c SHA512 4f9a65a3dd316af5bc28d9597cf14a04b16fa0f393e49dea59f53c8548c5c8edebdad5b08f6edd47377f2a65212031b980027a14480af847e64ae1d352384c15
 EBUILD filelock-3.9.1.ebuild 648 BLAKE2B ad4204547b1367db1ae6ad7a544b18d059a8008b56438a2e5b2d93874b64c811dbdfaab09500714498d09cbb06d7810893b88ddc422806594da56b9c36ddea6b SHA512 62bafa64060568259f9466b81c71b9763087aa42d80787b986651b87c8ec964857224df0cb0750cfad0ab5ea0633080b69442378f30a1d3e5ba9cb666726c637
 MISC metadata.xml 373 BLAKE2B 8923cea15313a2a4cad1af3e5e6c5623ac9855d3de37b6e43ff5249504d2bf07e1e334ce6ea8d9c397e03e3a05585cec0233e841a0a9f6c30d43eaa26b488933 SHA512 c114595146c326243756d0053476677b8b8c7541a253a0c739827e9b0f93c2a695d7289ee5a17c4a1a79639c02bf1396d2df4d8e20aaac9402c9d80f55be2f7b
diff --git a/dev-python/filelock/filelock-3.11.0.ebuild b/dev-python/filelock/filelock-3.11.0.ebuild
new file mode 100644
index 000000000000..86d1f81ea020
--- /dev/null
+++ b/dev-python/filelock/filelock-3.11.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2018-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="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/py-filelock/
+	https://pypi.org/project/filelock/
+"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 52ab7ad622d3..ffe069425850 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,5 +1,7 @@
 DIST inflect-6.0.2.tar.gz 70830 BLAKE2B 8faa09c53f836429b6e1a2965da3c4315260e1cb3ae7dc40fe226d7f4595e9bd54498167c044f67fed5f79e2997af5425cc13680b9c2b722ffd702095f60b038 SHA512 ddb0439eeffbd21b3293208eb7e89f97fe556a3ba1e88de7e15d1c6bc5a59cdb25a224d7cfec5a010dd384728b15317c1dc752e3a8d4d95dd6eea8224a4f2877
 DIST inflect-6.0.3.tar.gz 71294 BLAKE2B ead85b2e17cbf82a1a8cd4a7a0948b43462ab40dc2bd457eadf02c4cbc4e1295c6195da4baafa84cb5d8c6c4df0bcd6439ff2004fc424bc21e786f2e423632f3 SHA512 5bcd40b71301cba7890b31720aca3261224ec909ec3bbe6830e847f040b10daf91ff73cbe8d46c8835aa391a76c88342b268142393c5b96dafee90e668dd59ba
+DIST inflect-6.0.4.tar.gz 71131 BLAKE2B 24ec6f25462594fde4558f7a4269c68d31989ead54c982f3a4382b5f0c192fd5fcac7544413fecef0abaf7c3fe2f9b4a8049fc7dc7d324e4397fb6a81763ef8e SHA512 96aaa74b3e8c5dcc91d81af336af73535826f3cedaa556d6baf540ca54db1a7c1f17a372c240446c0d81697520eab154bad4f0aad6195c6ab8e131ae443d3811
 EBUILD inflect-6.0.2.ebuild 635 BLAKE2B d1b01fbe7db9fb15848b1141350513c901c99121f459cde0ede9f55874cf585fb14ec3ae5dd4a37226d8dfe35cbfb0829a8716fc1521cd11db59438fe6d9a883 SHA512 af156dd59d4ce286cc8d19b7c565e4171763459e70ceaf8bfaa18d94830dbd190f450a26caf83c7b9c2a6f349d64a69ede8ed113828ddccff7188d790b05139e
 EBUILD inflect-6.0.3.ebuild 643 BLAKE2B 1bd1be6f65d0284dcfc9d46fc03955644a105f2f66cbb8e45c22203e93a3ca670bb10e18b52e3e4263e6554f2486a2b2180306be0e91723db23354bbcb4cdf6d SHA512 6e763860253eedec62860aea7432f883bc648a6ca5f6c6c584311dd018cb95b0d93111f8ffb5a4b0926bac732957e50b0e149eaa8b2a32f2e60b2d89cd0b6bdb
+EBUILD inflect-6.0.4.ebuild 643 BLAKE2B 1bd1be6f65d0284dcfc9d46fc03955644a105f2f66cbb8e45c22203e93a3ca670bb10e18b52e3e4263e6554f2486a2b2180306be0e91723db23354bbcb4cdf6d SHA512 6e763860253eedec62860aea7432f883bc648a6ca5f6c6c584311dd018cb95b0d93111f8ffb5a4b0926bac732957e50b0e149eaa8b2a32f2e60b2d89cd0b6bdb
 MISC metadata.xml 557 BLAKE2B 1a327bb3ea2f7ecb0b3100d9f443c9c0c20a89f1e560eac79cef20a6f12855355dab9c71bab94881774e2be6fc2b4bd9530e1155caecdf687228db259ed34bba SHA512 d719ba7da2f6544cada37998dbc6b104cebb6419ab65bd164411928953c5898da2f5f2f789b72d41f7b46ee7a5570fc6646d331e0df39b34c1fa0685fb9165ab
diff --git a/dev-python/inflect/inflect-6.0.4.ebuild b/dev-python/inflect/inflect-6.0.4.ebuild
new file mode 100644
index 000000000000..3f5956338ce9
--- /dev/null
+++ b/dev-python/inflect/inflect-6.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="
+	https://pypi.org/project/inflect/
+	https://github.com/jaraco/inflect/
+"
+
+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/pydantic-1.9.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index f81bcd4dda46..7ba9a1d07d4e 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -2,8 +2,10 @@ DIST jaraco.collections-3.11.0.tar.gz 17639 BLAKE2B 6eb81b7a1cbc294626f26e4e8c22
 DIST jaraco.collections-3.8.0.tar.gz 17021 BLAKE2B d1439d2ac8e1c62a87f85775d58a1ea30abfb9eeae2d04c00eaaca9452cd3d46c668841073ee41913a52afa519ecbbddba321ec06584c8cab29dd736f4337219 SHA512 3d20c07d616e82c8c2699f2a5e7a0c42e8a4e5314535d4521a2e3457db510cd24019b23128682ac60c34b47fc4b5232ba0fd2e463c199aef6f6eb6d6ee4347ac
 DIST jaraco.collections-3.9.0.tar.gz 17407 BLAKE2B d5d266675a7a6ab69c1ac23c911fee639d05ef25c0d5f942695b02f8f45b4e6399628e13743beb570f61b1b2e400e28a34080599125e4ab8c59fa9d9c81172f1 SHA512 cac756866dffee2a7b41d4cc3a957e56bd7353454c0a819e94d7b5102bde624a759e84e74eccd6df475b1753f8730f72ac4dd2fc464085a387c879a0e2ac1891
 DIST jaraco.collections-4.0.0.tar.gz 17373 BLAKE2B 5903fed40affe3df25a7d339074355fadc0f86ce9340358530a0d269e288da05c3ada1bec662be86b0fd8e364344ca09d0ab69fcecf7a09e9a2dd78616d8c378 SHA512 0f30714d87ef85705dc3330aa1d4912e73f55718257d1c0f0ad0569b840d420d0838111eae50400df50ae2ce11c0b903943951a7cd1391acdb331afb5f76198e
+DIST jaraco.collections-4.1.0.tar.gz 17806 BLAKE2B 7558a50407db2113718701c52196f2ae2e0400a1f91104edb280e73ed5f8d74f9976c4309649684022ff83e8d5f55ceb0a9dbd44ca97e08fd508eb516e8ad4af SHA512 15ec220503304cedaa2c03a94cea79b172500685cc640902f774d178994cca1acda9cdc2a9b8f0ffec54cc98b0b75d2cd70512a12a453ea15ae19af4c691a3f8
 EBUILD jaraco-collections-3.11.0.ebuild 742 BLAKE2B 0461329753fd7531a0efaeca5507b45d5dbc27bca238ccb53160ae520cccba5ba7edc4988f067fd8cee9be7976dc97b1794dd896aa5f8ccbfe0e182d9778007c SHA512 7edd27fa21d330f695e24708587912286071c88f5e136656b291b323aa94377342cfae95e6ff214dd0644e47c3cbb0fa7946213eab7f81c0193f114b7d2c07b6
 EBUILD jaraco-collections-3.8.0.ebuild 736 BLAKE2B fc2f1acd286b09c44671a22e9bc729fc60c7923dc1fcfd4c7da6a4d384bf09a1f2c2e7fe6d221ac81f069c10d1e17c4be3461dbaa3385cdbab1043d459265bf6 SHA512 2a48ae9a9a8141f88cdfcd7f0f7d1ad5f999c4a9476817cdbb4fb5e1a01f6bf5c3180b47246908937f42a3010ce342310678cc98403e61f787bf632198f2d9bc
 EBUILD jaraco-collections-3.9.0.ebuild 742 BLAKE2B 0461329753fd7531a0efaeca5507b45d5dbc27bca238ccb53160ae520cccba5ba7edc4988f067fd8cee9be7976dc97b1794dd896aa5f8ccbfe0e182d9778007c SHA512 7edd27fa21d330f695e24708587912286071c88f5e136656b291b323aa94377342cfae95e6ff214dd0644e47c3cbb0fa7946213eab7f81c0193f114b7d2c07b6
 EBUILD jaraco-collections-4.0.0.ebuild 697 BLAKE2B 14a05ceb115e138d1c608bf8ed60b49473abccff74df58a511d7a5e73ee7a07cf76c3d92003a41d0b1c96870e9dd22d6eac8800ff10cf09b920cb491f44131f1 SHA512 ce4c925ab273474091959b1d15e06767a2948a2b6aee5bbe833726c6e1f5645ab75de6ecd24e19c2df5ece60359fa6af03c03ceca3b11c34c561608d21beeb0c
+EBUILD jaraco-collections-4.1.0.ebuild 697 BLAKE2B 14a05ceb115e138d1c608bf8ed60b49473abccff74df58a511d7a5e73ee7a07cf76c3d92003a41d0b1c96870e9dd22d6eac8800ff10cf09b920cb491f44131f1 SHA512 ce4c925ab273474091959b1d15e06767a2948a2b6aee5bbe833726c6e1f5645ab75de6ecd24e19c2df5ece60359fa6af03c03ceca3b11c34c561608d21beeb0c
 MISC metadata.xml 578 BLAKE2B c6ad7ecaee92099645bcbd75ed9eff9da2a83268e8a7f828b2dbaf5414228f26b40f09fa37fd156d128742b111cfcacb3e177970b217d4de890ca7262275b26f SHA512 b2602fb629500021bd8fad159ddfcdc76a11f15fe2a51d0d25d5d687ae09170f6cc8438c252e8cb2792ca43bec7be65e249a799582f17c882639e30a9222a0ec
diff --git a/dev-python/jaraco-collections/jaraco-collections-4.1.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-4.1.0.ebuild
new file mode 100644
index 000000000000..90e5e642b752
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-4.1.0.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
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.collections/
+	https://pypi.org/project/jaraco.collections/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index e9436dbda0c6..ad55fed31346 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,3 +1,5 @@
 DIST lmdb-1.4.0.tar.gz 881541 BLAKE2B 1a1bd0d0f6451c57063485f71ecf6f917f7ec293e51cbe7ffa488e867a24ebe1af20ee04c91430de2c96ea0dea40bf2525f2e7b756ab9b3c999357f663ab231d SHA512 d6121a2dbadf9dcef5b65e9f5661d5934cae2e43bc2d830723cfe3982a2e937ad9260f1ea74ddaee83927ac8da4dbcfdf2ea8f801b5bfdaab096c4d326d9ede1
+DIST lmdb-1.4.1.tar.gz 881549 BLAKE2B a821473c2c026a3c5f0b2686414c4dd102ae82cba7db12fbaadd5dde5b03f22e9eae630ca87424cc55d3964b40437cfbd833ab7fb237544771cf48429810af96 SHA512 96b39a45c6e7c0fcc0b6f913337d07adb5c8883d0b6a95102b0227b6b92ac3fcdcaf09c132e44f2d3779b5066692b407bb1afd19ae8d87feda56047652a07354
 EBUILD lmdb-1.4.0.ebuild 733 BLAKE2B 0ca9e38778d1d100f7ef36e0d85b18061e1ffaa6650aa6d782649a64417b16616f0759673bb73b584da95124f4cd49357766013cf8078596d889ea60459fa3f3 SHA512 fe2815fa822e27df4fd99cf1269002d056286916d4b662cc295ba8304b6d65e31b40c4de9134d66477b50dfdab836bc77f2e59a8ea15dc9cc0cf37febf982cb0
+EBUILD lmdb-1.4.1.ebuild 735 BLAKE2B 688da78c9fb2ebd325c70249aa19e389112b812ece9b021178032d1e4de2934eecc2941c05cff04d65ce9f7b5510aab9314973e7422b474586064c038dd04cb7 SHA512 6463f2a38e2edf21a6efc85c1379ef48627e295911194379146643ace30aaf67ad466fc274d15811cf6b6f91c715e88d33aaa09cdbbfb6cd2619a967310c4a79
 MISC metadata.xml 420 BLAKE2B c7f006e40fdf4c8c02e7fdd80aadbad12209b9539f73999c2edc7ec28abc7b31342df66b775fd413b8be6e6afb6980be1060db42a0497ae8710ab863da3f4e3f SHA512 e858fb0d95373a865da1f1367427f62fe91c4b0703dedcb7e114c4bf38437a9ea00f6593ffb7286df45836626d83b3e7d64e10df53f61820c4d52b37e51c45b9
diff --git a/dev-python/lmdb/lmdb-1.4.1.ebuild b/dev-python/lmdb/lmdb-1.4.1.ebuild
new file mode 100644
index 000000000000..ef402b2a053a
--- /dev/null
+++ b/dev-python/lmdb/lmdb-1.4.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python bindings for the Lightning Database"
+HOMEPAGE="
+	https://github.com/jnwatson/py-lmdb/
+	https://pypi.org/project/lmdb/
+"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# cffi is used only on pypy, so no dep
+DEPEND="
+	>=dev-db/lmdb-0.9.28:=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_compile() {
+	local -x LMDB_FORCE_SYSTEM=1
+	distutils-r1_src_compile
+}
+
+python_test() {
+	rm -rf lmdb || die
+	epytest tests
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 33660958fc00..7ccf74a1ed96 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,5 +1,7 @@
 DIST mypy-1.0.1.gh.tar.gz 2763553 BLAKE2B d8d2b6cd3ff386ce0f78d32f81f3f631bbb8ffdbebab8607af2496c890b6a876f870e487a88711b93e48615548aaf6fa32cc6f62cf472d2def59374b49818584 SHA512 081b1ada479ea694e570f6ac56e470196efe30cc5bd8d8e32255ca980a312d67779746eb3f780ecb4d83e8d7e3272fcc77231ba098e736be5893cf249b7ff84e
 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.2.0.ebuild 1730 BLAKE2B d551dcf3e6533016345a05ab95a050df3fd2bef314cfa0f804637507b38c97d82097ae497d86eb298e7433ad522502197a7ba66355cea1f2515d408abe1f5be9 SHA512 910864eccebd73e17b097fff17a11b04b63e84b361332a053aecee2d7d86618573f4492bf192c7034eb8ecbf45223fee6d986a04619e3c7e234ad09d171d04fa
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-1.2.0.ebuild b/dev-python/mypy/mypy-1.2.0.ebuild
new file mode 100644
index 000000000000..602afdd767cd
--- /dev/null
+++ b/dev-python/mypy/mypy-1.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="
+	https://www.mypy-lang.org/
+	https://github.com/python/mypy/
+	https://pypi.org/project/mypy/
+"
+SRC_URI="
+	https://github.com/python/mypy/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+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="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-2[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-1.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' pypy3 python3_{8..10})
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/filelock-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/furo
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 6f9da54f8968..f185cf031600 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,6 +1,8 @@
 AUX notebook-6.4.11-no-mathjax.patch 1527 BLAKE2B ccd6d1af303eccdd0eacb760d1b741b11354fa19c46b4d96c04da150793ea9e825cbf0922e152c7eac010ac4ef95d4fd16057092967a12873744fe45e6fbc4b6 SHA512 eb72afff71ab2589afafc735dff50651f9bd55aa8bda520d6d9ed8769373db8b557f79d69e4f2a0d95863e3c9f4d83e09a3a915390e6ad89d6d3bc558101a44e
 DIST notebook-6.4.12.tar.gz 14389641 BLAKE2B 1cda6a1eb1f4e7ccce964153bdce8de243588ffd4abcc5ab6687ba0ea347d68c5dd239c2af5bf93809409d850747db28df72be5c2ec03bfd06b725976ae1c599 SHA512 1314cfebe97ddada61e1013fdfd606bed08908c06b58e59f2fda6e63c43a1158eeed6a93a5cddbb609ecad0347bf80ee3a74747104fd29942629734c1ea749f0
 DIST notebook-6.5.3.tar.gz 5785846 BLAKE2B 90b028816ad906057708612c82d4c257616e28e2f335dfa26990888b04f6c2372dd1f579b28534ec0ed3c5a160e3c44c35f173b312e3d395db0fd3f01860dab6 SHA512 27177908960ca2e4c83bc5f4502250e02a885daed5f9ad67694502794f140e9e66f0cb24568a3903600c8f5cbae6d626fd7bfd362e23cc523bb42c210f5d2c70
+DIST notebook-6.5.4.tar.gz 5785832 BLAKE2B 28845c51c244d08b12e6a2853d3407a2af9e351f1501db8e76ff4f069e656d9bf27c3d2893b38f3f2bb51cedf38658219be3843a3397a588046d55bf445d3222 SHA512 72bf4efa4d553a6265c72e188ad0ee085accbbc05b0af182531c892303149d83f38f6d410f1bcb2c835071f713cb4267d58324b982b4087caabf9b46b8d77cfa
 EBUILD notebook-6.4.12.ebuild 3180 BLAKE2B c161e33f68868e8e29fc3162646cb479a8a80a88d5c6e67e0420ffc1c064b7b38cff2eb9c8c0ff0ea6b20fe092089a5c646959e02fd9edf578065cd191c9571a SHA512 3473583b7033c667e9e0c5bf3f4539027e4227d0c6b599301323440dfeef3e69f54d96efe213a73ee785d7d9ca47098a7cdbf8401f9a9f559bae914229927a2a
 EBUILD notebook-6.5.3.ebuild 2805 BLAKE2B 64f4d6bcfa93f53eed38ae8000f03200f118343af111af0b8c6221daf9d5842ad9ca6b17c5ed8c0f454c4ae805606e4dcb132d856fd57518164c2528ee0b5aaa SHA512 d95bbe9eb80115a7c46efeabf68d1b39fea4bad817f7d7b9d72028174d0aefe4016a5f33a2b0dba72024cfb0b1010f0301e72c2875092aab736a0cccc0b25c3b
+EBUILD notebook-6.5.4.ebuild 2805 BLAKE2B 64f4d6bcfa93f53eed38ae8000f03200f118343af111af0b8c6221daf9d5842ad9ca6b17c5ed8c0f454c4ae805606e4dcb132d856fd57518164c2528ee0b5aaa SHA512 d95bbe9eb80115a7c46efeabf68d1b39fea4bad817f7d7b9d72028174d0aefe4016a5f33a2b0dba72024cfb0b1010f0301e72c2875092aab736a0cccc0b25c3b
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-6.5.4.ebuild b/dev-python/notebook/notebook-6.5.4.ebuild
new file mode 100644
index 000000000000..57319b60138b
--- /dev/null
+++ b/dev-python/notebook/notebook-6.5.4.ebuild
@@ -0,0 +1,81 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.7.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	>=dev-python/nbclassic-0.4.7[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${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}]
+"
+
+BDEPEND="
+	>=dev-python/jupyter_packaging-0.9[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nbval[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+"
+
+PDEPEND=">=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# trash doesn't seem to work for us
+	notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
+	notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
+	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
+	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
+	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
+	notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
+	notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
+	notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
+	# TODO
+	notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
+	notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
+	notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
+	notebook/services/nbconvert/tests/test_nbconvert_api.py::APITest::test_list_formats
+)
+
+EPYTEST_IGNORE=(
+	# selenium tests require geckodriver
+	notebook/tests/selenium
+)
+
+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/simplejson/Manifest b/dev-python/simplejson/Manifest
index c4a15f9dd4c9..a0cf0544aaa5 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,5 +1,7 @@
 DIST simplejson-3.18.3.gh.tar.gz 81540 BLAKE2B bf6a162499b28a362638e19735f668571f88943ae396fb7f813d51ab0684caa8cb996a35deaf1d68adee2a812d685058e9e80d6f6e66604bbb7c704051b0b37f SHA512 54223e08775ab6277722342084bf56684588dd9dda574428cb73b791d37d0b74decef6082268c0389cc4586a534a19e62ec5738fa9ffffaee63f68e27fb465c8
 DIST simplejson-3.18.4.tar.gz 83721 BLAKE2B fb9ea04402ba740a445751ff2be2f5f5c826e20f38289dcf9aa9c8abbaba4b59bf906c3378317818c77bcfa6ccc3fe76608651eac660683eeac61f5750099e3d SHA512 6335389eb620c96d5c537cd335e20d4f112b86c0c463ceed4d8fa36c27bab8b00386b7995e40070bda5eed1fe5883a462579c7d09bdbc828c39537282669d0e4
+DIST simplejson-3.19.1.tar.gz 85207 BLAKE2B 4c3d1d5de4292404e44977777332fe57327ece1afcd9890b605d52a248764612da351b7c5afb36d4e1cdcb530f07b99b8d971124899b86e4b2f4005a66afcbb5 SHA512 a2239a932f43abe59da84fc3ba95eeaa6a720c929da79d8f4447603b8c770403c9cba0f008a66c20c5c8aa3255891b687336eef1db071171a2c8435563bbb1bd
 EBUILD simplejson-3.18.3.ebuild 956 BLAKE2B 91409a554c70ddbddf6bf6c22a19a406344a62b6cf99b1befdc45c5a200dd78dba22d3f21372cc70c58521577df9f6221dac29e5955ed5428d868901db310650 SHA512 0f8207f9a27de53edc93e82f4d27e075496c166b8985c30c12994469844f0166c7880c971cbbe1a22326eaaa689d92d6e414abd34a616d5baf4a30ef5f287d9b
 EBUILD simplejson-3.18.4.ebuild 873 BLAKE2B 1bb6e18767e5f232ad972a996a4870a4a3f791ccd98a4a468b023bcdb5a85af598429a408016145a122fc015bc2e6947bb7289b6326e2f277d75a691ed7f904f SHA512 b940fc6f65f54e93c17ceef010aec99347691726e8ec58718e8f9fc8e27dc523511b77a3d19f68eab7a733edd7ec6ae6392b886a5007f51173aa0f842ad1d1d9
+EBUILD simplejson-3.19.1.ebuild 873 BLAKE2B 1bb6e18767e5f232ad972a996a4870a4a3f791ccd98a4a468b023bcdb5a85af598429a408016145a122fc015bc2e6947bb7289b6326e2f277d75a691ed7f904f SHA512 b940fc6f65f54e93c17ceef010aec99347691726e8ec58718e8f9fc8e27dc523511b77a3d19f68eab7a733edd7ec6ae6392b886a5007f51173aa0f842ad1d1d9
 MISC metadata.xml 522 BLAKE2B b8b8fdade498ef65f4d5d6e30bc9f0708390f3d064a332d04f0b33346224c59252ef3d512a5a7187c637348201829ccc83254cd898e8df06dff314e857debb58 SHA512 1a1b53900ef62d4d40977504378dce3ce15f1c56ae5a73263127f5919674b1f9b13964128550e0c0e274d4bf50f2c2b438626e3ba1a5f8436071e1eb2f4c30af
diff --git a/dev-python/simplejson/simplejson-3.19.1.ebuild b/dev-python/simplejson/simplejson-3.19.1.ebuild
new file mode 100644
index 000000000000..8afcfa37c4ea
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.19.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="
+	https://github.com/simplejson/simplejson/
+	https://pypi.org/project/simplejson/
+"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="+native-extensions"
+
+DOCS=( README.rst CHANGES.txt )
+
+distutils_enable_tests unittest
+
+src_configure() {
+	export DISABLE_SPEEDUPS=$(usex native-extensions 0 1)
+	use native-extensions && export REQUIRE_SPEEDUPS=1
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 68df9305c6bb..47ecc0bc0302 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,5 +1,3 @@
-DIST spyder-kernels-2.4.2.gh.tar.gz 92561 BLAKE2B a77ce80b2225cce1aafed737c77770396624c61197b3966403f6a7d7a03407336d0556a581441a1d28e1022d6082fe39e48364638d4f70b6240efd49fbafe169 SHA512 aa1889be8809e2fc7bccd01f04f2809df14b76d6fc18f1595db2a83038d7af9a6183c6ac26da11e1dc7556d6d4bd2a57da096063e55b4dbddc06f2d89f2bc0c8
 DIST spyder-kernels-2.4.3.tar.gz 97886 BLAKE2B 1783747662745fa0807e50a9bfe8e350c394a3b571bf74b2f884aeb0c5b995c1b8d571f1b382272903ce005a140762327fa08d35247a9ced9e84709dec23a3c6 SHA512 efacde9e9cd511583fa1bc732c7823baee34cac086cacc7d2f69062b4721dc17eb322445a9641e55a716db980f7cb083fda61c279ba69c97b74664dd4b139f7f
-EBUILD spyder-kernels-2.4.2.ebuild 2269 BLAKE2B 8222e9798b444bc9c3176602193bafc92c638df787e3f57017f46c12987ae671ce1cfe8528c2bf6676cbf3c7e124bb3d41b0e34da02b6686dcf3382490e544a9 SHA512 c0f7490e0aa03aab7fb873c9afa4c8dbea9f162627cac8fb0ff9f74c5a3bcc2f77602d8f740227c877c9c4115268373f9acb136cc75eac6448d491931ecad0d2
 EBUILD spyder-kernels-2.4.3.ebuild 2146 BLAKE2B 30e43bd938a112b9b038073cb7cca042ab4b0bba3433dff40f8a6f5e584f297232ace02abda566548fa3ea1dfc2db2a845ca3066733c14e80b41c1ac55143442 SHA512 9976e31728dbd6342ba3b617b939ed3d14a82c4e34ebea698bc2a3aafb2b401a70c4fde9a0350293be873b1bb5af1da601afd60dfb52f23f2d5ca5d72232dbe4
 MISC metadata.xml 545 BLAKE2B 52be79edfbfdd86e7f895c53d088399b649901b76c7b69cf6363dfba6954971ce75b14624c2fc4254810112e32721e215255d59035f70850e1c1073f9784e65b SHA512 62ad725aab52d7071ccd5297bd15fcdd5e02e97854fc412a43b5c97b7995c77661251994850616743ce39eee0d0673b3bd4189b00876ed6124bf1871f6fb100c
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.4.2.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.4.2.ebuild
deleted file mode 100644
index 94f52832b965..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-2.4.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kernels used by spyder on its ipython console"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/
-"
-SRC_URI="
-	https://github.com/spyder-ide/spyder-kernels/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	<dev-python/ipykernel-7[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.16.1[${PYTHON_USEDEP}]
-	<dev-python/ipython-9[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.31.1[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.4.9[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-8[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
-	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# we no longer package distributed, and also removed dependency on dask
-	spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
-	# RuntimeError: There is no current event loop in thread 'MainThread'.
-	# https://bugs.gentoo.org/834893
-	spyder_kernels/console/tests/test_console_kernel.py::test_cwd_in_sys_path
-	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing
-	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing_2
-	spyder_kernels/console/tests/test_console_kernel.py::test_runfile
-	spyder_kernels/console/tests/test_console_kernel.py::test_np_threshold
-	spyder_kernels/console/tests/test_console_kernel.py::test_turtle_launch
-	spyder_kernels/console/tests/test_console_kernel.py::test_matplotlib_inline
-)
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index eace3972db82..6f37fed29c64 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,10 +1,7 @@
 AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7f760f9bb5dc975053c7f8bb409c79b90eeaf06c5121ca5833442b61929cc640e4f25e6cc27f6118f0fa8f27b5e SHA512 e88cbbeca42ac2720f4e0888df9432d912d3907af267d3fe6a5e658d18d1242c998a70dee88fa0efe9edfcf87a46a40cf75685037d75fce1d596b708acc32096
 AUX spyder-5.2.0-doc-theme-renamed.patch 356 BLAKE2B 666ba289498026ab0679776b8af8f6efe7561a9a736ff19b32eaefcac87d142a55a055556c09f94373869711e81a35ef90832fbfe68acc6cee0f2023742de0be SHA512 396944e6f242bf3b6a27ac9d47f0cc07fd99a55c50f174dbee2fccd1f0b3edf355347bf6291943c3003f55996304d96ce2d2fe45ae7c4291e8425bff73a3a861
 AUX spyder-5.4.0-unpin-qdarkstyle.patch 835 BLAKE2B 75ce544c6932d090dfee0ae06e37a960462943c93f36b235a9261eadc3105e0357ef2ee28898dd896b2c2e0d6a3eb25e36f4e77ab7439bd942e09fa1447a8ab1 SHA512 a6fa1cedf079dcf1c9f8c0c33b4be2de911ceff526e73412ee95a8b0806baf5dbaafc06ad5f49c91154106c76a85281f83ef9890aaa2c4778e8c3260eb0a53b8
-DIST spyder-5.4.2.gh.tar.gz 24523453 BLAKE2B 9ec3652fc60c483b96f287ad39f3280e963b8bb24a6e1326f5248373ee53465b67c5660e42b4f7d876498a8ee1652fa058b038386a3dd788d46452ba1475760c SHA512 e3650cd43d14d2ce7e6f90557904d6ac1e5db5f7846e87e8a1fd8173cdef97cdee485250caf00768482611b8318eaba60259efcaccf41f0308e888ac85eeb88d
 DIST spyder-5.4.3.gh.tar.gz 16207604 BLAKE2B d8111cfdda9a40c07371dd15a42bca55d47eed3cf870d21ed31836985f87d7f823574586e69ea9f5508b0b72299b834513f78a09eaed6fc0bbd3bf7ab1cd5bcc SHA512 70385d249059f60c78a401ded50a2304d260a93fa46a211e78b560310eeb84176b4886f640db5660a30f39972987d8be11cbd5664d9396d9efb3ef524abb01a5
-DIST spyder-docs-3ae8705d3eba8fc30d4600d6d1e29ce0da8cd0c6.gh.tar.gz 95448945 BLAKE2B 5e130bff9fbca71e61ed96236a6964e8f34602efbb930dbc928a22eec59ebb2d2bee39f679c27dbbf88686345e5db5894f931e7ab95a3e007444b17c4e021176 SHA512 a6ebe6b6ff057616951c0075ba7c8039dc3a304b6e1bbbb40f80bb54018cee374df230e491493f18070273dded2942e14bfecc9439d33ae1bc3edd5b47067d77
 DIST spyder-docs-fa824989a085ab2c8ed449505c0e023a3c597681.gh.tar.gz 95448760 BLAKE2B d4c764ca056c738a64c1fa51f368996c612f533b8b21615fb9df8b5404623f8d6c7ed460a4729057bb5cbb66ce323c259aa33d3bc7d4a9cf1232ac0ad2c5a6cb SHA512 b41afa90e082da458a8ed2710d4fbb82d8f837dbeefd90359052641e488a18b6294e32b5ba5cabb22bcc30df53f0275f5265fa4cdebe60bd6620a74a2b2c4325
-EBUILD spyder-5.4.2.ebuild 7623 BLAKE2B 17d6ef262a9d12ed42484db4b8233846bccb231f0b9fdb1735abf38c351cdad02f76ad4572943a21601b356334776f1ae2ef45cf5d117cab9b9d79e5a8c55777 SHA512 d0df13edc7c71c91db54e9beff7a8e47dd6141f0cafdf4c28b90efd35ebbb670fd5b92146faf4f4cfc14c08e2682b75ea9bb874ea1ada5eed5ceb527f58b9ed2
 EBUILD spyder-5.4.3.ebuild 7265 BLAKE2B f8ee0b712c9e0497c2801ea9ccaf6ac7ae192d5a10992fd3c4b3f00b9d3956d08c470ce4c7edc192ceb5f190200567ea740fbf72ae83dd0caff68de6641e091a SHA512 d3ca30f1ef05a23eb5c263d2bd5b4034b3e0f8d9eae479d47d302ba53692e5012f7783a023ad103c479f33b4c76483125d98e639ce52aeef8a4b52a6e06cc4bf
 MISC metadata.xml 1251 BLAKE2B 81f007eda89ddc66841771a949f76da6f015b49bfbf27b47a7557ab70f1241087f06a5c6675ea8da6aa871937cd705aea888989b468ac11d33420cbe34a27f27 SHA512 24977ed6053ad254748ba4c368bed7f8428d1e5928b586f57e48c01733934894fb1f94df077a71fcd7a00e891e24b776b9e57279f90c2f94728f709a94a90121
diff --git a/dev-python/spyder/spyder-5.4.2.ebuild b/dev-python/spyder/spyder-5.4.2.ebuild
deleted file mode 100644
index 4b757c335a9c..000000000000
--- a/dev-python/spyder/spyder-5.4.2.ebuild
+++ /dev/null
@@ -1,196 +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 optfeature xdg distutils-r1
-
-# Commit of documentation to fetch
-DOCS_PV="3ae8705d3eba8fc30d4600d6d1e29ce0da8cd0c6"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-"
-SRC_URI="
-	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# The test suite often hangs or does not work. RESTRICTing because IMO it is
-# not worth the several hours I would have to spend every single version bump
-# checking which tests do and do not work.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
-	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jellyfish-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-venv-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-black-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/qstylizer-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.4.0[${PYTHON_USEDEP}]
-	<dev-python/qtconsole-5.5.0[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-2.1.0[${PYTHON_USEDEP},svg,webengine]
-	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-2.4.2[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-"
-
-# Tests are broken anyway, so lets comment this out so we can enable py3.11
-# BDEPEND="
-# 	test? (
-# 		dev-python/cython[${PYTHON_USEDEP}]
-# 		dev-python/flaky[${PYTHON_USEDEP}]
-# 		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-# 		dev-python/pandas[${PYTHON_USEDEP}]
-# 		dev-python/pillow[${PYTHON_USEDEP}]
-# 		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-# 		dev-python/pytest-mock[${PYTHON_USEDEP}]
-# 		dev-python/pytest-ordering[${PYTHON_USEDEP}]
-# 		dev-python/pytest-qt[${PYTHON_USEDEP}]
-# 		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-# 		dev-python/pyyaml[${PYTHON_USEDEP}]
-# 		dev-python/scipy[${PYTHON_USEDEP}]
-# 		dev-python/sympy[${PYTHON_USEDEP}]
-# 	)"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.0-build.patch"
-	"${FILESDIR}/${PN}-5.2.0-doc-theme-renamed.patch"
-	"${FILESDIR}/${PN}-5.4.0-unpin-qdarkstyle.patch"
-)
-
-DOCS=(
-	"AUTHORS.txt"
-	"Announcements.md"
-	"CHANGELOG.md"
-	"CODE_OF_CONDUCT.md"
-	"CONTRIBUTING.md"
-	"NOTICE.txt"
-	"README.md"
-	"RELEASE.md"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc \
-	dev-python/sphinx-panels \
-	dev-python/pydata-sphinx-theme \
-	dev-python/sphinx-multiversion
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# these dependencies are packaged separately:
-	#    dev-python/spyder-kernels,
-	#    dev-python/python-lsp-server,
-	#    dev-python/qdarkstyle
-	rm -r external-deps/* || die
-	# runs against things packaged in external-deps dir
-	rm conftest.py || die
-
-	# Do not depend on pyqt5<5.16, this dependency is carried by QtPy[pyqt5]
-	# Do not depend on pyqtwebengine<5.16, this dependency is carried by QtPy[webengine]
-	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
-	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
-	# Do not depend on ipython, this dependency is carried in spyder-kernels
-	# The explicit version requirements only make things more complicated, if e.g.
-	# pyls-spyder gains compatibility with a newer version of python-lsp-server
-	# in a new release it will take time for this information to propagate into
-	# the next spyder release. So just remove the dependency and let the other
-	# ebuilds handle the version requirements to speed things up and prevent
-	# issues such as Bug 803269.
-	sed -i \
-		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
-		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
-		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
-		-e "/'parso[ 0-9<=>.,]*',/d" \
-		-e "/'jedi[ 0-9<=>.,]*',/d" \
-		-e "/'pylint[ 0-9<=>.,]*',/d" \
-		-e "/'ipython[ 0-9<=>.,]*',/d" \
-			setup.py || die
-	sed -i \
-		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
-		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
-		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
-		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
-		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
-		-e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \
-			spyder/dependencies.py || die
-
-	# do not check deps, fails because we removed dependencies above
-	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# can't check for update, need network
-	rm spyder/workers/tests/test_update.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-# Calling pytest directly makes the tests freeze after completing even if successful
-# Exit code is nonzero even upon success, so can't add || die here test results
-# should be checked for success manually
-python_test() {
-	"${EPYTHON}" runtests.py
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-	optfeature "Run Cython files in the IPython console" dev-python/cython
-	optfeature "The hdf5/h5py plugin" dev-python/h5py
-	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-	optfeature "Vim key bindings" dev-python/spyder-vim
-	optfeature "Unittest support" dev-python/spyder-unittest
-	optfeature "System terminal inside spyder" dev-python/spyder-terminal
-	optfeature "Jupyter notebook support" dev-python/spyder-notebook
-	# spyder-memory-profiler is not compatible with spyder-5.2+ yet
-	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-	# spyder-reports not yet updated to >=spyder-4.0.0
-	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-	# Plugins with no release yet:
-	# optfeature "Manage virtual environments and packages" dev-python/spyder-env-manager
-	# optfeature "VCS (e.g. git) integration" dev-python/spyder-vcs
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 7fc122b4f4b8..b83cf45cf907 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,15 +1,9 @@
-DIST SQLAlchemy-1.4.46.tar.gz 8544238 BLAKE2B 8ef4aae61bee3c9c54b953a9ba34074d8cac0d54d8ae3389f40fa99f57755b2ee0a8a7826e0835fada2d82b96559d974172c9d9781ec746c79006f59d7a5bba0 SHA512 1977c6125e9f45a45b7941c1e0164866bd5ea72839e619d4e259db9a5370fe2b4f191257f3c9ddb28b5c22617a71d359620601c54d9273c38b3281a6c2f5ff03
 DIST SQLAlchemy-1.4.47.tar.gz 8559530 BLAKE2B 051e6f0114162f5525e756d8762281464020a3c4e1751df8432f76ce3281ea1004fbf842e92bdd310e3a736fc87d25db12a1566720c76bde7960d51c22a483da SHA512 702cbae848bc662b686db43b2d2dbd18b503b3aacac6f5960bcd260cc5bd7058536ff2207f1780cb8425c228a82796490088c3ec32f24637edd2cf1cdac7a8bb
 DIST SQLAlchemy-2.0.4.tar.gz 9250723 BLAKE2B c3cec648a527e7beb349b2bbb6924a4e794a1fe4d1563ba7573afdc28ed24fce149c5b3c08fa419e85713b68080b2a805e1999e312f59ed7fae55f9aee6a966e SHA512 098004c594ff00a47a66850b0661f673e4d7a6f168fce72ca37a65ecfe04b3d291b9a6fb9393f7671c9a7c5c128ab6ba2035d18cef28736df1207e689cd8c412
-DIST SQLAlchemy-2.0.5.tar.gz 9285821 BLAKE2B e0af62e05801a30d915ff4a852dc30ab61b8d5ddc632cddef549bb2d548f5a2c4056519c9ddcf690587736d415973bde9042b6cd022f874e1dc3c143ef0a6add SHA512 642f6665ca8a3aa2c30bc9e14f8e65f9baa0a678f88637e784ee8606cece92d876f8d2e639dfd462261f0c790c2f0851e3490b4c84dbaa21028df93f354b68a4
-DIST SQLAlchemy-2.0.6.tar.gz 9294603 BLAKE2B ea8c7f23199c62898764656e82673f6b9c5ac8108feba49c2b74a4c3b278b2ac7ed5f9e5f2ad1b59c70b451440c9376dde19bd283c4c585029957386d56589a9 SHA512 2742f2dd7424118f34a70d3b17157d16976f422459c698ab042c08a5099c275cc8bebdb1f811fd783bd1b024e9f27925e1a72cac818dd16c807e1553a766f25c
 DIST SQLAlchemy-2.0.7.tar.gz 9298301 BLAKE2B abedb2805cad489e68fdec383eaf1bc65ef92777230317911a9351fce7c9159f746629197f7443a37495c23cd8d3cdd1015d8417f00227f28b8af1468a8327ef SHA512 94f5c4262741986456a9de435a81d9df8d5eed16417cc8c07321cb28030c99ea347c33a2054f2961e3b794bd5f75da19b0879675e2c1106fc5030382895caf75
 DIST SQLAlchemy-2.0.8.tar.gz 9314926 BLAKE2B bc54ba9be9f68cc2995bf5328cc5268e0890262efb162a94bd36713f3f3d2f1ddffa95b4d1d8ab140f865c2788d1a913f6c104f21809a695faa132686d77cf3c SHA512 66408768ff702b16ad1365931b254d72976313a3369a74e5a81326d83540ee274805b01d449010ea8e8750312e26dc91aad3b724c4cbdf037e7314b204f6908a
-EBUILD sqlalchemy-1.4.46.ebuild 2860 BLAKE2B 8fc052f4930f2369bbbbd336fbfdbf6b2a19b12d51e16f1876262ef1aa344f5d5db75597148a9d46f4144495c2f41a7e735c099bc059c27991f5c4c0c9d73495 SHA512 f043f2491f60baeb6db0055dc2cbe5d0d073e843a9784b8859baebdd37f0300be9b93a83c3910fc0f08e1cd3931b7d35f8a833f8c97f9737f9481dbee6f86087
 EBUILD sqlalchemy-1.4.47.ebuild 2835 BLAKE2B c2ed746fa742a1a59acec80bf6c7b0342c28226e3235fb3a7ae46a2d8b260cabc05840ce58d091bfaa16b7601b24c4da0f3ef32364d8817258af0551f560d787 SHA512 a326e8a93a6b6567314833c9b1b2f3da08cdab0176166e7faf7e19fb5ba65bbf0a54ab8ab1772fc7394157af02eddfcf40055292ab05431af6210adda30bdb3f
 EBUILD sqlalchemy-2.0.4.ebuild 3765 BLAKE2B 0250e7fada00dfd9043367270cc40a7e4ffaafe587859fe7dd938dc4f7714f6a016779c928856ac35f64a430ae6f6c5629f2458dc85beb0388820fba69f81dce SHA512 565ff18cae76c9383848b569d78a4c61a5ccf1b760c363eaaa80ef489daee95f210a589a710fa273ae35ef99e768fbd17d72f2a221d31546cd43e298f41fe602
-EBUILD sqlalchemy-2.0.5.ebuild 4253 BLAKE2B a6f14ccb44fafadf73fce9f21828bf0280e7b64f9ce04c0c0728b9d384dfd05646a66bedb285e5cd8963428e235164413fdd8b05f6d4045503c5acfd04c44d14 SHA512 3f7324a41a8814850db8cc7fd2cc5d183b480cf541738e14ea51fbb269f8937e338d58498a9ef56ce6fcb1143b2b5da23f10479dee8ee68de3b5e6d96cff182d
-EBUILD sqlalchemy-2.0.6.ebuild 4253 BLAKE2B a6f14ccb44fafadf73fce9f21828bf0280e7b64f9ce04c0c0728b9d384dfd05646a66bedb285e5cd8963428e235164413fdd8b05f6d4045503c5acfd04c44d14 SHA512 3f7324a41a8814850db8cc7fd2cc5d183b480cf541738e14ea51fbb269f8937e338d58498a9ef56ce6fcb1143b2b5da23f10479dee8ee68de3b5e6d96cff182d
 EBUILD sqlalchemy-2.0.7.ebuild 3781 BLAKE2B 37a074706e9140fc1cc2d93bb07ec31e3f477729d6d0cf9fe8fab065b3070f3b2d5c9b995119967d532f0f0bbe1d278013633a917ca281c90b6a40383fd8b38f SHA512 1cec3c21c8c14cf546769a3e113dc2f41551aef372296d01c5924e22c23c7204c17e0b7fc79e5f1c421d71440022b2eb374e3a845635869402d76a405c64db07
 EBUILD sqlalchemy-2.0.8.ebuild 3782 BLAKE2B fb89f7cdcda30ae985a2a8099e1d3cf9a7274661bd84711183f80af9b79d30269504953799889ede63abf62cd82bca06c9f6ad2461cb468edebb5a4dfa3d8cc6 SHA512 63832cd21822ef46b2047e4d2b7383bb2d148f85b743988b8f557e006a0e709ed79c628a0181c204c0f0e54f59d6c38b12e0c05b1454fba5c3a66baf0c2812b0
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.46.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.46.ebuild
deleted file mode 100644
index 637bcbfc00de..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.46.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		# https://github.com/sqlalchemy/sqlalchemy/issues/8762
-		test/orm/test_query.py::YieldTest_sqlite+pysqlite_3_39_4::test_yield_per_close_on_interrupted_iteration_legacy
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.5.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.5.ebuild
deleted file mode 100644
index 3eb291b7b107..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.5.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-		# TODO
-		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
-		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-		test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_3_40_1::test_cant_parse_datetime_message
-		test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_3_41_0::test_cant_parse_datetime_message
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_delete_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_insert_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_update_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_41_0::test_delete_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_41_0::test_insert_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_41_0::test_update_single
-		test/base/test_utils.py::ImmutableDictTest::test_pep584
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.6.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.6.ebuild
deleted file mode 100644
index 3eb291b7b107..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature pypi
-
-MY_PN="SQLAlchemy"
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		test/ext/mypy/test_mypy_plugin_py3k.py
-
-	)
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-		# TODO
-		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
-		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
-		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
-		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
-		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
-		test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_3_40_1::test_cant_parse_datetime_message
-		test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_3_41_0::test_cant_parse_datetime_message
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_delete_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_insert_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_40_1::test_update_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_41_0::test_delete_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_41_0::test_insert_single
-		test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_3_41_0::test_update_single
-		test/base/test_utils.py::ImmutableDictTest::test_pep584
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/structlog/Manifest b/dev-python/structlog/Manifest
index a47ed1e944ed..c92c42c41422 100644
--- a/dev-python/structlog/Manifest
+++ b/dev-python/structlog/Manifest
@@ -1,3 +1,5 @@
 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-23.1.0.ebuild b/dev-python/structlog/structlog-23.1.0.ebuild
new file mode 100644
index 000000000000..08625d392de3
--- /dev/null
+++ b/dev-python/structlog/structlog-23.1.0.ebuild
@@ -0,0 +1,31 @@
+# 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/
+	https://pypi.org/project/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/websockets/Manifest b/dev-python/websockets/Manifest
index a9a52dc02733..e1b253c6584d 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,5 +1,7 @@
 DIST websockets-10.4.gh.tar.gz 309611 BLAKE2B f3a739368ff9d78fef79324af59d1e77b3fb654b8b1a847373a29f19b11ae9266b9a938d235ee27d12b59d9b4cf29825fc7298ff2f35e5b260df2c7a41a1bd78 SHA512 087b1920ff26e21b8d3b80b53249d44b841fc45a4992df1ad725112404f724a41aaa2d759a2bd521dfe337459f8bf0d2ae048c423489f527c68f6825f928b582
+DIST websockets-11.0.1.gh.tar.gz 347321 BLAKE2B 21ebcf13c41f5e7ea5247174684e8e37ac383fe94da7f6a1ebfeaf6024669fd2b362847055775a81cb4a36722526a42b91c9e28e1a8d016918ffe16481375f7b SHA512 a9c3bf215c5c5cf1032cf8f2cd85cc8d78e3486f4e40e301be246181dc64a5543377bc7205695f89f7141b2c48115cbcd1cca6a353ad9d36ac9cb294d48b2e2e
 DIST websockets-11.0.gh.tar.gz 347307 BLAKE2B b40b8e88375a1e5e0f6ae1c73169703d206800dcec15d858a0360374701b681ec17c457b014a29dc34962ca1f62261a8b8298e34092429864d790dd4a060e8d8 SHA512 367347464d5d721ad65055743df92311e7d98d0391ff437ab8c3224f1c1e4193b5abbdbf1498cd040d9b30251e6bc051e9c1ec54122b87e4c937026e0f6f3b8e
 EBUILD websockets-10.4.ebuild 833 BLAKE2B 909c86ffb1ffc7c4791a88be6b429e8900f9cba4eb4398c94538d28a8a8e50f9461d534f75c1f84b2e82fa68e031c0a4993b8df0f743e003fb80ebe36681fdf9 SHA512 e18093e4d4d726a49040e58e9f218fb3e959b049682c5d6d10ef4f8c0e99e632fe4a2d26728e3109eebbecc0bc701e89d74f1f25ce28db3e5522d8433e2e507f
+EBUILD websockets-11.0.1.ebuild 981 BLAKE2B 840a56ea10f4a30d23d9bb5f656d3b6fdaf63014811516fae0129751ffc01b1aaab0cc019f71443052ec4e125d3f47c662f130d6429c7aabfc5d2eb0c72b59ff SHA512 32233030eadd7e3557490b16c394400848ebb746c08b8aad8d07a98caca03ff67531e7ee45fdd7b2069a9964775b48b5442a6d0408602c4c4010e35deddeb26e
 EBUILD websockets-11.0.ebuild 981 BLAKE2B 840a56ea10f4a30d23d9bb5f656d3b6fdaf63014811516fae0129751ffc01b1aaab0cc019f71443052ec4e125d3f47c662f130d6429c7aabfc5d2eb0c72b59ff SHA512 32233030eadd7e3557490b16c394400848ebb746c08b8aad8d07a98caca03ff67531e7ee45fdd7b2069a9964775b48b5442a6d0408602c4c4010e35deddeb26e
 MISC metadata.xml 572 BLAKE2B afce82591050907a54865a291a350c87f8d791053068484547ed0c3ebb826ba2fac3e3f73ce0c44f2851e05d86f3f2ff50146616743dd91be7d7270948b62c55 SHA512 841ba06ef123bf7176bcb6fd1dc5566b9bf5c67e8209bb84b201c68cd7ca985cfb2f11403b8621bafb16f4266053698992abe6926e2488b503ed57e42396271a
diff --git a/dev-python/websockets/websockets-11.0.1.ebuild b/dev-python/websockets/websockets-11.0.1.ebuild
new file mode 100644
index 000000000000..b9486a23c5db
--- /dev/null
+++ b/dev-python/websockets/websockets-11.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for building WebSocket servers and clients in Python"
+HOMEPAGE="
+	https://websockets.readthedocs.io/
+	https://github.com/aaugustin/websockets/
+	https://pypi.org/project/websockets/
+"
+# tests are missing pypi sdist, as of 11.0
+SRC_URI="
+	https://github.com/aaugustin/websockets/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export BUILD_EXTENSION=$(usex native-extensions)
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very fragile to speed
+		tests/legacy/test_protocol.py::ServerTests::test_local_close_receive_close_frame_timeout
+	)
+
+	epytest tests
+}
diff --git a/dev-python/ypy-websocket/Manifest b/dev-python/ypy-websocket/Manifest
index 7b5d710a2106..c20940f8b03e 100644
--- a/dev-python/ypy-websocket/Manifest
+++ b/dev-python/ypy-websocket/Manifest
@@ -1,3 +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
 MISC metadata.xml 414 BLAKE2B a58b2ac27d2f9e1a1d06c8fd9dcb6f9d1654fd2665d6d676a734ba228b71f6da488b835b7cb5739a6acad7102a669356e8f872bc96ce40b6ab0104699f8a7379 SHA512 533c2d5a8363cc5575d8ee08a3642f8b6fd11311fdef7d6902cc5e19fb33512ca2d9a6ecde76e909a6192a48449d612bb2b6db7b96ad1d99a89d67b06b749d76
diff --git a/dev-python/ypy-websocket/ypy-websocket-0.9.0.ebuild b/dev-python/ypy-websocket/ypy-websocket-0.9.0.ebuild
new file mode 100644
index 000000000000..f068e06e1ea7
--- /dev/null
+++ b/dev-python/ypy-websocket/ypy-websocket-0.9.0.ebuild
@@ -0,0 +1,51 @@
+# 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="Python bindings to y-crdt "
+HOMEPAGE="
+	https://pypi.org/project/ypy-websocket/
+	https://github.com/y-crdt/ypy-websocket/
+"
+SRC_URI="
+	https://github.com/y-crdt/ypy-websocket/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.6.1[${PYTHON_USEDEP}]
+	<dev-python/aiosqlite-1[${PYTHON_USEDEP}]
+	>=dev-python/aiosqlite-0.18.0[${PYTHON_USEDEP}]
+	<dev-python/y-py-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/y-py-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Requires internet and nodejs
+	tests/test_ypy_yjs.py
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# lower the necessary version
+	sed -i -e '/anyio/s:3.6.2:3.6.1:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index e9c5ca13ed40..ca54300e9a8a 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -3,9 +3,11 @@ DIST python-zeroconf-0.47.4.gh.tar.gz 151640 BLAKE2B 4591135e81fc0c1c22444fb8823
 DIST python-zeroconf-0.51.0.gh.tar.gz 152236 BLAKE2B 2339bd47e4f8abecb5b56c722e275c0cef63d4ab389c58b9a50e22e2a450b527f11727615a9c61e6e23d275195353121c5697f2fd496fbf9370465db5d9258c8 SHA512 e62d74ce164cd92913382e5a5530e2732a739e065f3f2fa7bc5cc7f62e863c98e8979ab08f5527f301e833cd1107c2d1c412db1dfafbf2bd1546b6e197d2c43a
 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
 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
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/zeroconf/zeroconf-0.55.0.ebuild b/dev-python/zeroconf/zeroconf-0.55.0.ebuild
new file mode 100644
index 000000000000..18c772b8a425
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.55.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 de544910bc4b..a746cedfa172 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 9f326981367d..b18fcca3f599 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -10,10 +10,10 @@ DIST rails-7.0.4.2.tgz 11063555 BLAKE2B f8a862ce91a356dad702a44f1e36f8910e914817
 DIST rails-7.0.4.3.tgz 11063764 BLAKE2B 389fd3a00bfff4ebda70cf5ec473942883048783b716ede1787a510d3b7b91f4e844dce4dde5ef643cb9611b1b3aa712f1ba5ebefb9e5a84e307a151b2e40bcf SHA512 2c817a0a58ae52f99686d8cd0de84f01e3d7ec05afc95d07910b3b5bf86d8162b06102893b2cbc14859b95a07eca6882a707956c87d437794697df7a18fa3c16
 DIST rails-7.0.4.tgz 11061225 BLAKE2B 9c520766f936c82ae9ee943c3db0ad575d7fc59aea947fb2790cf511188fbd33166a62332564c4714372203f5fabdde842334103b48f4115c31f5d0fe18375f1 SHA512 118035226054ad5083d2affde55a812917652491f82a9a578380a790770fdda3a14904f6de10f58651bbbab278aa23920b652aa1b34c71441d465c3b7b4be82c
 EBUILD activesupport-6.0.5.1-r1.ebuild 2681 BLAKE2B c1a4f4a3d600b4b405b472fb9589ecbffeb37e298abdf644925adda6bc671db064d44d10612aecc48c06339235267b0495e99694d14bf9a4753046b3716250c8 SHA512 92c1bf2a5ea9c6629d322467af90888786f91ec38da5e889c0869f3cc333ccf387bb5894f4efcc22885e5760470b54e66f7dc12cb9e622d96d774952705f6a6c
-EBUILD activesupport-6.0.6.1-r1.ebuild 2675 BLAKE2B 79c93503f43330d098bc34985a03003e74bd5f23a686a557b21e3eebc98e096c3f330681c72df487c7322e7b0e5100ba244316aea106131f2df5fd0f80c16814 SHA512 fca6e375c6f0d13288eeb82b774ceae719b23a98d1e18b30e0763686642379cf8009004fb69ecc9872d95d925e95edf8b05118bf40a56424867d413f3891ef26
+EBUILD activesupport-6.0.6.1-r1.ebuild 2674 BLAKE2B 0612d7adcdb34b65c962f8c9633e9f1661e76c905b91d7dd6a5e21493672b321682f7c5c01e994f27b2ed151dcca0c7ce598def736334bde5877ff6fc4ac600e SHA512 1a4b866c193f22a642ff15241e3901373352bc0324e8e72663762c762e57a1237ef848a8736d29591dde16b14f1612bace27c1e34ba238e675e1e3d2ee6f612e
 EBUILD activesupport-6.1.6.1-r1.ebuild 2772 BLAKE2B 3e908c2ae81e5e47ddce97b57e6015b05b194a04308ccc09d329327a5449a7062a1f906c20609e8a40bbbb7824ed886d358d97f2277ea0b4e30120bbda42c70f SHA512 0ed3a526c4df26c88874512f316a219baa90ec21513b64131180744e26eda3e09836474a4fbf723b44839e86cc31d63e86f2ab17053b428612db52610d7648f3
 EBUILD activesupport-6.1.7-r1.ebuild 2778 BLAKE2B b85cc9e1280e7f4ca5759fa7a12435c0b4defb58d66d62ca92cae296f7d8256dcac419caeb5f4d51797fb61bba129064a4501691f34643d55e25a5dfdc3e0b6a SHA512 fc9222ae8f81376559e0b63ecfb38af8de5265fe1c1ca1960537b978e0edd10fe1d02fcc19e711ebe4c36cf9afed8f57a6fa5889719e7dec80d2735f6bf3bf2a
-EBUILD activesupport-6.1.7.2-r1.ebuild 2776 BLAKE2B 27711864f274bf457078ae656f56892986581ee3f4fa27a22de162543e2fdea37ffe8c03da49e5d5a103ab7e5be830ecbe8304acc57c14eb31d4696f6f6f98fe SHA512 735f2b7b506f5c43869b6921cd7d1bc58f8c4052a80cacc007ffd3e69c449e1236fbbc5d81ce7a3233c3d386936f5505361fbf2b7cdfca013e9f39f1b3223cec
+EBUILD activesupport-6.1.7.2-r1.ebuild 2775 BLAKE2B ed297c212190a348bde27a48c95fc62885e6114211a139f5b7cece79f2707222911b04e1f674c9cb56b87dca16f7ebfb0010c18e92002253fec7faa97d6ce551 SHA512 0c5d44b440115ea4f144df5ccde0ffddf8bc527a8a9afcf30f24996bb435876fe6efc7d0f6b22e93327d40cdd315f6acdc3fb1bea35357740976eaab818cecfe
 EBUILD activesupport-6.1.7.3-r1.ebuild 2851 BLAKE2B 85ccf814786b3084ef629ca4f915a0cd3b9414747f4a0136889110d38c6b192f56bd492e117cf5c7f366e27ad3b7d82e46a86eba99b597e066a0835bfa6c5aac SHA512 ae79febc9220e3ea25dbb032f66f4509c3608f28115d89a1ac3ac835695d85746e75101eddebcfb5896394a761e5b66bcdbf331ee540bfb0be56d4b5835d478f
 EBUILD activesupport-7.0.4-r1.ebuild 2761 BLAKE2B e88e7cd2bc22a9da8bbd43d807fac807cf118b2a13f1648fba8f9ed31e5fcc11a785e520e49dfc3c92af1a200d3a0e2f0c67becaed5f171d4545e02b30dd5a43 SHA512 52c9dae526bdf53e2265c092269c588a10e091e5da196d114fa817a78e09b70df749e850e7f6032da567bf2e692ad48ecdaea6beeb685a522fa602387473076f
 EBUILD activesupport-7.0.4.2-r1.ebuild 2761 BLAKE2B e88e7cd2bc22a9da8bbd43d807fac807cf118b2a13f1648fba8f9ed31e5fcc11a785e520e49dfc3c92af1a200d3a0e2f0c67becaed5f171d4545e02b30dd5a43 SHA512 52c9dae526bdf53e2265c092269c588a10e091e5da196d114fa817a78e09b70df749e850e7f6032da567bf2e692ad48ecdaea6beeb685a522fa602387473076f
diff --git a/dev-ruby/activesupport/activesupport-6.0.6.1-r1.ebuild b/dev-ruby/activesupport/activesupport-6.0.6.1-r1.ebuild
index 472f44c5a7fe..2da6e6ef5818 100644
--- a/dev-ruby/activesupport/activesupport-6.0.6.1-r1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.6.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-6.1.7.2-r1.ebuild b/dev-ruby/activesupport/activesupport-6.1.7.2-r1.ebuild
index 1611bfb4a059..a86558c9b944 100644
--- a/dev-ruby/activesupport/activesupport-6.1.7.2-r1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.1.7.2-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index b5f85c3fcec5..23d11272a2d2 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,5 +1,7 @@
 DIST addressable-2.8.1.gem 105984 BLAKE2B 9ba6fffe2af965be57ef7b2f86c5c86c672e0037c41996d78a3b8f31a9b5a5818e06d7e119733cff3d5469bc985186fac6fa978740f107876a975b5ac662171f SHA512 ae0b7cb5fdc0b5b8717637e9589ab9167aa3924253f4c9102134b1e5aee07c7f5e3e92e2e32ca872b4a72a3a70c8086c7073cbbddf7cbb6e1948ed97de2c9108
 DIST addressable-2.8.2.gem 106496 BLAKE2B 701f4c298686593cadc7317fe2072474fa2a4a35c53047d650fb166db969d5a0e8eca703d2ec2ed334936711d7fe5c839dfe6f04bea5d413da22a41094d58b98 SHA512 9c5f2a5cad9f1f4ea9ec9ab30106123f922737f9dafdf5efd9b74c939e933976c37c0a9775743e7277a0850fa1676ede5520db4fe6e0a9507e5b3a2b94d9d8d7
+DIST addressable-2.8.3.gem 105984 BLAKE2B 00775f119c59d3db331bfeb3bb48f26c74d938714791183a4099fc4da7c871045c12074132e6368b2a8a0c114b18e301735aa142d8ae4bc52a77f55cc3fa61a1 SHA512 dc3f0731b2ccb464473ac9005d8a68fa457b9d5f83fd60f32fa2cd741b69d0e08e89c5ea10fb4734c0bb563ef73797cfd5500b486f1daaf0e1456488ec8c2340
 EBUILD addressable-2.8.1.ebuild 1324 BLAKE2B d767cf2fee7f7cd63ed69e7c81f20338858f8e98417687a6b9a26a988a3974b4a0a34c7dad1a1b696bfc5391dc0665ad6eca8cfbb5afc8ca3aa5f617be034413 SHA512 33fd7097dcfcb39269469e91525665c1fa2ec73d00e0c0f004d95a507713c2401ae394e3d9bad4ebaa25a1dee777a6ec18237889a627e110f0bbbfc26cf99363
 EBUILD addressable-2.8.2.ebuild 1330 BLAKE2B 4c61a89c14ec3ba295b90d79cba85c94dbc7ac52f5df57460a8a95f4d4304113865f4552a4ffbe6e51f2536dc5b43a28b56777b38f8ab849cc6f27a7e9bb884f SHA512 bc829e6b4428c9dd64acbca0eafb096b33d74ca1d38f84104d9e6e0054e8307a8caa0b410a6192250b983e6899392d395b21916995d673d29ecc5dade1e6f7ed
+EBUILD addressable-2.8.3.ebuild 1330 BLAKE2B 4c61a89c14ec3ba295b90d79cba85c94dbc7ac52f5df57460a8a95f4d4304113865f4552a4ffbe6e51f2536dc5b43a28b56777b38f8ab849cc6f27a7e9bb884f SHA512 bc829e6b4428c9dd64acbca0eafb096b33d74ca1d38f84104d9e6e0054e8307a8caa0b410a6192250b983e6899392d395b21916995d673d29ecc5dade1e6f7ed
 MISC metadata.xml 405 BLAKE2B bcbba1d9880e5abe377fe1e7fb1e1c732f1fd00bc32fcc48f69e5529749900d89dbe0e69de4477d4e0984d780b02164d812407951cb2bc3f9cf052e9ad5d0217 SHA512 2f270c88c5a807840b8165ab65bd6de51a878d218ab71ff0f7de18f60be298b6d048dacb8601605c0b1960852ba9b841de742e3bc64d74b96fb88d8338ca33fb
diff --git a/dev-ruby/addressable/addressable-2.8.3.ebuild b/dev-ruby/addressable/addressable-2.8.3.ebuild
new file mode 100644
index 000000000000..f81a5ff2c1a3
--- /dev/null
+++ b/dev-ruby/addressable/addressable-2.8.3.ebuild
@@ -0,0 +1,42 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
+HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
+
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "|| ( dev-ruby/public_suffix:5 dev-ruby/public_suffix:4 )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	# Remove spec-related tasks so that we don't need to require rspec
+	# just to build the documentation, bug 383611.
+	sed -i -e '/spectask/d' Rakefile || die
+	rm -f tasks/rspec.rake || die
+	sed -i -e '/bundler/ s:^:#:' \
+		-e '/^begin/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	# Remove specs requiring network connectivity
+	rm -f spec/addressable/net_http_compat_spec.rb || die
+
+	# Remove spec that tests against an unreleased github fork
+	rm -f spec/addressable/rack_mount_compat_spec.rb || die
+}
diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index 55bda956ee99..c72b9c87528d 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1,3 +1,3 @@
 DIST airbrussh-1.4.1.tar.gz 1450155 BLAKE2B cecdc1b278a23c76b169febf5aa704d024a1ef41344a81a24d28f2a0f53830804f494d1bf967d8a54bfa73a92df333095fcc4591970c1d3e2ed1c23095258d11 SHA512 33bc484a3ac42a2a4a3795068649e93472bded1f887d9cdab52f4268090889b1d6ddc1c8743574b07e174eb606b24311ee13952d8b61517841693b44bf92450e
-EBUILD airbrussh-1.4.1.ebuild 1115 BLAKE2B 519d37c1e31ada1b6e24833933606ca5bc06832eb9050a8ca29ee4fe8ceaebc1d307f4e165f7048c1de675335515ec27eec1ed38e08b660dc15f90c910b42d85 SHA512 6cfc853b021bd399f284b3ceb62391bed639d5787804fd80e20e7946e249526f1ee3b09182aadd85b43f265cc64d53ee37a986ecb351e078073178bf6fac0843
+EBUILD airbrussh-1.4.1.ebuild 1132 BLAKE2B 43b149fcc4693ce667821fcc34be819de430c10f3c3c2598fe35421b5ee6ac298e88a0394e0f8340183e89c7c93c91c8269cf6b4f8492b6fd32c51cbe1788d7e SHA512 f2be621f2f00156e1ba35bdefea5cc49c185458f649ffdd87e2f005297ec6c1eaf7d39dc401ba1f336ef979f72d60512c3d93af724d9664a9b0ff39c8832a4d9
 MISC metadata.xml 480 BLAKE2B 15cfe108e1870ef152c0b6b52bf912e6d57616fa9a6483fe77360b6f73e3b9e982338afbf3dc10d1b44d725df2253895988e01416827fbda817a453a424ad633 SHA512 8b24f6a0b49b0f078b4ad6cb401efda9b89f514db66309dbc2e4518ebbd48b7f39340b3fee42a35f0c446fda43124a67821b7bc30fea3b20e965779ff8a39135
diff --git a/dev-ruby/airbrussh/airbrussh-1.4.1.ebuild b/dev-ruby/airbrussh/airbrussh-1.4.1.ebuild
index 6fade7b39565..b87e69f23648 100644
--- a/dev-ruby/airbrussh/airbrussh-1.4.1.ebuild
+++ b/dev-ruby/airbrussh/airbrussh-1.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
diff --git a/dev-ruby/async-container/Manifest b/dev-ruby/async-container/Manifest
index 7f301454a33b..f6bd33765e5a 100644
--- a/dev-ruby/async-container/Manifest
+++ b/dev-ruby/async-container/Manifest
@@ -1,4 +1,4 @@
 DIST async-container-0.16.12.tar.gz 22626 BLAKE2B 8e850ebededcc0110a8ddf79c23287d816973fee1c32b7e7b76a7158995ffca5476d8701b3b4499aa3c0fd023ee9f253e4d07bc9ad0562a32d529678d0569701 SHA512 d71bdd1dc22a7ebecd4fed7e17b28c9ae1c875e111db4fb9cddda3508113e3cb7fc72b820c447cac27f047606d20f62180b203e58164da18dc47cff385262441
-EBUILD async-container-0.16.12-r1.ebuild 1277 BLAKE2B cf0d922255cab3900b1f5c126aa103fa96db833e8c657dc00c353e857f910a03f359072151b64f483c6bd328d94e7b164d5f882a7dc521b09e8777862b3753d9 SHA512 1e39d2095c58d15ab787a4871f92e01282264425e2ebf5efadcc8fee99a081572024c618c81ed4be5f05dcae5eb0ea3de0a4ee51bce29bfa0af55bf1baef6872
+EBUILD async-container-0.16.12-r1.ebuild 1296 BLAKE2B cb18fb4e48f1c78ee6ef88e601aa3e327e0efac9ff7eba18b7ad7439ae9636240450b8c18c0f95f73b486dd1e87182c34e72f34ad229a678c43eca70b6fbc359 SHA512 66fc9400ba9e899463a7f7fb8cc73a2e8fc021802c84a9990ebefcf6b9f3ae30b0981ce8caaca58204cb83a674f0937022cc3a1dddb42d47ead96cd9497b3d56
 EBUILD async-container-0.16.12.ebuild 1284 BLAKE2B 55c15ad469a45e34fa6796c5414cdc8d69909fab1c673bafcff849610329b2041981b136c794346fad46aba54f486cce67c5eb58d7fc8ed8f33fad536565c34a SHA512 dedb0eef4c1b7e4b34f571ecd05d883a0f79504bc42dda4defc7364e1a48a8064f4119cf5188ff35ebc6d22f525f4869a3a92d48272797ea4009b8cc587cbb20
 MISC metadata.xml 351 BLAKE2B 671a90bb6d0e6ee6c41c96beaefba1bf84f236b557c8116d8489da01f034edbd3a122063df64a85c587cc114455b9d9e00404307d1539c8fd8e79c781297e337 SHA512 402376317da59de4bc9f10422743898870efb6f9429ba07fc37861e3c4752b4ef2197051b81bef300d07279c6bf55f9c5796a5b5c84cab8dcaef9a07537ff725
diff --git a/dev-ruby/async-container/async-container-0.16.12-r1.ebuild b/dev-ruby/async-container/async-container-0.16.12-r1.ebuild
index 366f3cb3c727..c6f318021cbf 100644
--- a/dev-ruby/async-container/async-container-0.16.12-r1.ebuild
+++ b/dev-ruby/async-container/async-container-0.16.12-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/socketry/async-container/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/async
diff --git a/dev-ruby/async-io/Manifest b/dev-ruby/async-io/Manifest
index 5269386eb3d0..aa9fbfdbc928 100644
--- a/dev-ruby/async-io/Manifest
+++ b/dev-ruby/async-io/Manifest
@@ -3,6 +3,6 @@ DIST async-io-1.34.1.tar.gz 34163 BLAKE2B 782131de9b652d2b9e622dd6026835df208993
 DIST async-io-1.34.3.tar.gz 34178 BLAKE2B 0af09d723682f6818e63e43a356539c098c37f5ea2ee72638e8aa1af888def845f412eb5ebc6a0fd4b51d76a03ba66b78cb70d09336ef50cd68bcd6ba7c50002 SHA512 2523ae6aa4590672e2fd6a4755cde30fe3cc54a98bf8d75d7eba0b9ec052fad232f4feaf4d6e948421b152695cc2217c4173e2475c9ce5859e4230d1078d0444
 EBUILD async-io-1.34.0.ebuild 972 BLAKE2B 7593c4df2e65e55ba773516e31970645650a2306ccd53cd7e8c5f5acf977fca10e27eed5ffcd8ed01c31ccd6a90f64440f2baad56c86713d9e3159e242be3cae SHA512 aee8fe685a3b87fe904bf904523443d1ed05f0b05ec54e6dc78c8928050bb32c2737aa55fa48f03afe3b8556980bc157cce40671d2e5eeefc9f9f76238bf4d79
 EBUILD async-io-1.34.1.ebuild 957 BLAKE2B 76926155496b2e944c0779572b132008137c9655cf8267fce2a1029299278bf5ffaa3c9a3223998f307afc18198db1bb8bc35fc83919a30d7717bd64b3f2428e SHA512 b50d9ac40bc0ac240c0dd2c2367e7bcca6aa591bc2a2fbec4f92e38fbb07fc7aaba32b4de8ea7861b0a7028d1682e3be27c6ae4ed30a2a71f9e37e2eddbfad03
-EBUILD async-io-1.34.3-r1.ebuild 945 BLAKE2B 99f34d4b355c37997c098d576b2d3d6d6af0c5334e2b4db9b424cf0f89a94eb6df77cdb43637d07164944c4401f6a462d078184b008c5cde56a314dbc35fac50 SHA512 ce8ba77d368071a9ddac11f6c751b2e0aed1647514f0035f8193a9a30f2b448c6bebc28a69ce7ba9cadb5a63f8736eb15440cedfd528bcc29bd8c69c508e62eb
+EBUILD async-io-1.34.3-r1.ebuild 964 BLAKE2B d0bbaa0562a33b9c9d2175bd3d7daa205ccbd8e5c0f9876888f87faa8a418aae6fb8b4a929f7a32424a9446d00f72f5ebb0f947f459bb76ea049d6ed40ceb708 SHA512 e808cb330963f8d5fbede4e9323151de68732758218b29dedd58a4971780057925803cb1234374e12dcd9cf82642c7697d90163da2fed7976166330cc68528ff
 EBUILD async-io-1.34.3.ebuild 957 BLAKE2B 76926155496b2e944c0779572b132008137c9655cf8267fce2a1029299278bf5ffaa3c9a3223998f307afc18198db1bb8bc35fc83919a30d7717bd64b3f2428e SHA512 b50d9ac40bc0ac240c0dd2c2367e7bcca6aa591bc2a2fbec4f92e38fbb07fc7aaba32b4de8ea7861b0a7028d1682e3be27c6ae4ed30a2a71f9e37e2eddbfad03
 MISC metadata.xml 344 BLAKE2B 7fb67688ba60d30637605ba7a2020cb328e18ffebd9fd6fed09114cc14596836b0dcc4d1590fd3755952baa52c258bdb9a935c47b1a4ef4f2d5e545e931d40fe SHA512 6ea960fe1feb969df78e66ae985b6ac95faa09a248d694aaa47876634f84a09a3807effc2b4289d35dbeaee3793c2c73276fd0f8b87375ab99e813085edd12af
diff --git a/dev-ruby/async-io/async-io-1.34.3-r1.ebuild b/dev-ruby/async-io/async-io-1.34.3-r1.ebuild
index a664fe46b31c..8962b2a3c994 100644
--- a/dev-ruby/async-io/async-io-1.34.3-r1.ebuild
+++ b/dev-ruby/async-io/async-io-1.34.3-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/socketry/async-io/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/async"
diff --git a/dev-ruby/async-process/Manifest b/dev-ruby/async-process/Manifest
index f69f3b84d2c4..e79b1cc81861 100644
--- a/dev-ruby/async-process/Manifest
+++ b/dev-ruby/async-process/Manifest
@@ -1,3 +1,3 @@
 DIST async-process-1.3.1.tar.gz 4138 BLAKE2B 8c3b3109e016e135005dd25db96fb2d38c568ce88410ca8d1c22cfd23ea8f34f926447cb36a75d3a60fa11d8bb08cab6b46e45d88b8a42f2585e7ab0c6179c81 SHA512 13f6ded2f9001c8759350b6ade002703f3ba58dcc2960055c5e52c7e44c22af9c59c69713c55cb7e7244a7f09e3557a75f41161a7aafd5f6c279f4bdbb698e3c
-EBUILD async-process-1.3.1.ebuild 948 BLAKE2B 3a7d171c9c2479b39c7a47757b041d7d87b309e7f8566bf09dfd2a561a7cc6702d9f3ac2c7f0db80791edc9ff04d3c1114da8758a7469f2fea84a016a23ebc0c SHA512 e544e8f4c184670a53dd4871304deef92d4777bba095c908fdf69d57aaf23a6331b30948409ba93db1f0f9ae41e24c06fd0ec109efb649de1501f7fd5d47fab0
+EBUILD async-process-1.3.1.ebuild 967 BLAKE2B efa6452969205bb236ef73265d93652cdc0e70e898abb11e2bc9fa418410d17dee008617ae1aa01087d8354d1350d4c8919c28fc5b714f5b6de5543a6bdccc9e SHA512 4317538f785b972ea66e6df54b9a00c03e656e8bc03da9e655ea31fe03363193b3086158e1290a87e37f8c2b265f428fd7107fff4efb07a961859e573463dcce
 MISC metadata.xml 349 BLAKE2B b0fa4bde86b2d91060eee33d6b4cf5d761dc4c664c855829bbb039d65a6b7aa8ba13dae8b6f5a93ba3d0a4593c74f22a347a9be6809ea4f46f7a309d7489389c SHA512 ec9e374a9b91baaf96eb669a71930942300896b87f26dff7884cba32fb5f502c8e7ab72a6b363623416be8307d533418b46d33a79bc671c358a666224039532f
diff --git a/dev-ruby/async-process/async-process-1.3.1.ebuild b/dev-ruby/async-process/async-process-1.3.1.ebuild
index 7d7f639f6b3e..07509723ee1b 100644
--- a/dev-ruby/async-process/async-process-1.3.1.ebuild
+++ b/dev-ruby/async-process/async-process-1.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/socketry/async-process/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/async
diff --git a/dev-ruby/async-rspec/Manifest b/dev-ruby/async-rspec/Manifest
index 0fc5336154d1..462dddfa8801 100644
--- a/dev-ruby/async-rspec/Manifest
+++ b/dev-ruby/async-rspec/Manifest
@@ -1,4 +1,4 @@
 DIST async-rspec-1.16.1.tar.gz 7775 BLAKE2B a1ff314fbe3e42b9b25e1c891bf1a336644fa5183b6f504b06e0747c127e712a66a0fbb2f18695bd7cba91ec8a4e8af887a25fe3e9887f86fb5f17873e26f51f SHA512 5c2bc5cf5ff4ca25cad67e251b5e078ac9f6f2d0f5d50f67584d4a043040c4e9e9e51d3a9e2727f08de3eba39d46be66461e691af8b86e173d8b70b589161a29
-EBUILD async-rspec-1.16.1-r1.ebuild 940 BLAKE2B 28ad228e739b86e62462e483bc4f65163e1a92938e0ad69e564967c8278928981db304cc4d12c010a2961b26deb28f61d6da8f067070bd2bc92e78920a6ff6ca SHA512 1f861a2070d0a5141c136e4f9c31c11c83052771704e8c094c61410e84dbe804e23bd5c450eb742bf69b75abc3df66cebc31b0ba8768546860404f6e261a72e3
+EBUILD async-rspec-1.16.1-r1.ebuild 959 BLAKE2B 32abc27bcdfa89a87783332ebdf54f8cf788fa8b8d663ad1dd8ba3216d527d9942f31deb5e0d07bdc281f8912ff9f8aafd79fe753837137857aa7f40fc9c9fab SHA512 b83b37a20d13266a6aed701728db26cb63c28e32acbc07e76f1446c6e125ebbc2a63d217b22f30c67c067277703404ac3fb170c218475a39d18181535bb448fd
 EBUILD async-rspec-1.16.1.ebuild 947 BLAKE2B 9c12d18f0df2a63c4e11d64bbf521f245fa953a2a0a3b7b21c0f0d4cea14c240703dbe4f404ada307394b7e1662779fbb03e9b2f51b9016cd701b95b07f0a5f7 SHA512 3d1452b609677bbf7467f3c6f1384cd7a5130cb2c3cdafb1c9d0f96b8263733c3e8eed23df6b9cc32b9391249a5423c96fa340a434be23f9f17c5cdc8517f28e
 MISC metadata.xml 347 BLAKE2B d18d791313af87bcb00267fa7886d513738c127ca281e4e3f2eca2d3a345748097016ee229ea663efae9980d5fee97d27b800923021e682a9a9bb28bd031c0a5 SHA512 6396202046253385c58f6b5d1762800d596027e1d7ad7e95d69695023dacffa0bd32f2d0efa396fafd5e65bafd55376018f27e127752d5109f537339ac06584f
diff --git a/dev-ruby/async-rspec/async-rspec-1.16.1-r1.ebuild b/dev-ruby/async-rspec/async-rspec-1.16.1-r1.ebuild
index 7e2ec2c97046..6aa0aa0e9bb6 100644
--- a/dev-ruby/async-rspec/async-rspec-1.16.1-r1.ebuild
+++ b/dev-ruby/async-rspec/async-rspec-1.16.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/socketry/async-rspec/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rspec:3
diff --git a/dev-ruby/async/Manifest b/dev-ruby/async/Manifest
index 62962819459e..b7ba311548e7 100644
--- a/dev-ruby/async/Manifest
+++ b/dev-ruby/async/Manifest
@@ -3,5 +3,5 @@ DIST async-2.2.1.tar.gz 75671 BLAKE2B a652bbb99d49c569fd864015059391a013f35c888b
 DIST async-2.5.0.tar.gz 84307 BLAKE2B 0aa9042e6e63087c08def6a5bd66f51565addaf8caf1db3ce5cc94afd397e164dfd0e7af40d4f55d05b0bb08cec3c98dc89b5e4345ff053f06617a8ba6a9b0c8 SHA512 caa16d07b2863f236bdd31fc87aa29216a5e32c8182a6e6bf9fd5203cd223350bb1746be02a617f8930c31f2941ce4204f01c5f2fd902c215a1898192afd01c3
 EBUILD async-1.30.3.ebuild 1085 BLAKE2B 1e659a38ffcb334ffcc5f4c308058f42c9b09c9932b4d631a0b2177a21bc649db56f81fe412b67b42de12db45673697573070169f65346451ef552feb0024e8d SHA512 fbe133e2cab13eec23cad652eae0eec40000ba5d4e2b17391f87a5943e17d9ebf4ebf8eba5459e669d5c2e0fc30a12c0b3b64ad02f29084e46f8401f25504fb6
 EBUILD async-2.2.1.ebuild 1186 BLAKE2B cbc4c374d1caca55be6c84525c8d5d2b02fb46ff1a9b1ef09cc360cf6c1913432eded53f92f1750ea5baa111b91e637bc249dcbf74948cdaa1db46cc5c2ad824 SHA512 8f88a3ff2f1cef888a65ca857dcee7c0708eea7526ba9f79a709e58fd5820f17c37e86ca102051b1194bea83d0686ec6b229b9951ebefe8c1be1ecd5c9eba0ec
-EBUILD async-2.5.0.ebuild 1102 BLAKE2B ded2a224693e13716e26c88c252329fd126bae145eab2bf6fa31d88e71ef53ad8f7f89e173982ca625a5b54d1a18dd236aabfaaf5bde300f05806f1a153f9ac5 SHA512 229363d056356c22fdbf4cd5d334ceca6ee4cae8615fc449ea2c502e67930464bbee6ffc8d8b7413de0bf1a17d0992104e0b26649ce8e35d4ac516395b39788f
+EBUILD async-2.5.0.ebuild 1121 BLAKE2B 8e7ed13bd0a300749e7d3f4ddbda043de5d58f64d0d4932b4b35aba33f473557f9553e18edaf638cb38e195a5e6f5a9f2dd7a111077f5d8fb7ce70ad0a662360 SHA512 a66b47b985db49a540e4d320455c78d92ed9fc1fa81f696ba2ecb8a32f73d40a4d6b828e0069a21167d94ac8c8d6e544097f82e5c4ad8ea932fe1e14c282a861
 MISC metadata.xml 341 BLAKE2B acbe731aefbd211b23790c22ed97fbc1f83c45cf5ed786aa99fedafa5ca930081e71b3466584846f6e2f7a793da65c82bb4c9c85c15a669ebf5e7db47b74836f SHA512 d96626a4c34ef4981c11dcd07f51a9940d29b2bd8013868f3e5778d2f62a59bf3ca864a370a4d7951ca98079d6d5939d9aa9a4f4ed0233ec5f7fe544fa64fa26
diff --git a/dev-ruby/async/async-2.5.0.ebuild b/dev-ruby/async/async-2.5.0.ebuild
index ba7c4f2e796e..a37891de18a0 100644
--- a/dev-ruby/async/async-2.5.0.ebuild
+++ b/dev-ruby/async/async-2.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/socketry/async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 ruby_add_rdepend ">=dev-ruby/console-1.10:1
 	dev-ruby/io-event:1.1
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index af4e2a09ffc5..4c6dcbeccf60 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -2,5 +2,5 @@ AUX capistrano-2.15.5-sudo-cleanup.patch 413 BLAKE2B 77dbc37e742e1fe164540cd1083
 DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401ffa1476d9057bb8ad420194f1ab2c32d8e744d7c982ebece5c4b5369133dc8378b7adf54c78732f9cb249db2a9e SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff
 DIST capistrano-3.17.2.gem 69632 BLAKE2B e2d1c16d7b4118593e5e8741dff0fdebd69af61db9c2796faeeadfdaabf04577775b2092917c60eba6d213680dba6d241b4b4ac1295e74da11c607fb54392ae3 SHA512 2c8943eda6dab2c4016c5eb86773040a4a0640e58405115f56c9c8c02dfd06bf2c7a98a0a0bee5d5c77dde16b262ab7131210bbba8ae1b5a8f5172cae76492a3
 EBUILD capistrano-2.15.5-r3.ebuild 1242 BLAKE2B 897aade0a14bb37ae8e4af5709c5e32f37d87104359dc871445572618d70ddb14125c523b2aa3a3f0d915d30a48fc256d0b2ca7ef93cb1492b84e65e72eadcd7 SHA512 68afb2c8060adf5c0c774725e852603c624cd3699a296aaddd5ceedad7b87faf1d9f2574b0bdb811eeaff0e9110ec4f94bd472e0262894ac6653faa773c17861
-EBUILD capistrano-3.17.2.ebuild 976 BLAKE2B a17254ae8b019aff7b2f5b0b3419d8800bd73f1dfdb66274b49a962b2469ebd48c62afd22f9e61d1fb5f4e7eb6756df394a4ba96606770275ad9aa2f57af76a0 SHA512 d6034718a5af18059538507e161f7ce65871a2995587ff8f74f7e7f60ad4b512f5bc0764b1880daaacfedfebeb0dd49f1e13086e8b9b20933a35d68356ee2356
+EBUILD capistrano-3.17.2.ebuild 993 BLAKE2B 1ad68e00ab597eba2c2907bc777d224a8ab2b40c6a325c35946d54d7b8054878b375b46a2e6808c9850103c283786a64c3eaae4726eba4470c1ce9b8de93b44d SHA512 b77e59721c9550d4e920c14ab10b4d272a257a189e0b5eb744710c62ee86e136f9a58d1e693367efe475469b1edbc62842b46f65ad5408035228000cf64b6515
 MISC metadata.xml 396 BLAKE2B d27f0009de40add27cbe4a8a668ac4a82fa98eef30d794c61add8ad293db7e6b76c948499646c1dc23046cd4d88cfb36b41c1c14ebf78316ba6a4547493edb87 SHA512 98a3ccc2e6734e249cfb13754015cbd79485d20bc018312f7ff8500fa3c011db88c3955990a97da714dc6af7a6c94196057839eb76fd1612f30dba9e623ee0a6
diff --git a/dev-ruby/capistrano/capistrano-3.17.2.ebuild b/dev-ruby/capistrano/capistrano-3.17.2.ebuild
index c7b31f25d078..01ef9a13d336 100644
--- a/dev-ruby/capistrano/capistrano-3.17.2.ebuild
+++ b/dev-ruby/capistrano/capistrano-3.17.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://capistranorb.com/"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index a65fa56d0dd8..5666d2927582 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,3 +1,5 @@
 DIST capybara-3.38.0.gem 379392 BLAKE2B e1ba89daa08e43e5f97ed5c649a3ea82c27e2ee7a737844f83ba68f0379cc4ef2a0349bc2ae9af76a5cca3659c11f1ed0d1b7dcae7f7701305ca3644e40a4dee SHA512 530db1102e8bc1bfa1ac55d28a725a26a7c6c98baf89655bb15436217e99c7131edb204638f51831c416e4898b9e7c653b83c74abf8aa644eb4da0ad8cddd44c
+DIST capybara-3.39.0.gem 381952 BLAKE2B 2b70bfbf930258c2273bf0c6bddc70e455d1d717bd0ed79fc68459c6f40d47ef8149fec161dbaff08e6d8424aebbdf5160033169a6269408b368525218899e23 SHA512 0910ecef11a007d10e753887d9016bab4de74e2ddf2fa2c8b8fc32bfe7d71d64a8c0b72a0a606aa7b558922ab02b4368d1c42a0df78ecf3f68a5efc34edc8707
 EBUILD capybara-3.38.0.ebuild 1831 BLAKE2B 5d6340331a0bfaccce476f8b1a1fc060a0de11d3cbd4601f37326d5d698dc3722cbb8bdd8dd15b63af51d61c9abaed7268743338760f21d009600c94f541c1eb SHA512 c3eef527dcf786987fb191c0a17ddac3c98306f561c1ded71e9e078105f861a2eabfea9aa7324991f5b92b4324269b6115af7db2ee8c9aebecedc399d6e5fbe5
-MISC metadata.xml 344 BLAKE2B cc8fd629cca0ed4f66836cefd43f13a45baa7bb13d157fa7f90c61cdd4a12d71ef773ef9daa8dc6e5b07dcadd1b52a258995136a0792ec1870eb93fbb90cd61d SHA512 dae769c0ee80ebfdbd8b86b471fc13c3ac656bf556e554d3d5ce80108f6f6ab79dfe7a54f51b78af3d29f22807fa5ac5be48bfcf8655c60309bef7e3f80cea5d
+EBUILD capybara-3.39.0.ebuild 1836 BLAKE2B cf058f6b49569909a549b9590015dd5c4f75c1161a15b2e934659e99efe5524bb43240b84c3cb48c5b5c62f026de339195224850992c68ade82b8b68b37741c3 SHA512 0377bf0eed16add06515e6d70197fd3112dd48c0a7642c345be6a567d0608fe993576f0610c16b9e164aad2d608fe90749925da5bfd9ccf54341c9be5d08b688
+MISC metadata.xml 348 BLAKE2B b4194195a69c268721e6cd93da0b2c991fdff4528d4835e8a9717ca6b378a9b48930265f6312334d6ee59de19a7b683258a4767c7f436d2fc53a62b1fff600b5 SHA512 ef3fc6dfd16d2111ead7891ee86eca1f2252226a5e35a94182e3a052d5c63299e2e206e09f6f3062ca85b1a31c893a43232807216dd01ef30dd227fa94449c28
diff --git a/dev-ruby/capybara/capybara-3.39.0.ebuild b/dev-ruby/capybara/capybara-3.39.0.ebuild
new file mode 100644
index 000000000000..36161f10c21e
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.39.0.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_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/teamcapybara/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/launchy-2.4.0
+	dev-ruby/selenium-webdriver:4
+	|| ( dev-ruby/sinatra:3 dev-ruby/sinatra:2 )
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	dev-ruby/matrix
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	dev-ruby/regexp_parser:2
+	>=dev-ruby/xpath-3.2:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	#sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Update spec to catch the right error code. This seems to have
+	# changed recently across ruby versions.
+	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec
+}
diff --git a/dev-ruby/capybara/metadata.xml b/dev-ruby/capybara/metadata.xml
index f2c9b6d808ad..c8f186cb7600 100644
--- a/dev-ruby/capybara/metadata.xml
+++ b/dev-ruby/capybara/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">jnicklas/capybara</remote-id>
+    <remote-id type="github">teamcapybara/capybara</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/combustion/Manifest b/dev-ruby/combustion/Manifest
index 8cd109a78288..703d91b99322 100644
--- a/dev-ruby/combustion/Manifest
+++ b/dev-ruby/combustion/Manifest
@@ -2,6 +2,6 @@ DIST combustion-1.3.6.gem 17408 BLAKE2B 88fb0863d12005606a743a50a6fc19fa11d9c738
 DIST combustion-1.3.7.gem 17408 BLAKE2B 702ed32108f6d6dd85da39fce6643d0b55d124798afe03141082493fee9142624e2fb684a14d6d2615b5068498357b7b2d97bd4594f8e8f0ae0ae594b80e6bec SHA512 400c2209c72209a3d670b32569d3dce8623926a1ef531db7cca66cd8f6e1fd56fe96dc4cbe2f6dde6fffa8582883e6b511850fb16051b06fe709c12cf1baa026
 DIST combustion-1.3.7.tar.gz 16922 BLAKE2B 7edb6d68751bdae2c14f564d99bd5e4815aeb0ac5cbf9f86bf265bcf1cc02f39b36c2f439d1a79930f7fee5670451dee87821150b11b765cf3a251272b6bfb46 SHA512 2aedf160b099f16b2225dacbb8198fbdca6a00196bfaf4f869d651309e36976b3a14383c9b38b4361a5174726117200e0fc9da56f2cf08ec9ea99a5f5dbecf7e
 EBUILD combustion-1.3.6.ebuild 477 BLAKE2B e227bfdcc1eb78d89370dd80b505650b08071060c0fb80e5b3bcdc089ab58eb7e0a94d02584805c606a4db414127ecacaebd30be8013bd65086468edbd587cb6 SHA512 c6e77ac1a818ec5fa4e772e3c93ad4926c6edf87f9018063720faef9fbfa184ebf53f408e912b2e54a56d4de6d991fef2357156856cd19d4f1cadda2772b6b7a
-EBUILD combustion-1.3.7-r2.ebuild 1282 BLAKE2B 2d35ef4650a5826a98d3c0d4b87d9492ee87fbaaa3d6e99769732642cc6890d964b64f41617e260d06c6b415fcc072b783cc62afcd02f66fa2fb12091677cd38 SHA512 a86bcc36270dff96dab474ee901792c2e81a2e3a6ba01f7e04b4132b6abc53c8536d74d8a88b9c6f0e5d1e2e4648cb466f3b26a549e2ae5a50f17aed06a698c4
+EBUILD combustion-1.3.7-r2.ebuild 1289 BLAKE2B f3d181562057d92f869afff9168221c459230b089326ef6f9a21f2704e0787f314aec2dd4ccf1d609e9e4cc195182969944e079c000e42697ea4325cd1ab8034 SHA512 dba33b3f5ecebc597769a2801e15103525ebd13ffe56a167ae6bf4e276c980fd26fd35bf4a2ae8ac31e78a4fe1138e9fe0a475f2e903571348cc85646c20f0aa
 EBUILD combustion-1.3.7.ebuild 477 BLAKE2B e227bfdcc1eb78d89370dd80b505650b08071060c0fb80e5b3bcdc089ab58eb7e0a94d02584805c606a4db414127ecacaebd30be8013bd65086468edbd587cb6 SHA512 c6e77ac1a818ec5fa4e772e3c93ad4926c6edf87f9018063720faef9fbfa184ebf53f408e912b2e54a56d4de6d991fef2357156856cd19d4f1cadda2772b6b7a
 MISC metadata.xml 341 BLAKE2B 24a8a04770346789e2cddb31acfe79c81df0f6f3efd65ad78de5e6fbcd12e78f7d1c7568b356ba07b4540545f1a69ccddae1e9e5c6b89056022321f5c62b6bfd SHA512 74bf933e7faf3e48c548d3b46599722a919d2f8a45aa9db59837228d01e252bec5353046b3dda981486ac2e4ad3c6be77cbda9a2ccfa1262c7f7993994697f3d
diff --git a/dev-ruby/combustion/combustion-1.3.7-r2.ebuild b/dev-ruby/combustion/combustion-1.3.7-r2.ebuild
index db15e7bad83b..77ede8955804 100644
--- a/dev-ruby/combustion/combustion-1.3.7-r2.ebuild
+++ b/dev-ruby/combustion/combustion-1.3.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index 32c743b9801c..26b571c6278f 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -3,5 +3,5 @@ DIST curb-1.0.3.gem 91648 BLAKE2B 8f819a5411c92e353cee4e1ef87c65bed67783606fcfe2
 DIST curb-1.0.5.gem 92160 BLAKE2B 395cdbb3255d5a38dfd472787785738dfff8ec7eed69e7b93ae2d993c90635d427a6275cd3510b406fccc7b999bdedf544cb4177132cc890f0473452ad1984c9 SHA512 0b90da7757ee37bd542e2ab31407235788f103e67c987fd820073eb70ecae7cea55cc5ecdc354145ead58cb9762db0f8f27416301fbca93bc0f7a7966a5d8a63
 EBUILD curb-1.0.1.ebuild 1398 BLAKE2B d117b3d0e525c5fdd7d80dc53db1e6cdebc34a3a8beb4ca7d04907abe9150f43e7801b777b3860936b55028a42e62d9a253157c55a2cfd99cd5e38c341a5b30c SHA512 328b2c7db57cbb6a62c3f9be7917dd2cf528d305cbab63b6eba49aef0abee1889c760ea224886cf3b0d16e7474334c55bbe020883af30d9afdb8f11fe12fbfda
 EBUILD curb-1.0.3.ebuild 1391 BLAKE2B 9e73a8a0c09d222b29e2c21c5ab38eb8d34a7da51d4d9bc02b586eb5b13c3d9b77992668e4d868b6611e493acb4c961b7281ecf984eee78a990d40501214ea51 SHA512 3f800c1f927059692cd6e421c455c93975f4e7fb3585bbad4b6c74752e3b7beffc5ed79308288c589b8b0d4afea3b01844e8d66cfd6edd1b6d619173a00c18be
-EBUILD curb-1.0.5.ebuild 1523 BLAKE2B 6be6ffccf7374fccacce5b0ec1440d8ac76c0f822c3056b7f427967fd2fdaf2d45c2f589f205c8e5a21fc0cd4500ba458bd2e9b8e87be31dcb9fb54806b7f7b6 SHA512 b173215f255f47f0898b4b0948444abef875cb1e2ff4ad776e07b54542078fb21c5fe9770dc320338bfb954123710ef39dfa020b4d7423a8a9ed8de7c66f875b
+EBUILD curb-1.0.5.ebuild 1522 BLAKE2B ab97bc7f5ee062e792a6ab6a15319ce16fd291c38924df9de4363f6622a80fced0bf87e93831afa0f3066beb5796d85c632f29f009e71540fdbcfd62f7a103ee SHA512 b3a1d9d744f613e61329f0507381f94529f9a26e2cb7bf164db642c455a6018f06be9f24bac47b81ba8b4dafa79821ab8c8783d38cc0d9e2514b90cc53c17b52
 MISC metadata.xml 336 BLAKE2B fd9820c5561af2381bf081eb2f3370727020edc79f306bd94b90699e8a817d218edb11ccc60ae9aa43f1713218a91c9b53cff0a6c23fc3d189e06bc5a1265b71 SHA512 f948d0e7f36c4b9912c58d6a7bf1b2ac5934075780fc7de3d6f759276e4ee297850f725259c06245affca40745bdc2bab0ab78bbd60b308a5d11fc97edeb4ac1
diff --git a/dev-ruby/curb/curb-1.0.5.ebuild b/dev-ruby/curb/curb-1.0.5.ebuild
index e4df95039341..47157bd329fb 100644
--- a/dev-ruby/curb/curb-1.0.5.ebuild
+++ b/dev-ruby/curb/curb-1.0.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/taf2/curb"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND+=" net-misc/curl[ssl] test? ( net-misc/curl )"
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 6c523f26c8a4..a723dc1dffd3 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -2,6 +2,6 @@ DIST fast_gettext-1.8.0.tar.gz 89309 BLAKE2B 8ead2922662667c24d07dbc1145002583b1
 DIST fast_gettext-2.2.0.tar.gz 93511 BLAKE2B 8f4a8b169533194a82465ca29b4cbf52e9c724b9976355ad64459826ff9ad15da9762c6e90e237fef046fc6a8114abf54e0022eec573abf98a56bd067e7c06dd SHA512 06daacf46e4c8ef272ac2a60f8fad1abbb3eaa2bf5242991e7f32fd87e911917b6baf4965b0cbc96c11d0be0425585d501258d0c1faa065469dea6c3b8c97797
 DIST fast_gettext-2.3.0.tar.gz 93620 BLAKE2B 2f4dd0f6ad74df593573ce73ee40da549e506fc6fc7ca9ea17dacaa120cec97c202ba31b1fe32b628006fa1381572858dc314110a76c1ee7a91c049664133ede SHA512 517499785022922e54278ad4427abaabb63fd9d0470398cfca1c1804f3ca4992c01105ea727d152d2b8d1cbab86138a7552dfbbd4b3b3241b5fc1a3298db7dc2
 EBUILD fast_gettext-1.8.0-r1.ebuild 2053 BLAKE2B 64751e53df50aa23eb8eee2029c5b514ef82ba12c36d6940f628bf08496370371c5c46a044d59a1540e3e3deec43eddb1f886baff1e5dd478da388469b63feaf SHA512 216d0e81e88fb10b41fdeb771c7c172727efd5280a5ff3da0a84e5578b0cdf6ec530b795c1ac3b7b001c3612f8c9908e7dce0dcc27f25b77ae1225b5590b598e
-EBUILD fast_gettext-2.2.0.ebuild 2209 BLAKE2B 480985b9525f1b15072c5ef2eba1d0563107bf62979e307d837ce4ffe3e22ab0716be3c473a7e76f5131362b8da09a9225522f0881a1ea7a4d55a0626484070c SHA512 692448cce54a8ed926f2a04a34d5576f4ccd6f316de733cf727d4a8ef698e3954e441b32663aecf655d50e7e7ecbf627343af4ef2aa9844b1d2773f39c23967f
+EBUILD fast_gettext-2.2.0.ebuild 2207 BLAKE2B 8b615a2090e386bdb17cd2d70cc31cc35d16d2d124e25e7f8b92404a04557bf70c311e8b17789ae5130a22000be83ccad194022d10d4c38f4cc24b295495e36c SHA512 60de634f2b4daa49e95d9270e457c51a02d7d6d6b7d9afda137d9becaebfceed5df683dfa287a5bfc0d5d1d1fef341ba26a7f2cdbd800619ecf0e18aef4e055d
 EBUILD fast_gettext-2.3.0.ebuild 1730 BLAKE2B 86d77afaebdcfab0334717bdc8a4debdf52e17ad89891cf8a0bcb0fde0dba4956fcee2ea85ffc4a8a7cba4dd84ac14703e5d790e7df326ff57878ce6e2ee53dd SHA512 78d845c5a2bf6ab50d5bcd607b80e91e74d785abc5263c699e4118e27f5daa76729adf3b1ab485337c7dcafa86569473fe6c49b9a6ead23f8738e040d6181679
 MISC metadata.xml 347 BLAKE2B 4e31a112651c27ed99d38aa80ef658f244f365711abef6b17a30a89a39b1b86c183529aea6332260a424aa4024a43ed9502ba4ae9fd00e33218ef8ad3c9b9275 SHA512 d5284171ff8ee29ff612e0cdb406696963a90006d350e549ae09bb9d596e305b1901c6010c832f20071b91624fb5958575499b64561450e456890ddf64741ed6
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild
index d31cc922c48e..0d357c632ebb 100644
--- a/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"
diff --git a/dev-ruby/font-awesome-rails/Manifest b/dev-ruby/font-awesome-rails/Manifest
index 62ca7a2ce305..b10f1cba1d23 100644
--- a/dev-ruby/font-awesome-rails/Manifest
+++ b/dev-ruby/font-awesome-rails/Manifest
@@ -1,3 +1,3 @@
 DIST font-awesome-rails-4.7.0.8.gem 638464 BLAKE2B 5aaea78b2f8601004f349b6a526c6e19dfd42686dbe424dac112c9ae99eabe8f09ee571cf0b07fc2b1b0221a3fdeb7a005b9e466aa281a2d85d1c71804debc0c SHA512 011d2a3f66345f5629b98b1224ace1818657447635610c5b927def5595f8dd1878d7b65e526ab6f078fb717cf44804aa989d3502072c6e341f01b75d2f7b9936
-EBUILD font-awesome-rails-4.7.0.8.ebuild 473 BLAKE2B d28dd8c4499c9bc3d195ffd081592b0a52f82a1f96423584a7ea739a80a66afd0eb460847187439f044309c06ed6fdbfa14120231db04b69ef76cce93ca3ed4c SHA512 7f1c8bd9e3b6a8e86dc55f453c1fbed79c9bb7daac8fb844e7766912d8e38f98b98a98bf25b6dd9611e3f80f45d297f3ce063c9c8e86f0aa517578f7b77345a0
+EBUILD font-awesome-rails-4.7.0.8.ebuild 473 BLAKE2B 2d680568419da4450f1890bc3fb090058809b7b887b26c612e83ba51c45e8fcc4c723cafb4a23afdee313b83d03b4c7f2b295f58ce377b123f7dc9e3e34178f9 SHA512 30309fbc860487b89d6fefd3bf8e4471c7e52a9490efc84eba1c114259527b413417df424d587be424b1a84ca07ec062f6d5ef9582623d2be37f2f154ad7950f
 MISC metadata.xml 403 BLAKE2B b404ef92bc36bbb37a597966a63c2835509641ae98bb26c68dcf5284581de91507a615845b1744469d8a9b73edeba734324e94d715e652786b0d9527b0a55eaf SHA512 0fb5addd2f849897f540da63e8c335618e48e37f55133e8b4499efc027493a720cab358e2979d41c50831ebed01e88e402b0a2dbb576c5e5afa489dc20f106b7
diff --git a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
index c7c5f0afb6cd..5e704b2f6fb4 100644
--- a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
+++ b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.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_TASK_TEST=""
 
diff --git a/dev-ruby/haml-rails/Manifest b/dev-ruby/haml-rails/Manifest
index f8146112ed60..01d14b141c3c 100644
--- a/dev-ruby/haml-rails/Manifest
+++ b/dev-ruby/haml-rails/Manifest
@@ -1,3 +1,3 @@
 DIST haml-rails-2.0.1.gem 13824 BLAKE2B 24fded0f576d92083a10737954e1a32eb8e5f6a8db11fabc55ac0de3b17377419606d44f5b2e202e0733d9f538166172a6b5f7e08ee7efd71ddf7d3e7f6c9107 SHA512 7ccf9d618ca7b7c1681a063c51cf9dae9ce5e245479e3e7ba87a170ee1ba3eb35ff59061195928792f19f7e33a12ae7de3d5a36d35958e2a1761a12dc51b26d0
-EBUILD haml-rails-2.0.1-r1.ebuild 681 BLAKE2B a1660b1762b38009592c501904194284488d0e7120dadb0ab0f7af7b507d877c3a7330c3808c2db852c6c1d7ba556d03552006cb272baed5232973c09984a379 SHA512 fd335658c2e4d3598423c0b1f8731643367febf268d724d62435eda5685035a583622893b7deb6791d0686bbd421e7542c47abef5ca4737376a11c471ed47a7a
-MISC metadata.xml 336 BLAKE2B 54d028e53b74879f0bdc03ae29e305ae196bc34e685e54a0830dd77256aef4af2da221a3881eb9c4fba54c72b5f8e04f4a30a46cca9c5138a7496e0a92ff12e3 SHA512 4f719f4c6f8e8dd8b5df5b45aee7794bdf04f6a481da70696f7b88c644ed4942cc91a74d2d0626c893209dd3577e379550fb9f799ebcd1fd3f421a925a495321
+EBUILD haml-rails-2.0.1-r1.ebuild 677 BLAKE2B 2b7a0e60eeb46bbef03f71a2f0dfcc57da86b26b5c392f30921e1a5b5c15957bd6714ae850e889816828332357b965759e9940ae0feb719970be221969ef440a SHA512 0567bdce5b29c29e318b6a5a0e8e4220bdf6ad679281736dbf71b9d74f0594cebb398cac502eced04e43fc6dde3eca5b50ae19d7c69fa22ac264a40f9b233b81
+MISC metadata.xml 332 BLAKE2B 450838d99baca7fe45011092abbe7a9be9c51dc61490ac95c4f6e1be25f420e951e445248cd9cb7394a80e4bab3f6da27f6688ef778b35af48fde30acb201342 SHA512 871f1e8b2d6e7a4d952dd2ea3b758e12c261ecf45ab49790fec2f6ea0738a2fca2293e5a2ebb088ef0594044d756547db99df1107e1db8f0d4a24216d99062e1
diff --git a/dev-ruby/haml-rails/haml-rails-2.0.1-r1.ebuild b/dev-ruby/haml-rails/haml-rails-2.0.1-r1.ebuild
index 42ee8c50bef2..1e67465313d8 100644
--- a/dev-ruby/haml-rails/haml-rails-2.0.1-r1.ebuild
+++ b/dev-ruby/haml-rails/haml-rails-2.0.1-r1.ebuild
@@ -1,16 +1,16 @@
-# 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_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 
 inherit ruby-fakegem
 
 DESCRIPTION="Provides Haml generators for Rails 4"
-HOMEPAGE="https://github.com/indirect/haml-rails"
+HOMEPAGE="https://github.com/haml/haml-rails"
 
 LICENSE="MIT"
 SLOT="2"
diff --git a/dev-ruby/haml-rails/metadata.xml b/dev-ruby/haml-rails/metadata.xml
index 402241805d98..70da65b280d5 100644
--- a/dev-ruby/haml-rails/metadata.xml
+++ b/dev-ruby/haml-rails/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">indirect/haml-rails</remote-id>
+		<remote-id type="github">haml/haml-rails</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index b9a4a4477c4a..814a0ce086cb 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,5 +1,5 @@
 DIST haml-5.2.2.tar.gz 129833 BLAKE2B d68c24c7a3c817d6d364b2ec92b84b4f56f4fffa48b99d17b2df27da35f50b1fb1f69b184a7b21d899c476e0d4c8ad2b940a7cb2995ec24ecdafab8ef61fe393 SHA512 1aec59fab20d8139a5dfedde2007fa8137a377a345e4d30229f9d1140d56cdf970c8ae70e2647e6a408d7fa543a16050f66a8a636efa6a6b1f91ee1ffcc136c1
 DIST haml-6.1.1.tar.gz 669644 BLAKE2B 239b3a1fe02bcd1e2981198ba7c54c71ca2af0947102fcea6cd600cc6579294856baa290589a7d3a015e54df8bcecf8e50175cf2189e8f4f9c6f9721a558bcc9 SHA512 7d732be085b41b8f0eec418600a82b51c68301081165aa636fa342ae26b74215a202a4b15e592da980d9a7fbe24bad01399f599770420133c4b6ab7523386fa5
 EBUILD haml-5.2.2.ebuild 1496 BLAKE2B 1abadf57965798595ed08da1de7b19b0635a05ead6287e29e8902c2a69de9a69b693d3e282ba51468f6ed4c83a455c63f539020274c4e8332f8e933dec8d233c SHA512 3828bbbf977f0157e3669c425b870b8faff8260c94be80b3f08b55c04b2654a763e24f0b82d6dd4deb79075f0d85741e34462aa020903f01dc0c3c5f4eb43d4a
-EBUILD haml-6.1.1.ebuild 1523 BLAKE2B c068d4ef4e144d0051e7ca4cde6f9c36ffdb1ba1ab5898b84baf7f64de4f0c3d3971609436f09102eca4c0c2326a176be72c5dcc2de6016fef64c976fca64af5 SHA512 663490834a0dc61fea09ec1c3fdfbf7212ef6080b3c338c2026a158f957cba8ab4c0ac6e86f3a6a6e1b243361405b1829ff7d33c0939a453e185c602dc025a70
+EBUILD haml-6.1.1.ebuild 1520 BLAKE2B fa676f2d2e9e21dfb3e8a9c51822e940dd6a51229671b7daf05afa107463236d5ff96ffa8753ac8ed276115d2e0d4d19b79d9d6e5ba9f987eed4fb975ae40083 SHA512 7f3e61e6830681e28415d943a43e08716ac7d3825e2a4f0637d5105b70388c12a6235e7421dda623dcff07390c910725bf580a6332cd06d896d4a75276cdbeaa
 MISC metadata.xml 384 BLAKE2B 49a1ec969b1de2c61646aef404bcb19961d7f7b6b8c0324c1f447c8847adb0d3667e653b4273ed1c7e177e7e5216e6275a7c664ee6917ecb48e69d89554a33c6 SHA512 047f50785afcb708d07a770c38e40d7c8be01455832f01bbd006608eb18af8a8470a21ab0c57b7304ad4e2be39121310d0feb1ac64163a1b5e4c1cbf61cb8bfb
diff --git a/dev-ruby/haml/haml-6.1.1.ebuild b/dev-ruby/haml/haml-6.1.1.ebuild
index 049aded84e72..e8877b0d4a91 100644
--- a/dev-ruby/haml/haml-6.1.1.ebuild
+++ b/dev-ruby/haml/haml-6.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index 48a0ab2f451b..752dd3a61f99 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 1423 BLAKE2B 2c961e13d1e820c7f1b6c006025baee06a469888ad72f3961a1bbe67770f09aeb1084a64842dd31c1bc5644cb88507f58ab988823fe11963bbec58712260958f SHA512 a218c916fafcf5d3806135f5efdf0a39da06cffba2fbfb3190730f3db79e186311c5c375824bdefa0c0920d3526b6d5e77732c9f0ac31b43c9fca863a6dc9b3b
+EBUILD hashie-5.0.0.ebuild 1422 BLAKE2B 0d777c578daefcd2adf57d444880dbc6f9be205372888250b6fcc72cbeedf1cec88ab1056c280a5935dc4da2839d79b9f9024edd94c613337224d3777ca796a9 SHA512 1ce21476cfc84a4c1bc92a5282303dfc24a06e6e9464940f49d91c1268a02a2ed90ef4b428ae5b2ba0beb8b2f462afa7ba9b18cf930809dfa90147052cd26a63
 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 8bbead1896df..a4fd5e39c3ca 100644
--- a/dev-ruby/hashie/hashie-5.0.0.ebuild
+++ b/dev-ruby/hashie/hashie-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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/hiera/Manifest b/dev-ruby/hiera/Manifest
index e90c36f23bc6..22f68941407e 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -4,6 +4,6 @@ DIST hiera-3.12.0.gem 40960 BLAKE2B b2fea317bd89b754686b1658e8baa9ab0fd2edbbc93c
 DIST hiera-3.9.0.gem 40960 BLAKE2B 863fe37ecfda2153b5e94afde6d53893a0b5baaa10aa3bc3a939cc7df54168bbcb709f85bb50ffad11376d7434337ae3c79bc5d9fac99433da31e7dd77213004 SHA512 6ce3598e7c7a628198638a4b75a65efcc529089c7c80d7f3dfc072c26e8a65054d8bc5c71f40ce2833465ccfaa333c5490ecdfe58578532eb3455be46a69ad0e
 EBUILD hiera-3.10.0.ebuild 526 BLAKE2B 3bc71b2da6c48f2b2b332cd86aeab10a314b4b957b7f3bfcdf5816ee7f688b3a36d16cf090eed87f60656f0af99a3131cede33e8671c8283393f18f1a30bbd8b SHA512 b5a4c3c60e20a6dfaea3bf44c64ad17a914b66dbd734fc5cb583208340257551a229ef8975904aa209ae11a96e0e84f85c19a968c96840282535db24fd23ce59
 EBUILD hiera-3.11.0.ebuild 526 BLAKE2B 3bc71b2da6c48f2b2b332cd86aeab10a314b4b957b7f3bfcdf5816ee7f688b3a36d16cf090eed87f60656f0af99a3131cede33e8671c8283393f18f1a30bbd8b SHA512 b5a4c3c60e20a6dfaea3bf44c64ad17a914b66dbd734fc5cb583208340257551a229ef8975904aa209ae11a96e0e84f85c19a968c96840282535db24fd23ce59
-EBUILD hiera-3.12.0.ebuild 526 BLAKE2B 29a9c9172919f7fba6f1a5b4f047281c05864b27fe0e2c7a8a075194760020f6460878f4e73dcf73dae8c8ec4dda1724976b0f719a922de77b267fc94315b0df SHA512 4c3869f579b07ba388dc7f0681fc91039ace569de700bac4ab19786dd4f40b586735e358fd6c6a027a2bd26e41fd9732bbee60a0bf4fb172c64da12fba748854
+EBUILD hiera-3.12.0.ebuild 523 BLAKE2B eb173a0e1660f1ac5ff8a9d29d4b5bd8df7afdce6a8e43e644465f5e5a96cb207aa0004681431c46f4d12a267086d61efeccf2e3d3a022df6bd6f8478cc04740 SHA512 36e91ccd3cb35078775aefc5244e2a5bd972158ba168014b44849552ecfdb64acbeb64e34d4a38beb488fc48ada6c6752ae60e304419bf71cf105ebf22319da1
 EBUILD hiera-3.9.0.ebuild 523 BLAKE2B 1b7a4f94b843d62acb9c728aa02a90bc61eef8f171e0a63de00900a69024f8e12b97d50576a0ab08f3e56fd1196e0e9785c6502cbb6fa61476a39e00d8c0bf05 SHA512 09ebd67149a83f9bcd406a5945bf3f0ad52d9a795dd5a8e8ce56f2e0975a0e089697c3b8c1e01defb18b864fe58690eb5c2b3e6fbb1616227a5724f5408d8550
 MISC metadata.xml 442 BLAKE2B 108e882fb6805ccf19e6fa6754abfe678659b6d6f7572b57ea33a96515535b61637229d9338b67631c02648565435200d09605d13c2c61febada77ea75e4941d SHA512 6fddf1ff56b57c26963b6a42f4e0552c77090dbf7a97a6076cbedec86b38c0204455c390c335b4ff1749235f1cdedbe49379bae5e65eb94340cf3103ca9e320e
diff --git a/dev-ruby/hiera/hiera-3.12.0.ebuild b/dev-ruby/hiera/hiera-3.12.0.ebuild
index 12371903253d..57abf1d44284 100644
--- a/dev-ruby/hiera/hiera-3.12.0.ebuild
+++ b/dev-ruby/hiera/hiera-3.12.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://docs.puppet.com/hiera/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
diff --git a/dev-ruby/http-accept/Manifest b/dev-ruby/http-accept/Manifest
index fbfa66facf76..b637be220d1c 100644
--- a/dev-ruby/http-accept/Manifest
+++ b/dev-ruby/http-accept/Manifest
@@ -3,5 +3,5 @@ DIST http-accept-2.1.1.tar.gz 12488 BLAKE2B b909736c0fda14b32f30c38f12f4c4c2b2bf
 DIST http-accept-2.2.0.tar.gz 14174 BLAKE2B b6fd0c065a1d9c798ebee8a2f82aa45738cf98721d42d9806614fd98c8ce5d571ce06ad3292e81a972e484f55c75c0e99c5ad54f138323b180bb9292f87b3049 SHA512 341b09b3f8ba132ba9394c904bbe7c95a91fe0b39b080ae96d8228b8474f2d7de6edf4d9dce0b16783ac12aa375b0cda99be67290656f3348219f52d66b7f120
 EBUILD http-accept-1.7.0.ebuild 498 BLAKE2B f20de69d321d4f2e8c0c6480e9b98e674456e4526671ff09e36b1faadd4bf4d01f2758ca93e55ceea38e70ce6a9e0c4f12a501b3cea23f90a68b0a97fdb9f10f SHA512 46d224c218174951c10e989c38e8e22a78153192a3e6c2890e945468c6cd891fe0e18f21167f4e4e6fc8533164e86d77eba0b1b4b82b4766699044ea9ec7288b
 EBUILD http-accept-2.1.1-r1.ebuild 737 BLAKE2B 1fb0caeddeafe49d69f8416f9769fa67418ca0ce89f4ad12f5b893dbd7c0a7ad348a4a401823830f1a484950354faf1ee85a08e79ecb757097fa2287d32a6d49 SHA512 a14556a4bf004498fe9618d21e5a63eef7214213ea393d3251fb9aad952e14d7e48a3f24918b6f7c578539f042677d6eee73d69e4c3032fe71a9a8859897d351
-EBUILD http-accept-2.2.0.ebuild 737 BLAKE2B 2be9d27ff671e157051ddf98d9c14d316887c462d074676d97e294a5ab1c559260d27ff5b89902f0b9b88949abdaa4069e741f41cbc3bfb7fcda07d6d8d950b5 SHA512 5d161d5f760e3bce26d870eac1c52630a1378193af9c7e289442643056ad95672f97f576770e36dc20a9bd7206bf680fd8b7cfde52fd9ea96ac7b482b9ac83f9
+EBUILD http-accept-2.2.0.ebuild 736 BLAKE2B bd6b5f9dfe6ef787cbee0ec6c8023ac556f7b0211d35f97d425367f73238d729d7da14a978d8d80133ee9435b81b42d836c9cd906fb17b7c7e27433860b0dc17 SHA512 dd252df298eb3911223af2af5d00f09026c64f1c9fc9485130db5afab38b1eef9ccc5f33fcb135cd5e70a1930a31253f48604cae5719f0572c12ba580186a917
 MISC metadata.xml 347 BLAKE2B 94d85022fee1a9bba34d8d2e184cb2169dd91c680c15f1d6032d6989c22b8ec5bfc4e84c6b36452ba9fbe78f420d62bdb547fbe98e736f5830ca94126ae7a4eb SHA512 0efdea66a1d6d83efd16aba20e1dd0634bff7cc6bd5570d27a4e101a5307fb358a954b4b70253e08698afefcdff81455e2a3e3bb2f9054992354dd3a863c00ef
diff --git a/dev-ruby/http-accept/http-accept-2.2.0.ebuild b/dev-ruby/http-accept/http-accept-2.2.0.ebuild
index 4d262314d523..2e63d7de2a10 100644
--- a/dev-ruby/http-accept/http-accept-2.2.0.ebuild
+++ b/dev-ruby/http-accept/http-accept-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/jquery-rails/Manifest b/dev-ruby/jquery-rails/Manifest
index f0a3ec6811df..48886236d78e 100644
--- a/dev-ruby/jquery-rails/Manifest
+++ b/dev-ruby/jquery-rails/Manifest
@@ -1,7 +1,3 @@
-DIST jquery-rails-4.4.0.gem 526336 BLAKE2B d6a498424fd89ed575fe778a91ba199eb81fe7c98ac042df8602d0fd680305543d8bb1c1a663d12cf696ec50e1196c59b068051c4bf34b0e3b321cc3ea898bdf SHA512 af363fe81f9689ccb7effd8a755368245b14fdbc67e14698c7dc48e69e18b731e1c65ceefedf86638d6dca6378d21c3175b02f16f6c03bd76c45494c1d0e5eab
-DIST jquery-rails-4.5.0.gem 526848 BLAKE2B 2770db2e195932f5b53cf1f7145fb66f436b3c32a8691793b1e69caa4b6671ca8f9bb7ef98065805a12309aede123973ef7496fd787a24771c77edd57b9bb840 SHA512 1f1c679013110815c9383458839e82ff07c0980a2a068231ebc8d657cdfa6d8af792aed11b7ccbaba56d557ae302ed38fdc12c58599a5b5abeda3ca67f404516
 DIST jquery-rails-4.5.1.gem 527360 BLAKE2B fffd91adabd7e24a23fb65e94b02f6484d53afa5b63902ed7ae487f97a13289b2d884508b45744aacf2d5e7ab47dfab6a37ed94e8cf0bb8e56271692762facf2 SHA512 7921de900d1678e0af9adb1a83bf0ceebc75666a991d0babdc47465c45d08df0de959650eef750670b225354c942a2795fb08cb67694ce05d33af90fa1de5917
-EBUILD jquery-rails-4.4.0-r1.ebuild 738 BLAKE2B c6d73a8b0b762225af4ee9676a03019fd846a0947ab86498db8c650e1b4ac1ed620a8414d3b048d238f38d4664b6ae53f263c127d6c6c54bcbc6599288aa6da2 SHA512 f7de27c9d4400ba0f8e476937d56601feb6b39c712c0320ab2b96817b946bb76db32091c3dfa301f75a615799232ac0cdb84e7d1a80542fa54b74783c0987d8f
-EBUILD jquery-rails-4.5.0.ebuild 738 BLAKE2B c6d73a8b0b762225af4ee9676a03019fd846a0947ab86498db8c650e1b4ac1ed620a8414d3b048d238f38d4664b6ae53f263c127d6c6c54bcbc6599288aa6da2 SHA512 f7de27c9d4400ba0f8e476937d56601feb6b39c712c0320ab2b96817b946bb76db32091c3dfa301f75a615799232ac0cdb84e7d1a80542fa54b74783c0987d8f
 EBUILD jquery-rails-4.5.1.ebuild 738 BLAKE2B 9e8df95195d91a616afbe018a377dfb6543b814b848ace5f7803205dfb206922b652ac28b9ebc3b808c06305401aaf9ad334fb8097453d7b68e04895a9104a59 SHA512 9e090271258951ecab57e7048406e8eecd45a297df30bb1b635dcc482b0bc4ea584a6eba9e729666a2e7a988310150f596c8b46d408e7c4a7d930014110660e9
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.4.0-r1.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.4.0-r1.ebuild
deleted file mode 100644
index 975df6d4e710..000000000000
--- a/dev-ruby/jquery-rails/jquery-rails-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,34 +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_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md VERSIONS.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="jquery-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="jQuery! For Rails! So great"
-HOMEPAGE="https://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/railties-4.2.0:*
-	>=dev-ruby/thor-0.14:* <dev-ruby/thor-2:*
-	dev-ruby/rails-dom-testing:2"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
-}
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.5.0.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.5.0.ebuild
deleted file mode 100644
index 975df6d4e710..000000000000
--- a/dev-ruby/jquery-rails/jquery-rails-4.5.0.ebuild
+++ /dev/null
@@ -1,34 +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_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md VERSIONS.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="jquery-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="jQuery! For Rails! So great"
-HOMEPAGE="https://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/railties-4.2.0:*
-	>=dev-ruby/thor-0.14:* <dev-ruby/thor-2:*
-	dev-ruby/rails-dom-testing:2"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
-}
diff --git a/dev-ruby/jquery-ui-rails/Manifest b/dev-ruby/jquery-ui-rails/Manifest
index 8e797d618cc5..ded0a6e0bf6d 100644
--- a/dev-ruby/jquery-ui-rails/Manifest
+++ b/dev-ruby/jquery-ui-rails/Manifest
@@ -1,3 +1,3 @@
 DIST jquery-ui-rails-6.0.1.gem 175104 BLAKE2B f990968bc75d5f2c5556363f41eafd9ce2207dc08e20bbf10f857656219253fd5f29e8b4d131f7a8b942682d6c32bb11797c08621b34847f77984e7fe57e111b SHA512 ec0fd8c15ef9dbdbef01bdaca22fb36251a2ced090ade6859cff7c72e183c3c750fc384fdf757db7160ec1c6426ce84c972cce255c3d42a2bb9ebe5539390485
-EBUILD jquery-ui-rails-6.0.1-r2.ebuild 553 BLAKE2B d4b9537f0fba786248790d586c35aa4cbf4baa1f5488c6a2415f6de153fd1876b533865f24de98f64a4e713352c97735d73995b6780a89ccf752d8cb8fb940b6 SHA512 455c35b99f3a8a65d200c606551660dcbfe20180fd852a9a9f481538bff127e0846b3d55e9c2072ecc5e7e0507683ae4b1eff4164e96f1d5ca1abc91bcf9495e
-MISC metadata.xml 339 BLAKE2B 792d2a1851deaa3603d09fb0eb826d8e985712195207d164604e7a6b1be306ce065f0de25d25afcf1baaa70c75cb7ce6abb33dbc267783d160c3cc533856c78c SHA512 178cbf8aaa736afdaa18b37ee60a84410d4b23190ee5fbc5bbe1ec2955372cef4dfdcf6700f85b74e5f5c082b955275ccbde9b28bcc0ffb2bd555ae3cd3e2943
+EBUILD jquery-ui-rails-6.0.1-r2.ebuild 562 BLAKE2B 0461dd3e9f62d023860ac27fa252392ec590c7ad2286e2fc8c87eabde2d44d0629a7c46b565c05a5d30ec26439003c4569a3f58613b40ec67b4f9a387479cb2e SHA512 61c623ba8315ada4d31fa9fa000e1cbdceecd52d4672f18b46af0bbee1b27a834f294a07ca6d2e62d611fd75ff6642de137028fd75e253e28825ce8e6f900e38
+MISC metadata.xml 348 BLAKE2B b1174ac8be61f4859f162e196c15ecc516e515d0dd0065cf2b11b31ca346efb1526bb786a4d188b4a3aff245c9508af26b8997adbaa415698d5d7f99db170c00 SHA512 9e85580876bfa1cabe43c1f688ac5aca3881a4288be5c3e0f2343821c0ffb97d560da35a71200c93ffb36175b8da8108e66e2855773db04577c712a6bada6fc6
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r2.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r2.ebuild
index 4a0026574b82..cff651cd59a9 100644
--- a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r2.ebuild
+++ b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r2.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="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="app"
 inherit ruby-fakegem
 
 DESCRIPTION="The jQuery UI assets for the Rails 3.2+ asset pipeline"
-HOMEPAGE="https://github.com/joliss/jquery-ui-rails"
+HOMEPAGE="https://github.com/jquery-ui-rails/jquery-ui-rails"
 
 LICENSE="MIT"
 SLOT="6"
diff --git a/dev-ruby/jquery-ui-rails/metadata.xml b/dev-ruby/jquery-ui-rails/metadata.xml
index b4756598f39b..9700c4a28e2f 100644
--- a/dev-ruby/jquery-ui-rails/metadata.xml
+++ b/dev-ruby/jquery-ui-rails/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">joliss/jquery-ui-rails</remote-id>
+		<remote-id type="github">jquery-ui-rails/jquery-ui-rails</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index 4e70e4a63156..d8cf9ea8be25 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -2,5 +2,5 @@ AUX kpeg-1.1.0-utf8.patch 450 BLAKE2B 00472188e53b34f8395c33c9510232ad826ce71235
 DIST kpeg-1.3.2.gem 58368 BLAKE2B 511a5fe47aa7d62ecdea120f7e91066c44da9ef23d3ff9ebf7881854b62ce3dce2c56f89a9f0acf3935f238965045e68af3789dae90e995c4b24d88979683f89 SHA512 8fee4248f5201c54c54f3460db769ac1ad60ee60dc0f73a536ed14610a20a372af233b30aa076cf67ce43a57948d40ce0c47631acdb47077d1021dab2011a614
 DIST kpeg-1.3.3.gem 58368 BLAKE2B 335a5940207f81b2fc2e7de2f0c11fc7bd78073792e15e4e16f041ebefb5e0fec6ebfcffb407550e6e7e73e414b49239ab3eb66f3ad25eae67f1d3da776de4d2 SHA512 7495694cfceb715d5fb2e36e4dde5302a016bf03fd9b65f6ccf0ee8f9f1f856eecd8402cb4bcae4f25a74aba2b8c02f32cb6d7913a0b5397d8fbaccb87bd1110
 EBUILD kpeg-1.3.2.ebuild 708 BLAKE2B 93cdc1b478a5a50f3267d1819a2bcf9e16514e60f73dd0d32eb16a773704d6659fc42efed1b04335ebbaca77cb3e51f8a644120453934263d89ef9be9fb13292 SHA512 8627ec0d6b9a851fde70a4d62d7fd6ec95637ee6b37990c5037147e2c02d91ae6aac0fba46ac65a38ada8b6fcf17cbf010a64bc66f82cf574f7da39365b8b98f
-EBUILD kpeg-1.3.3.ebuild 667 BLAKE2B 8a96fe26b47f6aaca361ac8e83ffa3035404f117b6499b163730aff92d03b99d24ba952a485bbf53a41069fcd20b267c7e42d9fe49a3be079f23051d27267400 SHA512 9466a53ff2e35481094c1a92c76d75809dcaa470a87af8c2b8b9eb60c05d88c40364c5c6b404785e265ce86c8d0470c054f3edf8c12745183d6fe9e0f962e119
+EBUILD kpeg-1.3.3.ebuild 661 BLAKE2B 639a969b9009e316ea0226fff5f3cc1d180c0a2f9caa54ff113577bed2cf378f5a9710d286dc8026c4a0c36dfe193bc8c26d8c23b23410234865acd8038a7ad2 SHA512 8174476fbbfde3e2746a79e46348d7e55a7fd374032425d891d309274edc0a7c9cb99af2253e82c39c2dd6186a918651fafd862e102ec9fe6d060ad858b98e86
 MISC metadata.xml 339 BLAKE2B 84a27b2b24e20e2ec895782c175d959092397b5936b4c98daabab1ff20a24b7c3b3b951cb14622f8c824629131ba9d84404cf908c31003d17e049ea91868264d SHA512 ba4fc3f1c9f36619d257f5a9fc7fb2c0e47833e81ee5e092dd2649185d7e00ced6f865fce299e97d5e866b78184bd5b7350de1b874079d41b7337b2f4ef5a124
diff --git a/dev-ruby/kpeg/kpeg-1.3.3.ebuild b/dev-ruby/kpeg/kpeg-1.3.3.ebuild
index f1042ba89e66..bce94ad91be8 100644
--- a/dev-ruby/kpeg/kpeg-1.3.3.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.3.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/evanphx/kpeg"
 
 LICENSE="MIT"
 SLOT="1"
-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="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/localhost/Manifest b/dev-ruby/localhost/Manifest
index 3d4be3f9bcf9..4984609e69c8 100644
--- a/dev-ruby/localhost/Manifest
+++ b/dev-ruby/localhost/Manifest
@@ -1,5 +1,5 @@
 DIST localhost-1.1.10.tar.gz 2128142 BLAKE2B 06e4ab07bc273b8beba5fb3ee3f64e171a6c4a2e944c6d5e432417560283230277213732bf23ddd12e9737b2803582a11fdaa76356d14d2bdbd4e90d402c6204 SHA512 946ef247b256165cf5c849a32c0ba8dd2007164bd1549a20aca595328174709e9213ba8a98448dc41a57558b00147c3b7428b7bc625059ab24f89c94ff8850e9
 DIST localhost-1.1.9.tar.gz 2125545 BLAKE2B 5843b3857a11d9f56412f67cb15e424332b07cf81a29ae0a05a3ff20c6f06af56f6a02d8315f97c2d57fe76f7359c737cf19f116868ff532ac083070430fa22e SHA512 d46fd016957fd34309d50488dc61f23e9d47a5a6bfdeda5c049f6ffc112c13cd21394ada3e15c56f14913cba6ab503f60e32237431f7ff824fbbab8cd8a2d746
-EBUILD localhost-1.1.10.ebuild 991 BLAKE2B 987ae83b0f433ce61b98a0a628ca3a4676f7b5df5baf34e97ad9de0c5264a786d1862962703771b2ad4488d5be6fdc96a6ecbeded57721eaf74fa11b68b5a53c SHA512 c2b36d6dd1fd9688ae43eebe5471683dcae1f1a84125b1dff22ee1957786eee7c2aedc7a0421e3b3cc027d407cf85c3b69441b11b40dfa9f037d17c3f933aa22
+EBUILD localhost-1.1.10.ebuild 1010 BLAKE2B 2a707bbe23866fbb43557d15bf30be163b329319ab486aa3a90f7e2d389de781313ad81650b3b29fa40baf4d0d2e50b8a4ad4d2b5f573166bc0252d372d36cba SHA512 c9b9adc05ec4ceb7c978dd2614515de522118ccf7abc35900541c2d1e65daea783fa305cbf31cac47901dc06805707ac510d55d5976bff73136c84ca087872e5
 EBUILD localhost-1.1.9.ebuild 923 BLAKE2B a059e113865bca6f219d58ed6b3ce43f8617a365fdc9a976e063d30facd5596b7d9031c72f82ad704c8e4773171d46fe8d341372b89e914559feca448191f16c SHA512 c2c10bb0cc5b8930ce220e92b0ca2dff08acc9fdcd1a554974b131ff1ece538f77d9b58a75afc80765843809a4ef131d104009151a86bd20933f7a777e306efe
 MISC metadata.xml 329 BLAKE2B 7254a554334f253b54f3d5673d55f247298a55fbc677b916de26a3a93bc2866836d1e0bc5a5e3692605c364852fe007a285b6b02d1953b0b0cac2ff86b83a5d0 SHA512 32a7e4b5cd3fe72608fe629be5fd057a1e184bfe584f3bddb9be087566141b550d1a407ba20f9afb50d06af694945d6687115f785585c2b88a546dd31ada8297
diff --git a/dev-ruby/localhost/localhost-1.1.10.ebuild b/dev-ruby/localhost/localhost-1.1.10.ebuild
index ea6771c4f3d1..492c722d7e91 100644
--- a/dev-ruby/localhost/localhost-1.1.10.ebuild
+++ b/dev-ruby/localhost/localhost-1.1.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/socketry/localhost/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 ruby_add_bdepend "
 	test? (
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 193a2057e343..06cc110498db 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,3 +1,3 @@
 DIST mechanize-2.8.5.gem 142848 BLAKE2B 73fbf0ef6e3091bd37ace311415056bbc94ef22cfe5411b440faa791747faac349765db20c18a0133037e9564c061c13b250aa2a5677152d7fa0732d8a4a10cd SHA512 8ef26d80c7c55f564084eedf6c7255849ccf6efbb2e6ce11ddb3b5f8f3591861200041b89416ab3d8b9a8595c6c8de1f9c7e01b8e0c6b63265488498e2584c94
-EBUILD mechanize-2.8.5.ebuild 1139 BLAKE2B 2caf11e4515fb0ab3af58db7916ba1ef6bb748118710e2807366e3251fd3fb8a07d7b15718b9d7038cb0ca285ef7dde261750f464057dc84648dc69a3ce97a1e SHA512 677fcfa53aea28e508ccded52fd33221a4bebbfec5cdb573e2f3a3179ce677dae09a7a5d41c64a9cfd9881016c913eed29f9dc4ecbe8a22e92a811ea37f75d28
+EBUILD mechanize-2.8.5.ebuild 1139 BLAKE2B a190c347ad1c379ed6fbd41e253dd6594f251b08d61b0e26b3bd359dad14945489f69f0965b617808b3f1c27dee674f6bf1ac79a0cfe295743014b8ed13b270b SHA512 7efb3e5d05e040c15b219a4589967bbb5ca2382c6d3cee8f35766b961b8628eb089dbd22b3fa8a7024bbb10b34c75e8ed8b3aaa2e643a7b857dd8720e8c83fb2
 MISC metadata.xml 350 BLAKE2B 021ec7067e4b814b603126e68d4985450e443ad8953b45a8a5c3f28168edd0439456d96de71f8964f5002035eda5eca61d36b3aa527d4aac4c9f946f4a0bf8cc SHA512 b0971ce005597330094359747a6825c89e76f6d4c3ffce0a02f3b4c4f17be3fb9d2472ac12e3f9630b61016414bd8ead74dd3a955cb99365aaa6a54d27430ea0
diff --git a/dev-ruby/mechanize/mechanize-2.8.5.ebuild b/dev-ruby/mechanize/mechanize-2.8.5.ebuild
index 81b808140577..a1ce8b74c848 100644
--- a/dev-ruby/mechanize/mechanize-2.8.5.ebuild
+++ b/dev-ruby/mechanize/mechanize-2.8.5.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_EXTRADOC="CHANGELOG.md EXAMPLES.rdoc GUIDE.rdoc README.md"
 
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 3dcced914f5a..9044942e395e 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -5,5 +5,5 @@ DIST minitest-5.18.0.gem 95232 BLAKE2B 5b0f6fb2c304f0d96a6e98c5a4512acbff0a35429
 EBUILD minitest-5.14.4.ebuild 727 BLAKE2B ff25599b81e0eb8eaa5a619b6cbd8625e40e8f4494c3efc430777d0141dc0fa01ef782c869f9a60eb1dc084ad45963c5977ea984020e5becf0337474ff714de6 SHA512 d977f76e101e9c8c0a8faeb759b11b9edb9621108ad9cc6a6fd0717199082516b9649809f23b4c90a66f7df832c6a3f557bf73a96e423119e1c7979a293cc8fb
 EBUILD minitest-5.15.0-r1.ebuild 796 BLAKE2B edd91f693bfe176c33a8225cf03da72f92489ad684fe506f8f67564e6b487bee5e467ea7220feef1de094fc8938acaf09229e9a8c35143b6d953320fd193979f SHA512 5fef66fe77983236dcef647de0bd0e46c458505ab98f305533b9f4dfee5108b1783cf4fce2676ce42e3790a5fd67dc10affb534fa74a01c9b87fa713b74c7a68
 EBUILD minitest-5.17.0.ebuild 922 BLAKE2B cc1b213acf4dfbd4d4e8b8a9271f951354d9fbed95205fc03c2a929c4eef233fe29991e853dc9fd3a163202b735951fe9f2c8767bf38b68ace03b4f66825a08b SHA512 0bdde1b7d23783a8352145bc64fe1ad459516a0c37de7c272a50968edfa5b9f9a2625746c2268a87070bc9ae468678c3ee2f7b349712b9a0e1594506bb587743
-EBUILD minitest-5.18.0.ebuild 929 BLAKE2B 3a2fcafc7af6645b49067cb0dc1ded4d70c2f8d3f65639447cd60f1dbdbef532acadfc6a41efeaea2cd6ceb36df9f7d7af7cd6893c225f4ab3fa3ef87c869361 SHA512 7ff4371b6a2c59084e45098c0f76f4d76a31d9f775cb24fac11add46bd1e89902d9be70e13cdc44242176e77a490464d5c5756fae49b466203759b84c1f5ef5f
+EBUILD minitest-5.18.0.ebuild 921 BLAKE2B 91937edf13dd6f5c672a2969e30f359b3b61a5a5bb28403978215577a468e25b5d5f220d2667c3edfd50a6e53c2d109308095da334b861df1187575a1eb550d2 SHA512 9b4fd1d2ba1a48774583a346018e0a1dea4e4ccd9fb5ff24d3bf5934c03d2c7c18ed006c447ec2b3109f19b723deb3197e4de5adeed94939d1b199778afd0234
 MISC metadata.xml 396 BLAKE2B aeac1892215d93c002d508741370ca1ef7d086dcf63594490b9d98b1640aa06272327f11d27cfc3dd331c4ac892c6e0de52b846d301844891f0f4fe5f17a2cc5 SHA512 724d808e8ff75f66517230a204c88dccbd7cdcdefbb36b96315fec653a7f0eb57471d0b929130a5e7f33453a96f301e5c5bdc8efd0d2fa11a446b3c39c2b0f97
diff --git a/dev-ruby/minitest/minitest-5.18.0.ebuild b/dev-ruby/minitest/minitest-5.18.0.ebuild
index 3c5fd1ffae81..98b45641405b 100644
--- a/dev-ruby/minitest/minitest-5.18.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.18.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/minitest/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-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="doc test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 37d4cc3d68f6..79bd60d4528e 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -2,7 +2,7 @@ AUX mocha-1.16.0-ruby32.patch 1889 BLAKE2B ac383ca88d04a78751109cb03a3ab83692cac
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
 DIST mocha-1.16.0.tar.gz 246370 BLAKE2B c2891021c33e4038ff965a470eda3be7eac2765f7c038fef33f38cd07b8501fdb88a1dcd8d291eabb124fb0fff50c40651bf29ac4a28012b57c7a02d2ff46b63 SHA512 b7d8825771f84245e7383e4081dcb42734b9716e7bef3c1b5d49ac28850590b4beabf8d0370992e100b6340ff3cfb3113610e303de74bc33c059bd9b9910cb8e
 DIST mocha-2.0.2.tar.gz 245650 BLAKE2B 3bf56cacc99b5eeb17977cd1052c635df74aec10f20a76d843d703e68520ef434bc9111b739591dfa15b21ecdbdfb5b55037e9509683624349be83613528787f SHA512 93579390f4feaf034cd6e8905654fe8cc5c8a1f28f3d27488deeb84250114a5e04c4e7aa544f18f33b2c3887668d5fddb3a3f9bda5548d577be1522da2e09760
-EBUILD mocha-0.14.0-r1.ebuild 874 BLAKE2B 9cffaa02080f973e929c0f4ec7d5fd85b919fa05e48d3ff5f924c66a4b96f901bec9b05c257c09232a459eaa374722d4e34f3412039d287544de23af587c53d2 SHA512 a2232d40f2f118ce99f8c44f46c0ab7e11abbbffbf7f1451ae9734c7b96c6740a7b92a08427c20e9c4ff0e97f82924a9a7bbfc8e0c129c4618f26cc4fb2b243a
+EBUILD mocha-0.14.0-r1.ebuild 872 BLAKE2B 53853ae8bf87f257d689fa210a8b7d2799dbed98477aefc45be1f3aac55cd3a5491be4c063d4190460687687d57ecb05df52c0b6e73e15c94e648dab0528744f SHA512 e469ca9fd2a448affeb0a919355647e3d85793352619fae7855917be9261d52a44af1578133a51ed50da3ca5fc5f650c37fe0dd823596f727636bdbeb7ea574c
 EBUILD mocha-1.16.0.ebuild 1059 BLAKE2B 4a5b9815abd9ae4c88053b05f6a8855fb3ef1f96180f70c490020e6292004376ffd5a69ec5dee45a12ac4389d052d862d8fcfd9b844be86dcfe6cf4a04148019 SHA512 f0dac0499979c406be52ae294968dc160f06c4708224bf376a2e5e6d3e099ee38057caa3d30bcd7a4f8764cd11834dee4c65fdffd38984e3968fcc8b96935c00
-EBUILD mocha-2.0.2.ebuild 1083 BLAKE2B d3c5125b599526568972d22cb3ac30c6007f89ba7822822ae9669584f5d5470d0a57f6961f139f536a4faadf3d79346d30f380df377165da3c0f4667e9c5ebf7 SHA512 38a90b303b1dcfddf2dfe41ba58d53bac3416f4de7764cc6bb0e72a4cff6ef8f23b0ee088e422fb5424bc73ee9096fae6702ab7427e94fa2225614e959f80df7
+EBUILD mocha-2.0.2.ebuild 1076 BLAKE2B 929b09a37927bcbca0bff449cfcd81a8d431736c87d09afd1aea76eb2368234bdef79fc55d9af4a502246da4196b4998f77c37a24fb2397f5f16d2ddd310ba62 SHA512 223addcd1f6cac1e4fca4b2c16c75515e4a54a60afac375dafd38363290813c7105060ec13cf92399ad5e6cddb1b3082f2fb0ef0746db4275be6d20f7dbfe337
 MISC metadata.xml 332 BLAKE2B caf5137da39b091d3da2776b6219400546a5c2ee01d39759471a24a5beaac1f248be271c376f9061c0b1de49d531832b6e6cdf9be53f943d112789a8240feea2 SHA512 af0bd36bc12851a56c49ef645c95b145ef28ec2070b1bcf1fc3629526b91c20aeaa39357e997389e02482ddb19c9f3cb52acb7bb9a2f90142087ef4e874f1bd8
diff --git a/dev-ruby/mocha/mocha-0.14.0-r1.ebuild b/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
index d4985c30a762..e74290463a03 100644
--- a/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.14.0-r1.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=7
@@ -17,7 +17,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.14"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-2.0.2.ebuild b/dev-ruby/mocha/mocha-2.0.2.ebuild
index 7200023417c0..34b0910a8949 100644
--- a/dev-ruby/mocha/mocha-2.0.2.ebuild
+++ b/dev-ruby/mocha/mocha-2.0.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ruby2_keywords-0.0.5"
diff --git a/dev-ruby/moneta/Manifest b/dev-ruby/moneta/Manifest
index 3f9e308c6dba..b2f092d42272 100644
--- a/dev-ruby/moneta/Manifest
+++ b/dev-ruby/moneta/Manifest
@@ -1,5 +1,7 @@
 DIST moneta-1.4.1.tar.gz 129056 BLAKE2B b5a7a9fdb1817c88c942ce8cc3353974d556f14e6362722ae4b44c40311241aa5dd7354054e4edaca84edcc3a76b3d43230dc0a376d48911409721137cbf8d01 SHA512 7ff8fec2047a7df7e110480ff87eadc8e33b776176350279dd933b456cc7def0e92b74eb5dfb7ac2b2233232959acd839ede80d491bba0f134c31414d3f7786b
 DIST moneta-1.5.1.tar.gz 133512 BLAKE2B 6027685e3e28e238b2d984b02fe2d5e7ccf1dba6646d71980932581e9b63cfa9082aa3c3a1509b679922f480e1601c71475113ad3eea5f8b7644f69998e3bbca SHA512 018b162d75eb7cb5f2d38e1e6a79e5a17abf8aefc381eb3eb4d9d4981ac88be5063ce95b786aa928de1618c6458b926a27bd26f41ad6515cf7ee3dfc1274c236
+DIST moneta-1.6.0.tar.gz 136501 BLAKE2B 5682cfc265ac1c132f53d91c0cb6c2a99a08130d144d2eb8fb544952c29a77556066b36e9ea727df941b1768dec28e99bb3e3f4017ddf5e3cb38e690bcadbe0a SHA512 8f372bfd769205b88cd6f497266074784588ff04b99e3383641b4171cf586210a6655f003bb9e11fe5a2e9dfe5ebbb5fe372b415e2927ab50ee9c8f28bed6b5d
 EBUILD moneta-1.4.1.ebuild 794 BLAKE2B d7c5e3a02982053db218164f46446e9ee1d7b15b5fe8330bf9a9c6a5bf2d360c70048cddb7e09c7dfcbb5ea703e832174af41ba3ec49e4d4a9c9b360219400de SHA512 0e64db18aa345fc94118e2e8dc2f2854a001d1bb272bc07af4a0ed948417937f544516f84e8e66ddbfe360fb0274d9d26d7b606b4219d28172cd11bb3a5b724e
 EBUILD moneta-1.5.1.ebuild 794 BLAKE2B d7c5e3a02982053db218164f46446e9ee1d7b15b5fe8330bf9a9c6a5bf2d360c70048cddb7e09c7dfcbb5ea703e832174af41ba3ec49e4d4a9c9b360219400de SHA512 0e64db18aa345fc94118e2e8dc2f2854a001d1bb272bc07af4a0ed948417937f544516f84e8e66ddbfe360fb0274d9d26d7b606b4219d28172cd11bb3a5b724e
-MISC metadata.xml 339 BLAKE2B 21f9c4d9f4a62da269fa46aee7673be44d39ccdc286a7e2fce487405afc0468db93c14d186d99088a3004616ff825e5ef9e735e9eecbaecbd879a459f41784b9 SHA512 6335c7aca4de92722c5df1661c2b36e5c0080f189f7749ded437a2f50fcbf174b6ec8aadb47705bccee4ffed27d13163d67f307ccbb384d0c9c75d5600158aee
+EBUILD moneta-1.6.0.ebuild 802 BLAKE2B 98fba4ca2f7062391f65918b1afdc8cc319ad8508733cb48b85da4c35735ce9e557e2857d36ef172603ec8445e9734336cd1777b78f09b1f27caf39709de5740 SHA512 2caa8be03c1d7caa091523769030a25cff21da45c161cdbb607bed8d524b27f69a7d3e90cedef21350f050dd7c7515e3dbc679389383cec5e140e71d26af7e9d
+MISC metadata.xml 343 BLAKE2B 81bb447c53e50cc401fd1b4135f4145f9195799772f6a5941246c9b34e550d3f6338d4458232f02855abd4f5a96028b2b8c75db5b3d2bd48d037a8397fd0ada9 SHA512 1933fe9ec57ed4871b0571ab1ae6d17dc0a79c534eb02d515ebc6829f640dab16162558f7cd1b321b6063389ffb95847ba7ec04aa5e9101814338bc0855de91c
diff --git a/dev-ruby/moneta/metadata.xml b/dev-ruby/moneta/metadata.xml
index 5c626eb13865..15d5e5d493bf 100644
--- a/dev-ruby/moneta/metadata.xml
+++ b/dev-ruby/moneta/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">minad/moneta</remote-id>
+    <remote-id type="github">moneta-rb/moneta</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/moneta/moneta-1.6.0.ebuild b/dev-ruby/moneta/moneta-1.6.0.ebuild
new file mode 100644
index 000000000000..fc4f1c4800b1
--- /dev/null
+++ b/dev-ruby/moneta/moneta-1.6.0.ebuild
@@ -0,0 +1,31 @@
+# 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="none"
+# test is disabled for now. It requires many packages.  Test suite also
+# takes very long run time and has high memory consumption.
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md SPEC.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A unified interface to key/value stores"
+HOMEPAGE="https://github.com/moneta-rb/moneta"
+SRC_URI="https://github.com/moneta-rb/moneta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e "s/__dir__/'.'/" \
+		-e "s/_relative//" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/multi_test/Manifest b/dev-ruby/multi_test/Manifest
index d99d0db60d74..24a058c5af4a 100644
--- a/dev-ruby/multi_test/Manifest
+++ b/dev-ruby/multi_test/Manifest
@@ -1,5 +1,5 @@
 DIST multi_test-0.1.2.gem 9216 BLAKE2B 9a5888937c82f87822445855eb15406b4250b3b42f00116a2c54360ab35b923d08c4015d90b14003679aac5d674baec8756b74aae4a5246beeefbae262edcc1f SHA512 a0d59f51dc959b7febe9c32853b5ac5cbbb3215e8810de5e46fe10fa42931c1ea89df477155cc8124264d608c5928e54fd4e1949e7d0940f927e1430bfd60a2b
 DIST multi_test-1.1.0.gem 9728 BLAKE2B 7fb610adfb24762d3a4e31d299bfcd387c7db3c7121b9f32c23f3f7cd8bed8dff1bd1e8fdb9a82411977581dac88a4513164d88dae83ce957747bcca507f6388 SHA512 593b7cec0c63b497df5d2f05da72a401656a71229070ee3bdfbc89fd95991a803915929df0c89781470a12c63ac621e7a5ee00b5e6f610c9279a6fe99668c959
 EBUILD multi_test-0.1.2-r1.ebuild 534 BLAKE2B b4dd42607c4cbc00fffd83a2d519f00427849b1dd0c20c58221862855f32e0f2f5fd489f62ad3bafd8e849cba02b3ba91f2a0afef2d0cf77014e421ab4e3a1b1 SHA512 b7f5c0f84790df3b880245aa3d74a85eb2847a3c7db79e424521ce0097dd31a24d788550e97fd36c8726ae995faf6d1c464d73832daf7937ac99d214ebdd3fec
-EBUILD multi_test-1.1.0.ebuild 554 BLAKE2B b7704306694bb7b2dc2a70bed4da95cf9ba6a1a626f3cfe6a46f9440c6f73bbcb95d3156a3fa5b59f389feeab4da25d02b2b0f8d5f1a2175366f92c19e027a9e SHA512 ef422383b5e5fafe9d7e45fca1b1554cbe1d59d3d8566af9a7e077594d53470efe0e488690d50843237404f93a3080a1d47d9a45f6866f7c8e5bd4384a8a21a6
+EBUILD multi_test-1.1.0.ebuild 547 BLAKE2B 93cbabbfe3f46d398944c2c208dff88faa79bbb03787c0e520b5d09198aa42845aee0ed0cb9b4a337be7283be68e05409c073139b81bdc1fa5abeb662cff314a SHA512 d6e9d0e66686d124a6b0ae8268b5c84f7e26970f792926b4b706ae262f32ffc6bc8e7f4189ac395381b0222e4fb6df2e6eed9a4332494b3b45517ad30bdbc268
 MISC metadata.xml 329 BLAKE2B 1fa472ebdbbc50e715a6c5d5a70f217a0e5ba189ccf4fa68fd14d418b50157726058e5ff0ebe48f7edbe27ca7c01b424e16b1ebbc30b97c6c18820eaa8a81b59 SHA512 6128328163fb05f266488b9d917259750c9e462b87592334acebf364d7ed77705d97b7a8e17cc256f68786c93b5b37607a01544cd58cbed71e1e39a95aee68cb
diff --git a/dev-ruby/multi_test/multi_test-1.1.0.ebuild b/dev-ruby/multi_test/multi_test-1.1.0.ebuild
index 5478e4d51abd..1e1ca98f1d4e 100644
--- a/dev-ruby/multi_test/multi_test-1.1.0.ebuild
+++ b/dev-ruby/multi_test/multi_test-1.1.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A uniform interface for Ruby testing libraries"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index b73563b3bb3c..1a6d0fbc4347 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -3,5 +3,5 @@ DIST mustermann-2.0.2.gem 50176 BLAKE2B 82c134d56a11178a085dc3182e61c67e6e83638f
 DIST mustermann-3.0.0.gem 50176 BLAKE2B fc77327de469f0886de782c577ac164b222bbe18074f1ec63c35a08344cfcdf9a2cb44b453c594e2b153db3055ff1e7bcf969240ade04e70be5cb85a73e486a3 SHA512 c33d41281fe2ac80c0af0c5c31dbab2068c73b9da19a4b82b387bbe551019fc115675634d932a8e56b070c3a06a85d830c982a103e6c5193aff8647f599be6e3
 EBUILD mustermann-1.1.2.ebuild 603 BLAKE2B c0030cdd5abd02a6fc23b3d4049261a6c619c980fe3cb1564301ce79a2369fcc4cdbfca730afff316462255dcc4c8e71eb52171ed53858520ce78da8ccb2048e SHA512 e81668d44272e01c6ffa99e9547d2f7286a037e65bcf853136ac4a77be4c7e9bb4914644b3e85be23819e4cf4d61872f53bc93ba5d6978f2b32065f63ec6de83
 EBUILD mustermann-2.0.2.ebuild 614 BLAKE2B 4bb950faa31a57f3674785d04ac4ebf650102840d292003bb2a3b567f690ababfc09d96d236aa9c5c648c8ac484aab076e2b3d40d7568b0a1e96fb3a1f81f2b0 SHA512 ec4bd3bc483a05c0be3942ecd9631a6315effd86deff3b8449cd936c3220cb1d1fd0d5d09ea3adcc09c6c0b8256070608a55e7fe3272419850338725c6de16d3
-EBUILD mustermann-3.0.0.ebuild 615 BLAKE2B 200a1eea03b5d2547b4f9ce9f77fda759446878e301d6bb31918d5d69b0da1865fd8628a82221f5115a0fb203c81bddb775f8ec4f2d051e835624dc9458348f0 SHA512 c5f8319c2938f7defa9c67b2aaab384c8bc7c9c49e05e53ece501b834e35bf2ad2934d9badfd2e39c237d17d593f55e5f3fd7e286e87d0cf28908acf77cdf18b
+EBUILD mustermann-3.0.0.ebuild 614 BLAKE2B 525e008883ca3f06b5789ca5938f8948253e9093bb9e379b589f79955939de649c70ae083d03c538e962d30e4ff99e535f954a6383493ae739c2c17aac0f374a SHA512 668a13b7734d94e2474847a1df837ead1afebe437aeeb202158936523defd0a52749f0a6a99782e061a2d4569c0327ef194d68f8b7415f92aea8802eace93292
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/mustermann/mustermann-3.0.0.ebuild b/dev-ruby/mustermann/mustermann-3.0.0.ebuild
index 9c5d19b419c5..f8948fcfd734 100644
--- a/dev-ruby/mustermann/mustermann-3.0.0.ebuild
+++ b/dev-ruby/mustermann/mustermann-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/sinatra/mustermann"
 
 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 "=dev-ruby/ruby2_keywords-0.0*"
diff --git a/dev-ruby/net-http-digest_auth/Manifest b/dev-ruby/net-http-digest_auth/Manifest
index 123b220c609d..3993bde02fa3 100644
--- a/dev-ruby/net-http-digest_auth/Manifest
+++ b/dev-ruby/net-http-digest_auth/Manifest
@@ -1,3 +1,4 @@
 DIST net-http-digest_auth-1.4.1.gem 13824 BLAKE2B 537688c7d83408052d3d5d16d625a51434dbdc452cf36ec5738917b862eab305a85d3f3933d79d878356a76ae698d6eded24249b70e507b2d7131d71b5dcc482 SHA512 db62d49815a96cabde5836b00a1df58d6277f9efafae78e27296b1e2f4410ea613aed2181f8e39f08af5bbf6f5f758d682e1250d0afd4fe8243fb0d5c7fe78b7
 EBUILD net-http-digest_auth-1.4.1-r1.ebuild 615 BLAKE2B 79746a1fdb023b7d4b36507b0f96b9b3173c74d1de6977f442586c8216889f1b88420b1bac450786e3925c9a218be2a4ef62a396bfb67d22141626e1b11bd5ef SHA512 bff1c8dae37b67bcabea1220fb388c18b96b2ec928b377653b073f0e846d5cd541f721ef6ce78020d7a3c33e6d9b8f62cb45384b9e71a31a0909ad02947a6d68
+EBUILD net-http-digest_auth-1.4.1-r2.ebuild 617 BLAKE2B d39321aee733f4f6ffe0d90da713eefa6c2af73707e786376201da793ad5553b4a4676ed3e73131d12e9eb9627819dca36025ed4901d1b8942ba97a18fc96437 SHA512 35a77fd285a648b8afa5a12c17e8f3fcb4082b2500f3d4b8faf00dab4f05b28a449ff2fd1332f3c54280eaf197beb58d265ddaa06993007e5551e33d04cce8a8
 MISC metadata.xml 355 BLAKE2B bf078f672d8cf5351601abfd04db2fb9133d5ca37007575b13c8523d19a37d48dfa9db184a54322e065d91e66e1277cb7fa4edc8174924a3b19d49928f3095a3 SHA512 adc4aa527c747a99c6eba586d6b7a4e2b2ce8f771b52448dc68dc6726ed419ad39eb212701cd49be8710759a45d686345d23620719c486d0467ba15168b88201
diff --git a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r2.ebuild b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..98aaa02d1b34
--- /dev/null
+++ b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r2.ebuild
@@ -0,0 +1,24 @@
+# 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="History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An implementation of RFC 2617 - Digest Access Authentication"
+HOMEPAGE="https://github.com/drbrain/net-http-digest_auth"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 7e6aca3accb2..ab3131485cc9 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -2,6 +2,6 @@ DIST net-ssh-git-6.1.0.tgz 220190 BLAKE2B a5ae0f15cf3dac8934de0b3216541415cc9472
 DIST net-ssh-git-7.0.1.tgz 227016 BLAKE2B 98cdbad0c8c52d44f3d4e288de7de0389680c3f77d5cbd33e4a142d1f09881910f2dc74df01ecfed755e2e0ab37440ee19cf436b8aa7c49a3859bf07b3844b15 SHA512 3e41537b3b7e34f043c768959c382f72a630bf3ac430bbbd743323d9b0eade6c7b94f8948418b7f3e1aa2422fcb87829387aaa01e1e384ed297e2397cee33feb
 DIST net-ssh-git-7.1.0.tgz 229217 BLAKE2B ab3c46d3d8831335495ae72dc60f2659109b66566f04117a16e4fd41085203b6a2d333e65ffcda4e390c96a2b808c68baeb168be1a2e23d4c797ad63b5af93f9 SHA512 723f487e77526a7acba8a9c8f09dd85c8c0bb21577d148f6c4280c79d603d3d364e29fb55b2b282064b5c108465efb2b1da061a2ba5872d575b0be264f493745
 EBUILD net-ssh-6.1.0-r2.ebuild 1265 BLAKE2B 48bdcdb585462a553fa5b71b65c5e1ebd55bdbc5dc769e35ee9d9040a7c073458ab48ec12705f1a472913f6ee7cc022c2f00992d02c5d200b2eb5ccc795cfb19 SHA512 5c9be21772ba9a7c24bb7f394cb7f6a08548dbc07812dce94970f9c970a519fbd02e73098b2fa260056785923090518c78f0af57caf1d256584ab5758be04139
-EBUILD net-ssh-7.0.1.ebuild 1269 BLAKE2B 4a3ddc35f26bb089ac6893794d67adc3ad1812bc292fa136da6590f3a587ec41d9f5897eaf7e4ceac4c75ea1719961358d835fa7ace1a20cf65882d12dcd8038 SHA512 64cc9e17b20a2d6fb1bafdc3fe5faba22719a56a49da7c945c27c738ca95ae0ad9c0bd105490507b70426e4e34d9e68653efcab3a917fd390e2cb64eb3832b62
+EBUILD net-ssh-7.0.1.ebuild 1266 BLAKE2B 388ea7ea0b76ff5142f648d9287f581fb22b26b3de1ecfc462ce4b50fd17b0dc3dbf9f818cdd466f6acefda473ba8074b3c3ff2d121236c6c6404dbfd406bd80 SHA512 32e72b2f5656a62fbbf2135905628f9e0becc4ef0b833d9624c92362084f8ac53d7ac2ded7eb3ff2ca5c51de88a9da6716131d078114e21c799b7288c3f089c7
 EBUILD net-ssh-7.1.0.ebuild 1269 BLAKE2B 4a3ddc35f26bb089ac6893794d67adc3ad1812bc292fa136da6590f3a587ec41d9f5897eaf7e4ceac4c75ea1719961358d835fa7ace1a20cf65882d12dcd8038 SHA512 64cc9e17b20a2d6fb1bafdc3fe5faba22719a56a49da7c945c27c738ca95ae0ad9c0bd105490507b70426e4e34d9e68653efcab3a917fd390e2cb64eb3832b62
 MISC metadata.xml 429 BLAKE2B 12f25e38fdd426b0814611f3036ef401703666e1ac651d807e587187f641736627a35ba117f8707208f07716f31d4df8b471f38dd221fce79109eb2aaa749dc3 SHA512 4c760e2d9799444907f4b05c26ae95b6c18eb108786ce90a5b51c58cc903f4ec90da060556cab72fb80741c3786613589a4d403c64f9b411631d6c4b4ea982de
diff --git a/dev-ruby/net-ssh/net-ssh-7.0.1.ebuild b/dev-ruby/net-ssh/net-ssh-7.0.1.ebuild
index 989d3c0cbb5a..cce9aefea2d2 100644
--- a/dev-ruby/net-ssh/net-ssh-7.0.1.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-7.0.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="ed25519 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index 130a187b86ef..5f2f13153cb1 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,5 +1,3 @@
 DIST oauth2-1.4.10.tar.gz 65553 BLAKE2B 4b147a97536ae04b81ca5bc41117bc31c577aae9b7dc1f4f34830d3cd7b7013098e90ae83997c4917ca25e858b8738398eb708bfee954882359ed14b8e810172 SHA512 cee9e1f890f66252451cc22ab7135dda60c73bb200f2f1659a450b09dccc0a219982625ec45866dc9153669a4d35fb543fb6de497bfa83522b99c66e9c8b9d9b
-DIST oauth2-1.4.7.tar.gz 32341 BLAKE2B f3db3ff7ebcf7bc0958a564fdb0812c1bfb613148c5a16655f276fda4d6dac7769196305d854ee0fc3f8b4b53a93b4ae504b348029e1b363bcb704293887347a SHA512 4a43b3f75e827e9a12a74a6fe13a29b141c0d5bcb6a0d5c86dc8d8726f650a9fd5250ecc2c31cee5e985f0cb50e02f828d27fd07577bcac4dfc8ff4e009bd710
 EBUILD oauth2-1.4.10.ebuild 1499 BLAKE2B 8dcb6bfb83aa65af9fb62c43e81558ce739d06a1893150c355e030b8b2bbb1abc9160dd2d3ca8f2e2ac3dfbd1ba0c27a74da4cbd078bc45794515d27ab32fc05 SHA512 fcfed86236da49c2fa5df5d0920441dde1d15b1fd7af54e2933a7c61c4a92491fa2642807dd5c663ac0f44b14e7df40ceca4586695ef3cd1094b5577234bf051
-EBUILD oauth2-1.4.7.ebuild 1478 BLAKE2B 5dd9591470cc825729a00b24de2332d27d4baaab0a78525187ac89d5895a80b7908e3b0fc485cb16d7f7673f8c4613780b5c72eddef1de1d93e99759cf717a37 SHA512 b22a376f34809b148fbfe899adcb65f8ee1544f8abd227eff9937fd05ba824a4f66ea1199515f86976bf4e6ba591e0571b4aed972e4b29c2ae961debc3787edd
 MISC metadata.xml 342 BLAKE2B 14d2af934a4327d3d6c1c5236c0b5a0436c91cc3988d6957188171153c60a0f40b6dec75cb5acac49aa60518f89cc5bdb00e92021ca99249903f937df51f1b23 SHA512 cc8c7abab8d16e0ef97ec14f58bfc5941e161b2676950aaa45912812d53e523a54570407bcb2e9cd2527a0c6acca8f348422efdde66402c162e8a04dcfaabb8f
diff --git a/dev-ruby/oauth2/oauth2-1.4.7.ebuild b/dev-ruby/oauth2/oauth2-1.4.7.ebuild
deleted file mode 100644
index 255cac1628cc..000000000000
--- a/dev-ruby/oauth2/oauth2-1.4.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-2.0
-	dev-ruby/jwt:2
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? (
-	>=dev-ruby/addressable-2.3
-	dev-ruby/rspec:3
-	dev-ruby/rspec-stubbed_env
-)"
-
-all_ruby_prepare() {
-	sed -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '/silent/I s:^:#:' \
-		-e '1irequire "uri"' \
-		-e '/require.*oauth2/arequire "oauth2/version"' \
-		-i spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 605718e910f7..645f1fe0132d 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,5 +1,5 @@
 DIST power_assert-1.2.0.tar.gz 17358 BLAKE2B 8b75b34f5d80f8f52370816b916e3bc3a60493b8f52a910346c51c70770e0645566b8b7c3dd551d8bb1f1cbdac5dfcebe043457bd025d819e3782e75e41e0f16 SHA512 2f001f6223fc3fb586c7b0457f775379040e11eb83b5bdda51c02b2b24e531aecd6e12e6ec80bf9407a768ab1a10b0a6b4c8f1a92ca69ea702faf56202bb635c
 DIST power_assert-2.0.3.tar.gz 17228 BLAKE2B 6a7927102deaf6daf0e4f17e7183ec4a862a57607b965c0051b1ecd22a4bf555c6f6195911405d2839a725f38e1e1b49ef6ca3a4209452ca149996071d28e47b SHA512 f5658d18b3b78e7757ddfc1ccdabc011076c009a7343eaad2748ca7aeb4d112bf19c70621cb938e7dcf1582c8bb7c5512017885ea51503b3ed274980b7d7c0b1
 EBUILD power_assert-1.2.0-r2.ebuild 1403 BLAKE2B a8b4b9519ce4b908a0010d6d04a222cefec305d65f032602519fa4337710602db5fb0744e3391d9fc9c9e4bcd6cfb9cbc10d9f961cb3ca3187dec743d46392c7 SHA512 7cff121b50454888d6b4cf554006e582afa88a0e2b94e1bccc45f38d93daeef36e8f34a08ae3da2096830482edf1300aafa5e47a51ff7fc8cb785c02c9085b62
-EBUILD power_assert-2.0.3.ebuild 1430 BLAKE2B fd5c78d3ba10f62cd422301d6a2b63408506b18e702cef474f99457e77a5fdb4e74de81bd3a9ac9c4f1ad9c1ab3661186b1e1083e63fdcb4e4b48ad58fead64c SHA512 85515b69bb660e70a313dbebdafb56fc7ef3307d003506dbec8a53dbb8648f825f8a5bfb7407ce626a99ca6bb4408936265acfde933a943cda45e6c9b8c3074e
+EBUILD power_assert-2.0.3.ebuild 1422 BLAKE2B f540e1e3b0501785b5ccfe23dceb1e6261717afab18559105f8727f82505500f7d77abb12bef7194bb45ef0f084fb049ff7cc3161da7e9d6a82bf1ed36f13c5b SHA512 33cf2ce9e3e8df99c2e225b12be0a23e4ec08a78f8643c66a18a711e607cdfaf80bfcc79f8c2390452060aa2f4ac13c9793461ce4262b5ba4fb75b5e69b153b2
 MISC metadata.xml 344 BLAKE2B ddbcc35119c2be368b7a35afe07b20b18803b73879b9b659764c0f30e926c2ea9a78be8ac186cec751c540d6d3ad738d9a675cdea077b41b8e9b04cf958103a3 SHA512 d3045523736a372d5dc690b555cc02b3833bb206c8f608e7a17746f8dc406b7a5d99821aee9e86f3cfb542ed1b780659335d9061c8098fab55e2e5e2e5b4e869
diff --git a/dev-ruby/power_assert/power_assert-2.0.3.ebuild b/dev-ruby/power_assert/power_assert-2.0.3.ebuild
index 1df0d3746bef..1547c2eecf3b 100644
--- a/dev-ruby/power_assert/power_assert-2.0.3.ebuild
+++ b/dev-ruby/power_assert/power_assert-2.0.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ruby/power_assert"
 SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( Ruby BSD-2 )"
 
-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="0"
 IUSE=""
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 187247871c3b..3847713bb585 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,5 +1,5 @@
 DIST public_suffix-4.0.7.gem 113664 BLAKE2B 5da86713da01f59e7f311985a36b835e02807ca5f186ffc5e41e42cae7781cc10d96a4aca77dafb77050c78e6fb03e10f7ac55dace776c5cca68bca9f4bd7d75 SHA512 acdfe135684277a669ceaa61ea78fc70b979614f63daf27d145e78e4013221eac106651838a27b6694844f4fc33521ecc9f81102582ca1f1232fa80ce8191207
 DIST public_suffix-5.0.1.gem 114688 BLAKE2B 7d1f2bf8b05c4de548b281f01a50eba8911ca9d56f42301139e0e3242eb9960db7b6fe312f4b65996b9b796fcc84748c53968771417b45773a453dc99b2fa33b SHA512 9498d53af79ffa7ccf5f94eb4e54c2281ff3e025d963c9024aeac06efa919dcf766a51f901ab6168125737b6f53831f8835d5777739fc45ddb66c99c2e573746
 EBUILD public_suffix-4.0.7.ebuild 832 BLAKE2B d50994a8f1d2c1761b639f215c54f9524fa9a1348e4bde2d01b6dbc017fcadf4c8811179e738eefba4a2f455a1ce55b3cdbf351c61b384fdbb6141a56f489de3 SHA512 c645898f7d3495aee6a7edc73efdb90a98ec1f6fea66d344b706007938a573ce7d1aea80a16b64d048ef291723c29291ad4c7d10d4c94e5c868ed49d73dd6567
-EBUILD public_suffix-5.0.1.ebuild 831 BLAKE2B 1182ec2a8b464deda6754b40a977b09846a03f3e88540fd43917f129cdf70d5978c6231cc0ce3f475145a02a9a270963ae8d34406b952f7bc4830a08166e2715 SHA512 e9ab78fde668e182b3a0a7dfc5d349d62d0bb36876df3aacf2c04fc39fd231bbd254e2fb53cb56cb47502570f360a11826b5b66bc3256df76b2575de4b93dee0
+EBUILD public_suffix-5.0.1.ebuild 825 BLAKE2B 5e942cc7cdd45c988fc614b2e1c099c117753c0874f8f22f8a08e75a732ab82b0e226668d0f4a4c7c3570361806823a90495f00584d9558c3206d9d54f8a9866 SHA512 e42b1c6934f8af34b5e480692de2fcd722af3dcbe86311f726db9cd2cf663b3245892d8b9e4e334af87fd9692d11f3c4b22e0d88efa3fbd59464cfa2cc914e1c
 MISC metadata.xml 341 BLAKE2B b3cca7169b9fbc96674afb8199385f169236045a393efea2c899cb2ef6ba3f2887225b7f543fe4bfc7a48d67405cf88a58c2d076cd3ab8ad24a36997e836e8fe SHA512 d70ea0d3d7bcede6344839ab591ca4bb86da938f57fa8ffa1e2fc8498b0867fd9a5859a7b96b372453f577620c26250df8c20b9687aea96234a01d249251ad27
diff --git a/dev-ruby/public_suffix/public_suffix-5.0.1.ebuild b/dev-ruby/public_suffix/public_suffix-5.0.1.ebuild
index a00f35560339..66cb5e436700 100644
--- a/dev-ruby/public_suffix/public_suffix-5.0.1.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-5.0.1.ebuild
@@ -14,7 +14,7 @@ inherit ruby-fakegem
 DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
 HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 IUSE=""
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index 60c802aaee3c..3abe3139718a 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -7,5 +7,5 @@ EBUILD rack-protection-2.2.3.ebuild 725 BLAKE2B b65a457ddc3984143c102230fc0128ef
 EBUILD rack-protection-3.0.1.ebuild 726 BLAKE2B 4083feb02c0beef7cf258771716e2a70bb6cbc296bc42d39f322f15dbf770303e817faab09cc4e55f06b71e428646676cee19804ee364aa9518fa41d01c50baa SHA512 e7faa9d7d47927db185ab474107800d9e6e6377e95d1caa6cf56ca26c5ca99fbae7473de4ad75c21e0f1cc35d2d452ed9e039713be0694affd6988edbe54669a
 EBUILD rack-protection-3.0.2.ebuild 726 BLAKE2B 4083feb02c0beef7cf258771716e2a70bb6cbc296bc42d39f322f15dbf770303e817faab09cc4e55f06b71e428646676cee19804ee364aa9518fa41d01c50baa SHA512 e7faa9d7d47927db185ab474107800d9e6e6377e95d1caa6cf56ca26c5ca99fbae7473de4ad75c21e0f1cc35d2d452ed9e039713be0694affd6988edbe54669a
 EBUILD rack-protection-3.0.4.ebuild 726 BLAKE2B 4083feb02c0beef7cf258771716e2a70bb6cbc296bc42d39f322f15dbf770303e817faab09cc4e55f06b71e428646676cee19804ee364aa9518fa41d01c50baa SHA512 e7faa9d7d47927db185ab474107800d9e6e6377e95d1caa6cf56ca26c5ca99fbae7473de4ad75c21e0f1cc35d2d452ed9e039713be0694affd6988edbe54669a
-EBUILD rack-protection-3.0.5.ebuild 726 BLAKE2B 71cbd0fac644be09c96229635395a1067c958033d98cb4aba5490ab2c507de10368285647e6759d5d412ceab978cd80e722a757fbfdf8089f8b8e76d5aaac6b1 SHA512 b6410e5f3cade65514ef4fed852337abda58c9aaff6b72f7ef47ec14347870dc9f1891cb81731f7c24257003d07fca472edb5c1b12343e935754abb25927c93d
+EBUILD rack-protection-3.0.5.ebuild 725 BLAKE2B 79d4a39b7b43bab190b9c815b57c2d7bc2718198647427063bd47b95bdb889932329d108fdef6efafa63572175fea8bfe8c1013aa2352aa0a82db657b049335e SHA512 3e9ea62ab661873206f435ac0a5178e2daa5787ca597a958c60213fbca6c575e9e68c57677a74d9cde4864684dc83c62a0cb9e4d4122b9d2f205de1e59953067
 MISC metadata.xml 495 BLAKE2B f6dcdfdea078816191c90910089dd90c242b7aa90e41b07670f7bd024d24cdf4a19ab8486c2e82acd4da6bf26db2fc0dcd087b959d8e188d1be1a17ce6b98976 SHA512 bde612118e9e962e7dbd04340312b9556fa54d241831c0e754e10e65f0eccd4909b19622d4f393e684e688977ac34db30e7fa16848116fa39c5aac95f669f2ba
diff --git a/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild b/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild
index c1fe98e42fca..31bb18448cc9 100644
--- a/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rkh/rack-protection"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-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 "dev-ruby/rack:*"
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index ae6f84745107..f592a123322a 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -8,5 +8,5 @@ EBUILD rouge-3.30.0-r1.ebuild 1025 BLAKE2B 04edbb92744037b8281a351096c8d6ebaf923
 EBUILD rouge-3.30.0.ebuild 994 BLAKE2B 77391fc2ed5031cc149cad80a186421bf6c11e1a699123f4d04253e45deb7c3acd38965e6138923a1783fd509ab3f9ca53b43381d67559e03a3e1bdf995756df SHA512 aa95c26a6692b601816b56332247575c564bbeebba82dbfee56e5cc3b7371c112cb47e4407b7a15c14f08d6ba5084446b591ef3542f9f58d9e2ffeda39cce08a
 EBUILD rouge-4.0.0.ebuild 1032 BLAKE2B 97a7e01d220cf2168865a89b96c2a5cb48ce769810070b2f15e7c38c78f0808cca2fe80d3f504a3dfa0e4f1d0d9b2bfb66a70b626c4a0e39e565347aacccd19b SHA512 7fd8ace7bb1575ddac7fcbc839295d3bda7c7527c290daf73303a590f22a0a5dff6b9211730bc5089bb90988a54a8b1610913cbc9994da12ce8b5745ba38b400
 EBUILD rouge-4.0.1.ebuild 1032 BLAKE2B 97a7e01d220cf2168865a89b96c2a5cb48ce769810070b2f15e7c38c78f0808cca2fe80d3f504a3dfa0e4f1d0d9b2bfb66a70b626c4a0e39e565347aacccd19b SHA512 7fd8ace7bb1575ddac7fcbc839295d3bda7c7527c290daf73303a590f22a0a5dff6b9211730bc5089bb90988a54a8b1610913cbc9994da12ce8b5745ba38b400
-EBUILD rouge-4.1.0.ebuild 1049 BLAKE2B eca416f95f67735b25e44f1b6cda3f7abb1d59c448e6eb8957401e689e0c3b52627d378854e40068be97706f7ec05e0afdf8951d669e74a52e50da140bd88d09 SHA512 c7dd0330efb21a6070438142bedf90a82bf0a62b176311b4f5b6469922cd5e9643435fa5373058067aa1bd95e13d52dc50b4bc65fecd655c83f9d18bc5753bfd
+EBUILD rouge-4.1.0.ebuild 1044 BLAKE2B 780c4cdeb226c89fb759f54cfabfaa1712a03a562012cca4c9da879a1dd6979a929aac7ada3dbcb57dc5cba206ad4bd3be680ea43cc4815431f8c213fd5edeef SHA512 554084c126b353f727dd405c77a39ac7f0f977eb4a38e15d46cc85e39d1c11dcdf7ca68d5e8bceea9f5b61787c05126af1c396ccd3af432e578bc1239b5ac81c
 MISC metadata.xml 392 BLAKE2B 4db1396051514c7b0dc3a627c54c571dda876ede2f1154a16355876a421622efcec037022ab66d2240123b3d24a36f0e9f568c79d623f9f7b363fc7505b72fd5 SHA512 93b8c3e72d5836cc1fea2472f09b42571a7c8496422b1f454c2b607b912125a044d501c6e6ee75bce78324b1d078081188df421d0d8cbecf28bd7c2d22266fc9
diff --git a/dev-ruby/rouge/rouge-4.1.0.ebuild b/dev-ruby/rouge/rouge-4.1.0.ebuild
index e0976295e147..befb00b806da 100644
--- a/dev-ruby/rouge/rouge-4.1.0.ebuild
+++ b/dev-ruby/rouge/rouge-4.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rouge-ruby/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="MIT"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/ruby2_keywords/Manifest b/dev-ruby/ruby2_keywords/Manifest
index cbfce1f6c441..5a12ec2a8b4a 100644
--- a/dev-ruby/ruby2_keywords/Manifest
+++ b/dev-ruby/ruby2_keywords/Manifest
@@ -1,4 +1,4 @@
 DIST ruby2_keywords-0.0.5.gem 10752 BLAKE2B 430ddd02ed59c73c8dfff7762a2f4bbee2b4514d7c8c38a9bf34928a254799cc9e7401672d92b926e4284b005ed6ce59eb2f4503cabe76c5200626b89055bfa1 SHA512 f6b9078b111e68c0017e0025ecdccb976c7a32f35c1a8adf9fd879db0c91f89eb9bd799f9527a846e28056f2a5fbf0f3610cda9538570288c493613c35c83a6f
-EBUILD ruby2_keywords-0.0.5-r1.ebuild 489 BLAKE2B 11608c93ee048b0f5d2c55cd142f36a02ed55d32c20206771f5d3d6bcc7d6aba51ed5392fdb8783ab49bca535ea59a95022a88f540a16bf14589f8bf5dfe251a SHA512 e238c2ef0f30b0cd2a5e2dae59be25433d1afdabe4bd58781bcdb6b7c5082cb6588dea551d7f9a8931912cf3a531932844ca7279dc15ea22fb5a7cf5be19ed80
-EBUILD ruby2_keywords-0.0.5.ebuild 488 BLAKE2B e7a349dae7323f05c02ca000f0636b4a60de43ed45b543bc3fd1339d70019f8b3a8ab19f4c1e7224e6725446eef78f276b84c446bce9ea5e06e8934356b597ea SHA512 8de5743e86b56b4b2029e2b42cd40a335ead209a7b86551b8906a86cbd4a822eb48528b8e305c7a99996d48507e7f4148a08bbcfc68217ac84e37a9f8fbe0f7c
+EBUILD ruby2_keywords-0.0.5-r1.ebuild 488 BLAKE2B 2dba1ae5c908e59106ab1957066662cd106a4115cd3e3835c6357bbf4fbe83b6cabebbb6d7b32037c6054d0db740b7bbacc17d63ccb86138b2f299bcef68f54a SHA512 1bcb92dd65e7b3a480dfd18f811045c1bfa78f03d42913f8c0f5b9d11c8b8c8802ad94952bf8f899a3dd3c8fbb215978abed534ff449b2fb3e8f62b6872c8f0c
+EBUILD ruby2_keywords-0.0.5.ebuild 482 BLAKE2B 9aa69c7f2242bccd7e9db2f691c46be850949e2f80395cb6b066b8ada555788735951722f87aa63e43d349a7663e495d2da0ffb2ff9e499c83e19e797f375093 SHA512 1c505af5989bc8192442e3eedfab1c5267f2f02305822bb0a76f33ee40cae1fe35a73c783dcfa6d1c6d83c233b15b1c5012d8a7879820b64fb9e6514c5c511af
 MISC metadata.xml 404 BLAKE2B c3f2395aead0cca31763565c2ae30c6bc814915d2d402fae9506be9eddc279d41204eff59359aa5bf4fb67e0a8896d51936eb7c3ebbec97e32e2323008a4a34d SHA512 83d6d3df19864603c64ff832c9399ed6764b7bbb31f96b04c82d776e1e023cd25faf63fcfc2b6e91f1449b8729e723194eb8de7684efe5e23bb2af75f694f53f
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5-r1.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5-r1.ebuild
index f3f49755d9c2..2e61d28d192c 100644
--- a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5-r1.ebuild
+++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5-r1.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/ruby/ruby2_keywords"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
index 97083b750f15..873e633b2b28 100644
--- a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
+++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/ruby/ruby2_keywords"
 
 LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 2140e780dd84..be027264596a 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,3 +1,3 @@
 DIST sshkit-1.21.4.gem 144896 BLAKE2B a4f7cd2342810422c6dd680370c741136bbe1cc59656333bb8a82ac2edd6eb0e3d5482cf671a3ffdcc38cd2f2a97140623728e213e8fd3098b223b9e601e6ea1 SHA512 c3a56b7dd80334b87d512054e98e8a72d93b036a4fb0adc34fad259c5b851de6a3c69549d1472442a3b822d371e80115849aa767dd7fda215fd0f626a7138173
-EBUILD sshkit-1.21.4.ebuild 1156 BLAKE2B 9eec3fbb8154e95e0517ec45bf7487de1cc77270dbca3b26de6f179f3b795231130912af209e2f933f1f04d24b2b38744183f6a21d6b444f1b6d130101ac6a85 SHA512 e5e8fbe686c5f5721780fd3ca29e74c0f041cae0451b5db4d66fe637828bf1799bb8e58391e16662ff97b0faafdedc5f93dd36204560d7d15c662d4a06802734
+EBUILD sshkit-1.21.4.ebuild 1173 BLAKE2B 1c68037724151dac4c514f8fc7546ab49b4b03dc5f6bd6bfc5d29f5f4b65b47b83e00c3824599b265ac162ed2c306317d8598dc843f7b9c6933e47358e7acd5e SHA512 21c2a0b2cda3dcc86a937c363c7f63064ee3f4904f62ca5caf60865ea921f53d03f3512411e8c465432ac10c5fa3016ee21364071cbbfcc5275bf06791474a53
 MISC metadata.xml 344 BLAKE2B 16679900db0e4f70c9afc7fee058f72fd4df86453f5870666a329d1af1380894b7e592b89e02a4b23a07307765778f302cbd3166e45da66bcabe66b97b450d08 SHA512 afe79f300e02bfbcff4e984092bde60d4a8c6c528a0fd2816456bb5bb12c03aff61512e94e4ecbd6e76a947c2e5e22a433bb32fd052e7e0ac6e78814803f20a1
diff --git a/dev-ruby/sshkit/sshkit-1.21.4.ebuild b/dev-ruby/sshkit/sshkit-1.21.4.ebuild
index 8eeed28c437d..3ba31d6cef43 100644
--- a/dev-ruby/sshkit/sshkit-1.21.4.ebuild
+++ b/dev-ruby/sshkit/sshkit-1.21.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/capistrano/sshkit"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/sus-fixtures-async/Manifest b/dev-ruby/sus-fixtures-async/Manifest
index c8891415bb5e..f6d34cafdd0a 100644
--- a/dev-ruby/sus-fixtures-async/Manifest
+++ b/dev-ruby/sus-fixtures-async/Manifest
@@ -1,4 +1,4 @@
 AUX sus-fixtures-async-0.1.1-tests-require.patch 1988 BLAKE2B f07df7e49fef9b3c27125c0f08c81c95b8357a2f61b78355d4b85b30304d19ea697016e70337784b901fccdc51ad217bf34b096eb8fe2e1e48baff377c69945f SHA512 3d8857421b3e278cda79d085af52c1c70e6d7a215bf52f446b5f9160e007a754f29e41ff6304882a97d601abb7b06c3c0a14b86bfef459bfeb62b1e9f3ae4030
 DIST sus-fixtures-async-0.1.1.tar.gz 5017 BLAKE2B f293d9fe336b05e510a82c4337250f48b871eab8c38b7d9587a6402d19689197eb6a2b1f7f14e7b5823246b6f14d104e7e49f14f84a980392dd545543ffcd733 SHA512 cca073491d143b0ceaff34ada08d416ea43a035bc887c6dec02f62372724d891f47e9dfa8d749f6e485e7d14da8c395dc67185ed0a91d9ea0eb5466d3164c378
-EBUILD sus-fixtures-async-0.1.1.ebuild 932 BLAKE2B 729fbaea14c20b435b7ffdb07b6055824fadd2f6fe8febf7ef85ec959b7b9590525409151ef30dbe95ddcdbd55a788930a2377eff0d91a0bd4839b92ed23d730 SHA512 c4b9763bd47f509d68d0200f36fcb961fd87980b32c8c2d3d259756a3e2e59f0e02f2f68d8598b104cd0739d6c454ba0a06f98b1f2d5e655648c8dc75bc0fdeb
+EBUILD sus-fixtures-async-0.1.1.ebuild 951 BLAKE2B 11b7677fd63f74d4ca46ab49f7ba6b13edb76369480ec63f424cc88e56c4a3bf45bce98c27062a5f4ff1cbd77ee28162c27dffaa059a34d9880b2717736ef1de SHA512 9826dc3bbd5a6c1f6c78400651c1969e086ee7b2352e68e0877632ea25971e5b8f37cca479ebce0caa722dcf9432aaf35c3edfb15bf9bf536cb74fd35273254d
 MISC metadata.xml 354 BLAKE2B 2ee34480d520d59ceeb669e41cd1ee41d0723efb47099fbfea640ef1c051c0c3cfe81763b2d0a3c59097b27a30c04f6000e19f6536fb3bfbb2fdc9077217557f SHA512 3be0ebf3c83c72884674a512375a691ba9663e0216b1f0912616f5e8b3d814eb1eafa757c0444b925355e407e60c779400728041c6b12a43801e4df802c42172
diff --git a/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.1.ebuild b/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.1.ebuild
index 86447527d3cc..ab8cfdfd6df3 100644
--- a/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.1.ebuild
+++ b/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/socketry/sus-fixtures-async/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 ruby_add_rdepend "
 	dev-ruby/async
diff --git a/dev-ruby/webrick/Manifest b/dev-ruby/webrick/Manifest
index 5a236db579c3..a3f486fe9b30 100644
--- a/dev-ruby/webrick/Manifest
+++ b/dev-ruby/webrick/Manifest
@@ -3,5 +3,5 @@ DIST webrick-1.8.0.tar.gz 91072 BLAKE2B 9275458772048d68d5275e19e6c1e2c13bbedaf7
 DIST webrick-1.8.1.tar.gz 91111 BLAKE2B eff3f2dff64d017fa0ef5370b07d97bfcd39f1df426a3b04ffdd0b5b0ea43cdd5d267420ea64bd0c3e4de3f1ee88df2f09959fd17b2b158b5ce0ddc16995b2bb SHA512 21cb396887025f85cfe04868e7fa7ef039809ca42a3acadfe1decb4dcd02eeeb3c9163e970324b56a9e0eb6202d971370af56e200c69de2d224c1941f866400c
 EBUILD webrick-1.7.0-r1.ebuild 755 BLAKE2B 5f5ab7c1397e6863196d340e5794faf6872a42199fcf2833396f771c9a2c6150869fc8fdee375a3deb6659cc4e5c7e9deb1f6e1145025f60b81f96b9970ca981 SHA512 966915017e6c11a969d9dab2c2344d6521d330612feac7f0239aec2b86401fa484d374f628a82db9350a4487080cf379ba2580ffd8b984c16701473bf2343ea2
 EBUILD webrick-1.8.0.ebuild 755 BLAKE2B 8967221d6456624f5483e6fc1f721e2d0a8e9fd5d5c210e2b3bd2dd6624c2dbc4512eb86aac12fbdc678b958c14b2e794bc9f3c9d2cb0006656c5d01596972d6 SHA512 72ade795dd57f4ce2e106b5a41c97db1f82c9f87162f208d7c26002ec0a3a301abb428004a6fea01822d55afc5c2dcfc6f80d9093832149128f750cdefdc5539
-EBUILD webrick-1.8.1.ebuild 770 BLAKE2B 830abe14988a2a8464b162425ddae89f3bcde8f03616982859b01a91947a793049fc40e1f8a84a93028890ebfe6c7ce25015ba4228b4a63d9fc737c43b5bb369 SHA512 c7162592ba23a1ab1fe3d5b0c56561d4f1ed07bb29c88908cb5bec2f36a4666afe815d18c47f64ba70c29751128d5f70c9c0b64781cd4b0aec5ee2b4f6521fd6
+EBUILD webrick-1.8.1.ebuild 763 BLAKE2B 970fb1639e78f4cbec150e415f4cc8b1ff1ab44ebce4ab61c04c795d4159aee6aa23dbc1f8898dd823ab5214f4b7cb8291d379f964ff9900dd701e566d2a9a22 SHA512 c479eaf7f4d7c7b3edef61315781e7929035d215ce6e6273f76967df87f5897ed3c33656c1664330e64b1cc250ac960cb2c47ac6f8a0a9860cad189af03a1869
 MISC metadata.xml 339 BLAKE2B 818ee09423c4ed53677cff830ae592234879035757260fa554871e0180d47780056eb8c301678428928a841638059507ea2b170abd758f8c73546fcabd675b49 SHA512 4abab733deab5e4609430f0d51f7634fda1879be7694720e683b0d9972691f41dbfe7fe9e7d252cddb9ac5a449bdf521b0d3b10acdf510e02c3b3a8bad578b71
diff --git a/dev-ruby/webrick/webrick-1.8.1.ebuild b/dev-ruby/webrick/webrick-1.8.1.ebuild
index 5a8e1b8cf170..a1f3c05c2cd5 100644
--- a/dev-ruby/webrick/webrick-1.8.1.ebuild
+++ b/dev-ruby/webrick/webrick-1.8.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/webrick"
 SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-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="0"
 IUSE="test"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 215f9cefb147..7fbd931740fa 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index d641c7bac04a..4e9ad4de6b57 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -6,5 +6,5 @@ DIST byacc-20230219.tgz 898360 BLAKE2B aaa5fe5a1a3ea90bacc77bbf4ca71f1af491e8b97
 DIST byacc-20230219.tgz.asc 729 BLAKE2B a03f6a66e40462ddf1e584f8f6546e9bce00b517403b67c5b8e4778f2d13a8b9a61ef8569fbbf97e51ff4324307acb404df1bd85c29c1c0ea83f7cd54df55e85 SHA512 e55d8b395f34c931a59f2f0fa035908994b5cc2423de95c06ee608a93c9776a79a50ca5ad97f4de7e9e04eef4160174c4c4dfab826aa4d741ea60db7dbed45e2
 EBUILD byacc-20221229.ebuild 862 BLAKE2B a025a73a63f3bc246648f2bfc5c5a30334681b13981c0c5a32008958415cf57dbdbd68ccf5abaa5d9e61fb0c214dc9ac922484e7463ccae1696e4b29bb183668 SHA512 abfe6961e2f1f698caf2ad9f69e712cc5aa86ce11fd3e09fa2200fd33f15813fc289b1827c3d7e61eebc4d65d1bd34263e27bd52f6f70fdb83bb7bd40914d2c8
 EBUILD byacc-20230201.ebuild 862 BLAKE2B a025a73a63f3bc246648f2bfc5c5a30334681b13981c0c5a32008958415cf57dbdbd68ccf5abaa5d9e61fb0c214dc9ac922484e7463ccae1696e4b29bb183668 SHA512 abfe6961e2f1f698caf2ad9f69e712cc5aa86ce11fd3e09fa2200fd33f15813fc289b1827c3d7e61eebc4d65d1bd34263e27bd52f6f70fdb83bb7bd40914d2c8
-EBUILD byacc-20230219.ebuild 870 BLAKE2B f50dc96661e7837419002aec642bf87879778ce501d4821c7f05d710bec16929b6b0f2401206b49eac7541ee09b95f5e2f8373ebec0692d41db51e5806dbcc46 SHA512 6fd95bd9bf14e314167e0ebff83ffee05fbca6c2633f9072f8ac18c3bf2d676a30664ad0aa4d03c01b8b5ee12c69dfef5dbe9b0ceacfbd2592ab953c48ae5dc5
+EBUILD byacc-20230219.ebuild 862 BLAKE2B a025a73a63f3bc246648f2bfc5c5a30334681b13981c0c5a32008958415cf57dbdbd68ccf5abaa5d9e61fb0c214dc9ac922484e7463ccae1696e4b29bb183668 SHA512 abfe6961e2f1f698caf2ad9f69e712cc5aa86ce11fd3e09fa2200fd33f15813fc289b1827c3d7e61eebc4d65d1bd34263e27bd52f6f70fdb83bb7bd40914d2c8
 MISC metadata.xml 424 BLAKE2B f7c1172e12c784d254658b3743db6fec9d6ef008891fe84114c71c1d0edf24a37f00ad61a1705716bbaf6c912b763756995185f2cffd95c831b8ca57abec6d68 SHA512 8bbdcf35f0499db09f1d55d038d93f8c3aa516e0baa74ec078c7a3032d4885110530be47cdd309de1a44b8c92e6dca3f4353d3ff1d3da04b052d492c91549067
diff --git a/dev-util/byacc/byacc-20230219.ebuild b/dev-util/byacc/byacc-20230219.ebuild
index b3013c9753bd..c742cb13b523 100644
--- a/dev-util/byacc/byacc-20230219.ebuild
+++ b/dev-util/byacc/byacc-20230219.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
 
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 41f7efcf8afc..ecaafc728ad1 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -5,11 +5,13 @@ AUX jenkins-bin-r3.logrotate 188 BLAKE2B 0dc1f24b3f6f709060dcc4d758c4aa7b1555309
 AUX jenkins-bin-r4.service 518 BLAKE2B bfd33c8afc8db031903c5d66dd3bba7c77b6b1ea179c91918daa8b03f7437092c948f00836f3382731096af3f3c76990412efb0b3c753d5de54709f0c64588b7 SHA512 330143f3527095cd7cf0cdfdbec0641c5bd6f10b6d62853c887193400162c9a1125de65f0baed9cec9f501d6d966a46c42b66030669c7b9f167808d2fe67f8e7
 DIST jenkins-bin-2.375.4.war 94246705 BLAKE2B bff619c8cba8cb75ffa11b967176394be63d5d74f16f76487fc1e7e47f7843bded4b2005a37be5add38bb48a9ea622a3f3a8778f15f9aaea537d53f38263260b SHA512 0df55e83885583313829e9d6e4664c2e3811fe5c6bbf39fa264b39d856365a4b6740491dbe9e708e96cd429543d038b09cf2b09da014994f6482f27eba120231
 DIST jenkins-bin-2.387.1.war 98336194 BLAKE2B 928961b9cb64a03ca85eb7867b8976629470082130d076dc97be1b5181aec694634dc0a4778c4281f4993696090637e42adc81526215268f3bf8ba9bde38f6c4 SHA512 51d42be9f0c6a63b3163a0b95d579eb1b33c6e3ee1451f4f0782143bdba7cefac3e378949173dbe0d9adb3a11f295f1efe5b334654a4b7601bc2ffdd4b086c3d
+DIST jenkins-bin-2.387.2.war 98354350 BLAKE2B 2a1a3c1238e1f179855ee42863105583c886a36d57dbd18692b6708a36b7385bd141e840a66e9f1a795453885e14f9e855696a5bb0c44a3105529e4ac301cc67 SHA512 f20041013293fe5252ad8577481b395751fd8654152175b63588e891fda48a2b8d36a69d8c587e10233d45b557df81016b9e3457312ad1cdb20ad90abb090104
 DIST jenkins-bin-2.394.war 98409457 BLAKE2B b118281ec50b0e4f92fa1996ab1c6d8dc8f98a2aafff9f430c5f359b53bd58081754ec72d982e432e783ba912923607306f9217de15a03de6875291cf0c1a1d8 SHA512 4f41e654eadb8459750bd69030e35186cd4677f2e24c0c422df9a5536b000f51e3c960b2b5396605c3e928e0909a719673d08b70424b314ad6ae9777d42df035
 DIST jenkins-bin-2.396.war 98338848 BLAKE2B 5c51085f3a677a46d216c9f1acdef2a6b59145a9ce557b301878b610daf85c9395588376427c05427d1791cf356f3f96643d6c83298cdafe9dd7995ba563ff72 SHA512 70c8c61c6715f5f9b90775ea35ae51ae9bcfb2f9908ad99e1b04237e8a27c03bf97c4474fcbbb1ad660350c3524ff796ad44e64e56a7791a363e45bc30457b5e
 EBUILD jenkins-bin-2.375.4.ebuild 1126 BLAKE2B c244d9e340d8f79b4745f03276603e9d98986596b9370dd965306d92e3e456b230f3c844eab46f7084bec3b55555541b21df0d1c817db1ed1ab077db9d1237c7 SHA512 5cb5710c12775899c9535b4c71831d200ca83f721be0eb776873d841688e5a21646c852b6369c137291e1b77cf6cb107f377f7ec294f612abaab07395677dd6a
 EBUILD jenkins-bin-2.387.1-r1.ebuild 1126 BLAKE2B 8c198605bd0648fbb8f5e9288a5ff9a9f17d9b3a0de2bbb95f0e8425732f9efb7509bdf852e6797b36f3756470a576dd7c24f8001efb4762030316355070cd79 SHA512 edd5aeedc0565fda3ec2e72ad82302e99f4d9c5559ba3216584e40ecf0447fe2f4a92155faefacfea55daa512b85e39e183be257bdcd44d5273638aba1d6a911
 EBUILD jenkins-bin-2.387.1.ebuild 1126 BLAKE2B c244d9e340d8f79b4745f03276603e9d98986596b9370dd965306d92e3e456b230f3c844eab46f7084bec3b55555541b21df0d1c817db1ed1ab077db9d1237c7 SHA512 5cb5710c12775899c9535b4c71831d200ca83f721be0eb776873d841688e5a21646c852b6369c137291e1b77cf6cb107f377f7ec294f612abaab07395677dd6a
+EBUILD jenkins-bin-2.387.2.ebuild 1126 BLAKE2B 8c198605bd0648fbb8f5e9288a5ff9a9f17d9b3a0de2bbb95f0e8425732f9efb7509bdf852e6797b36f3756470a576dd7c24f8001efb4762030316355070cd79 SHA512 edd5aeedc0565fda3ec2e72ad82302e99f4d9c5559ba3216584e40ecf0447fe2f4a92155faefacfea55daa512b85e39e183be257bdcd44d5273638aba1d6a911
 EBUILD jenkins-bin-2.394.ebuild 1119 BLAKE2B 1f7768f33f7e68928c921f60ca98c2f2b930c5d21ac8af7880ebfa36ae51fa8b1e248599de40282500435dc19356ba81731c4217d33f9b8350b971109a7938ea SHA512 978d9e9be72c2e0fefafb9db19b6aa2f29d54aefa9897e135f627c30aa92e9ba57f8c8a15719c7d7cc5eb89cb9c0a8cb9d6cafacc54b3deeac57a2b90c7cdcee
 EBUILD jenkins-bin-2.396.ebuild 1119 BLAKE2B 89b7a2fc96aae40f76d164d1b85990afc1bc8d8dbb7fa5a8856646ea3a8bcc3f7417a362fc81b5f3e612b3e7f7a9c1637f17d63980a939a65121c7b82a5e82d0 SHA512 ffa1e674a53db715b38450d7f92c7a65f04b852cb2bd86082f8717a599c8e442372f5309cb05892a4940b04539c3a0324f1117c825def7b76abd61cfd5e4c49d
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.387.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.387.2.ebuild
new file mode 100644
index 000000000000..a6cffe5d8277
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.387.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="lts"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	|| ( virtual/jre:17 virtual/jre:11 )"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
+	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r4.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index edb0ec2ff0e5..7ebb83ea3841 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 2334b563750f..dbe5747ef50a 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -3,5 +3,5 @@ DIST libass-0.16.0.tar.xz.asc 228 BLAKE2B 78596aa961939f16ab0de76a040038bb299591
 DIST libass-0.17.1.tar.xz 403160 BLAKE2B b191e8910ddb3e41fb9df79b27517a127c0da2ad74c0a81920bc2cf8843ab18b02a60738024fa8d3594b91bd26ec6ea7f87e17ca5e07825a6017dd29d2b72b32 SHA512 437b4b60db2626e48f438b5138ab4dbf2c2ab4c8f0b587a6e554510c6719544ef2235c601ff1e482d020410f9bab95ad1a9b176d19a3bd54880499a576b41f23
 DIST libass-0.17.1.tar.xz.asc 228 BLAKE2B 0e70c104438be4409239f435d7872737fde1aba4485816ad0e35f0de743ee303662e66334425d0d511af4974e03443ba6d33ac44f941de9b0da17a56f204edea SHA512 a28c8271b4c5b5756620be9baf81b0262eb71c4f20d1aadb24238d1d0ccba44fdb3b25d788a3f7c9039945431a3d31842a7855660cc28a0a8acc36ff8f0c0298
 EBUILD libass-0.16.0.ebuild 1406 BLAKE2B 92357824f79e7968911f544d0ddcd14242c2f799843a690c7c8fa87dbebf14efec14ee29723e026083d0d617dc6bb471820626a48385be0f6d4d3705410b00ef SHA512 c56a7894b77ebcd6870d77a655e4fdf1f629be779d6d99a15b349ba855174c4cf84df7588bba549aa47171ca75b2ceff6c4f6670282965148827c1e083e85fa8
-EBUILD libass-0.17.1.ebuild 1523 BLAKE2B e66093ea47f717160f9cdce139cb239dd502877dd97346a3915de953366dae293cf1677fdb493beb86f297a81da42a00dbe4315dea68b1711638588f9f81da28 SHA512 7507ecc8c5c505565bf41a9e76817a56a025ee73049e312b2b96a36cf33c67f0c52ca9a2e0df6dd5eade9d3ce54c8a8a6a7808f54f95eefe76031bd2b8f0d36f
+EBUILD libass-0.17.1.ebuild 1519 BLAKE2B 8dab50c9215bb134d0aad00e5f14a9f8acc641d9134129eeb03af3df54b7a482635f77de27e567c089dd0da5eb4d56752e17d61849c204d18272aed1cf7f304a SHA512 ea36bd655dec875de9be683cf0c0dab4c6b2d6067773412cdc1c1effb18a19270a40b1092a3fae0a5295cdcb136446b1a6054f4d29f5867b06953e85295c779c
 MISC metadata.xml 310 BLAKE2B 32f2b0eb7f05223e3d092b3d75b7b1095afdac6dc322bd21fc8d32b6089cfccdc46300801e9d7566269fc0fb54780b6c1efff6e41be8de0aa31b26bdc52a44fd SHA512 97c76a4e387bbf43b14bf7799fe889c27e74e8e0b18c2027fc0c365e25ec5186ead530afe6d8e4d6b95440f0cb781d7ebc46e1eae1cc7b2161a199d38bd2a186
diff --git a/media-libs/libass/libass-0.17.1.ebuild b/media-libs/libass/libass-0.17.1.ebuild
index 05e4b30b8395..9ca9f5f173b7 100644
--- a/media-libs/libass/libass-0.17.1.ebuild
+++ b/media-libs/libass/libass-0.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/libass/libass/releases/download/${PV
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 01d4d29879fe..bb4f22482b7e 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index f8f8f3557a07..47a8bb90efd1 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST audacious-plugins-4.2.tar.bz2 1947472 BLAKE2B 405fe7d30f190590955e66540595059869aed920b5cbaffa84439a336b20e6016c704dd3d3775521bde5c3bef0954aae96d72587d6c383966d63dd955b7a6b4a SHA512 632f1ac90c3a079bb92120e4bc6ef6b13f3f809f150809a64569fae49c908dafeb30e16a34d18bb081e099fe2a252a7ed8b76da129ffa0d51b16216f0b6d1282
+DIST audacious-plugins-4.3.tar.bz2 1932184 BLAKE2B a62e7e3600b21a8af9248cd1b244dd736693e29f3d5374d68417bd46eb37263109b926beb9aa587ebb98bcea8d444403c6d8fdd96f0dcb7e6665199b0b34c9fe SHA512 51ffb38917bc9cf13d433c39843b37cbad6ef2a0db8b5da65ba18f8e547c94cfb979f0c8f4413080c56bc33d4f2ae47f92679ee5c11225aa47d85abfd27c0810
 EBUILD audacious-plugins-4.2-r2.ebuild 3972 BLAKE2B f8d4a2fc31bf909b64d21b84879893d98f7db33fca512f5c3df7367d50a67dfdb4739a4d9779e4580b1133909ab7f6672ec1a58913e36695c6823714399bd523 SHA512 a72a5910530792994f575543006dcc5e34f214854d797b6b5a2c47e2834f9f4a36bf4af83f2cd6c5393ebac440ac3454b38750203a20143e8750893cf2e84baa
-MISC metadata.xml 1091 BLAKE2B 6f429835737323f98f771d55ae9ccea937341dba297e559500461c3c3746b27410eb1d9a50a68651563eaeacc9cf22f99a7b4894753d15e202341680f1f4ee91 SHA512 fc8e02d56582e98e2f754531ac52c0d0257290b8b6c3b3663b1baa5f55799ff7934094c1c6e2384b13ee45438f9f59dcf4186b8a0c69f59e3821265d0a6cdb25
+EBUILD audacious-plugins-4.3.ebuild 4093 BLAKE2B 92b324744c22b58e7f0126a71d5f2f184ea81ef0179abb389debe0fa7c398ea020d11573a768132835d9aefc8215d1a947704272cf42798cf490c371838cc11c SHA512 53c5c4dd3db331199b3fafac73a9f98d0c62c025932a7fc5a4d5f17a0504855a3dce5d1a58bd2b316656703878f37ef1d142c0ea2cf79c73a76c93e6a58be3c9
+MISC metadata.xml 1155 BLAKE2B fbd2f8cb2bae9dedf92c13907010dda578bc963e32807259be40b656d0360857b7e71e0102ad5aaf0121d4f7488fa138b3fc61be15fdfda630d6ca963ad3f8e1 SHA512 20ac2780a6ff28629dd478a0cca8a4dc9d09a0883c9ceef401639da84c0a01821077e0412e0c6a414548df0ffe13d33dae893229bc797c9507f13a8e8c222d33
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.3.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.3.ebuild
new file mode 100644
index 000000000000..738bc55eae1c
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.3.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+
+KEYWORDS="~amd64 ~riscv ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="
+	aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
+	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl openmpt
+	opus pipewire pulseaudio scrobbler sdl sid sndfile soxr speedpitch
+	streamtuner vorbis wavpack
+"
+
+REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
+
+# The following plugins REQUIRE a GUI build of audacious, because non-GUI
+# builds do NOT install the libaudgui library & headers.
+# Plugins without a configure option:
+#   alarm
+#   albumart
+#   delete-files
+#   ladspa
+#   playlist-manager
+#   search-tool
+#   skins
+#   vtx
+# Plugins with a configure option:
+#   glspectrum
+#   gtkui
+#   hotkey
+#   notify
+#   statusicon
+BDEPEND="
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
+	app-arch/unzip
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	~media-sound/audacious-${PV}
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
+	aac? ( >=media-libs/faad2-2.7 )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	ampache? ( =media-libs/ampache_browser-1*:= )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia:=
+		>=media-libs/libcddb-1.2.1
+	)
+	cue? ( media-libs/libcue:= )
+	ffmpeg? ( >=media-video/ffmpeg-0.7.3 )
+	flac? (
+		>=media-libs/flac-1.2.1-r1:=
+		>=media-libs/libvorbis-1.0
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	http? ( >=net-libs/neon-0.26.4 )
+	jack? (
+		>=media-libs/bio2jack-0.4
+		virtual/jack
+	)
+	lame? ( media-sound/lame )
+	libnotify? ( x11-libs/libnotify )
+	libsamplerate? ( media-libs/libsamplerate:= )
+	lirc? ( app-misc/lirc )
+	mms? ( >=media-libs/libmms-0.3 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( >=media-sound/mpg123-1.12.1 )
+	opengl? ( dev-qt/qtopengl:5 )
+	openmpt? ( media-libs/libopenmpt )
+	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	scrobbler? ( net-misc/curl )
+	sdl? ( media-libs/libsdl2[sound] )
+	sid? ( >=media-libs/libsidplayfp-1.0.0 )
+	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+	soxr? ( media-libs/soxr )
+	speedpitch? ( media-libs/libsamplerate:= )
+	streamtuner? ( dev-qt/qtnetwork:5 )
+	vorbis? (
+		>=media-libs/libogg-1.1.3
+		>=media-libs/libvorbis-1.2.0
+	)
+	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+}
+
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "Failed to sed" # bug #512698
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-mpris2
+		--enable-qt
+		--enable-qtaudio
+		--enable-songchange
+		--disable-adplug # not packaged
+		--disable-gtk
+		--disable-oss4
+		--disable-coreaudio
+		--disable-sndio
+		$(use_enable aac)
+		$(use_enable alsa)
+		$(use_enable ampache)
+		$(use_enable bs2b)
+		$(use_enable cdda cdaudio)
+		$(use_enable cue)
+		$(use_enable ffmpeg ffaudio)
+		$(use_enable flac)
+		$(use_enable flac filewriter)
+		$(use_enable fluidsynth amidiplug)
+		$(use_enable gme console)
+		$(use_enable http neon)
+		$(use_enable jack)
+		$(use_enable lame filewriter_mp3)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate resample)
+		$(use_enable lirc)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable mp3 mpg123)
+		$(use_enable nls)
+		$(use_enable opengl qtglspectrum)
+		$(use_enable openmpt)
+		$(use_enable opus)
+		$(use_enable pipewire)
+		$(use_enable pulseaudio pulse)
+		$(use_enable scrobbler scrobbler2)
+		$(use_enable sdl sdlout)
+		$(use_enable sid)
+		$(use_enable sndfile)
+		$(use_enable soxr)
+		$(use_enable speedpitch)
+		$(use_enable streamtuner)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 9a545dbbbe47..878449b37107 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -11,8 +11,9 @@
 		<flag name="cue">Support CUE sheets using the libcue library</flag>
 		<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag>
 		<flag name="gme">Support various gaming console music formats</flag>
-		<flag name="openmpt">Add support for OpenMTP</flag>
 		<flag name="http">Support HTTP streams through neon</flag>
+		<flag name="openmpt">Add support for OpenMPT</flag>
+		<flag name="pipewire">Build the PipeWire output plugin</flag>
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="soxr">Build with SoX Resampler support</flag>
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f5c7ed31c4ca..97641645082a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 7a58c8c64ddf..9da216bbc314 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,4 +1,6 @@
 DIST audacious-4.2.tar.bz2 612155 BLAKE2B 04a910288278fa27cb4848663ab74f9e523f3cbea7851e28f5e197035c4ad17281e9b0d5756602efb531a65aeb8e6b7abd7b11274af3353f6ac1d21a0bd4c47c SHA512 814bd865e87cf9bc39df07c9f9898eca1dd94d8b8299b2709f77046669ce12e9c31067d55084371f6797724e79872f7571b575cc766093ee2124b38b0409a853
+DIST audacious-4.3.tar.bz2 623855 BLAKE2B a00d5f4fafff6eec5aba0374ba41b0521e60814421845d4cad284bb12bc67623d27d2101f5ba3c72bf7ab68d7f53f3c5473fd173bd929c35de51c4d2ff3ccde0 SHA512 7e92739ffd6adb62c6efe11b3107fc6d2d45ba5bbb6375dddd227f4c51387e0bbca2a5c1020b25a97933b9f02d3e726b22a21f7566ffac8b08ddfad609c3dc0e
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
 EBUILD audacious-4.2.ebuild 1463 BLAKE2B 9a0962f8b9ddb0d23a7d583cdb958eb019c3454d4161d6e46259c6bd5ccf8353278ff6728e47ff831f87e989ffb11e0c1f1fe2e2c02d4a8e8fc51d08ad5a14c6 SHA512 f84422d0bdaf4908b803e3a86f8a9b800b3db7188f9ade4c68e23c19b1c5f23caac4ab8876f889dccd39442c003f16485f9934ea242897ee207f3b91d3b18e73
+EBUILD audacious-4.3.ebuild 1465 BLAKE2B 765820b8beb8b46ef8959c38533ec5d57767fd98be20e7501b1f3aea095300b7c730e7f72f9dd0b282c11a00ef131ca2c154e4f8b0458a90f4678ecc8e7b244f SHA512 da1d49896627d57eabbe3a3b5c0323c79c22987cecb60093e3307cd95dc4ad3806e07ed310ffe4bca6e1040181f60e925faa8d79f9cc070d7778c6ae32c29fd0
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/audacious/audacious-4.3.ebuild b/media-sound/audacious/audacious-4.3.ebuild
new file mode 100644
index 000000000000..eb7bae84d68a
--- /dev/null
+++ b/media-sound/audacious/audacious-4.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${P/_/-}"
+
+inherit xdg
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+KEYWORDS="~amd64 ~riscv ~x86"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="nls"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	virtual/freedesktop-icon-theme
+"
+RDEPEND="${DEPEND}"
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "failed to sed" # bug #512698
+	fi
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	local myeconfargs=(
+		--disable-valgrind
+		--disable-gtk
+		--enable-dbus
+		--enable-qt
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins -r "${WORKDIR}"/gentoo_ice/.
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 314bb4124c0f..4e1d03817b90 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,3 +1,5 @@
 DIST ncmpc-0.47.tar.xz 291400 BLAKE2B 4b9e5bcc435b6064c054ad84000986942a699993e78decb26b73b4f3ec8d261e4e752e11d40ed5bdcbaab260b37f1a59b99708be05ade44973fee3f2b1e6d9d1 SHA512 6c9990ca9a0781eef67fae8b20ceec5fc00177b1db2b08cfdf122dd1f61f87a92030baadcaac154d73ddee622c963481d4e37d46f76a4ef21e51d4f18a6f3e6a
+DIST ncmpc-0.48.tar.xz 296320 BLAKE2B ee25298af9d50eff646d74aa8908358a3df7b5ca7cf0666b6d3d31027e66d1219c2a48c5097e160d728db2965e2113a0915accac0d97f246d6e75152a2c9a1b3 SHA512 71739fefe696402d4a594a0c931bae0d6fc26f2b7203c51b3d6664c703276ad55f32ea247e1100224a3072386b6de067c1c2e43aa8b6cfac564f7f215ec11f7b
 EBUILD ncmpc-0.47.ebuild 1992 BLAKE2B 58f10c1dc03f805e1a2c7c8cd3d5fe3bb6e4ec2016bbe62dd346b49e9d55305406eea81e079264e6458091e552c558e3466a0806a8be1e6c3bc7d2af7c5f6443 SHA512 66079bbc69e337527e79533cd65068f846ce72cf68ae452b5fbe37509b59f6a7ad3d3493ed2ea08b455788ab484e195b5adce3c3312416414916f25bfb28833d
+EBUILD ncmpc-0.48.ebuild 1996 BLAKE2B f2278313fd21247f8b9d64d8ae6f4a957a00f11063e8484f85ab6094dc7e27ae62f45357c4a5343e4ac327776cbe2d8d835a4c24aacdd9858f2664654385f370 SHA512 2c5b4cfc2d78d9664b5ba82e3ee7b02b9dd491d395ed221a6bb5497e91504201dc94e008d857fdcd54b47cf69d1d558f42f00aef4b7ad80dbdcf242046f06743
 MISC metadata.xml 948 BLAKE2B 712f8c8832f3c6ff6c35609c2042ae62f00b59753ebd648457c919d78f03297b646fc704331e6a605018115fd25ed3752cb5ff41d12c2b072d7929d7357d5e14 SHA512 231ff1ad361ee547df64e26ab6a37bfcddcc373e8e8421e0bc8e594547c844fe3c73fa7d8aa3fb7594f4c2b83b91bb2f52a1268f711a6c8a2a295cdf94f59d72
diff --git a/media-sound/ncmpc/ncmpc-0.48.ebuild b/media-sound/ncmpc/ncmpc-0.48.ebuild
new file mode 100644
index 000000000000..998167917c7c
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.48.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+RDEPEND="
+	media-libs/libmpdclient
+	sys-libs/ncurses:=[unicode(+)]
+	lirc? ( app-misc/lirc )
+	pcre? ( dev-libs/libpcre2 )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# use correct docdir and don't install license file
+	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+		-e "s/'COPYING', //" \
+		-i meson.build || die
+
+	# use correct (html) docdir
+	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
+		-i doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcurses=ncursesw
+		-Dcolors=true
+		-Dmini=false
+		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
+		-Dasync_connect=$(usex async-connect true false)
+		-Dchat_screen=$(usex chat-screen true false)
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dhelp_screen=$(usex help-screen true false)
+		-Dkey_screen=$(usex key-screen true false)
+		-Dlibrary_screen=$(usex library-screen true false)
+		-Dlirc=$(usex lirc enabled disabled)
+		-Dlocale=$(usex nls enabled disabled)
+		-Dlyrics_screen=$(usex lyrics-screen true false)
+		-Dmouse=$(usex mouse enabled disabled)
+		-Dmultibyte=$(usex nls true false)
+		-Dnls=$(usex nls enabled disabled)
+		-Doutputs_screen=$(usex outputs-screen true false)
+		-Dregex=$(usex pcre enabled disabled)
+		-Dsearch_screen=$(usex search-screen true false)
+		-Dsong_screen=$(usex song-screen true false)
+	)
+
+	meson_src_configure
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 13b45f890b04..c8d798387772 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ace5e08c4ed2..feafbaf30f8e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Apr 2023 03:39:49 +0000
+Fri, 07 Apr 2023 09:39:48 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index b25dcb619c15..69dac92d353d 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-07T03:39:54Z
+TIMESTAMP 2023-04-07T09:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQvkIpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQv5OhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDsvw/9F8OoMYxAmryGJIpQv2Yge7N3f6oAUSqzKpX/A8UeLTDxyTNLKf/Jkh6z
-MfeZ0HU5n0LiNOET3xb3qBN+7540LCSHUjc/5OOj3M1M9YBsPJYxnh/6G+qKnEFS
-s1Nqrah6CY3ZVdRoG5bcMd5dKpo/MxSi4Ky4QNX99jjwjNK5ebicg6RduYz9EphQ
-iwnxkDWrr1/Lvf7ZAUskXI7vuBM4LOUdD1xWaTmNZb7CeZR/uiNoAhT5Pn3KZMRl
-Di/vIVRhUrQY7CpbWC0QpNk3uEveErkr3zlx5NJmSRonJ2jAqKQWNZBBKTxqxZCB
-Kqq+lIZvlHNwT8a6Y/Fc6hULVfLn6bsQuzESjFW41MF/Mmog15uckd1SnKVbmxkY
-mBUJAX2FAUzLPFWhbUwvHWpO2oBmmjaLwsvoNyaoU82V8ltHqE+KEZM78myhSd2i
-dpsbbJHa8nr9nwYa6yllAikTZ55Dbcndg0ZE9nzewmz8yK9RXoyheV6/SlegBJ2i
-6MvPcU2d/xLGSSIW1hqTRjWitbE1krEBqxZK0LEqjdj8Fd6tOmV0wyVwpeiWpMcG
-n/DpDNIHxLcYAgweH9FaWZfDvXdo99xl5ZEy010E9IxylRXmS9pkZfjJPte4g165
-0MUdB+EWD9lmEpZo77e6CYhDyuoRLhNZkpIsFJpEn3qRG5BwG0o=
-=ZiQb
+klDVdA/+IgKCkEGrsTxlto2pH82Ipl8fV+tin23Q4iccEq+gDw3rQEP1pb+QA1Bh
+0bQqOyOf6NTokV9UXkO1QRaI/y2TKRSwenQoGmlFnj1R1VzRdYU7UiuobBHDX6SV
+6vCFZnhuFvzuW4uW/zrslru7wX7QKfymXPMrgtTFITS3URlAsbp9RgoXIwM6RBKP
+f875Xf+p9KHVR6Qyn+dz9Lwi/aqmT7C8OUQqLFWG0SJqjbze3OxPgx3Va2ct13Mt
+m8+3OpJHbKeHNyK+fFnc/wZ8da0su2GWgSoWkWJMhlRdRef32rv63/ykt96RElYq
++7NzjQPkEtc5R/Wr00WW0+DPZIZ9yvVGy7bKFi7E/av7nAHDPX6WxkDylMSNdkHU
+fozo+0UzTzVa304zVgUwHh5rc0MEaduAz2r99GHXiWPIxBsU1TRgOURVIBQJlc8f
+KL83rgvx9mhGpF38P0Zivje05rXTNdiFsjr2ADM0YZpeT00gyjfrpIpO9kgA/nok
+4jh4JYquNehbuErl7/0ev0fjwQlcqnAA7k/VF6yb6B9O0zdA1x0659vQUsyVGHy7
+9gOLehbcdQtkQfNERkVhAjhRbmRtgIA9ipdU4Nj4loe+gHMj2tnkdAKGJtylfF9L
+HpdYeYid+LhvzkPoTqLsgWI80vghQb6D64xEldGX6pD0/5xJAfc=
+=cTdn
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 533250c68efe..feafbaf30f8e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Apr 2023 03:39:50 +0000
+Fri, 07 Apr 2023 09:39:48 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b969a15bef69..0743674432e5 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 c4765be82b11..c8e829c6cca0 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.108 b/metadata/md5-cache/app-admin/awscli-1.27.108
new file mode 100644
index 000000000000..41b3132dcc0f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.108
@@ -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.108[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.108[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.108.tar.gz -> aws-cli-1.27.108.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/sudo-1.9.13_p3 b/metadata/md5-cache/app-admin/sudo-1.9.13_p3
index 171187575636..ae6c1a860dda 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_=7a809f42ea7e6074f65d53de1fa5aa1e
+_md5_=4e4986f6a95e2bc3916c7ab7aaf09796
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 043280a0300e..53f20a41120e 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/docker-buildx-0.10.4-r1 b/metadata/md5-cache/app-containers/docker-buildx-0.10.4-r1
new file mode 100644
index 000000000000..c1f558d1176b
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-buildx-0.10.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-lang/go-1.20 ) >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=Docker CLI plugin for extended build capabilities with BuildKit
+EAPI=8
+HOMEPAGE=https://github.com/docker/buildx
+INHERIT=go-module
+IUSE=test
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-containers/docker-cli
+RESTRICT=!test? ( test ) strip
+SLOT=0
+SRC_URI=https://github.com/docker/buildx/archive/refs/tags/v0.10.4.tar.gz -> docker-buildx-0.10.4.tar.gz
+_eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=4b6212f319fe86e4bedab604655fafeb
diff --git a/metadata/md5-cache/app-containers/docker-buildx-9999 b/metadata/md5-cache/app-containers/docker-buildx-9999
index ad582862d701..3c5e6c3a5f4a 100644
--- a/metadata/md5-cache/app-containers/docker-buildx-9999
+++ b/metadata/md5-cache/app-containers/docker-buildx-9999
@@ -1,6 +1,5 @@
 BDEPEND=test? ( >=dev-lang/go-1.20 ) >=dev-lang/go-1.18 app-arch/unzip >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install test unpack
-DEPEND=app-containers/docker
 DESCRIPTION=Docker CLI plugin for extended build capabilities with BuildKit
 EAPI=8
 HOMEPAGE=https://github.com/docker/buildx
@@ -8,8 +7,8 @@ INHERIT=go-module git-r3
 IUSE=test
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=app-containers/docker
+RDEPEND=app-containers/docker-cli
 RESTRICT=!test? ( test ) strip
 SLOT=0
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=71887383c7236928048b1b39a344b03b
+_md5_=3e278711e37dbe25ad47e80c896e92c0
diff --git a/metadata/md5-cache/app-containers/docker-compose-2.17.2 b/metadata/md5-cache/app-containers/docker-compose-2.17.2
new file mode 100644
index 000000000000..c1dc01c00ec0
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-compose-2.17.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare test unpack
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=8
+HOMEPAGE=https://github.com/docker/compose
+INHERIT=bash-completion-r1 go-module
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=>=app-containers/docker-cli-23.0.0
+RESTRICT=test strip
+SLOT=2
+SRC_URI=https://github.com/docker/compose/archive/v2.17.2.tar.gz -> docker-compose-2.17.2.tar.gz https://dev.gentoo.org/~williamh/dist/docker-compose-2.17.2-deps.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=5f001a7fc7a486849a1e124deccde802
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 601afb49d4e0..565cdf096585 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/binwalk-2.3.4 b/metadata/md5-cache/app-misc/binwalk-2.3.4
index 14eaaec122ee..885ada01f9f3 100644
--- a/metadata/md5-cache/app-misc/binwalk-2.3.4
+++ b/metadata/md5-cache/app-misc/binwalk-2.3.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ReFirmLabs/binwalk
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ReFirmLabs/binwalk/archive/v2.3.4.tar.gz -> binwalk-2.3.4.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_=a0e74fd5e4ff59df72354a3dad1503ff
+_md5_=dbd473316fffb6cd1e6e92e355397374
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index f4c3e76231ca..097e83e3f578 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1 b/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
deleted file mode 100644
index 268d1f51114e..000000000000
--- a/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A Device Firmware Update based USB programmer for Atmel chips
-EAPI=6
-HOMEPAGE=http://dfu-programmer.sourceforge.net
-INHERIT=toolchain-funcs udev
-KEYWORDS=amd64 arm ~arm64
-LICENSE=GPL-2
-RDEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev
-SLOT=0
-SRC_URI=mirror://sourceforge/dfu-programmer/dfu-programmer-0.7.2.tar.gz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=5d459867d8cc0f733a06b31ee95ec60f
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index b675401a706c..f43160d23339 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/fop-2.8-r1 b/metadata/md5-cache/dev-java/fop-2.8-r1
new file mode 100644
index 000000000000..7e63266393d9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/fop-2.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-fop ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=dev-java/batik:1.16 dev-java/commons-io:1 dev-java/commons-logging:0 dev-java/fontbox:0 dev-java/qdox:1.12 dev-java/xmlgraphics-commons:2 >=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/javax-servlet-api:2.2 dev-java/sun-jai-bin:0 test? ( dev-java/mockito:2 dev-java/pdfbox:0 dev-java/xmlunit:1 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=XML Graphics Format Object Processor All-In-One
+EAPI=8
+HOMEPAGE=https://xmlgraphics.apache.org/fop/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source test verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/batik:1.16 dev-java/commons-io:1 dev-java/commons-logging:0 dev-java/fontbox:0 dev-java/qdox:1.12 dev-java/xmlgraphics-commons:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=2.8
+SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.8-src.tar.gz https://dev.gentoo.org/~flow/distfiles/fop/fop-2.7-jars.tar.xz verify-sig? ( https://www.apache.org/dist/xmlgraphics/fop/source/fop-2.8-src.tar.gz.asc ) test? ( https://repo1.maven.org/maven2/net/sf/offo/fop-hyph/2.0/fop-hyph-2.0.jar )
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=c3f9c5e5f59f2f7f5ea1f746ecf9c7e4
diff --git a/metadata/md5-cache/dev-java/mockito-2.28.2 b/metadata/md5-cache/dev-java/mockito-2.28.2
new file mode 100644
index 000000000000..3c86d825d111
--- /dev/null
+++ b/metadata/md5-cache/dev-java/mockito-2.28.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/junit:4 dev-java/opentest4j:0 >=virtual/jdk-1.8:* dev-java/asm:9 dev-java/byte-buddy:0 dev-java/objenesis:0 test? ( dev-java/assertj-core:3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Mockito mock objects library core API and implementation
+EAPI=8
+HOMEPAGE=https://github.com/mockito/mockito
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/byte-buddy:0 dev-java/objenesis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=https://github.com/mockito/mockito/archive/v2.28.2.tar.gz -> mockito-2.28.2.tar.gz
+_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
+_md5_=e7060bd1da1ea6c9b2a85c434ca8081e
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index d83fa2b189b6..579eab92d44b 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/zig-9999 b/metadata/md5-cache/dev-lang/zig-9999
index daab95e35ba4..ab8dd273995c 100644
--- a/metadata/md5-cache/dev-lang/zig-9999
+++ b/metadata/md5-cache/dev-lang/zig-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !!sys-devel/llvm:0
+DEPEND=sys-devel/clang:16= sys-devel/lld:16= sys-devel/llvm:16=[zstd] !!sys-devel/llvm:0
 DESCRIPTION=A robust, optimal, and maintainable programming language
 EAPI=8
 HOMEPAGE=https://ziglang.org/
@@ -9,7 +9,7 @@ INHERIT=edo cmake llvm check-reqs toolchain-funcs git-r3
 IUSE=doc
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd]
+RDEPEND=sys-devel/clang:16= sys-devel/lld:16= sys-devel/llvm:16=[zstd]
 SLOT=9999
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e245edce6ec6a3ae8d52a8a23c442713
+_md5_=3626457ee2b719a0a06d08f25a32862b
diff --git a/metadata/md5-cache/dev-python/Faker-18.4.0 b/metadata/md5-cache/dev-python/Faker-18.4.0
new file mode 100644
index 000000000000..7981b6b2a888
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-18.4.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/freezegun[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(-)?,tiff] dev-python/validators[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker >=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=A Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_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/F/Faker/Faker-18.4.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_=3d823a26c5da46c3034436f91a3e509b
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 2ba89c019739..60157fdc297b 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/aws-sam-translator-1.64.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.64.0
new file mode 100644
index 000000000000..eaa0a88d31ab
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.64.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[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=A library that transform SAM templates into AWS CloudFormation templates
+EAPI=8
+HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[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/aws/serverless-application-model/archive/v1.64.0.tar.gz -> serverless-application-model-1.64.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_=3b51212bb788567e5b2f86181133b284
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.108 b/metadata/md5-cache/dev-python/boto3-1.26.108
new file mode 100644
index 000000000000..5a059e538607
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.108
@@ -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.108[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.108[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.108.tar.gz -> boto3-1.26.108.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.108 b/metadata/md5-cache/dev-python/botocore-1.29.108
new file mode 100644
index 000000000000..bcc5062cd09f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.108
@@ -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.108.tar.gz -> botocore-1.29.108.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/braintree-4.19.0 b/metadata/md5-cache/dev-python/braintree-4.19.0
new file mode 100644
index 000000000000..9786c0699408
--- /dev/null
+++ b/metadata/md5-cache/dev-python/braintree-4.19.0
@@ -0,0 +1,16 @@
+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.19.0.tar.gz -> braintree_python-4.19.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_=5ce465aca41de17e1e61f6d4ed07e0cf
diff --git a/metadata/md5-cache/dev-python/coverage-7.2.3 b/metadata/md5-cache/dev-python/coverage-7.2.3
new file mode 100644
index 000000000000..be7a57e9af24
--- /dev/null
+++ b/metadata/md5-cache/dev-python/coverage-7.2.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hypothesis[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/unittest-mixins-1.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=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 prepare test
+DESCRIPTION=Code coverage measurement for Python
+EAPI=8
+HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
+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 ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),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://files.pythonhosted.org/packages/source/c/coverage/coverage-7.2.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_=5a54eda392364079ec2bd0198961a31b
diff --git a/metadata/md5-cache/dev-python/django-4.1.8 b/metadata/md5-cache/dev-python/django-4.1.8
new file mode 100644
index 000000000000..07bfa9bc63ff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-4.1.8
@@ -0,0 +1,16 @@
+BDEPEND=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] ) <dev-python/asgiref-4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/asgiref-3.5.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[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/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[webp,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/selenium[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tblib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 ) doc? ( >=dev-python/sphinx-5.3.0 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite?,threads(+)] ) >=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(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=8
+HOMEPAGE=https://www.djangoproject.com/ https://github.com/django/django/ https://pypi.org/project/Django/
+INHERIT=bash-completion-r1 distutils-r1 optfeature verify-sig
+IUSE=doc sqlite test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=<dev-python/asgiref-4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/asgiref-3.5.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlparse-0.2.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[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite?,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/4.1/Django-4.1.8.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-4.1.8.checksum.txt )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	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	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=6ae7abf8da6cacc62fe319dbebbecaef
diff --git a/metadata/md5-cache/dev-python/django-4.2 b/metadata/md5-cache/dev-python/django-4.2
index 02d7c45244d0..01d6a183c585 100644
--- a/metadata/md5-cache/dev-python/django-4.2
+++ b/metadata/md5-cache/dev-python/django-4.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/4.2/Django-4.2.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-4.2.checksum.txt )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	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	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=2b96b75044f38ef45ceff5db13596751
+_md5_=e8d912ecea4cffb321a2ae075b0721dd
diff --git a/metadata/md5-cache/dev-python/filelock-3.11.0 b/metadata/md5-cache/dev-python/filelock-3.11.0
new file mode 100644
index 000000000000..df58b612afc1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/filelock-3.11.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( 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/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/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=A platform independent file lock for Python
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/py-filelock/ https://pypi.org/project/filelock/
+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 ~x64-macos
+LICENSE=Unlicense
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/f/filelock/filelock-3.11.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_=3680ee5aa2d591847e6d567f913e3ef6
diff --git a/metadata/md5-cache/dev-python/inflect-6.0.4 b/metadata/md5-cache/dev-python/inflect-6.0.4
new file mode 100644
index 000000000000..c97664bea936
--- /dev/null
+++ b/metadata/md5-cache/dev-python/inflect-6.0.4
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pydantic-1.9.1[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=Correctly inflect words and numbers
+EAPI=8
+HOMEPAGE=https://pypi.org/project/inflect/ https://github.com/jaraco/inflect/
+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 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/pydantic-1.9.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/i/inflect/inflect-6.0.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
+_md5_=807adc46e2eb7ad85036184990869b52
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-4.1.0 b/metadata/md5-cache/dev-python/jaraco-collections-4.1.0
new file mode 100644
index 000000000000..8f1f8cc51e03
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-collections-4.1.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/jaraco-text[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=Models and classes to supplement the stdlib collections module
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/jaraco.collections/ https://pypi.org/project/jaraco.collections/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/jaraco-text[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/j/jaraco.collections/jaraco.collections-4.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_=aea8fea40220ccdd74d93bde4cad24c8
diff --git a/metadata/md5-cache/dev-python/lmdb-1.4.1 b/metadata/md5-cache/dev-python/lmdb-1.4.1
new file mode 100644
index 000000000000..81d55cb10832
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lmdb-1.4.1
@@ -0,0 +1,17 @@
+BDEPEND=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(-)] ) ) ) test? ( >=dev-db/lmdb-0.9.28:= >=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
+DEPEND=>=dev-db/lmdb-0.9.28:=
+DESCRIPTION=Python bindings for the Lightning Database
+EAPI=8
+HOMEPAGE=https://github.com/jnwatson/py-lmdb/ https://pypi.org/project/lmdb/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=OPENLDAP
+RDEPEND=>=dev-db/lmdb-0.9.28:= 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/l/lmdb/lmdb-1.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
+_md5_=2e0e1548f8e730a5a4e90a808e928b77
diff --git a/metadata/md5-cache/dev-python/mypy-1.2.0 b/metadata/md5-cache/dev-python/mypy-1.2.0
new file mode 100644
index 000000000000..d54d54bdfd6c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mypy-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/attrs-18.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-1.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/py-1.5.2[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/virtualenv-16.0.0[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-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-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(-)] ) ) ) test? ( !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(-)?] ) >=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=Optional static typing for Python
+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
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python/mypy/archive/v1.2.0.tar.gz -> mypy-1.2.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_=d87b898a2cd62d2b50f79d17a1d131de
diff --git a/metadata/md5-cache/dev-python/notebook-6.5.4 b/metadata/md5-cache/dev-python/notebook-6.5.4
new file mode 100644
index 000000000000..9b4224e2581f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/notebook-6.5.4
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/jupyter_packaging-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/nbval[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(-)?] ) test? ( >=dev-libs/mathjax-2.7.4 dev-python/argon2-cffi[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/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/jupyter-core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.4.7[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/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/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(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=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=Jupyter Interactive Notebook
+EAPI=8
+HOMEPAGE=https://jupyter.org
+INHERIT=distutils-r1 pypi xdg-utils
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=BSD
+PDEPEND=>=dev-python/nbconvert-4.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-libs/mathjax-2.7.4 dev-python/argon2-cffi[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/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/jupyter-core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.4.7[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/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/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[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/n/notebook/notebook-6.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_=e9de23b974a7e0994392922e9a10f72a
diff --git a/metadata/md5-cache/dev-python/simplejson-3.19.1 b/metadata/md5-cache/dev-python/simplejson-3.19.1
new file mode 100644
index 000000000000..a70fdf95654f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simplejson-3.19.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
+EAPI=8
+HOMEPAGE=https://github.com/simplejson/simplejson/ https://pypi.org/project/simplejson/
+INHERIT=distutils-r1 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=|| ( MIT AFL-2.1 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/simplejson/simplejson-3.19.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_=cafe002bc99ee2d9da5ec830eb7cbf40
diff --git a/metadata/md5-cache/dev-python/spyder-5.4.2 b/metadata/md5-cache/dev-python/spyder-5.4.2
deleted file mode 100644
index 863a0d5920d2..000000000000
--- a/metadata/md5-cache/dev-python/spyder-5.4.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jellyfish-0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pylint-venv-2.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-lsp-black-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-22.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/qdarkstyle-3.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/qstylizer-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/qtawesome-1.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/qtconsole-5.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/qtconsole-5.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/QtPy-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/spyder-kernels-2.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/spyder-kernels-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[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-panels[python_targets_python3_11(-)] dev-python/pydata-sphinx-theme[python_targets_python3_11(-)] dev-python/sphinx-multiversion[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-panels[python_targets_python3_10(-)] dev-python/pydata-sphinx-theme[python_targets_python3_10(-)] dev-python/sphinx-multiversion[python_targets_python3_10(-)] ) ) ) python_targets_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 postrm preinst prepare test
-DESCRIPTION=The Scientific Python Development Environment
-EAPI=8
-HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=optfeature xdg distutils-r1
-IUSE=test doc python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jellyfish-0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pylint-venv-2.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-lsp-black-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-22.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/qdarkstyle-3.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/qstylizer-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/qtawesome-1.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/qtconsole-5.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/qtconsole-5.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/QtPy-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/spyder-kernels-2.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/spyder-kernels-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-0.10.3[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 )
-SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder/archive/v5.4.2.tar.gz -> spyder-5.4.2.gh.tar.gz https://github.com/spyder-ide/spyder-docs/archive/3ae8705d3eba8fc30d4600d6d1e29ce0da8cd0c6.tar.gz -> spyder-docs-3ae8705d3eba8fc30d4600d6d1e29ce0da8cd0c6.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	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c2a3439fa5e6ea27077e510f3437f930
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-2.4.2 b/metadata/md5-cache/dev-python/spyder-kernels-2.4.2
deleted file mode 100644
index 951903a131f7..000000000000
--- a/metadata/md5-cache/dev-python/spyder-kernels-2.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[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/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xarray[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/ipykernel-7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipykernel-6.16.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/ipython-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.31.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter_client-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.4.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter_client-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-22.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wurlitzer-1.0.3[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=Kernels used by spyder on its ipython console
-EAPI=8
-HOMEPAGE=https://github.com/spyder-ide/spyder-kernels/ https://pypi.org/project/spyder-kernels/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/cloudpickle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/ipykernel-7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipykernel-6.16.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/ipython-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.31.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter_client-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.4.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter_client-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-22.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wurlitzer-1.0.3[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/spyder-ide/spyder-kernels/archive/v2.4.2.tar.gz -> spyder-kernels-2.4.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_=49a657c5d9bd4ee58360882ce80c882e
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.46 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.46
deleted file mode 100644
index c9e458c96a97..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.46
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite] ) 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] ) ) 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=[sqlite?] ) 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?] ) >=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=Python SQL toolkit and Object Relational Mapper
-EAPI=8
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
-INHERIT=distutils-r1 optfeature
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite?] ) 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_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.46.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_=21229f19671cc8200704a428c150da15
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-2.0.5 b/metadata/md5-cache/dev-python/sqlalchemy-2.0.5
deleted file mode 100644
index 4bfab5c2b304..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-2.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite] ) 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] ) ) test? ( >=dev-python/typing-extensions-4.2.0[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=[sqlite?] ) 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?] ) >=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=Python SQL toolkit and Object Relational Mapper
-EAPI=8
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
-INHERIT=distutils-r1 optfeature pypi
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/typing-extensions-4.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite?] ) 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_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/S/SQLAlchemy/SQLAlchemy-2.0.5.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_=8b96f4c65efd84577467469b719ebe98
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-2.0.6 b/metadata/md5-cache/dev-python/sqlalchemy-2.0.6
deleted file mode 100644
index 2106f89dabc6..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-2.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite] ) 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] ) ) test? ( >=dev-python/typing-extensions-4.2.0[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=[sqlite?] ) 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?] ) >=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=Python SQL toolkit and Object Relational Mapper
-EAPI=8
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
-INHERIT=distutils-r1 optfeature pypi
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/typing-extensions-4.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite?] ) 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_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/S/SQLAlchemy/SQLAlchemy-2.0.6.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_=8b96f4c65efd84577467469b719ebe98
diff --git a/metadata/md5-cache/dev-python/structlog-23.1.0 b/metadata/md5-cache/dev-python/structlog-23.1.0
new file mode 100644
index 000000000000..57d3971e0518
--- /dev/null
+++ b/metadata/md5-cache/dev-python/structlog-23.1.0
@@ -0,0 +1,16 @@
+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/ https://pypi.org/project/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-23.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_=89f1c43356dadb28329750d30c032a3c
diff --git a/metadata/md5-cache/dev-python/websockets-11.0.1 b/metadata/md5-cache/dev-python/websockets-11.0.1
new file mode 100644
index 000000000000..c630f16d6a75
--- /dev/null
+++ b/metadata/md5-cache/dev-python/websockets-11.0.1
@@ -0,0 +1,16 @@
+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=Library for building WebSocket servers and clients in Python
+EAPI=8
+HOMEPAGE=https://websockets.readthedocs.io/ https://github.com/aaugustin/websockets/ https://pypi.org/project/websockets/
+INHERIT=distutils-r1
+IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aaugustin/websockets/archive/11.0.1.tar.gz -> websockets-11.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_=43e7eb74f93c7b23b059bb20335ad986
diff --git a/metadata/md5-cache/dev-python/ypy-websocket-0.9.0 b/metadata/md5-cache/dev-python/ypy-websocket-0.9.0
new file mode 100644
index 000000000000..475a3194696f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ypy-websocket-0.9.0
@@ -0,0 +1,16 @@
+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(-)?] ) test? ( <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(-)?] >=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=Python bindings to y-crdt
+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
+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 )
+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
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.55.0 b/metadata/md5-cache/dev-python/zeroconf-0.55.0
new file mode 100644
index 000000000000..9d6fa1e8b42c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.55.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.55.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 8f0a7bb672de..98830ff74baf 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/activesupport-6.0.6.1-r1 b/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1-r1
index b2d9c91155fe..6741fad05601 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1-r1
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.6.1-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 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/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] dev-ruby/i18n:1[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby30(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.2: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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.6.1.tar.gz -> rails-6.0.6.1.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5f1e7b8b46c28b4067515eee484953d4
+_md5_=4f47a6b51c6493b9083cf0882299622d
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.7.2-r1 b/metadata/md5-cache/dev-ruby/activesupport-6.1.7.2-r1
index 22eaeb93eb36..94f139afc793 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.7.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rails/rails
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby31(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby31(-)] dev-ruby/tzinfo:2[ruby_targets_ruby31(-)] <dev-ruby/minitest-5.16:*[ruby_targets_ruby31(-)] >=dev-ruby/zeitwerk-2.3: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=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.7.2.tar.gz -> rails-6.1.7.2.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9e4cd6b7729cccd17f8f5924449ff428
+_md5_=c2b458b6ea8b06c0248da6331f2e0ed7
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.8.3 b/metadata/md5-cache/dev-ruby/addressable-2.8.3
new file mode 100644
index 000000000000..41dac96e2907
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/addressable-2.8.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby27(-)] dev-ruby/public_suffix:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby30(-)] dev-ruby/public_suffix:4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby31(-)] dev-ruby/public_suffix:4[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby32(-)] dev-ruby/public_suffix:4[ruby_targets_ruby32(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec-its[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_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 replacement for the URI implementation that is part of Ruby's standard library
+EAPI=8
+HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
+INHERIT=ruby-fakegem
+IUSE=doc test test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby27? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby27(-)] dev-ruby/public_suffix:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby30(-)] dev-ruby/public_suffix:4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby31(-)] dev-ruby/public_suffix:4[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( || ( dev-ruby/public_suffix:5[ruby_targets_ruby32(-)] dev-ruby/public_suffix:4[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://rubygems.org/gems/addressable-2.8.3.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=cc23c7c48ae589404f44ab4ca1c9ed53
diff --git a/metadata/md5-cache/dev-ruby/airbrussh-1.4.1 b/metadata/md5-cache/dev-ruby/airbrussh-1.4.1
index 759ef01878d6..42f4ac333232 100644
--- a/metadata/md5-cache/dev-ruby/airbrussh-1.4.1
+++ b/metadata/md5-cache/dev-ruby/airbrussh-1.4.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mattbrictson/airbrussh
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >dev-ruby/sshkit-1.7.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >dev-ruby/sshkit-1.7.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >dev-ruby/sshkit-1.7.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >dev-ruby/sshkit-1.7.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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/mattbrictson/airbrussh/archive/v1.4.1.tar.gz -> airbrussh-1.4.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4edc640e1943ecba92a10b460bfb9c62
+_md5_=7a2f55cb16e8305fec03b48794b69bee
diff --git a/metadata/md5-cache/dev-ruby/async-2.5.0 b/metadata/md5-cache/dev-ruby/async-2.5.0
index 112e9cd23308..75491704c844 100644
--- a/metadata/md5-cache/dev-ruby/async-2.5.0
+++ b/metadata/md5-cache/dev-ruby/async-2.5.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/async
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby31? ( >=dev-ruby/console-1.10:1[ruby_targets_ruby31(-)] dev-ruby/io-event:1.1[ruby_targets_ruby31(-)] >=dev-ruby/timers-4.1:4[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/console-1.10:1[ruby_targets_ruby32(-)] dev-ruby/io-event:1.1[ruby_targets_ruby32(-)] >=dev-ruby/timers-4.1:4[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/socketry/async/archive/v2.5.0.tar.gz -> async-2.5.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=15fcfdffd4769b33b2451b3c0b962de8
+_md5_=8bfada1a041d1ecd3bb64756f56ab83f
diff --git a/metadata/md5-cache/dev-ruby/async-container-0.16.12-r1 b/metadata/md5-cache/dev-ruby/async-container-0.16.12-r1
index 7a1f7359c23f..b447bccf7f0d 100644
--- a/metadata/md5-cache/dev-ruby/async-container-0.16.12-r1
+++ b/metadata/md5-cache/dev-ruby/async-container-0.16.12-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/async-container
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/async[ruby_targets_ruby27(-)] dev-ruby/async-io[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/async[ruby_targets_ruby30(-)] dev-ruby/async-io[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/async[ruby_targets_ruby31(-)] dev-ruby/async-io[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/async[ruby_targets_ruby32(-)] dev-ruby/async-io[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/socketry/async-container/archive/v0.16.12.tar.gz -> async-container-0.16.12.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=132356c6241d9589fee237f35d3003fc
+_md5_=607d88789651daa1ec48e653503eb8e6
diff --git a/metadata/md5-cache/dev-ruby/async-io-1.34.3-r1 b/metadata/md5-cache/dev-ruby/async-io-1.34.3-r1
index 623faf137ce7..4cf026c00b9f 100644
--- a/metadata/md5-cache/dev-ruby/async-io-1.34.3-r1
+++ b/metadata/md5-cache/dev-ruby/async-io-1.34.3-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/async-io
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/async[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/async[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/async[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/async[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=1
 SRC_URI=https://github.com/socketry/async-io/archive/v1.34.3.tar.gz -> async-io-1.34.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6a0a65e311897a86cd6117b7ad87cb97
+_md5_=31978259d1bd2cd7c6da4f67db5986ae
diff --git a/metadata/md5-cache/dev-ruby/async-process-1.3.1 b/metadata/md5-cache/dev-ruby/async-process-1.3.1
index d47adc23d271..7e98909dc5e2 100644
--- a/metadata/md5-cache/dev-ruby/async-process-1.3.1
+++ b/metadata/md5-cache/dev-ruby/async-process-1.3.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/async-process
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/async[ruby_targets_ruby27(-)] dev-ruby/async-io[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/async[ruby_targets_ruby30(-)] dev-ruby/async-io[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/async[ruby_targets_ruby31(-)] dev-ruby/async-io[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/async[ruby_targets_ruby32(-)] dev-ruby/async-io[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=1
 SRC_URI=https://github.com/socketry/async-process/archive/v1.3.1.tar.gz -> async-process-1.3.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f9ddc0d65230d8833d420e1ffbff2d00
+_md5_=3483dd7ad51fa95843267f56e19dace7
diff --git a/metadata/md5-cache/dev-ruby/async-rspec-1.16.1-r1 b/metadata/md5-cache/dev-ruby/async-rspec-1.16.1-r1
index 3b9a29ae551d..59a9c6e856ed 100644
--- a/metadata/md5-cache/dev-ruby/async-rspec-1.16.1-r1
+++ b/metadata/md5-cache/dev-ruby/async-rspec-1.16.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/async-rspec
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/rspec-files:1[ruby_targets_ruby27(-)] dev-ruby/rspec-memory:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/rspec-files:1[ruby_targets_ruby30(-)] dev-ruby/rspec-memory:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] dev-ruby/rspec-files:1[ruby_targets_ruby31(-)] dev-ruby/rspec-memory:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] dev-ruby/rspec-files:1[ruby_targets_ruby32(-)] dev-ruby/rspec-memory:1[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=1
 SRC_URI=https://github.com/socketry/async-rspec/archive/v1.16.1.tar.gz -> async-rspec-1.16.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=452764d8dadec6099ef05f82bee7ce6d
+_md5_=b43a3aeaf572fa96c19cd4ad1bad63ea
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.17.2 b/metadata/md5-cache/dev-ruby/capistrano-3.17.2
index 094fe0dbd5d7..d150d0ca2408 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.17.2
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.17.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://capistranorb.com/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
-KEYWORDS=amd64
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby27(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby27(-)] dev-ruby/i18n:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby30(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby30(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby30(-)] dev-ruby/i18n:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby31(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby31(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby31(-)] dev-ruby/i18n:*[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://rubygems.org/gems/capistrano-3.17.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1eb9695a99ca7e571b70a28c2249b98e
+_md5_=8933cd879543d2362ee1ad45e946a06a
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.39.0 b/metadata/md5-cache/dev-ruby/capybara-3.39.0
new file mode 100644
index 000000000000..662f62c73502
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-3.39.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby27(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby27(-)] || ( dev-ruby/sinatra:3[ruby_targets_ruby27(-)] dev-ruby/sinatra:2[ruby_targets_ruby27(-)] ) www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby30(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby30(-)] || ( dev-ruby/sinatra:3[ruby_targets_ruby30(-)] dev-ruby/sinatra:2[ruby_targets_ruby30(-)] ) www-servers/puma[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby31(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby31(-)] || ( dev-ruby/sinatra:3[ruby_targets_ruby31(-)] dev-ruby/sinatra:2[ruby_targets_ruby31(-)] ) www-servers/puma[ruby_targets_ruby31(-)] ) ) test? ( ruby_targets_ruby27? ( dev-ruby/addressable[ruby_targets_ruby27(-)] dev-ruby/matrix[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] dev-ruby/regexp_parser:2[ruby_targets_ruby27(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/addressable[ruby_targets_ruby30(-)] dev-ruby/matrix[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby30(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] dev-ruby/regexp_parser:2[ruby_targets_ruby30(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/addressable[ruby_targets_ruby31(-)] dev-ruby/matrix[ruby_targets_ruby31(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby31(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby31(-)] dev-ruby/regexp_parser:2[ruby_targets_ruby31(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby31(-)] ) ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) 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=test? ( || ( www-client/firefox www-client/firefox-bin ) ) 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=Capybara aims to simplify the process of integration testing Rack applications
+EAPI=8
+HOMEPAGE=https://github.com/teamcapybara/capybara
+INHERIT=virtualx ruby-fakegem
+IUSE=test 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/addressable[ruby_targets_ruby27(-)] dev-ruby/matrix[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] dev-ruby/regexp_parser:2[ruby_targets_ruby27(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/addressable[ruby_targets_ruby30(-)] dev-ruby/matrix[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby30(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] dev-ruby/regexp_parser:2[ruby_targets_ruby30(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/addressable[ruby_targets_ruby31(-)] dev-ruby/matrix[ruby_targets_ruby31(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby31(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby31(-)] dev-ruby/regexp_parser:2[ruby_targets_ruby31(-)] >=dev-ruby/xpath-3.2: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 )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/capybara-3.39.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
+_md5_=94d9802266577b6fb713a45e72770a1e
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.3.7-r2 b/metadata/md5-cache/dev-ruby/combustion-1.3.7-r2
index db9d76e184e6..9bfc0a5141f1 100644
--- a/metadata/md5-cache/dev-ruby/combustion-1.3.7-r2
+++ b/metadata/md5-cache/dev-ruby/combustion-1.3.7-r2
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/activemodel-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/activerecord-3.0.0:*[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/rails-3.0.0:*[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/activemodel-3.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activerecord-3.0.0:*[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/rails-3.0.0:*[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4[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/activesupport-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby31(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/activemodel-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/activerecord-3.0.0:*[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/rails-3.0.0:*[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/activemodel-3.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/activerecord-3.0.0:*[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/rails-3.0.0:*[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/activemodel-3.0.0:*[ruby_targets_ruby31(-)] >=dev-ruby/activerecord-3.0.0:*[ruby_targets_ruby31(-)] dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/rails-3.0.0:*[ruby_targets_ruby31(-)] dev-ruby/rspec:3[ruby_targets_ruby31(-)] >=dev-ruby/sqlite3-1.4[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_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=Elegant Rails Engine Testing
 EAPI=8
 HOMEPAGE=https://github.com/pat/combustion
 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 doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/thor-0.14.6:*[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-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby31(-)] >=dev-ruby/thor-0.14.6:*[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://github.com/pat/combustion/archive/refs/tags/v1.3.7.tar.gz -> combustion-1.3.7.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f67ce902384a006f9097478f6e91ab37
+_md5_=c45b59675e68b0d280b7b4111ee776a9
diff --git a/metadata/md5-cache/dev-ruby/curb-1.0.5 b/metadata/md5-cache/dev-ruby/curb-1.0.5
index d31224cc572c..afb2c4a7d8fd 100644
--- a/metadata/md5-cache/dev-ruby/curb-1.0.5
+++ b/metadata/md5-cache/dev-ruby/curb-1.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/taf2/curb
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Ruby
 RDEPEND=net-misc/curl[ssl] 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=0
 SRC_URI=https://rubygems.org/gems/curb-1.0.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4784f99dd69b84a0f41a35bba80887df
+_md5_=4879f008f63e7ec64964a21ecff7b990
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0 b/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
index 2e9923079118..cbb321909f6c 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-2.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/grosser/fast_gettext
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=public-domain
 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=2
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v2.2.0.tar.gz -> fast_gettext-2.2.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b12f43bec291d04ac1816bbe9b64f27c
+_md5_=411ba557d939e35486d47eaeec684614
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
index d4f8cacefb33..d57303e99c12 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.8
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-3.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? ( 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/railties-8.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-3.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? ( 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=Font-awesome for the asset pipeline
 EAPI=8
 HOMEPAGE=https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails
 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
 LICENSE=MIT OFL
-RDEPEND=ruby_targets_ruby27? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-3.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 )
+RDEPEND=ruby_targets_ruby27? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-3.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( <dev-ruby/railties-8.0:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-3.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/font-awesome-rails-4.7.0.8.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8e53dafa94ea69bf60185ce63b1b2518
+_md5_=bcbaf5e378509325c38d026504f1ff75
diff --git a/metadata/md5-cache/dev-ruby/haml-6.1.1 b/metadata/md5-cache/dev-ruby/haml-6.1.1
index 78b272cbe655..df4b974250dd 100644
--- a/metadata/md5-cache/dev-ruby/haml-6.1.1
+++ b/metadata/md5-cache/dev-ruby/haml-6.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://haml.info/
 INHERIT=ruby-fakegem
 IUSE=doc test test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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 ~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/temple-0.8.2[ruby_targets_ruby27(-)] dev-ruby/thor[ruby_targets_ruby27(-)] dev-ruby/tilt:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/temple-0.8.2[ruby_targets_ruby30(-)] dev-ruby/thor[ruby_targets_ruby30(-)] dev-ruby/tilt:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/temple-0.8.2[ruby_targets_ruby31(-)] dev-ruby/thor[ruby_targets_ruby31(-)] dev-ruby/tilt:*[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=6
 SRC_URI=https://github.com/haml/haml/archive/v6.1.1.tar.gz -> haml-6.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=455d74e832b1cfeb8e401a5fc3fd90c9
+_md5_=1ed91aa2ed7db5174d7e23c0b54176c4
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1 b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1
index f729e37aaff8..ee3ee29f2b07 100644
--- a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1-r1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby27(-)] <dev-ruby/haml-6:*[ruby_targets_ruby27(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby30(-)] <dev-ruby/haml-6:*[ruby_targets_ruby30(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rails-5.1[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/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[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/actionpack-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby27(-)] <dev-ruby/haml-6:*[ruby_targets_ruby27(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby30(-)] <dev-ruby/haml-6:*[ruby_targets_ruby30(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby31(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby31(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby31(-)] <dev-ruby/haml-6:*[ruby_targets_ruby31(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/rails-5.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/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[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_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=Provides Haml generators for Rails 4
 EAPI=8
-HOMEPAGE=https://github.com/indirect/haml-rails
+HOMEPAGE=https://github.com/haml/haml-rails
 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 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby27(-)] <dev-ruby/haml-6:*[ruby_targets_ruby27(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby30(-)] <dev-ruby/haml-6:*[ruby_targets_ruby30(-)] >=dev-ruby/html2haml-1.0.1[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/actionpack-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby27(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby27(-)] <dev-ruby/haml-6:*[ruby_targets_ruby27(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby30(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby30(-)] <dev-ruby/haml-6:*[ruby_targets_ruby30(-)] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby31(-)] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby31(-)] >=dev-ruby/railties-5.1:*[ruby_targets_ruby31(-)] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby31(-)] <dev-ruby/haml-6:*[ruby_targets_ruby31(-)] >=dev-ruby/html2haml-1.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=2
 SRC_URI=https://rubygems.org/gems/haml-rails-2.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=70b8723dfce8bd3d56e00370762a5146
+_md5_=195a73f7e75101a9d908d86af9c18395
diff --git a/metadata/md5-cache/dev-ruby/hashie-5.0.0 b/metadata/md5-cache/dev-ruby/hashie-5.0.0
index ea43def253d6..f20512791001 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_=3cf353dcde0f6ee1ca06e7be4631cf0c
+_md5_=28d37dad498dc85b88a5193ee36e7c80
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.12.0 b/metadata/md5-cache/dev-ruby/hiera-3.12.0
index 9e19de362504..640c1d95762b 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.12.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.12.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://docs.puppet.com/hiera/
 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=Apache-2.0
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/deep_merge[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/deep_merge[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/deep_merge[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=0
 SRC_URI=https://rubygems.org/gems/hiera-3.12.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=65c1ab9a27c4424e8b5c3edd9de0d72d
+_md5_=f19eec99c768d073d56ab0f9400998e4
diff --git a/metadata/md5-cache/dev-ruby/http-accept-2.2.0 b/metadata/md5-cache/dev-ruby/http-accept-2.2.0
index d0a5b47c8a45..4f177d7ef895 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-2.2.0
+++ b/metadata/md5-cache/dev-ruby/http-accept-2.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/http-accept
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 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=2
 SRC_URI=https://github.com/socketry/http-accept/archive/v2.2.0.tar.gz -> http-accept-2.2.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=76d943a5b305a8592089d5896c2cdafa
+_md5_=7425b5476f8a8c73f6db4435c6a8f3c5
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1
deleted file mode 100644
index 94547d3c7ae8..000000000000
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby27(-)] <dev-ruby/thor-2:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby30(-)] <dev-ruby/thor-2:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing: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(-)] ) 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=jQuery! For Rails! So great
-EAPI=8
-HOMEPAGE=https://www.rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby27(-)] <dev-ruby/thor-2:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby30(-)] <dev-ruby/thor-2:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing: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 )
-SLOT=4
-SRC_URI=https://rubygems.org/gems/jquery-rails-4.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=49571e9b0f0138bf8253d02940dad608
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.5.0 b/metadata/md5-cache/dev-ruby/jquery-rails-4.5.0
deleted file mode 100644
index 4a65f4d17300..000000000000
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.5.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby27(-)] <dev-ruby/thor-2:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby30(-)] <dev-ruby/thor-2:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing: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(-)] ) 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=jQuery! For Rails! So great
-EAPI=8
-HOMEPAGE=https://www.rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby27(-)] <dev-ruby/thor-2:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby30(-)] <dev-ruby/thor-2:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing: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 )
-SLOT=4
-SRC_URI=https://rubygems.org/gems/jquery-rails-4.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=49571e9b0f0138bf8253d02940dad608
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2
index e3a8beb3dcf0..7dc4ed093363 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r2
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/railties-3.2.16:*[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(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/railties-3.2.16:*[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(-)] ) 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=The jQuery UI assets for the Rails 3.2+ asset pipeline
 EAPI=8
-HOMEPAGE=https://github.com/joliss/jquery-ui-rails
+HOMEPAGE=https://github.com/jquery-ui-rails/jquery-ui-rails
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test
 KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/railties-3.2.16:*[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/railties-3.2.16:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/railties-3.2.16:*[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=6
 SRC_URI=https://rubygems.org/gems/jquery-ui-rails-6.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f3e8ee98d30daf607b0f3c71124b33e3
+_md5_=9b8878a1a72998dee8068d6bbf72ebf3
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.3.3 b/metadata/md5-cache/dev-ruby/kpeg-1.3.3
index 666e0a67b7c3..4981312e8332 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.3.3
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.3.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/evanphx/kpeg
 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=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=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.3.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=160dca4f60f284a4ad2389b8224007a5
+_md5_=39b1d91289a64dc89329b8cfbfc20910
diff --git a/metadata/md5-cache/dev-ruby/localhost-1.1.10 b/metadata/md5-cache/dev-ruby/localhost-1.1.10
index c421b368daa6..ac1ba96721cb 100644
--- a/metadata/md5-cache/dev-ruby/localhost-1.1.10
+++ b/metadata/md5-cache/dev-ruby/localhost-1.1.10
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/localhost
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/localhost/archive/v1.1.10.tar.gz -> localhost-1.1.10.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2016ff25a243e33e4f5cf1057d3fb021
+_md5_=6ff6741b420b46739eeb72ce10dde8c5
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.8.5 b/metadata/md5-cache/dev-ruby/mechanize-2.8.5
index b1e20966c813..d50c1fae9026 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.8.5
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.8.5
@@ -1,17 +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(-)] ) ) 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_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=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_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=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 doc test test
+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_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/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.8.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=79a2332d377f6c6cc7b1ec6d1a5186d7
+_md5_=8e2d75d1254abae5d72fc71df30ac726
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.18.0 b/metadata/md5-cache/dev-ruby/minitest-5.18.0
index 4f769778a357..2b8219204671 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.18.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.18.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/minitest/minitest
 INHERIT=ruby-fakegem
 IUSE=doc 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=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=5
 SRC_URI=https://rubygems.org/gems/minitest-5.18.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1a5c9fb595faf7db8389236fce07eff6
+_md5_=0e2e32896f5063f4368e26ec23019b12
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1 b/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
index 81c555aff23a..1c6cf090cd70 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/metaclass[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/metaclass[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/metaclass[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=0.14
 SRC_URI=https://rubygems.org/gems/mocha-0.14.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=44f7a40fd292fa9e52a493ab2868e8e8
+_md5_=920d05a3f452567f3afdc7d8d06ad1f7
diff --git a/metadata/md5-cache/dev-ruby/mocha-2.0.2 b/metadata/md5-cache/dev-ruby/mocha-2.0.2
index c4dd1375b3de..4bd4babf6ee0 100644
--- a/metadata/md5-cache/dev-ruby/mocha-2.0.2
+++ b/metadata/md5-cache/dev-ruby/mocha-2.0.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mocha.jamesmead.org/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/ruby2_keywords-0.0.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/ruby2_keywords-0.0.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/ruby2_keywords-0.0.5[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/ruby2_keywords-0.0.5[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
 SRC_URI=https://github.com/freerange/mocha/archive/v2.0.2.tar.gz -> mocha-2.0.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a1aae291f280a7dee51f54e00bc7e497
+_md5_=84faa2fe5527dd964e1b0b4d34435ad6
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.6.0 b/metadata/md5-cache/dev-ruby/moneta-1.6.0
new file mode 100644
index 000000000000..dc0638cacab7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/moneta-1.6.0
@@ -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_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 unified interface to key/value stores
+EAPI=8
+HOMEPAGE=https://github.com/moneta-rb/moneta
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test
+KEYWORDS=~amd64 ~riscv ~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_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 )
+SLOT=0
+SRC_URI=https://github.com/moneta-rb/moneta/archive/v1.6.0.tar.gz -> moneta-1.6.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=5f205d15994c7bf9d211b84905bca9ba
diff --git a/metadata/md5-cache/dev-ruby/multi_test-1.1.0 b/metadata/md5-cache/dev-ruby/multi_test-1.1.0
index 60568116cfb1..7dba45576f6d 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-1.1.0
+++ b/metadata/md5-cache/dev-ruby/multi_test-1.1.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://cucumber.io/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc 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 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/multi_test-1.1.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8ae30bfabd1a14229518c7c35d7123dc
+_md5_=aec3f923db29f853e90a2368e27a0c84
diff --git a/metadata/md5-cache/dev-ruby/mustermann-3.0.0 b/metadata/md5-cache/dev-ruby/mustermann-3.0.0
index 105cdf31812c..2c5a9acec380 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-3.0.0
+++ b/metadata/md5-cache/dev-ruby/mustermann-3.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sinatra/mustermann
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 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/ruby2_keywords-0.0*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ruby2_keywords-0.0*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/ruby2_keywords-0.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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mustermann-3.0.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fee158ee965806bbb4023720a5854a7e
+_md5_=49ea33bb50165447cf52b2f00a8bdd03
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r2 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r2
new file mode 100644
index 000000000000..7bb78c3c9bfd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r2
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/minitest[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_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=An implementation of RFC 2617 - Digest Access Authentication
+EAPI=8
+HOMEPAGE=https://github.com/drbrain/net-http-digest_auth
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~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 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/net-http-digest_auth-1.4.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3d4baf6b33c9998d4e1d4424d9512130
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-7.0.1 b/metadata/md5-cache/dev-ruby/net-ssh-7.0.1
index 0cca886e02b7..ab0e37f0e9c8 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-7.0.1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-7.0.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/net-ssh/net-ssh
 INHERIT=ruby-fakegem
 IUSE=ed25519 test test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ed25519? ( >=dev-ruby/ed25519-1.2:1[ruby_targets_ruby27(-)] dev-ruby/x25519[ruby_targets_ruby27(-)] dev-ruby/bcrypt_pbkdf:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ed25519? ( >=dev-ruby/ed25519-1.2:1[ruby_targets_ruby30(-)] dev-ruby/x25519[ruby_targets_ruby30(-)] dev-ruby/bcrypt_pbkdf:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ed25519? ( >=dev-ruby/ed25519-1.2:1[ruby_targets_ruby31(-)] dev-ruby/x25519[ruby_targets_ruby31(-)] dev-ruby/bcrypt_pbkdf:1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( virtual/ruby-ssl[ruby_targets_ruby32(-)] ed25519? ( >=dev-ruby/ed25519-1.2:1[ruby_targets_ruby32(-)] dev-ruby/x25519[ruby_targets_ruby32(-)] dev-ruby/bcrypt_pbkdf:1[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 ) !test? ( test )
 SLOT=7
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v7.0.1.tar.gz -> net-ssh-git-7.0.1.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8c6ab791cc50aeb4499e27673ec64c14
+_md5_=37be1847fd7b2b869911aa3346b97374
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.7 b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
deleted file mode 100644
index f8af0c5f1bcd..000000000000
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby27(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby27(-)] dev-ruby/jwt:2[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby27(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby27(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby30(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby30(-)] dev-ruby/jwt:2[ruby_targets_ruby30(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby30(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby30(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby30(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby30(-)] <dev-ruby/rack-3:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/rspec-stubbed_env[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/rspec-stubbed_env[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=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
-EAPI=7
-HOMEPAGE=https://github.com/intridea/oauth2
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby27(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby27(-)] dev-ruby/jwt:2[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby27(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby27(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby30(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby30(-)] dev-ruby/jwt:2[ruby_targets_ruby30(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby30(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby30(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby30(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby30(-)] <dev-ruby/rack-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 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.7.tar.gz -> oauth2-1.4.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d54ad2da4786715e455c529415e282cb
diff --git a/metadata/md5-cache/dev-ruby/power_assert-2.0.3 b/metadata/md5-cache/dev-ruby/power_assert-2.0.3
index 4e5ffb9f21ca..88b99972469e 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-2.0.3
+++ b/metadata/md5-cache/dev-ruby/power_assert-2.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/power_assert
 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=|| ( Ruby 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/power_assert/archive/v2.0.3.tar.gz -> power_assert-2.0.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c9aa0114e069b601c3016857dac1adcc
+_md5_=32625dd3a8e0787238468a50e936daef
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-5.0.1 b/metadata/md5-cache/dev-ruby/public_suffix-5.0.1
index a477fa7f86b7..942c503f5f9b 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-5.0.1
+++ b/metadata/md5-cache/dev-ruby/public_suffix-5.0.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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=5
 SRC_URI=https://rubygems.org/gems/public_suffix-5.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7b25969d5d96a694b7943b4e05ddc849
+_md5_=9e7ef94b7ca672d4eb5453e352ffa387
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-3.0.5 b/metadata/md5-cache/dev-ruby/rack-protection-3.0.5
index 109815a5b61a..9d73985f6b01 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-3.0.5
+++ b/metadata/md5-cache/dev-ruby/rack-protection-3.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rkh/rack-protection
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc 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/rack:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rack:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rack:*[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 )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rack-protection-3.0.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4a36b74eae173dc90ab007f72edc6286
+_md5_=263cfd37bcbe90c9652be23d557bb7de
diff --git a/metadata/md5-cache/dev-ruby/rouge-4.1.0 b/metadata/md5-cache/dev-ruby/rouge-4.1.0
index 9ee7c6f8cb32..d1a0faa0e3bb 100644
--- a/metadata/md5-cache/dev-ruby/rouge-4.1.0
+++ b/metadata/md5-cache/dev-ruby/rouge-4.1.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rouge-ruby/rouge
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/redcarpet[ruby_targets_ruby27(-)] !<dev-ruby/rouge-3.30.0-r1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/redcarpet[ruby_targets_ruby30(-)] !<dev-ruby/rouge-3.30.0-r1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/redcarpet[ruby_targets_ruby31(-)] !<dev-ruby/rouge-3.30.0-r1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/redcarpet[ruby_targets_ruby32(-)] !<dev-ruby/rouge-3.30.0-r1[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=4
 SRC_URI=https://github.com/rouge-ruby/rouge/archive/v4.1.0.tar.gz -> rouge-4.1.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9e3b1d4f9657f3c06479afe528fda08e
+_md5_=6cd06f8ba002d098e45107c8352b60cc
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
index 05e826d6288a..89dfebb2de11 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/ruby/ruby2_keywords
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( BSD-2 Ruby-BSD )
 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 )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=99854dd4e6b8efb4d610d109582aab17
+_md5_=bb6c894b8df739cd26e9f6ecf9b1a301
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5-r1 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5-r1
index 5ec0c8287361..b7c63ddb311d 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/ruby2_keywords
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( BSD-2 Ruby-BSD )
 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 )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=847b9e60162a7ee50f9f1701839bc6f4
+_md5_=9afac7d8e9d059d700f7f6dd7a2cd6fd
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.21.4 b/metadata/md5-cache/dev-ruby/sshkit-1.21.4
index d950c97a6bbb..db654cb9248b 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.21.4
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.21.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/capistrano/sshkit
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=amd64
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby27(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby30(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby31(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby32(-)] >=dev-ruby/net-scp-1.1.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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkit-1.21.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=aedd45cf3aad720e9d49ec64d0335be4
+_md5_=baf7d71ec25fc7c301230a42c271777c
diff --git a/metadata/md5-cache/dev-ruby/sus-fixtures-async-0.1.1 b/metadata/md5-cache/dev-ruby/sus-fixtures-async-0.1.1
index d76a9c0bb3c4..793d65d99258 100644
--- a/metadata/md5-cache/dev-ruby/sus-fixtures-async-0.1.1
+++ b/metadata/md5-cache/dev-ruby/sus-fixtures-async-0.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/socketry/sus-fixtures-async
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/async[ruby_targets_ruby27(-)] dev-ruby/sus[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/async[ruby_targets_ruby30(-)] dev-ruby/sus[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/async[ruby_targets_ruby31(-)] dev-ruby/sus[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/async[ruby_targets_ruby32(-)] dev-ruby/sus[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/socketry/sus-fixtures-async/archive/v0.1.1.tar.gz -> sus-fixtures-async-0.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d7402475113a042358bf754dc1dcd3f5
+_md5_=3613fdaeaae65dd5cf5e305b70255cc7
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.8.1 b/metadata/md5-cache/dev-ruby/webrick-1.8.1
index 70550c6d64bd..e05050f56eab 100644
--- a/metadata/md5-cache/dev-ruby/webrick-1.8.1
+++ b/metadata/md5-cache/dev-ruby/webrick-1.8.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/webrick
 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=|| ( Ruby-BSD 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/webrick/archive/v1.8.1.tar.gz -> webrick-1.8.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1a607402d94874680053727ea861311d
+_md5_=4aa2396271814387f3f0158c59d91493
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 017023c151bd..a3ef51e61bc7 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/byacc-20230219 b/metadata/md5-cache/dev-util/byacc-20230219
index 8df93fe664a6..1bddf384ca14 100644
--- a/metadata/md5-cache/dev-util/byacc-20230219
+++ b/metadata/md5-cache/dev-util/byacc-20230219
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://invisible-island.net/byacc/byacc.html
 INHERIT=verify-sig
 IUSE=verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/byacc/byacc-20230219.tgz verify-sig? ( https://invisible-island.net/archives/byacc/byacc-20230219.tgz.asc )
 _eclasses_=verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=a54f929b718242696082e7585853761f
+_md5_=12efcb0eaaf71393f02e1017a1d62da5
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.387.2 b/metadata/md5-cache/dev-util/jenkins-bin-2.387.2
new file mode 100644
index 000000000000..617a75a6f153
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.387.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/jenkins acct-user/jenkins
+DESCRIPTION=Extensible continuous integration server
+EAPI=8
+HOMEPAGE=https://jenkins.io/
+INHERIT=systemd
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=acct-group/jenkins acct-user/jenkins media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 || ( virtual/jre:17 virtual/jre:11 )
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.387.2/jenkins.war -> jenkins-bin-2.387.2.war
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=59019707a09d919ea3c5070d521282e8
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index dba3027f9e2b..8e4b0545aebd 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/libass-0.17.1 b/metadata/md5-cache/media-libs/libass-0.17.1
index 00fbb7b9501c..96659b268e6c 100644
--- a/metadata/md5-cache/media-libs/libass-0.17.1
+++ b/metadata/md5-cache/media-libs/libass-0.17.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/libass/libass
 INHERIT=multilib-minimal verify-sig
 IUSE=+fontconfig 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 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=ISC
 RDEPEND=>=dev-libs/fribidi-0.19.5-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(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-1.2.3:=[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] fontconfig? ( >=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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz verify-sig? ( https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz.asc )
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=51f9ce0d2ee4add874392f5c2c49d938
+_md5_=25fa4a7d0a0fd5be9f7b57e4e30e5c83
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index dd8f8124271a..9875fbef3bde 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-4.3 b/metadata/md5-cache/media-plugins/audacious-plugins-4.3
new file mode 100644
index 000000000000..b6e23bf0435e
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/audacious-plugins-4.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen virtual/pkgconfig nls? ( dev-util/intltool )
+DEFINED_PHASES=configure prepare setup
+DEPEND=app-arch/unzip dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-4.3 sys-libs/zlib x11-libs/gdk-pixbuf:2 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1*:= ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1:= >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) openmpt? ( media-libs/libopenmpt ) opus? ( media-libs/opusfile ) pipewire? ( media-video/pipewire ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+DESCRIPTION=Lightweight and versatile audio player
+EAPI=8
+HOMEPAGE=https://audacious-media-player.org/
+IUSE=aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame libnotify libsamplerate lirc mms modplug mp3 nls opengl openmpt opus pipewire pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/unzip dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-4.3 sys-libs/zlib x11-libs/gdk-pixbuf:2 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1*:= ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1:= >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) openmpt? ( media-libs/libopenmpt ) opus? ( media-libs/opusfile ) pipewire? ( media-video/pipewire ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+REQUIRED_USE=ampache? ( http ) streamtuner? ( http )
+SLOT=0
+SRC_URI=https://distfiles.audacious-media-player.org/audacious-plugins-4.3.tar.bz2
+_md5_=4b55f65bbf6a0607b33d2af484bba1c8
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 18c38880bf62..25eb5980e590 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/audacious-4.3 b/metadata/md5-cache/media-sound/audacious-4.3
new file mode 100644
index 000000000000..380cadd572ac
--- /dev/null
+++ b/metadata/md5-cache/media-sound/audacious-4.3
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool )
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/freedesktop-icon-theme
+DESCRIPTION=Lightweight and versatile audio player
+EAPI=8
+HOMEPAGE=https://audacious-media-player.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=xdg
+IUSE=nls
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=BSD-2
+PDEPEND=~media-plugins/audacious-plugins-4.3
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=https://distfiles.audacious-media-player.org/audacious-4.3.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
+_eclasses_=xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9cfeba6b7b61968a96cdf104b2899573
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.48 b/metadata/md5-cache/media-sound/ncmpc-0.48
new file mode 100644
index 000000000000..bc77f5293a4f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/ncmpc-0.48
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libmpdclient sys-libs/ncurses:=[unicode(+)] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre2 )
+DESCRIPTION=Ncurses client for the Music Player Daemon (MPD)
+EAPI=8
+HOMEPAGE=https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc
+INHERIT=meson
+IUSE=async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libmpdclient sys-libs/ncurses:=[unicode(+)] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre2 )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/ncmpc/0/ncmpc-0.48.tar.xz
+_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=ffbd50ec21a67fd3e065e2601b8ee228
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 13691879205e..ed56d76495f0 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-r1 b/metadata/md5-cache/net-misc/curl-7.88.1-r1
index f534163a57b3..20acad4f3710 100644
--- a/metadata/md5-cache/net-misc/curl-7.88.1-r1
+++ b/metadata/md5-cache/net-misc/curl-7.88.1-r1
@@ -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_=94537221c401f33ad2e3fb83e7fac8c2
+_md5_=c09de8d0d9bcba4e92d1b1c9badf4ade
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 e0393a510393..3cc19adecaae 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_=8101c277a1517b8e9334a6c1ccfe6908
+_md5_=e9f7d68e925eded94e048cb2ffa95e34
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index b30b5f7034be..5ffdf14dcb19 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-apache-xmlgraphics-fop-20150603 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-xmlgraphics-fop-20150603
new file mode 100644
index 000000000000..4f5969eb1061
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-xmlgraphics-fop-20150603
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by xmlgraphics.apache.org/fop
+EAPI=8
+HOMEPAGE=https://xmlgraphics.apache.org/fop/download.html
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://downloads.apache.org/xmlgraphics/fop/KEYS -> openpgp-keys-apache-xmlgraphics-fop-20150603-KEYS.asc
+_md5_=f2bd509563c93fe0a4d97cfab5632810
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index ba2c192efc32..cc73617c3d37 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/man-pages-6.03 b/metadata/md5-cache/sys-apps/man-pages-6.03
index 7e2c9a85fe01..cbe43c227f13 100644
--- a/metadata/md5-cache/sys-apps/man-pages-6.03
+++ b/metadata/md5-cache/sys-apps/man-pages-6.03
@@ -4,11 +4,11 @@ DESCRIPTION=A somewhat comprehensive collection of Linux man pages
 EAPI=8
 HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=l10n_ja l10n_ru l10n_zh-CN l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv l10n_uk l10n_vi
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos
 LICENSE=man-pages GPL-2+ BSD
 PDEPEND=l10n_ja? ( app-i18n/man-pages-ja ) l10n_ru? ( || ( app-i18n/man-pages-l10n[l10n_ru(-)] app-i18n/man-pages-ru ) ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) l10n_cs? ( app-i18n/man-pages-l10n[l10n_cs(-)] ) l10n_da? ( app-i18n/man-pages-l10n[l10n_da(-)] ) l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_el? ( app-i18n/man-pages-l10n[l10n_el(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fi? ( app-i18n/man-pages-l10n[l10n_fi(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_hu? ( app-i18n/man-pages-l10n[l10n_hu(-)] ) l10n_id? ( app-i18n/man-pages-l10n[l10n_id(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_mk? ( app-i18n/man-pages-l10n[l10n_mk(-)] ) l10n_nb? ( app-i18n/man-pages-l10n[l10n_nb(-)] ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_sr? ( app-i18n/man-pages-l10n[l10n_sr(-)] ) l10n_sv? ( app-i18n/man-pages-l10n[l10n_sv(-)] ) l10n_uk? ( app-i18n/man-pages-l10n[l10n_uk(-)] ) l10n_vi? ( app-i18n/man-pages-l10n[l10n_vi(-)] )
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-6.03.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.03.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=434af3e795978b2e7bdaaaee79b47e9f
+_md5_=336fb458ec7b3b33abe88bb368b55477
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index c6327fe48ba3..83106d4d2c45 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/flux-0.41.2 b/metadata/md5-cache/sys-cluster/flux-0.41.2
index 9e5e8ce4919f..0fc569b0ee49 100644
--- a/metadata/md5-cache/sys-cluster/flux-0.41.2
+++ b/metadata/md5-cache/sys-cluster/flux-0.41.2
@@ -11,4 +11,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/fluxcd/flux2/archive/v0.41.2.tar.gz -> flux-0.41.2.tar.gz https://dev.gentoo.org/~concord/distfiles/flux2-0.41.2-deps.tar.xz https://dev.gentoo.org/~concord/distfiles/flux2-0.41.2-manifests.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=53b98b798fd23ca8a2f54fbed143eb3e
+_md5_=af7df9dbabc5601c55887e388109497f
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 8c0a9c2ac78d..d7ace1319c09 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4-r6 b/metadata/md5-cache/sys-devel/flex-2.6.4-r6
index 680faa597ae5..4477c75d4df1 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.4-r6
+++ b/metadata/md5-cache/sys-devel/flex-2.6.4-r6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/westes/flex
 INHERIT=flag-o-matic libtool multilib-minimal toolchain-funcs
 IUSE=nls static 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 ~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=FLEX
 PDEPEND=app-alternatives/lex
 RDEPEND=sys-devel/m4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-devel/flex/flex-2.6.4-autotools-regenerate.patch.xz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=32049b0431c44d90abfd271226d8cb4a
+_md5_=fd33f67da11dba0669490dab8ad13ff5
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 6c20840fbbfb..fc162d613bc3 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-6.2.1 b/metadata/md5-cache/sys-fs/btrfs-progs-6.2.1
index 4a5dba09bdd7..7612bb48b8b7 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-6.2.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-6.2.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/
 INHERIT=bash-completion-r1 python-single-r1 udev
 IUSE=+convert python +man reiserfs static static-libs udev +zstd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v6.2.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=a1b4de774d46392f809f658269890176
+_md5_=5c14e5da10c957032e86b876a829c507
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 525c11b03b04..679b348d5e91 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-6.2_p6 b/metadata/md5-cache/sys-kernel/pf-sources-6.2_p6
new file mode 100644
index 000000000000..1b2be0d333da
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-6.2_p6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=8
+HOMEPAGE=https://pfkernel.natalenko.name/ https://dev.gentoo.org/~mpagano/genpatches/
+INHERIT=kernel-2 optfeature
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.2_p6
+SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v6.2-pf6.tar.gz -> linux-6.2-pf6.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.2-1.extras.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=26906e2b2c92e81f89c60caf8f694795
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index a4b710d7bb60..5a2f4f424bae 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libnvme-1.3-r1 b/metadata/md5-cache/sys-libs/libnvme-1.3-r1
index f49e3abc0fd0..015a84993535 100644
--- a/metadata/md5-cache/sys-libs/libnvme-1.3-r1
+++ b/metadata/md5-cache/sys-libs/libnvme-1.3-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/linux-nvme/libnvme
 INHERIT=python-r1 meson
 IUSE=dbus python ssl +uuid python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/json-c:= dbus? ( sys-apps/dbus:= ) python? ( python_targets_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 ) ) ssl? ( >=dev-libs/openssl-1.1:= ) uuid? ( sys-apps/util-linux:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-nvme/libnvme/archive/refs/tags/v1.3.tar.gz -> libnvme-1.3.tar.gz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	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_=d5d0aeb523afc3768ead911db27ab0ad
+_md5_=9c493d14beba2fdcee73d6d473cc0922
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 6a6173e05c44..abd3244325e2 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-112.0.5615.49 b/metadata/md5-cache/www-apps/chromedriver-bin-112.0.5615.49
new file mode 100644
index 000000000000..0099e468f8ea
--- /dev/null
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-112.0.5615.49
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=WebDriver for Chrome
+EAPI=8
+HOMEPAGE=https://sites.google.com/corp/chromium.org/driver/
+KEYWORDS=amd64
+LICENSE=google-chrome
+RDEPEND=sys-libs/glibc !www-client/chromium www-client/google-chrome
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/112.0.5615.49/chromedriver_linux64.zip -> chromedriver-bin-112.0.5615.49.linux64.zip )
+_md5_=1395edba166dc740188909a5324f9833
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 17e51835b51d..1ca8778e49de 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/uget-2.2.3 b/metadata/md5-cache/www-client/uget-2.2.3
index bb0963214687..89479316a434 100644
--- a/metadata/md5-cache/www-client/uget-2.2.3
+++ b/metadata/md5-cache/www-client/uget-2.2.3
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( gnutls openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/urlget/uget-2.2.3-1.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=32dfa20475c88f1ff8617b82c68eacc9
+_md5_=436079ea085aeb423561d23d4986bad5
diff --git a/metadata/md5-cache/www-client/uget-9999 b/metadata/md5-cache/www-client/uget-9999
index 221a2b2553c0..f8ef30f87fe9 100644
--- a/metadata/md5-cache/www-client/uget-9999
+++ b/metadata/md5-cache/www-client/uget-9999
@@ -13,4 +13,4 @@ RDEPEND=dev-libs/glib:2 dev-libs/libpcre net-misc/curl >=x11-libs/gtk+-3.4:3 gnu
 REQUIRED_USE=^^ ( gnutls openssl )
 SLOT=0
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b2e1591b640614846be814d8c30b7d97
+_md5_=eca309813e6b566982accab637ef3102
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 4bab122e414c..c5f00c7e1bd3 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/puma-6.1.1-r1 b/metadata/md5-cache/www-servers/puma-6.1.1-r1
index 6948d8df0016..32cb8ad69d3d 100644
--- a/metadata/md5-cache/www-servers/puma-6.1.1-r1
+++ b/metadata/md5-cache/www-servers/puma-6.1.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://puma.io/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/nio4r:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/nio4r:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/nio4r: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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v6.1.1.tar.gz -> puma-6.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c885be197b30b37303921bb5a2b6b2f5
+_md5_=182fd146c30800fcd5b01563fae94e85
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index aea0e3c9f785..3bcb6a2200f9 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-07T03:39:54Z
+TIMESTAMP 2023-04-07T09:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQvkIpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQv5OhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB91xAAsL+nsvB4AqLYYmuizqtR6i6MDzVvii00KFffe8niK9r7G/BxWRprWeDc
-dp1PhJ6utAE7ErIOTbxPGySjebIb4eZ1BT2zsWW0be30dEC43FrXR5+xVIDFdILf
-OnIQtH3hcxOF2dgLgMHVOiAaFkxwhPjd64coHJ4fWmiavG4LeVPXqPqv11lsZfLf
-56nz/v77cxWwi8NqNHI5HPzVg4rNTbPXZkLry+GgQ82AuTjepaA/D7P+IRZeaXWU
-zQgpWKyagnHObRmTRWQh6khePyJcq3Dm7aL0J+SGda+7zMilxQMn+cDwDz063QZp
-3O8Sk/HkFIFPuJUEnAUUOF2od9adodZlG4wLns+K3UQr7mDwsL6o/9cZy53KVIV0
-0OnyjhVuBq+Fl8cUejIdGzumvEQdCllTYZKm0ezVxMunb18NYpNp51Qu6FYDfad1
-q+U7nch+FDZI64dIWKdSMN98vflUCwbkoU0+g/wg+S856iWO2aN79AgzGG8jpQiz
-rAhYwBrkSGrpI1K0PL+86EnZ77MvOxkZZtxJEYbIJ/9Asq2DO0XLXOW2dqD7KVOR
-cdPO/79he7Ilmp8qv2xejkUUxRnMHlBtyJIBkSsViHQd1gmD2LRWz3VYjrv7DV1+
-IQOzhUslOhIWTNdA2p+H6g4axO6jQ3Y0oKvu54A96PxidQ7wcCw=
-=omBI
+klDYpw/9E/DzDhl8p6MFHC5o76fwzu+xugH8Dpx9ZZLdSw+f/A6GnCKrJQW6IXhU
+KYSk32E3dObkJUEW4D5evipQgP5Jux6F29vPcstjk0My35O59pHtxGIDI2bnufJv
+oXbVxkVgfRoPK8m6gw/yc+7JQMOkJFJYNmGz6++/0VNeDpcqSJqJmZBRC+NEEcMY
+/DyQO+sPZmRCMb/Eu6Wh17gLTiOvRIDAr4NYcK0zy4F0Kd5vZ6zuK9Jn5bWB9rJw
+3Vn3q1eRx8pmDz2H+1wHNBtUFI5Cn1sp8NBCtj5eDsE4SscUxk6tJcU0f9aFHUa1
+NzdnXs80SUezDNpZWG2QaF/GdQndw4yjfufK9UENVEZXDh2ZS2ARtNOcnGrojVKK
+t5oEiFzdiwL72eHrdGEJHWWjGTjFx8MfhK8gEdCLr5DD7LA07TCR8q83A4s5DK1K
+ur0juaV24rOHCzTv7PSBVOntRcJeIf7ObSxHpPLTwDgelY9+lQZg4/IKy0QjzA9A
+nLMmEiNrmoGy9tMjDJ9HqSkp4pJu2czZpFam2iOd0JmyU+a141A5qZXZV98XWNEe
+J6/xy5ruR7fwm4ZOGzqzj4pdVuaKBxE1IZmW7pzHb5v9Z5h5yHHSHHYWdHHzz0dZ
+Npb6v1CrBlxWqqYT7z6y3m3h3ZY9illrdqjB7LCOzEckV9cQ7do=
+=wiEb
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 533250c68efe..feafbaf30f8e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Apr 2023 03:39:50 +0000
+Fri, 07 Apr 2023 09:39:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 75508390251c..c8de31878a78 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Apr  7 03:39:49 AM UTC 2023
+Fri Apr  7 09:39:48 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0f46d5f532e1..aa3dda46f690 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Apr 2023 03:45:01 +0000
+Fri, 07 Apr 2023 09:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3cff4c59cd06..d28b3bf636c9 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-b24ef30ed3852077e9397ff244470027fcbfadc7 1680838191 2023-04-07T03:29:51+00:00
+224d55845f9501ff6e7ea1fddb6d74df6c4d6a6d 1680856976 2023-04-07T08:42:56+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 679067fb97d5..7cf6700f197a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1680838801 Fri 07 Apr 2023 03:40:01 AM UTC
+1680860401 Fri 07 Apr 2023 09:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 533250c68efe..feafbaf30f8e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Apr 2023 03:39:50 +0000
+Fri, 07 Apr 2023 09:39:48 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 09e37d028c91..3c411a27fd5b 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d1bd0b9522f5..33bc32f6bda3 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -14,7 +14,7 @@ DIST curl-7.88.1.tar.xz.asc 488 BLAKE2B ea90d840846fca3f0b17838a84431cb44d6e3f8d
 DIST curl-8.0.1.tar.xz 2575544 BLAKE2B 67d82e9d71f0a351b5c2ed3ad5eab02e367ded872658a295179b935729d5105015f8c29569c396e11cd14036656af894ded85c8838cba260d9f6f1a8dcb5e22b SHA512 3bb777982659ed697ae90f113ff7b65d6ce8ba9fe6a8984cfd6769d2f051a72ba953c911abe234c204ec2cc5a35d68b4d033037fad7fba31bb92a52543f8d13d
 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 8921 BLAKE2B 87313b0462d84f49ac2aaa6dd2627980701c4ad915a95a79639394cc56c8b59060be6c00c5a23cc77e1370142e7e4ec2df898c051fa755c19372e88c598fcf67 SHA512 e5f63f9ab209d6b3524819c1a8900f2be82b67fa4a5dbcaa311f45bfb198d79155d0239de4c304ec7e93393e7cce4ea882d70a950bf12dd00a4245e245958cff
-EBUILD curl-7.88.1-r2.ebuild 8963 BLAKE2B bee346613f8a3cd17e5aeadd2e7d7f5c3dbda118391897cc0b921ab5ba32a861d1cd2bdf4fd50fe40ec2d3651a43bb96dacd9a50bec9a078e8ac1e09cd2eb433 SHA512 592f438871c47c80880897d3af77b2a079ed93c91a9b9a63df75f37ca03e36537470b28a9e53c3ac35bf79a1affabc989b1468f2c6eb948188da1ee458efb112
+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-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-r1.ebuild b/net-misc/curl/curl-7.88.1-r1.ebuild
index 9857f3a4d3a3..aeb3fbf03c58 100644
--- a/net-misc/curl/curl-7.88.1-r1.ebuild
+++ b/net-misc/curl/curl-7.88.1-r1.ebuild
@@ -93,7 +93,7 @@ MULTILIB_CHOST_TOOLS=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
 	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	
+
 	"${FILESDIR}"/${P}-header-dump-segfault.patch
 	"${FILESDIR}"/${P}-pipewait.patch
 	"${FILESDIR}"/${P}-silent-parallel.patch
diff --git a/net-misc/curl/curl-7.88.1-r2.ebuild b/net-misc/curl/curl-7.88.1-r2.ebuild
index d1a2c5b2213a..528ecbb2d290 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/profiles/Manifest.gz b/profiles/Manifest.gz
index f5bb8e8fc7d7..241c18197bd6 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/powerpc/ppc32/parent b/profiles/arch/powerpc/ppc32/parent
index 3ed68f2e0b7f..f3229c5b9876 100644
--- a/profiles/arch/powerpc/ppc32/parent
+++ b/profiles/arch/powerpc/ppc32/parent
@@ -1,2 +1 @@
 ..
-../../../features/big-endian
diff --git a/profiles/arch/powerpc/ppc64/64ul/parent b/profiles/arch/powerpc/ppc64/64ul/parent
index b088bfd7bf7b..f3229c5b9876 100644
--- a/profiles/arch/powerpc/ppc64/64ul/parent
+++ b/profiles/arch/powerpc/ppc64/64ul/parent
@@ -1,2 +1 @@
 ..
-../../../../features/big-endian
diff --git a/profiles/arch/ppc/parent b/profiles/arch/ppc/parent
index 105d4126940c..e698a140459b 100644
--- a/profiles/arch/ppc/parent
+++ b/profiles/arch/ppc/parent
@@ -1 +1,2 @@
 ../powerpc/ppc32
+../../features/big-endian
diff --git a/profiles/arch/ppc64/big-endian/parent b/profiles/arch/ppc64/big-endian/parent
index e50f74c7ede8..0e081067a01b 100644
--- a/profiles/arch/ppc64/big-endian/parent
+++ b/profiles/arch/ppc64/big-endian/parent
@@ -1 +1,2 @@
 ../../powerpc/ppc64/64ul
+../../../features/big-endian
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b3b9bf36786a..798424ada5ab 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4401,7 +4401,8 @@ media-plugins/audacious-plugins:cue - Support CUE sheets using the libcue librar
 media-plugins/audacious-plugins:fluidsynth - Support FluidSynth as MIDI synth backend
 media-plugins/audacious-plugins:gme - Support various gaming console music formats
 media-plugins/audacious-plugins:http - Support HTTP streams through neon
-media-plugins/audacious-plugins:openmpt - Add support for OpenMTP
+media-plugins/audacious-plugins:openmpt - Add support for OpenMPT
+media-plugins/audacious-plugins:pipewire - Build the PipeWire output plugin
 media-plugins/audacious-plugins:scrobbler - Build with scrobbler/LastFM submission support
 media-plugins/audacious-plugins:sid - Build with SID (Commodore 64 Audio) support
 media-plugins/audacious-plugins:soxr - Build with SoX Resampler support
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 6c88572a710b..456383b37579 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-xmlgraphics-fop/Manifest b/sec-keys/openpgp-keys-apache-xmlgraphics-fop/Manifest
new file mode 100644
index 000000000000..d951334061af
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-xmlgraphics-fop/Manifest
@@ -0,0 +1,3 @@
+DIST openpgp-keys-apache-xmlgraphics-fop-20150603-KEYS.asc 18941 BLAKE2B 40ac4dff3ea5de72f66b5d38fd495139bfcbe2c635aec1d72007a6ef1f75aef5f48df0a4d34ef0db57332ddd2f3b6512c301ed5db0375e7a36b4e741d9592fdc SHA512 0d35727716e670639d1dfc623bdd9f91518ce24ab32d4bf0e21629d5e719dedfffdd66bc8af6e09fe65ae9ccca3bb4808a8beb0b13101080e122cf5b69a5d8f7
+EBUILD openpgp-keys-apache-xmlgraphics-fop-20150603.ebuild 559 BLAKE2B cd8d51c5c9109dc537f67cd6d1659419262cf46d40df73a8f1004b81207dc1d7060e87e4b0c3f3c19985e2ef38446f4d769e926f310ab0398f3de8b69a294652 SHA512 ef91940dcc040e7ecb217df273cd4de8f6e01fee0e8bc9160357a3298431397aabe5671b13fdf05d4102d83baf263af386c42ac19629e8720cac37064275432b
+MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/sec-keys/openpgp-keys-apache-xmlgraphics-fop/metadata.xml b/sec-keys/openpgp-keys-apache-xmlgraphics-fop/metadata.xml
new file mode 100644
index 000000000000..6ef2d50cf07e
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-xmlgraphics-fop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-apache-xmlgraphics-fop/openpgp-keys-apache-xmlgraphics-fop-20150603.ebuild b/sec-keys/openpgp-keys-apache-xmlgraphics-fop/openpgp-keys-apache-xmlgraphics-fop-20150603.ebuild
new file mode 100644
index 000000000000..7cd757d97a88
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-xmlgraphics-fop/openpgp-keys-apache-xmlgraphics-fop-20150603.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by xmlgraphics.apache.org/fop"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/download.html"
+SRC_URI="https://downloads.apache.org/xmlgraphics/fop/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - xmlgraphics-fop.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f8c849929db6..2cffe731984c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 33123573d348..d26efe4f8ccf 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -9,7 +9,7 @@ EBUILD man-pages-5.12-r3.ebuild 2240 BLAKE2B 4a1280b41226eb5b98c8572e37ec4458db2
 EBUILD man-pages-5.13-r2.ebuild 2248 BLAKE2B 500770a4a21b8d236eadda9eaac53e581d9020ecb07585083ab65c770349dd504ac0382d3092a44e75cccf426c393c32f6397e1e3b8d4d5804af4c943beee80e SHA512 c5da6cc30b978e1307ddcb2a8d2092b79f9b5ae4a8fb489404fb8e575273f2dd5ce2dbd1151e9347c5956efc266b879661b56a8aed4e193d85b3c50686322da2
 EBUILD man-pages-6.01.ebuild 3405 BLAKE2B c8130de04784669488dab75485aafa711a3c6f649a6b0f9a5ad6d45fe12f63847fb3b6690e4862381aa5ccb5b22c2be1641b992f4031ab57b9452d3159e10be5 SHA512 e8364c65c48a3f6fa3e2d36b5a8b3ea70c7bc090d1c4f4fe03d55ea538ee248d85fd9d92c19683760d0e8c2f4b2718ce9e22b143aba1e718e886cb9f8bbdb777
 EBUILD man-pages-6.02-r1.ebuild 3384 BLAKE2B 2dcb051a1bae08360839c923125f5783abba112c923e98e3d707ac9768895e4a24af132b6b469858c8fc00e0ee73362758fd8d800f25eaccc368ab7af90f437e SHA512 0d58e0b646a4949e750d4a0444278930302d453b3829d72c9dcbeef2fcfbfcc817529e1e04feb708b10e5410bd27e0c248b7de95ba61370c700f0f9b1def6455
-EBUILD man-pages-6.03.ebuild 3392 BLAKE2B 92a00f25351e729e06a329eb69132638ebb4db356b5d17fd2c93093b54b6c8202220961ea66770e5f006b5bac45eee1cac90f330d64066e37ac09b0df0f9a6c8 SHA512 137dd7d96ab5fc8e96fe03df4e5ff7a8320714a16b085187b1f53ecd3807011ef3c18c2431c0426966c1824489bc365d42eaec0505da5c1587b5f72ae0acd37e
+EBUILD man-pages-6.03.ebuild 3384 BLAKE2B 2dcb051a1bae08360839c923125f5783abba112c923e98e3d707ac9768895e4a24af132b6b469858c8fc00e0ee73362758fd8d800f25eaccc368ab7af90f437e SHA512 0d58e0b646a4949e750d4a0444278930302d453b3829d72c9dcbeef2fcfbfcc817529e1e04feb708b10e5410bd27e0c248b7de95ba61370c700f0f9b1def6455
 EBUILD man-pages-6.04.ebuild 3586 BLAKE2B 90622d78e50d167165c575a7c694f7c9b22f10ed3b57223dac98d6aee3bb5cb2bb5ad9d0bffa097abf18326a6bc8024c7c0ad17b1421a92a27357ea0047766f2 SHA512 9a5a4f711d58ddeba275092cc96e8c12607d4d38187254ffd6cacd65830fbfd3f53d037809e7c8ef82e40926ffb9b8bedcdb6275c49a97b52eab5b70803b4ebc
 EBUILD man-pages-9999.ebuild 3586 BLAKE2B 90622d78e50d167165c575a7c694f7c9b22f10ed3b57223dac98d6aee3bb5cb2bb5ad9d0bffa097abf18326a6bc8024c7c0ad17b1421a92a27357ea0047766f2 SHA512 9a5a4f711d58ddeba275092cc96e8c12607d4d38187254ffd6cacd65830fbfd3f53d037809e7c8ef82e40926ffb9b8bedcdb6275c49a97b52eab5b70803b4ebc
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-6.03.ebuild b/sys-apps/man-pages/man-pages-6.03.ebuild
index 023f08c0211a..c5309d217f13 100644
--- a/sys-apps/man-pages/man-pages-6.03.ebuild
+++ b/sys-apps/man-pages/man-pages-6.03.ebuild
@@ -40,7 +40,7 @@ else
 		"
 	fi
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 3498a5a787a2..9b3216d5b87a 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/flux/Manifest b/sys-cluster/flux/Manifest
index e35d653bd61d..02a3b4ac74ba 100644
--- a/sys-cluster/flux/Manifest
+++ b/sys-cluster/flux/Manifest
@@ -1,5 +1,5 @@
 DIST flux-0.41.2.tar.gz 395636 BLAKE2B 2d1732729709d0f753ff62aa5b5563b9d42f3cde42a98b5356607b640715e30afa9ebdfdb9c71281eff9188c91ea6e6b082ddc2198e4d790a76aaeb155b8ef2f SHA512 c68ad402c99b61ca9ef737749417b48dc4e852544d76311c11d94bff42c2e081a8e11e72e438cb9e1834ec7d48e69a30473aa6ab1d68c2684dde5c2b817000a2
 DIST flux2-0.41.2-deps.tar.xz 166945460 BLAKE2B 292ac5a66237916f1eeb8460f38f803fbe6bfec7cc6ee09512c0893928478049dbf8d482a897e7f4d5bed537f3cae3d73019d6c793764d1b15dc984724bc4ec7 SHA512 da36b3d78066cad548492d368df2b0d31c25a72f4fe4e5791b0c4315d5ed2625da5318b4a010395a587c072a07d23c6d6e7ff3c43bbf201dcd7d45a85dc24297
 DIST flux2-0.41.2-manifests.tar.xz 22904 BLAKE2B e23150ff1b7617f144a1250c890cb48bccbfa4547cc2d46b6d6905349c969a8505e2bc23466a469bb0eae326ec571eb5987ae5c0768b648ba6e35b1daec2b039 SHA512 ba58ffa05be150e32a30a492d28cdc582c9b0e7162b768a83ca8d44a4a08fca195700f8c124cc39cf85a0c62dfbe380304c0d203d0f05619a1b65284d22278de
-EBUILD flux-0.41.2.ebuild 1089 BLAKE2B 8f5373bb519330ecde1438f5cc995f5055bf8d849bafd28376a7db6aaaa89263bb2ca4663bb78849595d4767932d6b71556372998fab80f99a2211a8c8437ef8 SHA512 79e0b2be76690ee18bf4970f0bf1f123f77183275b3c0962628e5ce30b5e9c4edf2a4aa6e9d3739da30fe8e334bb48431134460477aad47c383a21ad5cb93fec
+EBUILD flux-0.41.2.ebuild 1096 BLAKE2B 3bcee15bd317d1f2969e692b12d76b931349d6c31f9abf7980b07c2231a065b0c43e931885d5aa5a434f88b6829b20856bb82a009446e48b7b14ed86083e4675 SHA512 c21c41e281bd1670fff0bf13a0dc44f801dce5bcf7f6ee836c4e2c71c4a48c64295b263084a6c48502b35c730f1adc85d0dca53ec7e9a853131ce257e6b993d6
 MISC metadata.xml 330 BLAKE2B 24addf90e0c727cb9bedcafe1afa87e3a46e302bb456db353b84715fbf50a8e741ef20a18ddb02a6f06a09625dd013c1da225bae524a0e37887601e256fe6147 SHA512 f2302b31942d8a9a31fb8d9c9b55384482e7a119209b39ba4f501574b191239209e4079b94afba3bbd2adeb8dd78490215cadf5315882bc71cf79fc0aad19fcc
diff --git a/sys-cluster/flux/flux-0.41.2.ebuild b/sys-cluster/flux/flux-0.41.2.ebuild
index 0a791c2eca47..3e8f5b0393f5 100644
--- a/sys-cluster/flux/flux-0.41.2.ebuild
+++ b/sys-cluster/flux/flux-0.41.2.ebuild
@@ -21,7 +21,7 @@ RESTRICT+=" test"
 S="${WORKDIR}/flux2-${PV}"
 
 src_compile() {
-	mv "${WORKDIR}"/manifests cmd/"${PN}"
+	mv "${WORKDIR}"/manifests cmd/"${PN}" || die
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
 		ego build -ldflags="-s -w -X main.VERSION=${PV}" -o ./bin/${PN} ./cmd/${PN}
 }
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index cef7d6275940..027b2db2fc4d 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index b90089b49d03..9a487af294e4 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -4,5 +4,5 @@ AUX flex-2.6.4-libobjdir.patch 770 BLAKE2B 0771af247117123e3efed3e2a0c8a71573c81
 DIST flex-2.6.4-autotools-regenerate.patch.xz 282588 BLAKE2B 3995b8b5e354a43b1a4ff72fae76027c904ddb24eb8e5d55fc6fbe81299f48fa70ac3c4a98b9ed39aca8a98190d6db5005cacb96ec1016d413860d84a434dcc0 SHA512 9efd3197fdf7f8435dfbf4dafbe6b99c1fafede0ec364dbeb9cca81711763d693bc5d30fc3b2af038a44f8848577d19dd737e3afe0cd3b08ab79daea64fcdefa
 DIST flex-2.6.4.tar.gz 1419096 BLAKE2B c003d4f764f7f4d41e33af7ee28c2af272a9f0aee6ba7c2494ba96722d8d0b18f7a3f745217e9a2cecb43b6863328267a810280670c04464156b3eb3d7ee9d62 SHA512 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
 EBUILD flex-2.6.4-r5.ebuild 2517 BLAKE2B 25ea227113a5e1eb8d09d68613d4124e5e5bb773cea8eaa201e8f7b04f64606bc1cd27147123e05c62e2179d353e5017ca4f18fd0ff299a5391d1592e1a9c00f SHA512 22597131284228569e9b82dc72b255779fcc926b6d8c83195f960141cd1c84306b9e1d9b12acfa066b21af2d0b59f7dc7e5cc8d173c1f0d25bc59e7c84e1db6c
-EBUILD flex-2.6.4-r6.ebuild 2595 BLAKE2B b7da401dcd10071806589295dc3022afd443a913b6be14bf17f7d7e72b059d611be8b02b2419c8b390df576a38975d12439f01f0a3f6ca4708f3368901b17aca SHA512 403cd179bc6f6f2e1ed2cb68f49992df718c0bc4fe5e0f9ffbbf1bcf012ddb1ffefbb103e0ec44551d93326563e94e1a71140467b172a0753d1c0e12b1458f34
+EBUILD flex-2.6.4-r6.ebuild 2587 BLAKE2B 08a79811bc61c356f1646a6cdf40de55a256b4329dbba74df128c8ca913e2ed331d671efe46c331048ce7edab643715d0eb6d92494f503f3bfd7f452e65d26e8 SHA512 b8cabc7303fc57de8d16a201e71c202cf62d44fbb38c5bb26aa75abcde4d5c7996e07d93c1722a836603a1175c0186bd0cec3dc6f2f655f157ba68c5deaeb3fc
 MISC metadata.xml 444 BLAKE2B 28bd0cd35c6ab4386dffdf221e6b43927e47971bea62a0f0395e3cd6725567114675055dc1267ce5ffbd42fe4731a806b4e5666ea6b83ad4bcf4d35b5529ce85 SHA512 53f91d714d7f4401f7d986d743c08a817d794147f9b277d829a4e8065ce91ce00123cd5b42957af60ef9051568a214b7ce791aa8a4baf82a5179859971357d56
diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild b/sys-devel/flex/flex-2.6.4-r6.ebuild
index b4d76b9e0b1a..9398c43042a4 100644
--- a/sys-devel/flex/flex-2.6.4-r6.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 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="nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index be6a8d1df953..753b29125e4e 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index e011628496c5..4ace25e0494d 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -13,7 +13,7 @@ EBUILD btrfs-progs-6.0.2.ebuild 3316 BLAKE2B 04f3a7b2f5e79948c5b87e8faa9f6046d87
 EBUILD btrfs-progs-6.1.1-r1.ebuild 3371 BLAKE2B 6d1dec5724837eed26ba50d9a4c0bf7f97d4783a07fd6f2ad51e8d83790acd4fce210daa846336d52bf459dfc7485ec90feff9e7005e9f46235c2faebcfcf8bd SHA512 455bc0717e4720ae7b99add5bbdf961258b8d0bd43585f8c68003bad8ee6fbcb9df666a999194c530a3c3d40abe33c39c449449874b32adaf85c69f562c00a30
 EBUILD btrfs-progs-6.1.2.ebuild 3316 BLAKE2B 04f3a7b2f5e79948c5b87e8faa9f6046d8727580c7fa4a55657e831a3b4d5160a958e348ee31e4d141bdce8893e9f383b2ffda3300232979a75b5d9a34aaaccc SHA512 dfc4566c398687b0bbbbe2896303ab4fba5fb142ffd40362f5fa11da4f54b450d82168c904ef5fc7e22176c17d856874214ca09cf4ae0d10a85c54b0a62fec59
 EBUILD btrfs-progs-6.1.3.ebuild 3522 BLAKE2B d25e101e6401ecd165ce200a58c84b8aed6071253a8af07856b657d48d05f63e3b5014d7e3ab75605679dacc2d88b60c8bc8fddcfda544ed86dde959dae25aaa SHA512 b6088fc730d875b53ea1e594bd7ed9931569ab71a1465856833455a1fdbf63073acb7eadcbb3952ed0a5329c8cf7ad5259988d6e674bc83d45a667caa9295cac
-EBUILD btrfs-progs-6.2.1.ebuild 3586 BLAKE2B 024a9f9b6b60ed76c12279e3d0e60dd250729379902ba5e4961c049e6dec66e59aecd9e846af7ec7778c62934e93da8ce1a21b5728029539c25202a1db56c9e2 SHA512 ad3209b278ad5c5d5307c3fa28b872fe102edc64ed8162b02ab313b6c19a346eb312d7e29c424639bc51aebb9fcbb367751d9097b4a347039ed4c115b787189f
+EBUILD btrfs-progs-6.2.1.ebuild 3580 BLAKE2B e66421da8398d9b6856958d4c13ac3fd8271e9773987e13540dfbe1bc69a99780b2654d0b95842770bf1195792592afc19c949ab07786d4748d9ef06fb5e9d86 SHA512 174ab73eabf5af68987a3fd2f13a09d913d947150407cce8a4c6f9af4e2437bb5fe287acaf074cb19e7ecc8477aafa229b13195ba8a9d6674f1a7858b7d759fb
 EBUILD btrfs-progs-6.2.2.ebuild 3553 BLAKE2B a9a3dbcf35d320f5a4bff03a0956d056b1ab997b903bd544023c630e242d801896bd9d6c561693c44f57176a123a9191286ef29aafeb1eda4ae7d7e8f074c51f SHA512 b562bc54b02440f127558948ff3fdc46f0e705482729a76539904c72628e556bb818b25f991a8c7c38005878408b6c1a95a55d99c3c7c513be1862181db07050
 EBUILD btrfs-progs-9999.ebuild 3553 BLAKE2B a9a3dbcf35d320f5a4bff03a0956d056b1ab997b903bd544023c630e242d801896bd9d6c561693c44f57176a123a9191286ef29aafeb1eda4ae7d7e8f074c51f SHA512 b562bc54b02440f127558948ff3fdc46f0e705482729a76539904c72628e556bb818b25f991a8c7c38005878408b6c1a95a55d99c3c7c513be1862181db07050
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild
index f89547b3aa45..bb42954a60bb 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.2.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 	fi
 
 	S="${WORKDIR}"/${PN}-${MY_PV}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 96ae8ac90caf..4e9d3809021d 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 7bb37d953ffa..f801a23c0c8f 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -17,6 +17,7 @@ DIST linux-6.2-pf2.tar.gz 222861169 BLAKE2B b3e6bddc8639475313cb3203b99e068c109c
 DIST linux-6.2-pf3.tar.gz 222849935 BLAKE2B d0c00d16dd92a0a1617442cea2bba0aa64fbba16ae7632609efbb3c107bd27c9e5920b4292497dfbbcc02c8e05d9c726dd0b39a6c31bd834edb976268f6537ba SHA512 f0e24f4a69befbdf14124d8f82f1387a7e8dad7c997e63850d04f81658baf9d9bb7c827fabbe5163695eee8dd4c7bdc3c010674471fe8a3f3b57d2680b0593d7
 DIST linux-6.2-pf4.tar.gz 222900183 BLAKE2B 6ed60362c81577e314c944f063ddbe547961990d1a54843ac1238f8e2e01fee8fd319be2f3ff33b364ce98909bba4f3fc4c61c67f3375a46b38c9c2db7568c34 SHA512 16aa5baeaa9e55a0c483b08baa2fb40d1f7c698ed1baaa52b832569284740bb5a9ef78b1b3bb415f096772a1efd9490fb28cdf0442d17210ae82da9e7ee7b745
 DIST linux-6.2-pf5.tar.gz 222904645 BLAKE2B 90b5bec754bed66535c949ceb835875ff926764d37a1a0aab26324c6e83ad4634d1782afd1b10d38f9f2f110fc052ecc335d1ba6536e8e09738cbb070e7e7ef9 SHA512 00576eb22380a1d61eaae1570c2cac5d8a7492887d1bd6c94181142510796629ca98406922dc64d351ac8d861d1dfe7fe95c673ef8eff13555ded2a17757a881
+DIST linux-6.2-pf6.tar.gz 222930980 BLAKE2B 03579940417cd704020922a2b55574951301899ffcfba5a83b4537d8d139ff54c0e573e456006ddbfa05b1ec57d261d8e16a5a2c3170fbd65c50614c18f68355 SHA512 23516bda6c957b0c1cca977a14453d9e033b96be92410038eb6851d9957eed9ef4592e86897377265b36886f9be8d7624ab82b9f3955b18fd6ecbb92ee2cb2a0
 DIST prjc-519-r1-vd-test.patch 274504 BLAKE2B 87950689ffe97134100aa91d0ff89acd6f4e93b626ad7ab08af464a49457f16526cae7b863d53213dd129d47b6f97b3407ae7027b02656d9eba85942241e8d3f SHA512 d652b6060400329d051257fedee5d9f37a70554ab722e93a15f294d1c6229bfa227941461147e0128178b02875cdf838e0d71e89884d8c01e7549ee482213b71
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
 EBUILD pf-sources-5.18_p5.ebuild 2781 BLAKE2B a377fa1820f637bcab95c220e00375dc8a0f009ad728088a37e1f46c5c4c3931c9a4b9fa86d05130440d12e29534468adb488b54f8b7c1975546594d16f7a28d SHA512 4e0acd60313555185dc11e1d6310c3c4d7bdea8acb4256e9ffd985a001c72949a3065fbfa7830bc66827d56961fa523300827613bf5653ac359420f08172a62e
@@ -28,4 +29,5 @@ EBUILD pf-sources-6.2_p2.ebuild 3131 BLAKE2B 5b8d61ac12265c35b9cba7ff606167b06c9
 EBUILD pf-sources-6.2_p3.ebuild 3131 BLAKE2B 5b8d61ac12265c35b9cba7ff606167b06c95b9995983aafb33de5727121e3ab217dce326a20a3164dd74c00fbc4929fc53e28c670d4d42f9d0ab6060e655ac16 SHA512 5b4690025986cb0a5ba70365d24609f6ab72fdf82323f7c1c70ba96edb080eb8f7a28339bde71cf2795d40a289d8d14922eab0b6c66715f88362790e6f0c3773
 EBUILD pf-sources-6.2_p4.ebuild 3131 BLAKE2B 5b8d61ac12265c35b9cba7ff606167b06c95b9995983aafb33de5727121e3ab217dce326a20a3164dd74c00fbc4929fc53e28c670d4d42f9d0ab6060e655ac16 SHA512 5b4690025986cb0a5ba70365d24609f6ab72fdf82323f7c1c70ba96edb080eb8f7a28339bde71cf2795d40a289d8d14922eab0b6c66715f88362790e6f0c3773
 EBUILD pf-sources-6.2_p5.ebuild 3227 BLAKE2B 1419c6b648085ae97e2cb69e9909871677f6ac0c5e424e091b2877ed449a671cd20c12563d71c6b69d178d58d543da2a706df60061f56c9e1b3b1b793f3f1e9d SHA512 7700643feea3f29522b80605205cf5211b1a57fe8bef530d420a1860ffa7ed46cdee4b8ff671f9b8c029c592ce772a16776e082387aed5bb4f8ac8da56f27cd6
+EBUILD pf-sources-6.2_p6.ebuild 3227 BLAKE2B 1419c6b648085ae97e2cb69e9909871677f6ac0c5e424e091b2877ed449a671cd20c12563d71c6b69d178d58d543da2a706df60061f56c9e1b3b1b793f3f1e9d SHA512 7700643feea3f29522b80605205cf5211b1a57fe8bef530d420a1860ffa7ed46cdee4b8ff671f9b8c029c592ce772a16776e082387aed5bb4f8ac8da56f27cd6
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-6.2_p6.ebuild b/sys-kernel/pf-sources/pf-sources-6.2_p6.ebuild
new file mode 100644
index 000000000000..2ee0009ae2d4
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-6.2_p6.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Define what default functions to run.
+ETYPE="sources"
+
+# Use genpatches but don't include the 'experimental' use flag.
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Genpatches version to use. -pf patch set already includes vanilla linux updates. Regularly "1"
+# is the wanted value here, but the genpatches patch set can be bumped if it includes some
+# important fixes. src_prepare() will handle deleting the updated vanilla linux patches.
+# See https://archives.gentoo.org/gentoo-kernel/ (or subscribe to the list) to see all patches.
+K_GENPATCHES_VER="1"
+
+# -pf patch set already sets EXTRAVERSION to kernel Makefile.
+K_NOSETEXTRAVERSION="1"
+
+# pf-sources is not officially supported/covered by the Gentoo security team.
+K_SECURITY_UNSUPPORTED="1"
+
+# Define which parts to use from genpatches - experimental is already included in the -pf patch
+# set.
+K_WANT_GENPATCHES="base extras"
+
+# Major kernel version, e.g. 5.14.
+SHPV="${PV/_p*/}"
+
+# Replace "_p" with "-pf", since using "-pf" is not allowed for an ebuild name by PMS.
+PFPV="${PV/_p/-pf}"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://pfkernel.natalenko.name/
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PFPV}"
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_unpack() {
+	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
+	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
+	unpack ${A}
+
+	mv linux linux-${PFPV} || die "Failed to move source directory"
+}
+
+src_prepare() {
+	# When genpatches basic version is bumped, it also includes vanilla linux updates. Those are
+	# already in the -pf patch set, so need to remove the vanilla linux patches to avoid conflicts.
+	if [[ ${K_GENPATCHES_VER} -ne 1 ]]; then
+		find "${WORKDIR}"/ -type f -name '10*linux*patch' -delete ||
+			die "Failed to delete vanilla linux patches in src_prepare."
+	fi
+
+	# kernel-2_src_prepare doesn't apply PATCHES(). Chosen genpatches are also applied here.
+	eapply "${WORKDIR}"/*.patch
+	default
+}
+
+pkg_postinst() {
+	# Fixes "wrongly" detected directory name, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
+
+pkg_postrm() {
+	# Same here, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index c96b8dcd9cb7..4b7cfd2a96f7 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libnvme/Manifest b/sys-libs/libnvme/Manifest
index fec1f2adaa45..27bd5f5805b0 100644
--- a/sys-libs/libnvme/Manifest
+++ b/sys-libs/libnvme/Manifest
@@ -3,6 +3,6 @@ DIST libnvme-1.2.tar.gz 484397 BLAKE2B ae6b1c3aa8f45594219470059cfc8982674433772
 DIST libnvme-1.3.tar.gz 499870 BLAKE2B 5a019c12829890a0fe0b5e6aec5fbd009fc3bd6dfe7e81f61731292f4ea8b03044e7625491479350c399cc8cd5bc023e02cc9e93f1eba38f4c747667e84cfb24 SHA512 c874b29b73e55be842f71e74a226a76fcd50dfa72e2be100f0437bc83e740cd146b6d2f2cdaa940c11c3d8c48ff2c065ac0e8a83d4d0dde743edf4179f328670
 DIST libnvme-1.4.tar.gz 506101 BLAKE2B c1496c6258bf20ed4109710b06671fa7f0e27c7649520ad8ccf4021df00fffc45f80fea248d62d2b85eecc8b15b6afaf4a113d96d6737ae6772346c9d0bc1002 SHA512 cc4a0a78083471e912736d76e4faaa5c285e1149029560f212ff06254863e8f21b48fcb1638599bd68efcf888312a248fb748d23776af03574b39fbd9b2a418d
 EBUILD libnvme-1.2-r1.ebuild 1192 BLAKE2B dd05f5d1fba9e50117b24d66fea37d05d1a9d1f900206e419f3f3ce76e3f0868639aa2aadf597507767f726fa5c59376e9d51d6bcd1067d62e24b12069e1baae SHA512 b56d7690c6b71d75b27436d36a0f47dee76b8c3951374aaf58cf4794b687b6fa02b2dbe5936c8fa76390a65c1463842ad2290d4fb4b37f3601644705c3d49971
-EBUILD libnvme-1.3-r1.ebuild 1355 BLAKE2B 75d8ad6027f6f491b7e488c6814a15689d987faee3e9aab76f2809356e33ef0946faf36a8e97561f8479e29fac974d8f8086d95b6cd5511c5162a487f723ceca SHA512 4c4d3edf0bff68516f32b14af4197e137fde15b344d88a88a8bf8c51171a8dab2cdc40f1c1f65007ba64ae484b213b90fa94fdcb66b3a6753c7b78be15813d85
+EBUILD libnvme-1.3-r1.ebuild 1351 BLAKE2B 571a22422960fd0a7f5c2a0e16e367cb5b9ad9fcd543698b7aa4f320d24c5bb7cb4918bd858d9ebd144e24ec15e4c4db0a546aa773bb4ed023539314b01da3ed SHA512 223e511a5699cdef31b1a22d7bdd1bf757442b652f3dcead4a08e481524f963eb243f70cafa732165783bb32a7ad2d33baf1f379e9c18252f338943c472096dc
 EBUILD libnvme-1.4.ebuild 1397 BLAKE2B 20608700f022e705635032056cfc30a40549e98035ff6ffb7ffb6b5ac0b5fd2b8ad8de56396429b0ab36b60735bd8ee7300c73b75b0f1a52796cc65512c64dc4 SHA512 60fa846277fbf707d0099b15723c923eb73b27feb8edb0fc410dd3045bda89c57ac52607eb804013c418b99be64af4c32120ba757110fb3565fa73259f5f0837
 MISC metadata.xml 585 BLAKE2B 6163419190adb903fdbdef99ad53f8b14ffbc08ac3c8b56f820049468010af2a58ac204ded1b53c767759e9ac864bf85dbc3b723cd7113cb919194dd9ceaaac3 SHA512 2f5268b41676d2a61d5415de3ec62149cda53613970a1af6aface937cc635d26866c88205a6d9fcf7efd7df0c7f45308ecf5b29b6cea937966b765a222edb8f7
diff --git a/sys-libs/libnvme/libnvme-1.3-r1.ebuild b/sys-libs/libnvme/libnvme-1.3-r1.ebuild
index fe8743ba86d6..d5b333357815 100644
--- a/sys-libs/libnvme/libnvme-1.3-r1.ebuild
+++ b/sys-libs/libnvme/libnvme-1.3-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 IUSE="dbus python ssl +uuid"
 
 SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 
 DEPEND="
 	dev-libs/json-c:=
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 413be25fbb87..289009640127 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 96dd5c45f6e1..a4234871ae79 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,5 @@
 DIST chromedriver-bin-109.0.5414.74.linux64.zip 7300223 BLAKE2B 2974008f430e18717deb0415ffa24c7022536d87da73026ed4a66ed45ef92dde11beb8c12a6e01958a8fe6dab144d78b92fe05481810cc843ee6e3c1ffb7885c SHA512 581b3f13a935ac719e0d36c91e5ae247befbeb247e126a43c5e7b0c5735c786e5b1fc89a938383c822d6ee375bc4a6948d7072ad31df70ab6f9d4379678210cd
+DIST chromedriver-bin-112.0.5615.49.linux64.zip 7079001 BLAKE2B 6b2489b8626ca1aaf128c8d05d51bfc6a6e1024ec1a3d06f9bac6e4178fdc5b91793b7d508c624b8fe6735a8a9e3a1403d0ff9c67a5322fd45312b4ae86306f6 SHA512 ca08f9e2ce6308ebe6681b3ccd90ccc5fa4deb5e03c4ab680cde3fdd2d3706ef54db9f95480f3d9b50c382d6401df8335f3a8f653962c6b2dbe1033296cc3e28
 EBUILD chromedriver-bin-109.0.5414.74.ebuild 604 BLAKE2B 6e6ed41ec8e0ce379052733d3eeec09f5dd4e8ba8b0266102662c87bc7e42da037e41b51b6d0367d0c99503081487e8bd5dad94c4cbb9754924adf7913609510 SHA512 71c6f5f2dd5039b8a98795ac72f48fb49957a2a2d9a8ac5bd45496909c51d2bcb67c56d0de54f4dab000d497c702c79c3d4b04b42822a41e95f76c1b35c082aa
+EBUILD chromedriver-bin-112.0.5615.49.ebuild 602 BLAKE2B c922df4a3d1117cb945d51bebb0bf2ee40145ba2e9d82380e4261c6f4bd732529791e6497c206d58fe7c4eefe0c70bcce2d6c977e733a1a42fb6308c6c4e7c68 SHA512 0775320092fc559a1c7ab0e4ba53f8e2f015fccdae25f359c79011243ed289de0618717766a061c813b304154c77689b57b0d29f157a808d670de0de7694f69d
 MISC metadata.xml 461 BLAKE2B 4e6e0fd9bf732be9040a4defe4dc1ca63ba7e1ba860abfc97ad487d6220f7bc5cb1e304d001409cb866408fdf393ca42f3b95eb9b8dc258a0627aaa978f66e6e SHA512 3c9217fe5af26ee8ddc705edad8a32604d542ad60c3e78ed8aba9e08a5bd2b3508234e42710d4524149f8b7626bba08f83cb96f7f942fe5ccdfbd8bd98908bec
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-112.0.5615.49.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-112.0.5615.49.ebuild
new file mode 100644
index 000000000000..9643ffbdacec
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-112.0.5615.49.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/corp/chromium.org/driver/"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="amd64"
+
+RESTRICT="bindist mirror strip"
+
+BDEPEND="app-arch/unzip"
+
+RDEPEND="
+	sys-libs/glibc
+	!www-client/chromium
+	www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install() {
+	dobin chromedriver
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index d2568f1fe28e..7c8e6e7822fa 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/uget/Manifest b/www-client/uget/Manifest
index 13541c1db651..bc6ef8b64d01 100644
--- a/www-client/uget/Manifest
+++ b/www-client/uget/Manifest
@@ -1,8 +1,9 @@
 AUX uget-2.2.1-ayatana.patch 1014 BLAKE2B c9a0d23d0f0f3e0c9dba59278db37e86276f228abd81af2156e31542004821477c8934c154b22699d443f0e8305339b4eef80987496f6bd718e176102f476cd4 SHA512 a35673e994181d5feb96f61741b8139a28843f8c97446fd5b991ecf92e247d58037c331d095987948bb4a6bce7922e4cda0a6edfd2e251512409c10bcbb6a37e
 AUX uget-2.2.1-fno-common.patch 144 BLAKE2B 107c0876bd4c4813836c7d6a4a87ac1f14eb03b2b0bc60af87346d25545eafb79899a781e195a6285d3c0856d026f0f169a71d4e3491fe709cfb3981a30eee31 SHA512 d92104b3ea8af9f66e09e2de78c7d12ea0b4655dabe1dcdd1f3bbdc0bc78eb2b4fb417430a3b16b7c13826d7fa467e634bb026289d6102d380c05e798d692309
+AUX uget-2.2.3-broken-curl-check.patch 481 BLAKE2B 5111be159cbad88b863e050f4fefb314fbe7fd910a64dc3c841f4ea7a2cf66d9b5c800ab384e2ab3495a6096d12d5f4289b61fbca09f827d5385614424c29460 SHA512 5a53d5e1c457b57ac6c9c79b7a07dfa5de8865d9df3c875be5581e2a9f216b9116fd260a15292709e253b759668791899bc58f4c2d0f96fea907090b61f9fdb6
 DIST uget-2.2.1.tar.gz 1006697 BLAKE2B 2580cbcbe12d3001ada252a46358c4bc357fbe2ca4e3433e13ad95efb8e99d567a194db024eaf2ba58246a35937a5262be62aac4ee24272421f531dc72eeab20 SHA512 b76e5240e42cd0aa5bc47eb1a9cff0a0d8cdea87995455d72cf925923321f492200896ad904960e7f7462eb9655284f5b295b8a779b42223fe73a098a143576f
 DIST uget-2.2.3-1.tar.gz 1003976 BLAKE2B 1b599c9c5ba4cb5929c211c35382b9dbc6940e52bc995f150632dfc52f1429d26e15d330f53d1da9bd1ef296368cf3877673ee3fb5ab3f33d5ded4cf86b7b3d2 SHA512 a2359200486c60a79d53083f25c627d70f969880765e5c38897e7d35e94540c59e45f294dc10b0863ae812c449d232ad230cae90bb5e0ebded9bcabf2b4b7725
 EBUILD uget-2.2.1-r1.ebuild 1201 BLAKE2B f91f072bc18d95790b342a23f0b9d6597b1dc3e37bd68366879ff5dcf6b775cefc9a46781ccb4c763927437be975b89902964dde50b7ddfa5777dbe5f7e5491c SHA512 6a8beb90155dd1430bbd6844d0e7c94f50a0c108118737eb016ce92931cecf7dfd3ade5ccf57309f395b4e4fa38e0b97d5ffec020199e593b8329efc286a1d85
-EBUILD uget-2.2.3.ebuild 1357 BLAKE2B a0886550ba3d22143fec2899341dc04b5ee113e8099048f3e4c35061e22bad5febc25eb8c1a42b5f55abe82ae3ddf8df90a14854eed37dab424a8622c66feca0 SHA512 b0ceed964b257977289b243cdd47ad662e1f217bd6a13ae5afaae7d4bb89f632953f54024935f6d01eb85acd1e3ef8f186770d94d3bff19eb767749fe559c190
-EBUILD uget-9999.ebuild 1305 BLAKE2B 166f805706bf8c6f4ad7cb500d560dd858e2d8e6b595e475db32c86080f84211aa44dc096440956a745a26aaa049c502c0f8d6ce02c105bafc0f29743e2da6d1 SHA512 6f471f467fa7e8367b4b904bcbbbf7b1b600b1e2a3ad244a56a037347c8fe19f5ddf0fe8bee8e55a30bf6d4c08b1cb52b6e04094482346a7a0098037c1bece29
+EBUILD uget-2.2.3.ebuild 1408 BLAKE2B da4634266ef72dcb876a89a23cfddc0625acc687598d1cc26182f1a9143a69d6f5a668f767113c21db3d141a48a5ff724c6964a3bdda35bba70d0a1512072013 SHA512 a24b7d38896eae8f646d8c87ecdf5b4c5dbf430b5375b3f142bccc1e49c90cb4fc9bd44f36570ab6af39d83f9f114b405691ba87dd4af996750adae907b07a41
+EBUILD uget-9999.ebuild 1356 BLAKE2B 042efb7721976bb7506cd57ff48e26df3d9a3e1b52837bb1f87eabb66159bb8dfe2565a12c1b055fc16b7d21a73f5038f0126dac0d12b35e32a203328e322b0a SHA512 b089f97cc9b7743d33ce554076e09996c930db8c090839b7ca4b5ab1e8b65352f7efe552904c1fffc5662626a6da7c417c6445dc52e64cebb5de24219bcda9e8
 MISC metadata.xml 919 BLAKE2B 368feee8fc4527843db82e6ba32efad61ab47792305485bc795dd2639a24ccffb311a1878fd7d823748d3b74307b7010bd729f1fee9cc993ede35de20de01b2b SHA512 dfd6d9f5d86699ffb1c0c1a1e8850d7b22935f1bf32a73ee39630f7641f42881180a1325eb2cfb580871e5aa1694a6d1a7819e651e1ab0f47ae1c463838c341f
diff --git a/www-client/uget/files/uget-2.2.3-broken-curl-check.patch b/www-client/uget/files/uget-2.2.3-broken-curl-check.patch
new file mode 100644
index 000000000000..c8e37abeca97
--- /dev/null
+++ b/www-client/uget/files/uget-2.2.3-broken-curl-check.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/872080
+
+This check can't handle curl >= 8 or non-bash /bin/sh.
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,11 +81,6 @@ if test "x$CURL_CONFIG" = "x" ; then
+ fi
+ CURL_CFLAGS=`$CURL_CONFIG --cflags`
+ CURL_LIBS=`$CURL_CONFIG --libs`
+-let CURL_VERNUM=0x0`$CURL_CONFIG --vernum`
+-let CURL_VERMIN=0x071301		# 7.19.1
+-if test $CURL_VERNUM -lt $CURL_VERMIN; then
+-	AC_MSG_ERROR(Requires libcurl version >= 7.19.1)
+-fi
+ AC_SUBST(CURL_CFLAGS)
+ AC_SUBST(CURL_LIBS)
+ 
diff --git a/www-client/uget/uget-2.2.3.ebuild b/www-client/uget/uget-2.2.3.ebuild
index b64f27cf31ef..7838c2e3a254 100644
--- a/www-client/uget/uget-2.2.3.ebuild
+++ b/www-client/uget/uget-2.2.3.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.1-fno-common.patch
 	# https://github.com/ugetdm/uget/issues/49
 	"${FILESDIR}"/${PN}-2.2.1-ayatana.patch
+	"${FILESDIR}"/${PN}-2.2.3-broken-curl-check.patch
 )
 
 src_prepare() {
diff --git a/www-client/uget/uget-9999.ebuild b/www-client/uget/uget-9999.ebuild
index bd1d745b7b0e..2fe8e367fbcf 100644
--- a/www-client/uget/uget-9999.ebuild
+++ b/www-client/uget/uget-9999.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
 PATCHES=(
 	# https://github.com/ugetdm/uget/issues/49
 	"${FILESDIR}"/${PN}-2.2.1-ayatana.patch
+	"${FILESDIR}"/${PN}-2.2.3-broken-curl-check.patch
 )
 
 src_prepare() {
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 33861c0e5415..b0a93c5e6a5e 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 1d44797bedcc..6abd7fdc1ae9 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -12,6 +12,6 @@ EBUILD puma-6.0.0.ebuild 1890 BLAKE2B 701c88a61bbe44e2b72fce75921043036f3defe7fb
 EBUILD puma-6.0.1.ebuild 1890 BLAKE2B 701c88a61bbe44e2b72fce75921043036f3defe7fb66dd28a34afb42574a5bc05cc8d410903121a404be3b359cae9bde25ec7a59bbf447cf7ab6a51068ec1b1d SHA512 f8b81ac9e7432339cd8c0297ee4271eb4b67e74feaff9a999c70baa895a4fdc90355a5397db02c8b7b44a7d4fbc1d7c89dba02824a144183a01da2d5c89e15a7
 EBUILD puma-6.0.2.ebuild 1890 BLAKE2B 157dae5ba217a3d4814b9ef1e3c08e633d04d48970783c3446cef4ac5497d0f0150630c4607ec6479a9d45e3e4e1880793084fc04189c6e258a5f30862265cb8 SHA512 a541171cb753ff342604bef4a460b969d74ba3751c3c57a62a0b5de87ef07acd1821226411bcd6e889ea6ece386ad687ec0e675465eb957e05d2d08001d2e486
 EBUILD puma-6.1.0.ebuild 1932 BLAKE2B 9e29e12283d4b906c4c1876719463f1a1379852bfddb4193a1983dd7376b664fa4bf6965a2cf3984dab011418ae33c33d2a582472b9a583c3d48b3fa3ae11549 SHA512 e9723db022c6a926fd02dba8ac760845d1ab475eb5eb4a999c24f87e92b9baa9b852d8976d14012dc9874bdd1138c225f72e4eef59cdb825efef4658b5d7ef0f
-EBUILD puma-6.1.1-r1.ebuild 2022 BLAKE2B 5f6ec3942912418db73071fce20eb77301cb3b48ebd29fd421ba63252e03b9186118d466f3e3a1e131ec13ed7e4e8f543a569ea00441ed79b8b911dd0962c4f2 SHA512 8e3f46727a18223f7816e8205588bc13d61fd7ad61afacec7efefa615248fa0ce746ccfc55c256d2ed5322c87046f2024580874a7099852a2863190fd0ccb399
+EBUILD puma-6.1.1-r1.ebuild 2041 BLAKE2B 51dc8425328e7a75ac4c92de3894dc0591fb9f25f8b4a6a399f8cbe71c4a89a778a4c7ebfb1faf77b2a1050482b3b6a602a74e864cb32f68af03ba8d808678c6 SHA512 8b546462d57810ac6000f6303181e0bf43143ca9e9b79423a4cd727cb7b33eee3cbeb90198b79ee990a36aaf9bc790e4f787e854ef380a265d306093d5adcd53
 EBUILD puma-6.1.1.ebuild 2047 BLAKE2B 4e3ee978e4dcfca58044b8da76e0071d7244360a126344bf28c8c844219cfa7d6e6a85c1a139a963a550fee803aa56e383a33041a0567c83d109c224affd8ac1 SHA512 5086424da2c1b596008311679127c55e8dff32d1e5c74e2d552efcc6a5b0020f67f169c52db75f995d40022662207c1aedbfcf7014d1403d1cb24b0e7d79f11f
 MISC metadata.xml 710 BLAKE2B bf109653812999e453fb414a83bf404786d16df301ba9dff87c123e0f1dbff8e3024109e96b7f36a3d9e1ebe57eb7aecc7acfd923f0de1bc8c4f358a87b32379 SHA512 894c677c61b3c7f8081b1511c64c274497c4ea85171f5b19d9606a19e4dff33df00d169653e3aede3eee07737b1cf9faadb812eebcf67292be68150c026b7f8e
diff --git a/www-servers/puma/puma-6.1.1-r1.ebuild b/www-servers/puma/puma-6.1.1-r1.ebuild
index 4d5269c1bdd0..4410ee0354d7 100644
--- a/www-servers/puma/puma-6.1.1-r1.ebuild
+++ b/www-servers/puma/puma-6.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
author	V3n3RiX <venerix@koprulu.sector>	2023-04-07 11:29:55 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-04-07 11:29:55 +0100
commit	a17b25a10359070f9527893d861369d378021aa9 (patch)
tree	02188942c1da9eb507b509fbd36c9b7a5aff86c8
parent	efbb52742172c497c5245486906aade0fb6220e8 (diff)