gentoo auto-resync : 17:06:2023 - 07:43:56

author: V3n3RiX <venerix@koprulu.sector> 2023-06-17 07:43:56 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-06-17 07:43:56 +0100
commit: b978efa000250668b2befa4e2cc96e0afa137611 (patch)
tree: 0c561efed9b15c17a9d3ef926443f35c58dfb48c
parent: fa5e8e92d94ea9de5d49a1f5ad19abf7272503d0 (diff)
313 files changed, 4661 insertions, 2685 deletions
diff --git a/Manifest b/Manifest
index d2ebbf8a226b..b370a2e4f811 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29260 BLAKE2B 20b66b63175dfb45d63bd9ca78f6bbaa5fbc8318d97c5279e28a7da4f93f8c11e5d128065c4410eb835320881699a8f6061e874d7826106cb767e323ca75739e SHA512 0e16817ba347652bb228cd6f05818f0b33dfe64bf703cbea46e4a10956246ec721578cb303afc9a760941c9739e6b72816432192603c5dbdd689a940ac7cec57
-TIMESTAMP 2023-06-17T00:09:52Z
+MANIFEST Manifest.files.gz 29302 BLAKE2B fcf7e2fc484a5e1c09afdfbc46162b0134a2118e148da9d92744027eaec3541a4f79582255d6bfbb3764f9914f5175bd58c4c8e69cb35bfaaa77312d83c419ef SHA512 fa589bbf61523d182472b6d76a2badf2e3ed2b3f3b6772639214a436dc2979e61a279e9960ef5571e6ef7a027a54cc0e079d25468c33f6de2449fbe2ac8acb5c
+TIMESTAMP 2023-06-17T06:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSM+dBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSNTjNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDXEw//WbUVTz6dNhcqkkAbp0S/ZaZ44/BeE2yN2fFlFhdAEYa6KCryFGFU9Lt2
-LZpUL9v6c4Ru7opTJhdM0y5leOA56re/HtjCZhhnDu7B3IliaUyFfHt4LvQmp4Zx
-/mpc7cau6gWR6uI7rzSXfFAvSUviqAyKbdTsUjOhV+rwtFXfwUoRkLpsp8MNKWd4
-zuHRT7ThVh1E7TC3+MIlMoRbc05cqnjNdV3t+ChLG/HIOIhEj9TEqaq0N1zQAc2X
-owlBOTfjF7Qu72RZe4+/KDR6QxZedDEZM9ziEV9aXWphGBd4BWIgd/QkMLpod6ua
-ATgCsHYpVRBvBrjay9Hx6byLtdsvCMGJVIsj+fBNBJYg4k2sJa4O2h/mKutfILqg
-BBFfsZphDooHWH8Rsc2lDyPQTKF4NU62PtLgxkObZcYhuY4a2VJmgaftsgShxzDk
-n0WHLrNqhVGySjNbdQ+m3tI94pN6Cuxf1SU+cz9Kh700mxBMt2DkTo8hHInXk4+A
-jF3/e2l8ZePeMXkC0uz3KUNdNyDE1QIuYETNIp8Wz+ts4DjeT3K7Zk80e4Dn9c0/
-PLOCL/nxEmM+wtR0C+y56lvc8SfFOyUypBPkAOL18BKBczlgtglQ3XDsjABk0PiK
-HfTXaLn1a1z4N62vrdNjPk/h6aaZrVCHW5wkrEZhcwv0BcB6wRA=
-=VejD
+klBx1hAAqgk/8KzmOoxDImtw/DSYAcK04GzQwGP2jlReyw3/EYwz6osUpyf5Bb/G
+p6pTUMz1uYiWX8Q7VjxTA8rP4hAe8ZepvdQHdusqGTUibdcQSb6sJt3g/c4Z4smI
+rH39Bk6axZCPvcA6uQ1CPBex0voQHqwd5T058EX8HM0gHpyNaAd1KjsjmyC0YVC4
+scRhN0Ezy1vzYnBk+knfxtLApX1thvT2xQzpWTNq8AYiFkcjV0XppqotkS/S3/V2
+jn0MSvqV/ZALucnOfB27/Hv92mq5tPkETAfK3uSM51vjRdnkRrFefK2VFKJJK5Vu
+J6V07AqHTFiXwuoYiCSUenlYbsKoFxXh66f57ciaDl1sFn4jBcjBCzTcCk3o0pO6
+ChWlKwiHJs1o9yo6r124horXqtSYcNCdH1ASDt9unnwYlAOtVaYKdIwp6wIFPun4
+8Z0pq1R7Gi+81WXoJEARo1Qsg5Wpn9+uhQ1l7Diva6lfcmNFLms1s0zOLCuY3Bes
+UiepKul/RTAooHm3/w56NhgI64/Vz48VMuk7DINnfbZ0OMHbxeENbOfcwUpzF9wm
+VLUn/vp5fpAwBkL3tvh7HZ/X5Rd+OZynbZt9ID4Qs4LH+ZRsCNZtbG7ctCT+TWIA
+3MC77IsER1yu0sjnPDWADcNXGV1qZJCvVW4z1fm7ujnxrvZCo6s=
+=dcIa
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 069f4bb34c29..b762c71093c3 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 6980b024a4b6..8bdbdd96638c 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index bb5d67be93c8..7d58d41b0d20 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.27.151.gh.tar.gz 2433265 BLAKE2B a26710e9af6cca92db87394c15415ade
 DIST aws-cli-1.27.152.gh.tar.gz 2434279 BLAKE2B 4c7ff9c0df3aee2eb8d195941f0d443a0904f7becbf6d9484425d940ca2f686520a28e9ab196a634663f6b1662905352ad7548ec4ba2bbde770af74970a5bf99 SHA512 8039ff55f967091649e74f4a827044ebddeff7beb28cc4bc47ed817941c64cd6f6e274c705fbeb49ce58331514b4bc4b6622689f1740a6ef676983cf0224e942
 DIST aws-cli-1.27.153.gh.tar.gz 2436062 BLAKE2B e9351f70b36ffb15fcab233ba2c6845675749b34a16ddb6baac25acb712f7ce42fa531683684fa7deb4bde38c896eca6f5e47d6637f10e45c56d7e20eb99145e SHA512 6e48dfed4c7d09acc1d567952e921a926ac2a63cbf4c0ab27856a17336cb517157ff5e7a3685b9f6c7d2f2edc2aad7dd52079ac3b5cbb13ad0da65a772dc3099
 DIST aws-cli-1.27.154.gh.tar.gz 2436624 BLAKE2B 79f55cc001ba3286a125002304c350dbecc6582b0e52b1ab1c1460b15406a82b397907ab11c7fd92c0db4e952856cf6f7b2c7a0022ff4ddddf836b5f49a86461 SHA512 366ddc5274631c70e2e5735ead4d54cecfdc7b115d8168aff6fff25b3f842731a2938cd66da1c6897833fae7ac534945c848551ca5a07c7a52fe7d6f9f2b55f7
+DIST aws-cli-1.27.155.gh.tar.gz 2437165 BLAKE2B 59a757940ec6999567f1744d147078acbb3e0bf02390e40452d8a9ad04748d29d88e8bca70a666a5d7ed33d947f8a77433028033d732ae962f927dc42a799d9e SHA512 6d1cb53fb2e7b9b724bf9ecbbaac3549fd44d33134f1060a52d67867cbca935304bce440f99c92adedbd15b2295a2753df79e83b660b0d415a95ee10c1cc52d7
 EBUILD awscli-1.27.142.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.146.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.151.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.152.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.153.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.154.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.155.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.155.ebuild b/app-admin/awscli/awscli-1.27.155.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.155.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 141023498aa2..cfe71ec70b17 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -4,7 +4,7 @@ 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 7398 BLAKE2B 34cdf8e3ac4d0fa63f435d831ff572fa9afab5974f2910c4fd16bc3a20cae3a081cd59ed0d7fcd62f60086c338e69803ec80426087daf424ea3522354e9f7c17 SHA512 7ba2341ddfedc10c267946eaa33bd6c694c1429508b1e3dfa52fbe04a61eae17cd2801784f294da4f63f80cc745d66d80f07d7fc949b6d96a990926dc25836f6
-EBUILD sudo-1.9.13_p3-r1.ebuild 7474 BLAKE2B 4a8b0aeba7ec24fd0bca81006c031fe1796efb2c086819153e878f2a009c0dfaa2e883a8f89c2a6a120679de765579c060430387b5bc3c538f626c82f6a52f4e SHA512 98474e772bec7f0449be59d5b81c8a598194c06109707e75b830e9788fe3cd7ffb96b590debc61c92776f390df409065c89fdbf2c687fde0f3cbab7d6a0861e6
+EBUILD sudo-1.9.13_p3-r1.ebuild 7473 BLAKE2B 0e205ead1a48b6884df5f7f827e4278cb5dbfa8743857fe880774ecaad7fa1fe629fa72e661d583528d5e361b43e0d923a7a4a6543ebf6651f965b0fcfc16492 SHA512 04abe98851ba527addb15b79c2a68acce47a3e17b8dd2900f925f3dc5d6c44498bbca469f37856519c0be0beb35e34035b9daf8c30b29924f84c8f6912c987f5
 EBUILD sudo-1.9.13_p3.ebuild 7398 BLAKE2B 34cdf8e3ac4d0fa63f435d831ff572fa9afab5974f2910c4fd16bc3a20cae3a081cd59ed0d7fcd62f60086c338e69803ec80426087daf424ea3522354e9f7c17 SHA512 7ba2341ddfedc10c267946eaa33bd6c694c1429508b1e3dfa52fbe04a61eae17cd2801784f294da4f63f80cc745d66d80f07d7fc949b6d96a990926dc25836f6
 EBUILD sudo-9999.ebuild 7406 BLAKE2B db5807280c13b6af566ff9b4fe52ef59a84af4b83c1533e61756e2f070b79b39280e8c119cba4722c5caec2e0100054fd5e91144c3d02c4eb0d2a3d4b49f8fa6 SHA512 6ba837f09404f3db44fae8d30153d58fb7ba88f7542c3e0548593cfbe2a62d849582244098023103c0cceeb6342774a279611bd5357d07179597646b424e448a
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.13_p3-r1.ebuild b/app-admin/sudo/sudo-1.9.13_p3-r1.ebuild
index 94779d70a22d..0436ce0971cf 100644
--- a/app-admin/sudo/sudo-1.9.13_p3-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.13_p3-r1.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"
+		KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	fi
 
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 82417259f16a..e9595e2412d3 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 1d10f7f487b7..62330cb40299 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -7,5 +7,5 @@ DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c7
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
 DIST cpio-2.14.tar.bz2 1521004 BLAKE2B f2fa9f5bc39cd91f4755fdf27f43cff4d1c1f098639502689a01314762ad686bf357a1eda7f92e4c802e6e8335548ca31fc789cea056ef685c558892ddcbebd1 SHA512 2dc93a81e31b6fb7ff9976243d22ca7a84bb396c7ad09e0abfb5d5efae1164ebb319fb89be45045797f8c604b3e3d2ea0746e3cfe559aa86282ea4ec9a17da28
 EBUILD cpio-2.13-r5.ebuild 1470 BLAKE2B b386190f7ae374d4f85397ee78e2709238781b68b254aa41241bec7badf05e8e50a27f2991488289c6673ec4f1b252cbfdac725e99336121e2a55f31ea4cb17b SHA512 a1fd85b530866ab34a315fa76755acc65d5334eb1be32904e31e99ebec97ceac94737cdbc28d2df11f0c919d85f9c48ebe5d3b0d6980942cd4e262f2520883c3
-EBUILD cpio-2.14.ebuild 1152 BLAKE2B 327dc590f2a7ff1f3192ebcd244aed2ed9f3e32ab12125824d54db31f70c969db4ac2959d372801461b91ac49d7c73c66a4074b8088e2df4b61f17ff9edd1767 SHA512 f43c229df6476a38db0eed90275472fec4b6265cf15e3876dd37c495009f0b9b7fae7a01366723470007b76691ede66b58234c14a1be8cacd1e9dbbcac08e163
+EBUILD cpio-2.14.ebuild 1150 BLAKE2B 258569275bbe46daba92604e88b5e3e084e80563449c6dddaa38b9c3a2d5c4afed5c4be8774912a77f8b69bd8ba148ef618e002afc3543e7d88db79913f1ea95 SHA512 5fca6aa628a0caea1596c30f0a87b9e8982b336330a873e4111fcec261b9e33111f64330ccd79a9697fbec3595f96feab7fcd95aa3cafe9bba15c97bfbb76ec4
 MISC metadata.xml 328 BLAKE2B f8b8bff5b160351a92837553de20eda1da31a6c0594c1118e1f71b3cd19d9ea8d3420bdce943d83644f5ffc234950f95fb9229a213660767dc5281120085b26f SHA512 08e1c6a03b894946bf6332bf46c8a7534ed0998777b30cb9eecb9c746bb333b65fb41dfeeb6938cbc08d0ad0a303d752ea70a6a6a6ae2c5c2935b2b4e4d9928f
diff --git a/app-arch/cpio/cpio-2.14.ebuild b/app-arch/cpio/cpio-2.14.ebuild
index 8e24abfe8c9c..5aa9d05c169a 100644
--- a/app-arch/cpio/cpio-2.14.ebuild
+++ b/app-arch/cpio/cpio-2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="nls"
 
 PDEPEND="
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index d09cf49d8ae5..b376261e08f1 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -10,6 +10,6 @@ DIST xz-5.4.3.tar.gz.sig 566 BLAKE2B 1e3f86a2de532e77cae4c31928d57edeac81ca207e0
 EBUILD xz-utils-5.2.11.ebuild 2861 BLAKE2B 2f82998b46a1459000d734a6f826985331550b7d781ee6a6aef857d5f13c8f04973d3097ff292a3923b3e77c5ab0841009229125a5e47797b05da4aec640ccfc SHA512 37e4ff8983501593b5d1f528c2a960093834e57e647ef9963100aa876fde49a0534afafcce83ab2edded61307b885eb30fe33b972012361dc8f703b96a390a33
 EBUILD xz-utils-5.2.12.ebuild 2848 BLAKE2B 7e6c6dd50418e2a374edd75b4a4796d2421269e64dccdc51294700413301fefe1a3aa60a64580dd6f797aabb39122a579b5e95b80a68874110dd3960e063139a SHA512 a2a3e2bbd23295c2e2c9f05e495a7cb24b43a52e7cd1f440dad0dc79ec4cd5533686b407f1c8cd6c66ec697342e620841d50c8e545e0852003d13aa566c93d7c
 EBUILD xz-utils-5.4.2.ebuild 3178 BLAKE2B 855fa2339a86f5bc9ac2f5586a1c027d0ec9f7f62fbb159dc54cf05d5cd86dc408cf510aea3bafcfeea3f08cbaab5a998e65165dd5f3103a5a9ee6e9db72e0eb SHA512 eaa9b7aaf79ac42bc2ce22c713d7206c594872e31c66873d3c0e7560698d84bb9a629f44f5be6f2fb247ee9eb8656618af1f1902d750663d4b611fc51935a703
-EBUILD xz-utils-5.4.3.ebuild 3109 BLAKE2B b46142678c3fb5181c1c085cf9caac6c6b898f916d4a687545975d822bac60f75eacf6ef92d8f100a2c89cf9a44852fd2ca4e84004a0fbf0a5288a9f2a00f0e7 SHA512 244d9b2d6ddb4cd53bc92446b7f4b42f12af3e497478f1cde97c34c63529069304aecf87373d8fa342de8868c9fdddbafea4c498662f1b51227ee9dfd72de683
+EBUILD xz-utils-5.4.3.ebuild 3107 BLAKE2B 1d169898e50f179242d4775bbf0a34dcbbd3ebee7ebc1338956a864dc7c0a5af0de2db7c932278816a961c362fbd8ba949c96c3d410e002747d1ab71ba35fb2d SHA512 6440b393f320e8f3946319e5fe3fd1a03a6b2c098d3b1b5bda50586dba18b9ecab987fa103b1a7ba5a9c69a30bddc35ebd1dfdd6c964b73d591641e2376204ff
 EBUILD xz-utils-9999.ebuild 3109 BLAKE2B b46142678c3fb5181c1c085cf9caac6c6b898f916d4a687545975d822bac60f75eacf6ef92d8f100a2c89cf9a44852fd2ca4e84004a0fbf0a5288a9f2a00f0e7 SHA512 244d9b2d6ddb4cd53bc92446b7f4b42f12af3e497478f1cde97c34c63529069304aecf87373d8fa342de8868c9fdddbafea4c498662f1b51227ee9dfd72de683
 MISC metadata.xml 663 BLAKE2B 7a6625813cb3bdbab8a37845c9c64ac53ff377db394f776357d4fff60fbfe7c7b0e954fdc15abcc8874dd6c0f9ee90bc6e179a00bc5d12cd2e7cedc6f998c019 SHA512 696e573853d5d401f22079492d8e2b5f3c27e9ec4b6095f5ff46f109366b1c65c11976123abed06f302b8f03aaa1b0c54884f0156fdfdce23f4bf28feaafd39c
diff --git a/app-arch/xz-utils/xz-utils-5.4.3.ebuild b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
index f2b9287eaedf..b0a9b63e9760 100644
--- a/app-arch/xz-utils/xz-utils-5.4.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
@@ -35,7 +35,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index ded548e2cefa..b87d5d6c6578 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
index a5512aa9f6b1..89f4d1531846 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -1,4 +1,7 @@
 DIST aflplusplus-4.06c-patches.tar.xz 4360 BLAKE2B fb59065ef610e87d8bc822513822c150b592e0cdcf4f8f2d861b5dc4a5ded49a03b4ccc46636e24d69bdcee58f6882511f25a04cbc02565f9435c47be1b0829f SHA512 251db964ce6c7e1f59c6c1a8383c1fe4d362c7d336df4d13f0bc1f3c8583494e2b9c9f160fdd544174cc784afc1ae100310109d0d6a30c361b82f3ab50350afa
 DIST aflplusplus-4.06c.tar.gz 2859398 BLAKE2B bf26d6be364d01f91a5b60e2bca1ab48e2fed04571bbaee2fd74c31af1c3d53295808c5372bda8dc941232349e9113e09f2d0e8cadc5917fc4fc52e24bad9d60 SHA512 b585b244218e70e1120a81a5fbb7401d277174be13c5d5d507130ff7a7b25723ff29c2b3c820466ba847ff53ef016b23781edaccdfcdce904f6b93ec4d860140
-EBUILD aflplusplus-4.06c.ebuild 2052 BLAKE2B f779548b9fb4ab8ffcc36f83e6d06c8a7f786ced57f8aa36abc8a8416dde9f122a1eec7e99b705ae0c16e306a7f149f1922d93ffb51a82244d427333f39841af SHA512 961f9092fd3b0c058ce3d21b43e29b7e2b33aa2f708995c7af3247f9709776bcc06fe4ea1cf12f588e953a16888d58f7987353e16e53157b024181c014e00951
+DIST aflplusplus-4.07c-patches.tar.xz 4788 BLAKE2B de109198fbabfce2554459fee6a14f66002a952f5584ff265a6ff7d7646f520ed53a6d9c8c125a05eb5a4aa0c1cc675dca82647ad4c0965cdab10d3aa2f09467 SHA512 0ea4279b261d55cf209e32ca4b7fd7dc1181ec902dd7e4c7f36854d84f14037e643a543dcbb849927b41919c527303fc5877c9fab5b09c8988fbfab499b8f8bc
+DIST aflplusplus-4.07c.tar.gz 2878659 BLAKE2B c3c4c5507e29ed8015784378a13a55cb6b389dec915979749b1869496c16366ce876f1eecc91eb09d51cc58266a92296218cd5eda2a201f5cf4faaa2ea61942f SHA512 c62fce112d59ef5ffb847adab9a7ff8486d44e6316a391392979da19a8160b55f9af7f75fd39cdc98997b3e166f4f6a33ddf31b827c9414a1392657701ecb5e8
+EBUILD aflplusplus-4.06c-r1.ebuild 2052 BLAKE2B 1704ccdafac548a426c167aedfb0374e57afd170f89f2a2da354ae3c2cf5eedca6848e016bdb394e7b3607fd7b6bddd87d3b7334ffeb1d647b66f601feea6060 SHA512 091e082736086528360a9f2f048232cb5291cc5953b7dfd0ead4c8593f68e0fbb7ca2badd847f81b49b0c0b4795730247006d76f9f36513db3e8d0ccf1587e9b
+EBUILD aflplusplus-4.07c.ebuild 2086 BLAKE2B 1c7b2065d91a42d80b04610066846e2f260c59be78ef47556dec63c43af3b9d8eb71037c64a35ad687bdd6c2a84979d0e8108ec70d8ff05e0fad647ed6c64335 SHA512 62566719b60baff76019cad37e5cc1bb58d86b4fe92c2e7b11693d98d32607d7ea985a7d06b38a1bd451cebbab9eec0191ec2eadab2f8c1f6072127c281cc124
 MISC metadata.xml 328 BLAKE2B c9ad582740e9c2ad03a30fe0eaafb8ee19f0d9bc2e98cc7bcd14385a3407f84301479d324b92d3aecafdc1e5cfef1d2cfc8a15c2ecb5d8f2fa348d82de920128 SHA512 e56ce158f6764926c2ed4dc486f017ce75fa272ac8e6ad16e4a816f8c734d7313e3dc9cb007bab07efe73e59cab185312a02d6178296bfe25002719ce4975d14
diff --git a/app-forensics/aflplusplus/aflplusplus-4.06c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.06c-r1.ebuild
index f86e69395a77..e7be31befa79 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.06c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.06c-r1.ebuild
@@ -27,10 +27,10 @@ RESTRICT="test"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=sys-devel/llvm-13:=
+	>=sys-devel/llvm-14:=
 	|| (
-		sys-devel/clang:13
 		sys-devel/clang:14
+		sys-devel/clang:15
 		sys-devel/clang:${LLVM_MAX_SLOT}
 	)
 	!app-forensics/afl"
diff --git a/app-forensics/aflplusplus/aflplusplus-4.07c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.07c.ebuild
new file mode 100644
index 000000000000..0cc23849eada
--- /dev/null
+++ b/app-forensics/aflplusplus/aflplusplus-4.07c.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+LLVM_MAX_SLOT=16
+inherit toolchain-funcs llvm optfeature python-single-r1
+
+AFL_PATCHSET="${PN}-4.07c-patches"
+DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
+HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
+SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${AFL_PATCHSET}.tar.xz"
+S="${WORKDIR}"/AFLplusplus-${PV}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests involve heavy use of LD_PRELOAD in some cases
+# This isn't compatible with sandbox
+RESTRICT="test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/llvm-14:=
+	|| (
+		sys-devel/clang:14
+		sys-devel/clang:15
+		sys-devel/clang:${LLVM_MAX_SLOT}
+	)
+	!app-forensics/afl
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib.*/afl/afl-gcc-cmplog-pass.so
+	usr/lib.*/afl/afl-gcc-cmptrs-pass.so
+"
+QA_PREBUILT="usr/share/afl/testcases/others/elf/small_exec.elf"
+
+PATCHES=(
+	"${WORKDIR}"/${AFL_PATCHSET}
+)
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}" && \
+		has_version -b "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS_FLTO="" \
+		LLVM_CONFIG="$(get_llvm_prefix ${LLVM_MAX_SLOT})"/bin/llvm-config \
+		PREFIX="${EPREFIX}/usr" \
+		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
+		MAN_PATH="${EPREFIX}/usr/share/man/man8" \
+		"$@"
+}
+
+src_compile() {
+	mymake
+}
+
+src_test() {
+	mymake test
+}
+
+src_install() {
+	mymake DESTDIR="${D}" install
+	dostrip -x /usr/share/afl/testcases/
+}
+
+pkg_postinst() {
+	# TODO: Any others?
+	optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
+	optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 728c46459ef2..278c2195d8b0 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index f5ec5ef5befb..63e873f7246b 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,5 @@
 DIST ansifilter-2.18.tar.bz2 436432 BLAKE2B 43c592e83a967ee86404332a464d57d202a73651b2e29da2d1d21163d295b6efba96ecb5861dacfa89b8f567c0367f7a32b8e658f8cefad82c5982f2f2bf70bb SHA512 ef7febed1fc31f5c7503648e4fc0a7aefc3da8e30ea649bd6f03eac2904667fb779049106ccb77ad16fbf655e979f6651b25b84ab126c940c66bedee115a28e2
+DIST ansifilter-2.19.tar.bz2 439141 BLAKE2B de720a10e96e9b55d205b3e19620c85ae7cfeb5a6f15194c78ec01901ab7d6af1a655d7a8ceb810de5923a0fb0c21f3e3b3149495ce04b976796892401f9c1e7 SHA512 2346f41bbfde9a8f38996a24a1c8207d65183ce58b8ba86831cebbd2da8a356d7bbd5503c7fc34f6f2d06bd7157f5811e857e6a03c85a46ce2f1696b0493a0c1
 EBUILD ansifilter-2.18.ebuild 1118 BLAKE2B 4bfcd5f4416e17802292fc13fed87ced72b30dea5e0b92774be4c8c7bd3789dcee38ed8836411dc4d98f33b4ddf6d4683f0a1ea73850cec33ec3ca5caebc54a3 SHA512 d14974a54e90b96547827af226bd3421c0ef978a3e7e17e28661a01783240108d8c49f9cf334876b15f3c824c6225686e2490761c56620b7643145dd92d67179
+EBUILD ansifilter-2.19.ebuild 1294 BLAKE2B 38051860ee300f5387db7324dce7d2910a9943b7aaad2d30ada32bb1511c965a89150126da872b993b05f68af3a162e0d8f949382e17401a80928aebf1378bde SHA512 6dda219ac2678a620047ea88006d8671252ffaa0d8469db19822611a85962dcb95af31d30d9fabf6ed5ac0f1892635304de6e968767e1406a57b0c11561bd1b0
 MISC metadata.xml 336 BLAKE2B abbe2be16083114dab5fe1f2f7bc8a269bf44680dedd69c741275d7328120dadabe3007cc9e49705c044916cfdcc17227d96b7950b05662684140264b869e397 SHA512 5c08736995589d34cc3f37ce20abdaa402c56986506a4bb88a63f8326ccf4f233a059705815d9cdbd1b07a156d82a155bca70cb70f9b4b4273ef8f6be29dc4e3
diff --git a/app-text/ansifilter/ansifilter-2.19.ebuild b/app-text/ansifilter/ansifilter-2.19.ebuild
new file mode 100644
index 000000000000..c6a5f8516a3d
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.19.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs qmake-utils xdg
+
+DESCRIPTION="Handles text files containing ANSI terminal escape codes"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="gui"
+
+RDEPEND="
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog.adoc README.adoc  )
+
+src_prepare() {
+	default
+
+	# bug 431452
+	rm src/qt-gui/moc_mydialog.cpp || die
+
+	sed \
+		-e "/GZIP/d" \
+		-e "/COPYING/d" \
+		-i makefile || die
+
+	sed \
+		-e "s/-O2//" \
+		-i src/makefile || die
+}
+
+src_configure() {
+	if use gui ; then
+		pushd src/qt-gui > /dev/null || die
+		eqmake5
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile CXX="$(tc-getCXX)"
+
+	if use gui ; then
+		emake -C src/qt-gui
+	fi
+}
+
+src_install() {
+	emake -f makefile \
+		DESTDIR="${D}" \
+		doc_dir="/usr/share/doc/${PF}" \
+		-j1 \
+		install $(usev gui install-gui)
+
+	einstalldocs
+}
+
+pkg_preinst() {
+	use gui && xdg_pkg_preinst
+}
+
+pkg_postrm() {
+	use gui && xdg_pkg_postrm
+}
+
+pkg_postinst() {
+	use gui && xdg_pkg_postinst
+}
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index f1638af3b885..2bb250bfb8e2 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,4 +1,6 @@
 AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18
 DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
+DIST highlight-4.6.tar.bz2 1488327 BLAKE2B 952171929aa021c80690b2ddcd5adba3b6c7e54425cfc851368b768a53c749e34495b0832d4ce5546b5bc68c0ea4e3b5bd6df4f379e02702fd3a497adc52d60b SHA512 0214f2141ecf2ab350368ff165dc5f58eb3a23b31142b9d1c443a35f8ea72b9e33770c2de185cd2e3645e298ad41ec1fd45db5ebf546da3144e1dc93da32b811
 EBUILD highlight-4.1.ebuild 2423 BLAKE2B 812355e2acd16abd03cc4a6d5555f24af630cce614ffeebc4e4e525916f62a9b51ec1269667d6bd00c744e63ff4b74dbd5cc020307cd24ce12ab6780f1147f94 SHA512 975b17328a8fbe9659c49bd69ea0a1eef4015fa2c70f03d08ce2c5a2dc76252285e5534ea0618d9c3b0da5c0f3dd65206496b4d429c88d7798be500aaff8139e
+EBUILD highlight-4.6.ebuild 2466 BLAKE2B 49d356dc265081ab2daa808016be4a9894038de25acfee2d58e12488c15b776ed09dd199161f9d6fbd09f0cbbf2283fb200835386fc4d19334b8b510523dbd70 SHA512 ca9540dbf379f752487f42bd7b052efd3304e2295a8b19bf186142ee6f44a5b15bf409e18d9626adfcc9cd4460989f90f31dce9a7761c92b673da99f09e9bd4a
 MISC metadata.xml 331 BLAKE2B 3c864f08058c451342b7f7799f36e901f392207b36114dd123bb3faa59f04fe3b00d8e65cee4ad3bbbe44606bdafbd246c64d5fce03cd54fc64cd40cfde59788 SHA512 eb96ee44971855de0b12f9e230d58714acb54de1b0a814c0681f8c31124a5c3e39290e2fd17523b2b52b65efaf30f64580f00777a8e9c908779b582577897906
diff --git a/app-text/highlight/highlight-4.6.ebuild b/app-text/highlight/highlight-4.6.ebuild
new file mode 100644
index 000000000000..d6d49225f645
--- /dev/null
+++ b/app-text/highlight/highlight-4.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples gui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+	gui? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
+)
+
+myhlopts=(
+	CXX="$(tc-getCXX)"
+	AR="$(tc-getAR)"
+	LDFLAGS="${LDFLAGS}"
+	CFLAGS="${CXXFLAGS} -DNDEBUG"
+	DESTDIR="${D}"
+	PREFIX="${EPREFIX}/usr"
+	HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
+	HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
+	doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
+	conf_dir="${EPREFIX}/etc/highlight/"
+	examples_dir="${EPREFIX}/usr/share/doc/${PF}/extras"
+)
+
+src_prepare() {
+	default
+
+	# Disable man page compression
+	sed \
+		-e "/GZIP/d" \
+		-e "/COPYING/d" \
+		-i makefile || die
+
+	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		-i src/core/datadir.cpp || die
+
+	sed -r -i \
+		-e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
+		"${S}"/extras/tcl/makefile \
+		"${S}"/extras/swig/makefile \
+		|| die "Failed to set Lua implementation"
+
+	# We set it via eqmake5, otherwise it forces clang...
+	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+		-e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+		-i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+	if use gui ; then
+		pushd src/gui-qt > /dev/null || die
+		eqmake5 \
+			'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
+	if use gui ; then
+		emake -C src/gui-qt
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+
+	if use gui; then
+		emake -f makefile "${myhlopts[@]}" install-gui
+		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+	fi
+
+	if ! use examples ; then
+		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+	fi
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 893b61864b19..0bd557feb3e5 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 87b0aac4096e..782866732ba1 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,5 +1,7 @@
 AUX mono-5.12-try-catch.patch 1267 BLAKE2B e33836d53fd4c9a4e64614d3f309058b2009487a853aee48fae99cd0326095b6dc26e7fbdd178e25f9fc3901f74f937ce5e9d3bb4322ca50e139d13f66c209a5 SHA512 3a82d4bed31b212e23fe24647fc5b9c4788be5f4966377a3bef9f92a51d16181e77e19ca1ec4736792da6a18206986bbb54d967499e2ca7e224201cf811f91b5
 AUX mono-6.12.0.122-disable-automagic-ccache.patch 513 BLAKE2B ca0f3f1b2d9f3357f8e5197acdb18c3f02a9e09d90140fec133e20edaf960e74a4bd4949b453d79c656c3314fa720e94794b91a748469ca91abf78c8ca0bb8c6 SHA512 5e97c420272644f0636dcee2baf49cfc91d055c42990197c1c2724358e6847cf4866f22c247d4930ad7b780037c252970c3c3baae7641794ed8f50ff6456f23e
 DIST mono-6.12.0.122.tar.xz 292266176 BLAKE2B 07043c5fbca33edf64ebca0392b47af9b9ab502be772efb5afbe5ec9e8683b7f4e96a305ee906dff617842bdba2819c2abc130d7aff23b12779f403bbd88f3bd SHA512 0fbd4147498cc81e384933147eb6aa5c559d17a794a308af7ffa43dce51e0faefde24fc75e987ed804dcb161b52756944bc3611100fc0a4adcc260ca97ddaecd
-EBUILD mono-6.12.0.122.ebuild 3373 BLAKE2B 28ba2d5b8dcbeb9a2fb5c3880575e1165726ba5fb5965ac33fd37db0e6f4547a5dbfebc8e5ef34f4e7ef3ce24c066bfee364de52a940f72eef8a14ebddd2565e SHA512 8c6d2cb0e61a865befedfe636885317e286fbd2e78458c892c55b21fc819cea3c97c858d0eb966255fd3dc0fa499f5520975e931d37aa45d3993b3c4d1a8c05d
+DIST mono-6.12.0.182.tar.xz 303230932 BLAKE2B fc959e1d57d91670e8adf8ab64d3c0f16b7291f6a70d191b4401bf42a6bd35a7ac23b1aa5d2ed5cda833f29204bd56d800910320169941283cab52a1cb79ef30 SHA512 5f0f02f2adf89785af8f620c16d69fc97b87c9b39133286e6f1237a397f4842ea8d26802d9f802f8798a86540dc1bc3b5201428f218c78fbcf91f0d575cde512
+EBUILD mono-6.12.0.122.ebuild 3422 BLAKE2B 10b945c0878e41dbff086857b51feb02f24082fac71179de07e6e0498c3a5bec8adb117871451fde322ad4f34701bb39d823b9ab49d87fc5aae6311b861a0b4f SHA512 8d9f298fe94d9f0cf932d2b7ff7d0981bdd94b9d12106af37ea79267ac10dad1158894f488e1ad00c7c6029aea9d5b361c964da846f49e35bb53d39acc628ffe
+EBUILD mono-6.12.0.182.ebuild 3416 BLAKE2B d66de83d6874ce4f6ba91e72037617c9a29530a58399d702d089bd10b66c32c88ebc2aa6ff4102570a5d7f5f207f34bd68b4df8e06796f52bc0d38fddeb90cc8 SHA512 8a5984fbc1099f04b3a970e8a5f484bfdc32e1acb584acb9e32d08457d936b10cc2cb557c0c5ce27175cdb51508b4ed3fb3bce23fc8cb443fc1d2f68307a966c
 MISC metadata.xml 582 BLAKE2B 498a6035f8da9da20ae51144d40ff5c599576bc3aa76471d655fb1eb127bc9fac7d5e3c6ef20d2c3d7befce109931f6a2ce6751183d1444eda6a39456068ceb7 SHA512 691d1cba0271329b683c9c81651343dafaeab891aab0b9396c7f620ff1897848d2c7171d3ad73e7feb6ac2f63e98262c9ee3ee6f679e4a08bf7d1b6973921b2d
diff --git a/dev-lang/mono/mono-6.12.0.122.ebuild b/dev-lang/mono/mono-6.12.0.122.ebuild
index 41df3da3c290..fa328db808d8 100644
--- a/dev-lang/mono/mono-6.12.0.122.ebuild
+++ b/dev-lang/mono/mono-6.12.0.122.ebuild
@@ -28,7 +28,9 @@ RDEPEND="
 	${DEPEND}
 	app-misc/ca-certificates
 "
+# CMake is used for bundled deps
 BDEPEND="
+	dev-util/cmake
 	sys-devel/bc
 	app-alternatives/yacc
 	pax-kernel? ( sys-apps/elfix )
diff --git a/dev-lang/mono/mono-6.12.0.182.ebuild b/dev-lang/mono/mono-6.12.0.182.ebuild
new file mode 100644
index 000000000000..7ec3e4980142
--- /dev/null
+++ b/dev-lang/mono/mono-6.12.0.182.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4500M"
+inherit autotools check-reqs linux-info mono-env pax-utils multilib-minimal
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="https://mono-project.com"
+SRC_URI="https://download.mono-project.com/sources/mono/${P}.tar.xz"
+
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux"
+IUSE="doc minimal nls pax-kernel xen"
+
+# Note: mono works incorrect with older versions of libgdiplus
+# Details on dotnet overlay issue: https://github.com/gentoo/dotnet/issues/429
+DEPEND="
+	app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	ia64? ( sys-libs/libunwind )
+	!minimal? ( >=dev-dotnet/libgdiplus-6.0.2 )
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${DEPEND}
+	app-misc/ca-certificates
+"
+# CMake is used for bundled deps
+BDEPEND="
+	dev-util/cmake
+	sys-devel/bc
+	app-alternatives/yacc
+	pax-kernel? ( sys-apps/elfix )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.12-try-catch.patch
+	"${FILESDIR}"/${PN}-6.12.0.122-disable-automagic-ccache.patch
+)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if use kernel_linux ; then
+		if linux_config_exists ; then
+			linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
+		else
+			# https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
+			ewarn "kernel config not found"
+			ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+			ewarn "See https://bugs.gentoo.org/261869 for more info."
+		fi
+	fi
+
+	# bug #687892
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	mono-env_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# We need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
+	# get killed in the build proces when MPROTECT is enabled, bug #286280
+	# RANDMMAP kills the build process too, bug #347365
+	# We use paxmark.sh to get PT/XT logic, bug #532244
+	if use pax-kernel ; then
+		ewarn "We are disabling MPROTECT on the mono binary."
+
+		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+		sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+	fi
+
+	default
+
+	# PATCHES contains configure.ac patch
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with xen xen_opt)
+		--without-ikvm-native
+		--disable-dtrace
+		--enable-system-aot
+		$(multilib_native_use_with doc mcs-docs)
+		$(use_enable nls)
+	)
+
+	# Workaround(?) for bug #779025
+	# May be able to do a real fix by adjusting path used?
+	if multilib_is_native_abi ; then
+		myeconfargs+=( --enable-system-aot )
+	else
+		myeconfargs+=( --disable-system-aot )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	emake -C mcs/tests check
+}
+
+multilib_src_install() {
+	default
+
+	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+	# for reference.
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}
+
+pkg_postinst() {
+	# bug #762265
+	cert-sync "${EROOT}"/etc/ssl/certs/ca-certificates.crt
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a04e0b79ecc0..09e0877d83e1 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index da266bc359a1..0cc5277c4f55 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -4,5 +4,5 @@ DIST libgpg-error-1.46.tar.bz2.sig 238 BLAKE2B c9f48969dc5b51c4d6c0c643a510e442b
 DIST libgpg-error-1.47.tar.bz2 1020862 BLAKE2B bc04efa0686b1b7d7cdce045fc080c090c1abec60349b673c2e1ce27900483aea090eb6ebcb3fb49a4eed36f18156a12413d5446f739475632f4ed2a2481ff27 SHA512 bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30
 DIST libgpg-error-1.47.tar.bz2.sig 119 BLAKE2B d23ea6c38621407c8f9f0c6bde71abd0e50c136d2e5de9a6cef64627f5d398c344a3438995a2405c4ef148ad8638ef7125f34670819957acd7d597370f1630e5 SHA512 09343016eaf7fcc455f8ce533847153a8a9b7c36f375a8ebe71ef5fc2923edf7b70842f834f52c51874e427869487b74a2286ea0112cffad0d72f79cb6d4eceb
 EBUILD libgpg-error-1.46-r1.ebuild 2586 BLAKE2B 00372e4b21b58587cd76d4866f8426f37115dd65a69d4612c3166f6c02f5bc2066edb8347d8bc651dcca76fff3eee98d5d145e651ac911c7f5b11fdb00990d8f SHA512 18c6e53e702fc91e7848bbd2cab2aa6b81d4fa4fdf6b522ab8d9fead61fc1426f07a35fcd44e7838bf7144998ee4788164f360a12361fbbb5c82210233552e4d
-EBUILD libgpg-error-1.47.ebuild 2594 BLAKE2B 943577255c95ac9f34a5bb14d1d8857408ce7b254145140c76fcf8a9361c101fdd8d0fa78061586bd9dca975eaaf8be144963acb843403c212ce4181445c1405 SHA512 2620b818097fdcc04abf8f3df11b11530a22e0fb0a13279e0b4fe548fdadb0a7d0d0f2a457ee1373a0c0be5bcc23f6a9c3985aab5b054de8b62ed4f29c4f7e26
+EBUILD libgpg-error-1.47.ebuild 2592 BLAKE2B f6579686fb9c0b9c3351602d1a62265b7d94ffd8090628b6d804752c0c26c787795a39b295d0dd3d2f6fa5e79c82b8d259cf508ed1fe56f901aefeb69ebf3528 SHA512 b48c5b77f01b18f86ceb06f648c300178ed70bd0d5f1336743fef6c2da5f589dfbc985eafe6fbfc7e1ff3c3a79e235d4f894f2bd29efdd656b5b82e66bd1f8e6
 MISC metadata.xml 420 BLAKE2B 0b469c533336497584faf0c8a5531c54dd242817d46fb78f1369997b77ec3ea49da3a0ae869488c17639fdee26bc4dee94fb20605db6fa8f6f3dbaeab77d3072 SHA512 22259311b2c83f7b63e859a7196a3fd586c85afbd777327d9a6172a359500160807866b74051836717c42145ed0e289152fb0a374a05bcc7e982d4df3e94b305
diff --git a/dev-libs/libgpg-error/libgpg-error-1.47.ebuild b/dev-libs/libgpg-error/libgpg-error-1.47.ebuild
index 0589c7f573f5..518bf7e74c9f 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.47.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.47.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="common-lisp nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 33f811877e03..2fd109377ac6 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/XML-LibXML/Manifest b/dev-perl/XML-LibXML/Manifest
index 7a91080bb03d..a48b8c3c72e5 100644
--- a/dev-perl/XML-LibXML/Manifest
+++ b/dev-perl/XML-LibXML/Manifest
@@ -2,6 +2,6 @@ AUX XML-LibXML-2.20.800-modern-c.patch 1873 BLAKE2B 3ecebf6822094014001865b1a8ec
 DIST XML-LibXML-2.0207.tar.gz 462595 BLAKE2B 9ebb4786dcd45f552ef31ba0854693e876b6f8098b577401429651e5eb55792bb623185db371d2578432c00031ce2cfb66603e08290d7cf8f74dee5fe45c143d SHA512 86bf4200c800e1295161c3217892398dbc65e107ad1a3df8ea7f237350ba67d88ad7b18ab7123e647053a8721bc13a8959ddb101fdc6de18dcaef02c0f0f5b58
 DIST XML-LibXML-2.0208.tar.gz 465763 BLAKE2B df3e1c917c4b6aec49650668dca8a9db3f83e9060ab7795495ef4b505f8970d11294c687df9805b55db4f81a5b81121b463ee6258bbe6106f63d20b6a901b5b2 SHA512 b8407359b9111b43247cc57b6e9e54c4e99402c9b7e939e49beb752be8fd1ce0e31a98e07dd5d1f7eaa7e37aae25571c38a14792f9e5a64c1533a0387c71423d
 EBUILD XML-LibXML-2.20.700-r2.ebuild 1916 BLAKE2B fbf5d024fd4b4d2559d86812c370f1a9d19190196ba9fa5a81203a42167eaf30ca412b323d0c3e1c662f4ad59c73c8dd6bfe7613be05aea6f952d2b0be170b73 SHA512 1d5a5b1b72f8f1bf3602d9543db5b8b4dbaa1a74e5e4ce00057e30ec6472999af940d56de157b5d6c484fb650520a3efcdd4daa07a5a8d9440ba458f8be6b932
-EBUILD XML-LibXML-2.20.800-r1.ebuild 1981 BLAKE2B a4f0bd4aaa45dccbf0c6dc3625551c7264cc918644436ebb11174dcdbaa8221efcf2ec9b3db8cefec42ac915c516bcdd8edff8cfd6a37aea0d817c8496e1cdb9 SHA512 5b62e10afe366cb31cd9496982d7ccd5f44c78c85a3fe3126b6778035e91714aa066b3e291d77d395effee6a39f45f1af2736796e737d0846c5a9f25aaeffea1
+EBUILD XML-LibXML-2.20.800-r1.ebuild 1980 BLAKE2B 01eaabdb28acb4457cced0891a5cd6f3244a9ceee988cc6d75a8431b61d1e5728cbac025cf6d957a536afa6d0e84740adc499ff2bb698808696bf8649b6c40a0 SHA512 49da3d979e1222981dd41c96a7c47441734e7f03ce726604c570154b8516e336d4c68fec4f85dca9b85e4f2d8bc0cedf9cb95fbff4452b51d190bfea0c53955e
 EBUILD XML-LibXML-2.20.800.ebuild 1916 BLAKE2B e58acaa9c2b7414fabd0a152aa3a399c64ec5d39d5d77fb7d05f7feea435c2a7c62830e115cabef75106410b9487444901038ec0d32c237bf6b69a6993c4ca5a SHA512 1057f193905042c0aaaff9f235671e9be4535656f5ea95f0ca113b0867b4dd865706ba3f2fa8a04d52f58dedaf3ca2e62e2761916ecc27e305d72b7b787ed024
 MISC metadata.xml 2848 BLAKE2B ab04e542e1e6bf7d2d56f131b33b0ff0a568e76c205358f7de0e631d0e1cf16804103f8ac6da9867662023d887d97e6d4b25941056af8ad1a60eb1f1e9074987 SHA512 70f9e3c83938f8d73cdb1a87b2a663d636d5a51ca5a2a969b473171a303acf00f214f96ab342b6a607e8e5024074b5602598df50dbf7f7604212c2331927932b
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.20.800-r1.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.20.800-r1.ebuild
index bd3938b77c2c..f1b53bf719a1 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-2.20.800-r1.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.20.800-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl binding for libxml2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="minimal"
 
 # >= on XML-Sax needed to avoid "miscompilation" (essentially empty install), as newer XML-Sax
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 998dc01c6dbb..182a4b2f8689 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt6-WebEngine/Manifest b/dev-python/PyQt6-WebEngine/Manifest
index 92ab919b9c27..4c9550ce0716 100644
--- a/dev-python/PyQt6-WebEngine/Manifest
+++ b/dev-python/PyQt6-WebEngine/Manifest
@@ -1,3 +1,3 @@
 DIST PyQt6_WebEngine-6.5.0.tar.gz 31349 BLAKE2B 80ab4ad292107e5ca57c5b27f2af3747f9c28ebf2c1afe0f32fe1fbd6897dd701d7f46bda8f08c5f0048d4efef4c3c0087854acbc58a319163e328f74177b05c SHA512 bafa26cc800ec031fe9bb1e309832df79b41c5f43a6cdc8ecc2bc4b09c59b60975a67ede6190726db887689305e7a6012f705eb9b83c3e0c82a23f3f1c3880ff
-EBUILD PyQt6-WebEngine-6.5.0.ebuild 1727 BLAKE2B 7113bdd58cbe6960c6bf14f5d4996493f63829a1b3475a5922c08747b4ce55d8e7225324c466227b86e0d9c871520539da7e50bc667b8f91dd3fb2ba17783300 SHA512 e4837c62ec318d00a24852042d7c6bee0bb6ded783f0344b694ce277f75e1419518d88ed017c4be38eb277e194aac9389fa632302046631769463b14643bc26b
+EBUILD PyQt6-WebEngine-6.5.0.ebuild 1871 BLAKE2B 70488ddbf338a26e8b579149f6fe8b71bd3075575ff527cd0be5a3450f218d7d596093f95e0dcd328b5a858b3d8bab9b83d831392a8dc4f028c5a8d9da4df543 SHA512 4279268b4ad078ff7abf7646dceb8d0f7292f21d8ebe9d8bc0658df49af332a0ab1a61f70ba1390643a54e19f5af703191989269d6f673464c11164de295291a
 MISC metadata.xml 572 BLAKE2B d0c911bf7d8f4f33e30daabfafe3447367045dce444dda4d8600ea47a844842996989ee7c64ccee6ce77a033bdbd1e7c58136e16ddd5f76a7b5688681f791d2c SHA512 11a8b7ab3fe9fa8e8a7160658aac5b8148a60f30b49bcba92cb08eee6d8f5021e4d117632dcddab98c9a0ebbbecd256ce09fbbe43f05105f7429355f9120e42f
diff --git a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild
index c14617c05118..9e4ab2b11079 100644
--- a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild
+++ b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild
@@ -30,16 +30,18 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-python/PyQt-builder-1.15[${PYTHON_USEDEP}]
-	>=dev-qt/qtbase-${QT_PV}
-	sys-devel/gcc"
+	>=dev-qt/qtbase-${QT_PV}"
 
 src_prepare() {
 	default
 
-	# hack: qmake queries g++ directly for info (not building) and that doesn't
-	# work with clang, this is to make it at least respect CHOST (bug #726112)
+	# hack: qmake queries g++ or clang++ for info depending on which qtbase was
+	# built with, but ignores CHOST failing with -native-symlinks (bug #726112)
+	# and potentially using wrong information when cross-compiling
 	mkdir "${T}"/cxx || die
-	ln -s "$(type -P ${CHOST}-g++ || type -P g++ || die)" "${T}"/cxx/g++ || die
+	local cxx
+	! cxx=$(type -P "${CHOST}"-g++) || ln -s -- "${cxx}" "${T}"/cxx/g++ || die
+	! cxx=$(type -P "${CHOST}"-clang++) || ln -s -- "${cxx}" "${T}"/cxx/clang++ || die
 	PATH=${T}/cxx:${PATH}
 }
 
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
index 79cb8883957f..c58ac50eba6a 100644
--- a/dev-python/PyQt6/Manifest
+++ b/dev-python/PyQt6/Manifest
@@ -1,5 +1,3 @@
-DIST PyQt6-6.5.0.tar.gz 1033399 BLAKE2B a22ad07813c50d6b626b95aa168996ab51f9714fbf3bf3d6e41a233ec2edb8c8e2cb7edcf3b036bc4f69f0a8f1e6549cde512562a420c0809f84a0e04cfb9368 SHA512 c73d4c253245d2ccc776544bc651d47ea67067f57b49c3f820100701af4d79385ef4cabe9f65098f35daeba5f2921a566606be4f237e567f6f56360cc760f548
 DIST PyQt6-6.5.1.tar.gz 1036776 BLAKE2B e8e9ac2222de1864386d1fddb75414cf600e380e584e274cfcffbdeb1451cde9e199a43ad4c66cfc8a006cabc833904fe177ccf9dda85ac683f9c8e4f6f87e53 SHA512 8c1135ec48906fe842f0cb50e253a0325b478dd43a7f313b925aaf1d3c148f5462a3e96142470ab0efc0f24fcc8b15704242401cab9f8ec9c3c424e922c49681
-EBUILD PyQt6-6.5.0.ebuild 4813 BLAKE2B c30ffdd14a34213429e338dde537f38ef3ca47110980d4d2c00d35dc2b72953ed7464dbbb9f45330ca2a044923a28969d377290c9264e417ee566dcd7cc36dc5 SHA512 dfac5353ae1882f2399c7ef44a891b0e785d2268fd45bda86fabea9b3fc20cf33e213a0ad82729f1b145505ecbdb34d89bc3be6ee8152122597e8518899d857c
-EBUILD PyQt6-6.5.1.ebuild 5041 BLAKE2B 128d32c70ce75d18a1b7a8f109c8fb92fc40405f8807d205b7eea597cddb821986079b69b07207f83554e5e5067683888ba1f75539ace0281369f333c60825b9 SHA512 79da1c1a6d1da1d838021975f6b70a74b50fe6ce480172970193b077fc5097e64f94e1d0b97d7ab333ed31313bb90197c2df29aec627cb5828bccb4df883d102
+EBUILD PyQt6-6.5.1.ebuild 5185 BLAKE2B b2e42fc505797133a976a7573878cba10f88c14b46b74e68e9e0e65ad1e2deabac1f169d4d2c350d998eb6a2f909b512aa5ecdf42d28ba4d89b2c3e0f97ba2ed SHA512 348a4c5d6d08dcaa91265d70fab6670a7a6a18582a58dfe0080a99d1147767134aca6ed1d6bec09d746ab5a1d2f717802c967429e10ba2b373cdb3066d303d42
 MISC metadata.xml 1995 BLAKE2B 8fda7f9c4a21ad6264b77b4bb9dc76698082e3272647911c7a0afa138c48cde16d18c9d282caa49ce3ffa36b211c51e865af87fc9caf739de106fb3cb6ff6896 SHA512 2ab635404dd6b1be94cad9c5ee424939ded0f26a7415dc766d823ad5b0ede1beae09a90bb519ba82e0b2ffb638c5abc7841c4d1f0c7481a112cef5a56fc96e84
diff --git a/dev-python/PyQt6/PyQt6-6.5.0.ebuild b/dev-python/PyQt6/PyQt6-6.5.0.ebuild
deleted file mode 100644
index e91c13b9dee8..000000000000
--- a/dev-python/PyQt6/PyQt6-6.5.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=sip
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
-
-# 'can' work with older Qt depending on features, but keeping it simple
-QT_PV="$(ver_cut 1-2):6"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-# defaults match what is provided with qtbase by default (except testlib),
-# reduces the need to set flags but does increase build time a fair amount
-IUSE="
-	+dbus debug qml designer examples gles2-only +gui help multimedia
-	+network opengl positioning +printsupport quick quick3d serialport
-	spatialaudio +sql +ssl svg testlib webchannel websockets +widgets +xml"
-# see `grep -r "%Import " sip` and `grep qmake_QT project.py`
-REQUIRED_USE="
-	designer? ( gui widgets )
-	help? ( gui widgets )
-	multimedia? ( gui network )
-	opengl? ( gui )
-	printsupport? ( gui widgets )
-	qml? ( network )
-	quick3d? ( gui qml )
-	quick? ( gui qml )
-	spatialaudio? ( multimedia )
-	sql? ( widgets )
-	svg? ( gui )
-	testlib? ( gui widgets )
-	webchannel? ( network )
-	websockets? ( network )
-	widgets? ( gui )"
-
-# can use parts of the Qt private api and "sometimes" needs rebuilds wrt :=
-DEPEND="
-	>=dev-qt/qtbase-${QT_PV}=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?]
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		sys-apps/dbus
-	)
-	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-	help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	opengl? ( gles2-only? ( media-libs/libglvnd ) )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	qml? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/PyQt6-sip-13.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/PyQt-builder-1.15[${PYTHON_USEDEP}]
-	>=dev-qt/qtbase-${QT_PV}
-	sys-devel/gcc
-	dbus? ( virtual/pkgconfig )"
-
-src_prepare() {
-	default
-
-	# hack: qmake queries g++ directly for info (not building) and that doesn't
-	# work with clang, this is to make it at least respect CHOST (bug #726112)
-	mkdir "${T}"/cxx || die
-	ln -s "$(type -P ${CHOST}-g++ || type -P g++ || die)" "${T}"/cxx/g++ || die
-	PATH=${T}/cxx:${PATH}
-}
-
-python_configure_all() {
-	append-cxxflags -std=c++17 # for old gcc / clang that use <17 (bug #892331)
-	append-cxxflags ${CPPFLAGS} # respect CPPFLAGS
-
-	pyqt-use_enable() {
-		local state=$(usex ${1} --enable= --disable=)
-		shift
-		echo ${*/#/${state}}
-	}
-
-	DISTUTILS_ARGS=(
-		--jobs=$(makeopts_jobs)
-		--qmake="$(type -P qmake6 || die)"
-		--qmake-setting="$(qt5_get_qmake_args)"
-		--verbose
-		--confirm-license
-
-		# TODO: enable more as new qt6 packages get added
-		--disable=QAxContainer
-		--disable=QtBluetooth
-		--enable=QtCore
-		$(pyqt-use_enable dbus QtDBus)
-		$(pyqt-use_enable designer QtDesigner)
-		$(pyqt-use_enable help QtHelp)
-		$(pyqt-use_enable gui QtGui)
-		#--disable=QtLocation # force-disabled in project.py
-		$(pyqt-use_enable multimedia QtMultimedia \
-			$(usev widgets QtMultimediaWidgets))
-		$(pyqt-use_enable network QtNetwork)
-		--disable=QtNfc
-		$(pyqt-use_enable opengl QtOpenGL \
-			$(usev widgets QtOpenGLWidgets))
-		--disable=QtPdf #+QtPdfWidgets (QtPdf is disabled in qtwebengine:6)
-		$(pyqt-use_enable positioning QtPositioning)
-		$(pyqt-use_enable printsupport QtPrintSupport)
-		$(pyqt-use_enable qml QtQml)
-		$(pyqt-use_enable quick QtQuick \
-			$(usev widgets QtQuickWidgets))
-		$(pyqt-use_enable quick3d QtQuick3D)
-		--disable=QtRemoteObjects
-		--disable=QtSensors
-		$(pyqt-use_enable serialport QtSerialPort)
-		$(pyqt-use_enable spatialaudio QtSpatialAudio)
-		$(pyqt-use_enable sql QtSql)
-		$(pyqt-use_enable svg QtSvg \
-			$(usev widgets QtSvgWidgets))
-		$(pyqt-use_enable testlib QtTest)
-		--disable=QtTextToSpeech
-		$(pyqt-use_enable webchannel QtWebChannel)
-		$(pyqt-use_enable websockets QtWebSockets)
-		$(pyqt-use_enable widgets QtWidgets)
-		$(pyqt-use_enable xml QtXml)
-
-		$(usev debug '--debug --qml-debug --tracing')
-
-		$(usev !dbus --no-dbus-python)
-		# TODO?: plugins not in wheels by upstream, see project.py#L214
-		# (if needed by something, will need to be added to python_install)
-		$(usev !designer --no-designer-plugin)
-		$(usev !qml --no-qml-plugin)
-
-		$(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2)
-		$(usev !opengl --disabled-feature=PyQt_OpenGL)
-		$(usev !ssl --disabled-feature=PyQt_SSL)
-	)
-}
-
-python_install_all() {
-	einstalldocs
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/PyQt6/PyQt6-6.5.1.ebuild b/dev-python/PyQt6/PyQt6-6.5.1.ebuild
index dcf60aee78e0..29f6a8ef6fe2 100644
--- a/dev-python/PyQt6/PyQt6-6.5.1.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.5.1.ebuild
@@ -66,16 +66,18 @@ RDEPEND="
 BDEPEND="
 	>=dev-python/PyQt-builder-1.15[${PYTHON_USEDEP}]
 	>=dev-qt/qtbase-${QT_PV}
-	sys-devel/gcc
 	dbus? ( virtual/pkgconfig )"
 
 src_prepare() {
 	default
 
-	# hack: qmake queries g++ directly for info (not building) and that doesn't
-	# work with clang, this is to make it at least respect CHOST (bug #726112)
+	# hack: qmake queries g++ or clang++ for info depending on which qtbase was
+	# built with, but ignores CHOST failing with -native-symlinks (bug #726112)
+	# and potentially using wrong information when cross-compiling
 	mkdir "${T}"/cxx || die
-	ln -s "$(type -P ${CHOST}-g++ || type -P g++ || die)" "${T}"/cxx/g++ || die
+	local cxx
+	! cxx=$(type -P "${CHOST}"-g++) || ln -s -- "${cxx}" "${T}"/cxx/g++ || die
+	! cxx=$(type -P "${CHOST}"-clang++) || ln -s -- "${cxx}" "${T}"/cxx/clang++ || die
 	PATH=${T}/cxx:${PATH}
 }
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index b47c92da4af0..380bcbbd2118 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,11 +4,13 @@ DIST boto3-1.26.151.gh.tar.gz 661732 BLAKE2B 8adc42757d828414dd4bde9f460bc9fd678
 DIST boto3-1.26.152.gh.tar.gz 662874 BLAKE2B 31866c0c3244cdb868fadaf985410e5577d8d75f37387ee44f6ce879ae06c282a4e85e262da4bab3e588918b126110c10b5a64bf7764f076baf495a4382cd225 SHA512 3d496da055172bbc840a3a6f8bd7df6f24bbb1f2f5dbacbbc0e337d4bd15d1355b9fd2e5dbb9e611aa1e415d11dc32bd0b61428a0d0ce7e2d55bb143a0cf1491
 DIST boto3-1.26.153.gh.tar.gz 663859 BLAKE2B 6c5a04fcaa6dde09a09552c2687a2ad1a780ce703cc60eda84c2fa6ad9061dd5f0a4aa0c8f7a7d15f73da2abd9f28d12f8f3d4f859a552cc355bde16f9b306aa SHA512 70117de2475d82f4bb94be2033b7ba18447290f767334d3ea11c60807619d76846003868439f1d025b396df12b91e126f4935f7438d649ca2ee7d629f0a499f4
 DIST boto3-1.26.154.gh.tar.gz 664248 BLAKE2B d36363c3a1561392fe9217c694f263ed34d10fee42141efffbe9d0899e5472d765af717a148deb9b3ef2abe654dcbb5840557d24644763a43ebda61fb39d7b5a SHA512 3aa8b243f9a39921c48d7d63ffb0be64f3bf8dbb824df03e7aafea072a218973660deb52b80ec23367f2a94f8bb9b2ee284a5b4d41d0edd81a1ea063cf94f453
+DIST boto3-1.26.155.gh.tar.gz 664838 BLAKE2B 35c78d4da5bcba6f218a854d67647b71b16915b380271ed03c79775c547ab69fadd750f58557460445d5a6448f927042cccb6cea6e14670dda7e59ccac3c5b5f SHA512 40197333b87c85119428faa35489207ffdc6c03cec03c6446e239d616bd19a40da1512e5ce43618fea9465f174564b533021ba95e26d105a00786dfe47ec7342
 EBUILD boto3-1.26.142.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
 EBUILD boto3-1.26.146.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.151.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.152.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.153.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.154.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.155.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 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.155.ebuild b/dev-python/boto3/boto3-1.26.155.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.155.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 8aea9f891006..bd6c924a674f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,11 +4,13 @@ DIST botocore-1.29.151.gh.tar.gz 11618833 BLAKE2B cac8007e6177c029b97e288c244668
 DIST botocore-1.29.152.gh.tar.gz 11624895 BLAKE2B f6b8596548ab8ff5cbf401d98ebf90cd0425f0363f9be1b71f58649a98dd6c69a859deb80467621bcdc5c15ebe151df7960880ebc013d5834d5310e80a89e948 SHA512 f51f8e00e61ed51d39ec9e51a08cf0f57d29f5e1d4e77460cf28ed296f062cf9df2b5761a30d8a78b6bc4ca8a971032150929cb84147d099e45f8e0112a717e5
 DIST botocore-1.29.153.gh.tar.gz 11665559 BLAKE2B 82a51ba87753e4f241776652f846db39e5d3748997c635af960dfa389786f3abe3b622f2415abba1aaef81d12aee8b7197f1dea9e71a34e6fc18e1712a79eed5 SHA512 84f774eae433b8efecbc4ccf4990435cfa2f9a5fa1a6d29d94bbc57a75b6f3fd4c0b8392672a7d06a00ad7b5f0f4c3fcf66aa893ad655e3a1409083d8731df78
 DIST botocore-1.29.154.gh.tar.gz 11667747 BLAKE2B 0f5ad1bd37b977fcbf938bde18ddec0aab0ce71180e64b5f7318647843082cedead62215a99099a7b4f795228afa1093f22364fbe84b3ecd6c1d177a00f5ee8f SHA512 f66819a5b70ceb30b42bf448c9069d2ebfe68d25f33d4b489e1836b65a2233a3a62bd50d723c4b25531fa13fd49a4ba50cad9e67b6315954aa113428d8a87d4e
+DIST botocore-1.29.155.gh.tar.gz 11673165 BLAKE2B 653cc8b368d34502bcb16622677f11562d38a301e449e2712bcaa7702920a2e2291406fc370d58b562e92719f3945234578f1dc185e9b31e636f09e06f8a00bc SHA512 b4e0d46164953c7eb6fe185a3501a011395c48944028248f831347dd5abfa006c0e46196089d4c78010693f88137f49183b12381b984d99fc9a0a75b5d5892a2
 EBUILD botocore-1.29.142.ebuild 2478 BLAKE2B 12b452c39c98b793a4f15b9a8e8b082ba77dcf677a7c529d2d4b8b81d729403597e071da7d2c98e5e4ed65778e19ea881c6993cf3405e7f80ad20a078fa18a63 SHA512 5118842311b8971e9d2b9f03a45f496caef3b95cfa79334f77097430d569cab7ac1261dcab3fe13236ecad3907936ae49eea87620a12304ae6cf6798639deb47
 EBUILD botocore-1.29.146.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.151.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.152.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.153.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.154.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
+EBUILD botocore-1.29.155.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 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.155.ebuild b/dev-python/botocore/botocore-1.29.155.ebuild
new file mode 100644
index 000000000000..3ced99abe4ff
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.155.ebuild
@@ -0,0 +1,79 @@
+# 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
+		# urllib3-2 compatibility, mock relies on implementation details
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_handles_expect_100_with_different_reason_phrase
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_state_reset_on_connection_close
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 5ed60b144913..05f57ac99edd 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,7 +1,9 @@
 DIST django-otp-1.1.6.gh.tar.gz 76790 BLAKE2B 442c2418a870ccc8034a080415befb09780f9228562a15737e0911a0343945908f9fc2e026220a4477a5e5e1a6c1e4c3f7d51c823d4a9019f2bc15ae3367d8a3 SHA512 58c64651a5b274542bf09604daf3e59fdb0ea4eb96e7d14e59fd10a042d86cffb5df462191198f12320ea706f4d9aa651ef2c79ad7aa33e9d4ba0d157d90f4fb
 DIST django_otp-1.2.0.tar.gz 64888 BLAKE2B 4b9eff29508b1ce537452ecf7337c7440acbab08b66c651080973d6a39e8e7cd5255f440e4dfb397886f562234d297333eee296ee9958075790e183e47e6637a SHA512 2f108ff08a01044a0f6572f4e5a57311c28926b5baf808f5013e6ffc1e40db77fd182b078ce53596b4ecee87fc0223fdf6fc41158e03a6ba3e80455234d64810
 DIST django_otp-1.2.1.tar.gz 65762 BLAKE2B 8243763a717c5f22513e10a03b8eeccf26d5e556cca15a22cad8e66ae8f6b4e6bfd53c43bf4de328e0b78f66895869a258ed1f42daaa0c3f686ae42ae0222ee5 SHA512 cb1ee0507dca15cd23d96c28566368079d38d85e3ef3a11ac14d25443c7d50ee62e8256dafe355632c33c84f74af54146890e58e17dc588e52502ee68716510f
+DIST django_otp-1.2.2.tar.gz 66391 BLAKE2B f66472ec2e3842ebc634edd8f689d1de51738381fd86c4af0859dee2f1bcf407b1c952c795203f9c742a95633ee14ce9253dcc1ffd7988c960e26b23a1ec5dfe SHA512 e8608f0a3b0aeaa82e509f034f69131eb1015124ecf84b734a5be58f62c309eee506b12fffe2aeb4b707e70c612413d1458bc64533102508c55255035432eb1f
 EBUILD django-otp-1.1.6.ebuild 968 BLAKE2B 31df4f4a70a81c7a3e2fbf310662bccf7046dcbe81315c6186216451624f11c5f75a8412b033b0f3873717c23f4117596d59cef65a41d9a60755a6fbff8e482e SHA512 21b01e9fbd5825dc225195d466a09c372efb4885cd9cc59e306fc52f19d5941fe14a83d5e35874ef6432cbca809a8421bae0d5a32ccf07144d56c2225c2b769d
 EBUILD django-otp-1.2.0.ebuild 954 BLAKE2B 90a2c23f82e2cd0eba9ac159549b0c94cca518244eac161efd185368a4fcf4e841e63b33139ff074439a160ed3ce32b7fb9661d9d07939b2335f937b707cc133 SHA512 a7848266574d2fb8cf68d529ffa2128ece9f80dea42de4cec8f00883a31ea304b60bcff3c39d73bddce1c2b2ecce93bb14bd53991a1dc924a1735ce636ebfdf8
 EBUILD django-otp-1.2.1.ebuild 955 BLAKE2B 707da3e53fe4cfdfa8fa6c822eb1eb40298016f8c8ba5311f90826d4e4c5c1aaf41b8786bc60f0d54a5e6df565f3ed728a08102dee35bc50349ec4a9528cf7a1 SHA512 8106c8adeaa6d4139e9bfe7840a2ee3fe21fe025d517e032f94b78adab00e81e928de5e6ccf41b09c62b33b0362f2902645087d78040dd38c2d52130f72aada2
+EBUILD django-otp-1.2.2.ebuild 955 BLAKE2B 707da3e53fe4cfdfa8fa6c822eb1eb40298016f8c8ba5311f90826d4e4c5c1aaf41b8786bc60f0d54a5e6df565f3ed728a08102dee35bc50349ec4a9528cf7a1 SHA512 8106c8adeaa6d4139e9bfe7840a2ee3fe21fe025d517e032f94b78adab00e81e928de5e6ccf41b09c62b33b0362f2902645087d78040dd38c2d52130f72aada2
 MISC metadata.xml 387 BLAKE2B f1be13d8af9a4926d7c82442cb939f1030a8234d4f18917cf8b2b8b204d763974b5f08f8597334238733d6446fc1165ba19d454e13105dc16afacf1fa3a98ea0 SHA512 d85060b9982c55057128a0c7b7fd1537e3eb613f9d44e6c40438283d76f6d65c92db78815005ce44b4096d57c62584659d5997491f003ca1ed8c36f88db8623c
diff --git a/dev-python/django-otp/django-otp-1.2.2.ebuild b/dev-python/django-otp/django-otp-1.2.2.ebuild
new file mode 100644
index 000000000000..fae3a5117ea5
--- /dev/null
+++ b/dev-python/django-otp/django-otp-1.2.2.ebuild
@@ -0,0 +1,43 @@
+# 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_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="
+	https://github.com/django-otp/django-otp/
+	https://pypi.org/project/django-otp/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.9 3.10)
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	"${EPYTHON}" -m django test -v 2 django_otp ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
index 24a0814c8c5c..d78fbe6c9c75 100644
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@@ -1,3 +1,5 @@
 DIST django-redis-5.2.0.tar.gz 44132 BLAKE2B 5d9680e43bfff506924b90cdce4fcbf40883a732af6b599c2e36d8549ce2aedbd69540b187152dc8fdc0d2a93b21c5fd2724d6386772f9b4af8632e38414b577 SHA512 65d3dc6b1d72c8b90908cf368cb66ac2eb74bdd32d0b42c8a5288b4448bd7444b21320251262627bc950eaf0d1a1ef0c3014761b690122bea9e5e20f744dd433
+DIST django-redis-5.3.0.tar.gz 44800 BLAKE2B 29a671f2899aefa6e59086bc194438aaf7e724b3edcefaf0c590a14e958847e86da34b8f94d4c29d62270f53f88395df2e911659e58471b5c037d1c2cd0f4dd7 SHA512 2867d405b69400355576eb3c052b4245844d56304979f09750251f8a2cf35ce704ebcdb6c80e6280fbfe24acfb237a3428f68081b6ada11ffc78257263703d7e
 EBUILD django-redis-5.2.0.ebuild 1672 BLAKE2B f70c1ba9a1fb3475a82a36e9dc9325971e03a1cb38a424feedb694c07c7741eac6b539de5dce35347a16be3f58c24c2df610fb1ec0eaef32e9a961e4dd7e4b4c SHA512 2e10c557b6af865f266be81e941749d9debc35604af44ad0a7719eb757f200cb9eff85c0f5f2a9e7015bbe07b539a7eb973e44db08b3a6d67cd8555f3edc3f0e
+EBUILD django-redis-5.3.0.ebuild 1725 BLAKE2B 5319976b70663f20de9dd82fb84e2e13e6a4591e67af76d808157f4beb79cda7dac6a640e20708698ee5b46442dc0b302b2d7f5264e6126bb5dacc8276c52a9f SHA512 51a57f02d215405761302ecc1b15cd6a0e58cbe6e70e00edba92bd6f8b3aa4c80d61ede6136076c28c47f3dcab68ff97370ea9969ae796668b720ababe529e3c
 MISC metadata.xml 486 BLAKE2B 5bbffdb40a82538635cec1802d748bcf8c628390de12d19450486651f84f0c23ff7471354080aa51ae80790600d76f35a6fd37f720cb61cf410eab92bd15cbed SHA512 45cb2046312b95a3f9c87287e9a01015dc46b767de2dac060e79ee5457fa066f3229e815b313b4692128c88f6e13208f96048532ffe6554533427edc92286a2b
diff --git a/dev-python/django-redis/django-redis-5.3.0.ebuild b/dev-python/django-redis/django-redis-5.3.0.ebuild
new file mode 100644
index 000000000000..864b922bdd3b
--- /dev/null
+++ b/dev-python/django-redis/django-redis-5.3.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Full featured redis cache backend for Django"
+HOMEPAGE="
+	https://github.com/jazzband/django-redis/
+	https://pypi.org/project/django-redis/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+	>=dev-python/redis-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/--cov/d' \
+		-e '/--no-cov/d' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd tests || die
+	local setting_file settings=(
+		settings.sqlite
+		settings.sqlite_json
+		settings.sqlite_lz4
+		settings.sqlite_msgpack
+		settings.sqlite_sharding
+		settings.sqlite_zlib
+		# TODO: requires pyzstd
+#		settings.sqlite_zstd
+	)
+	for setting_file in "${settings[@]}"; do
+		einfo "Testing ${setting_file} configuration"
+		epytest "--ds=${setting_file}"
+	done
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index cc9c1b5f8b81..4dd24a0c19c8 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -4,5 +4,5 @@ DIST google-auth-2.19.1.tar.gz 230290 BLAKE2B c7f76e1bd936d4d76c81e19fbf6bb50dfe
 DIST google-auth-2.20.0.tar.gz 229669 BLAKE2B 547cb99cb72a4a5b224fdfff2bf156effe1cce5d7b4316b16530b1a3bbe50ab24dc54520fce3206fb2cea3fde1ca0c35f7bf5920e5128a5ed1bed13883fc75e5 SHA512 e13471f4452bd5c69c2ca9d1ff145431b160805e4ab2d3a70c35cad78c6e3e4f4bc789dfe99f55a0e60e5f335f9983529eabbfb0fc50794b62dfa7eeb70882b1
 EBUILD google-auth-2.18.1.ebuild 1502 BLAKE2B 2584d825075581b0185e33536a49f232989211770e62ba26bd89c7cb8be4f7df68dfde860418c8ab4b8e0b93972d9e1015bebe0eb44a30ea532464f53c55c0f9 SHA512 63c7d81173b43acd8543c6dd14bb6ee55ff3b583ee42f7389a0557f053fe519bd6e065e2ac9923b54d05d15c7a56114461d1d35b8b0c81c417ba77f47875c82e
 EBUILD google-auth-2.19.1.ebuild 1504 BLAKE2B e981f35bb9fcebd5b8dd729bb7708d5956951cf9328d679914134a00a2a6d5f92be54c83d52016634612e351d8ccaccc6744ccbd52d4dbd773748df803225537 SHA512 68cb3d305941f1aca108d1c795ee75305ebdbb1bd60c1cf4d352257929240901b332d94135a37b1407e67e3ba35ca6f3538582e5bb2451c608c1f0d96eec0032
-EBUILD google-auth-2.20.0.ebuild 1638 BLAKE2B 71ce7027198f2fc6987ad7db9da0c572baed35616807f12eeb913c19dc012bacab80bd57c8cf48406837eb36699c3dbc393ccdc8698dfcec8c1063c27f4f763c SHA512 64fbe0810cff2ed43359b60672db8ccdccffbff61e1e5c6d5a19cf74c4f21a6f316c8adcab9d29a5b20df56b44f7dae162cf1053be140253d08de561328a5439
+EBUILD google-auth-2.20.0-r1.ebuild 1638 BLAKE2B 71ce7027198f2fc6987ad7db9da0c572baed35616807f12eeb913c19dc012bacab80bd57c8cf48406837eb36699c3dbc393ccdc8698dfcec8c1063c27f4f763c SHA512 64fbe0810cff2ed43359b60672db8ccdccffbff61e1e5c6d5a19cf74c4f21a6f316c8adcab9d29a5b20df56b44f7dae162cf1053be140253d08de561328a5439
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.20.0.ebuild b/dev-python/google-auth/google-auth-2.20.0-r1.ebuild
index fae7f6b53c35..fae7f6b53c35 100644
--- a/dev-python/google-auth/google-auth-2.20.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.20.0-r1.ebuild
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index daeb5c725dd2..20c665d1ace5 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,7 +1,9 @@
+DIST gsd-3.0.0.tar.gz 106562 BLAKE2B 0a8616300a0f568de82e7a7fa56440b7cdd3abc86e530ff3c139a21d9f57750c0454d55e261bcdaeebb1d882ffcc6d69a09b7fe61fbf662b647ca46ad91b265c SHA512 2808fc52a46256413aeee98642f5cf2e2be8f3e09a8beb8626db7a71a1864566161d3496577d501a88caf5afde05212d80bac2fe2346f95c04a3284eb2c447d7
 DIST gsd-v2.8.0.tar.gz 107602 BLAKE2B 1317548dda93f7b7d07e74163f09aea9808ee50617e02c43f635339313e7604f5e06e0d488bdb7b336e96a7c80c1d1b1cbde0de6809102fedcfcdba2ced7c8ca SHA512 9346ed54a28d23cca9b1d3a82a86c4186dab47a6949e519e307ce121a3ed80105332360fb5a151cc68c403e00651746b2fef4d2c51781188a52569032f3bd700
 DIST gsd-v2.8.1.tar.gz 107943 BLAKE2B beeddac15851396a4969988396459ff244cc191d02618a5a2fe3059ad4e798b6f95a526fb46149d447c2478bb6f8eb9dae7e484bc15aeb7c0585b20808dfd1fa SHA512 6b68966abc92b46d84287687e975631a923b38aaca936d5031c27b8dc0fda5e02f13b725e0c87dfb61f68bbfa0ac906895479232b8ff646c98c12025e78ed6ee
 DIST gsd-v2.9.0.tar.gz 107656 BLAKE2B 78abd1bd832b1cd39844b87ddba6d687627c91624d3bcc3f81b7187b341bbcee1e2135934901bf1b860730ca4397298bd8d5d8723990e3f3efe3151bb941d406 SHA512 96883044b9c6cd580b2b45bc4db4b5f21121f83b4d67d2fc0449661e793a49466f26e497ef873d16a0af35bcb0926332fd4ce6f254f46582ba5cfccb8b52a02a
 EBUILD gsd-2.8.0.ebuild 759 BLAKE2B f825dc2059ec969c4454b686b7a8a6d450c75cf2d2d478881018c5b94ffa78ad17e3fb0f81470e967bec6f6a188007805ba4f06f01a2c2cb79bae6b5b795370c SHA512 677fe27fd5b57104efc8af001f22444bdec4ca7b1f54229707632bcb43e1288adb669f6304019fb84caf444f7b93752565f33c7fc7bb04c913f448e93417bf89
 EBUILD gsd-2.8.1.ebuild 775 BLAKE2B 2c3a1ead4c629c6fbb0036b02419f97eebc152977a90c062e58118c5fc7d42f3ee8857be6e75394a299c0154e5da3541b068f2ee3e2331a45aa21adffc98608b SHA512 4c6ba8abec9652c0f09718169be1afe80ee5cde6f99537b68c94c5b049abbdbbf8bd352d02484f6b117050ef1725d0f81c0697ce05b3e54dd6fbbfe6e8739c7f
 EBUILD gsd-2.9.0.ebuild 776 BLAKE2B 14c170e8c1a1759e97ff6068cb205765f69bf07654aa29e2a015dc3dbd53198c617e7897037603b5281c5d6478fc8eaf675cac0eca4e5913cd99fcde0ec93393 SHA512 4260afed08960051c10b02ecaae60610b6adbc07610b7336add379a9bdef131d19ac0b546ecbffd619e157824452605f91f9eccc36e2354e0f63e91f6e110aee
+EBUILD gsd-3.0.0.ebuild 737 BLAKE2B 77c8cba0720f2c093da859609efa064a5266fd45f7c6f1bcefd91f150bca5542bc2f65e6d52862938f5eb44a39bc03ee17bf34ffa1c9ae6010e0ef121543718c SHA512 e0c034b04096541f05d62c7eec2452b2d693a96658928cc2520d54b2eb1b95615e1ec1b30e51b8f1bb88e485d24a8d4166fcecb8943900664e6c8fb5a8a9723f
 MISC metadata.xml 470 BLAKE2B eaa8e5381c07e9d74d0df82cc0d3724493f0e0acce922837677d7fe6434ccd868cee2f85fa6e48cd2b01844247120c8ccec516b78279f770d3b90568e70e6f02 SHA512 2a1b071f15d642d7e0f1c71500c349cee330f65fa1c0841ff21e0b84227eb68e1ddd244b08c352cc7ba8a8f9910cdfc365cda943838f533bf70bbbb8d0945c47
diff --git a/dev-python/gsd/gsd-3.0.0.ebuild b/dev-python/gsd/gsd-3.0.0.ebuild
new file mode 100644
index 000000000000..c9851b2e7559
--- /dev/null
+++ b/dev-python/gsd/gsd-3.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="GSD - file format specification and a library to read and write it"
+HOMEPAGE="
+	https://github.com/glotzerlab/gsd/
+	https://pypi.org/project/gsd/
+"
+SRC_URI="
+	https://github.com/glotzerlab/gsd/releases/download/v${PV}/${P}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-python/numpy-1.24.2[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs gsd
+}
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index e5eea190be13..844ecfc69684 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,5 +1,7 @@
 DIST jsonpatch-1.32.tar.gz 27988 BLAKE2B b60dc7607f644f1ffd095486c237e3bb537b465132725e98fc8799a42a92dcbb43e1e41d281fbc2ce2c4efec327ad681d7740129be55d94c51321e620d084d95 SHA512 4e2978555dd506e09553014d426c4e3a6c6d5c865428f11450952704007c8a0b2060b945cf1fa33a128151427e1c66919891466e095e96fff4316304f0b3ad1d
 DIST python-json-patch-1.32.gh.tar.gz 27988 BLAKE2B b60dc7607f644f1ffd095486c237e3bb537b465132725e98fc8799a42a92dcbb43e1e41d281fbc2ce2c4efec327ad681d7740129be55d94c51321e620d084d95 SHA512 4e2978555dd506e09553014d426c4e3a6c6d5c865428f11450952704007c8a0b2060b945cf1fa33a128151427e1c66919891466e095e96fff4316304f0b3ad1d
+DIST python-json-patch-1.33.gh.tar.gz 28475 BLAKE2B 7d95ab23e09141cbe26618c91b12558d5fbfecda3e5b148d834753a364155d30859a9bdc3d321bdfcc5269f7e0170671524ae78f5fe65a8c97041bab3fb522b9 SHA512 0685f63949bee135b19d0962bdaab32ba97e02772b6650d885be57c09a2e89546222ebba1a4cf146b2f91027790b0a3ff2ea072d66dcebf9153aa601638bbfa2
 EBUILD jsonpatch-1.32-r1.ebuild 956 BLAKE2B 03001cac25cb82788c59b6a155458a53fb2cc19dc2710d5155e999b8e5f754d5f584935c08b90a45196cf3c85549d01f4b9298cd2a3ead7cfa9f55b62f009ac4 SHA512 a13b9e0a0d344324d9d2403729d3011a0f8f576dfaae26b7c0f9239c63c06253acee3e577c3a54a1cfd97512abe71d0319b1a4b46117aa61787e805f3de7b95c
 EBUILD jsonpatch-1.32.ebuild 849 BLAKE2B e5845e6cc79e7d09249c3771fb57b79f023d0d0033387a28860a909293b3fb816396f3de7a3719c5a5ee39e80ab3fe09dc9e0a1dd64d7cb9f80c9b74baece724 SHA512 df87a48b28d40ddc236adda9afec0f499a92dae6102c57d57d50300acfc60f58fd356290dbc6f4952d284f79e8f9952467f1db1f0aed19b9e1c15944ff901664
+EBUILD jsonpatch-1.33.ebuild 956 BLAKE2B 03001cac25cb82788c59b6a155458a53fb2cc19dc2710d5155e999b8e5f754d5f584935c08b90a45196cf3c85549d01f4b9298cd2a3ead7cfa9f55b62f009ac4 SHA512 a13b9e0a0d344324d9d2403729d3011a0f8f576dfaae26b7c0f9239c63c06253acee3e577c3a54a1cfd97512abe71d0319b1a4b46117aa61787e805f3de7b95c
 MISC metadata.xml 705 BLAKE2B 4c59d56bf1f2eee88fd6a9284f13055ff97cc9c787ad3e03b983b8ba0c995fd34148e9a6ceb0f3f4cd1226aff0e60c6f7bc23e26e8da375d3527148ed49766ed SHA512 0323b39edf87ff697dc30deefd0568706e8318e54fb072902d5b60a31be65c39966d727f441f524715ce4c3a0958b9264d82ace03210c9550115a5b3fda2edac
diff --git a/dev-python/jsonpatch/jsonpatch-1.33.ebuild b/dev-python/jsonpatch/jsonpatch-1.33.ebuild
new file mode 100644
index 000000000000..db865c090f6c
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.33.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=( python3_{10..12} )
+
+inherit distutils-r1
+
+MY_P=python-json-patch-${PV}
+DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="
+	https://github.com/stefankoegl/python-json-patch/
+	https://pypi.org/project/jsonpatch/
+"
+SRC_URI="
+	https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
+	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-freezer/Manifest b/dev-python/pytest-freezer/Manifest
new file mode 100644
index 000000000000..d1c38c41764d
--- /dev/null
+++ b/dev-python/pytest-freezer/Manifest
@@ -0,0 +1,3 @@
+DIST pytest_freezer-0.4.6.tar.gz 8661714 BLAKE2B 03d2545762f0702776fb72b63ceffaa44e53775c2b96636223aee67b7d8503624dad02371cd9985eb507939b1346463d8a38bec9305518768ad63af0aca50147 SHA512 85b703d9ef20ff9d2186004d574357a89f0c19de251c9fdda4f47526b920df40b330c7970d06dcde2eccbcdd2a61f62ef995670d11a9a3fe6816eb64f5bc3158
+EBUILD pytest-freezer-0.4.6.ebuild 564 BLAKE2B 33ffaa62208f9a4601e8538ca300b6081eb15612a76af550e58379f17d94bf3229ae34a4d7226c31e50a62542390747ccfb94305d0f20a88a00032e79b700487 SHA512 b18653e24dd62a947baef9ef6a5e96fb0716ad7f9718a84bad0dd0c67e2d87830514ea5fc6179936db5aa07dd3a629e60b13064c7d5b58c2a0dd73c7b17a3c34
+MISC metadata.xml 385 BLAKE2B ad42609cfafcadd07ad0c5b698899ea764c48d7468a5b19ed5bc32e383ec6da48fa449e9c15354ce8372fe5110d74f6c0c4921afb3b68e78c4770d6f364079a0 SHA512 3c1dac31091625d0a18ef7f4d36220602084ab10314b3c42ec319a30db364a57277c0dc4913383225b04ab0a55137460769e18ae4188c32d17aaf493200315e1
diff --git a/dev-python/pytest-freezer/metadata.xml b/dev-python/pytest-freezer/metadata.xml
new file mode 100644
index 000000000000..800e4e6973d8
--- /dev/null
+++ b/dev-python/pytest-freezer/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">pytest-dev/pytest-freezer</remote-id>
+		<remote-id type="pypi">pytest-freezer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-freezer/pytest-freezer-0.4.6.ebuild b/dev-python/pytest-freezer/pytest-freezer-0.4.6.ebuild
new file mode 100644
index 000000000000..94f14719fda3
--- /dev/null
+++ b/dev-python/pytest-freezer/pytest-freezer-0.4.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pytest plugin providing a fixture interface for spulec/freezegun"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-freezer/
+	https://pypi.org/project/pytest-freezer/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/freezegun-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index c445805c5da9..b9556d2e796c 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,7 +1,9 @@
 DIST sphinx-autodoc-typehints-1.22.gh.tar.gz 35429 BLAKE2B d871de3d3a37b2632e6b43dcb4ce58fbf61bdfdb225650486fdffbbfff4148770f40096815d3e6807f4d3f789c0f7f7fdfef841a3d087f0b12e65671597207e3 SHA512 9fed312b5b63dcbf0b39e226486abd687e68c26eeb7303ee3049251c7007d7c364ceb196672ac16101b1a76493e0a0a4e1d9532e54eec250720a37f0c8f77fda
 DIST sphinx_autodoc_typehints-1.23.0.tar.gz 35945 BLAKE2B 4af9ddd722a1fc59d52009ef46ad7af828d826cce61e0bce260b68045d4abe3b184ffc0368b29f60eba210def8d8b3b37a5455442c156b326d4b9956c6afc32c SHA512 990db1f042913088fddf56cbc9ad5f401f7d886164c348aaf19fd1541fa1566a2d58d1c182e52d839d1dd32606ca3da1191b7062a6ed9c8f04dc6a47efaf5488
 DIST sphinx_autodoc_typehints-1.23.1.tar.gz 36243 BLAKE2B e53dc42a31e358ca1e3fbbe41a3002abd4e1f470ed259d5b0b6f8def81de91653d1cb609e44dc10409340775ca877ea394e4fba1a5f2c3a38c10ce33996e12c8 SHA512 fe10d0ae4d23a979125868fd6743b37d2f65e1297620142c13cb59b83ba242e4b45098cc580c18232be1b535f5927ba6dd401f7cd4d3a39c2aab3611a2a751ed
+DIST sphinx_autodoc_typehints-1.23.2.tar.gz 36198 BLAKE2B 15c47e89e50a1a88878f2ec5c511900ad5f0437975c041c99a33f2cc9e29de955b897bd6f853b010c0f8185cd669be9e8de351ee654e9bd640337a5771caeb62 SHA512 27e9a4179f050444dfbd3d4648212f1d56c47a938f8e33dded9121c5cd4637b4e2096eb383bbf663078223dc46973f3e0fcd02ecd162611d353ef5d702977f48
 EBUILD sphinx-autodoc-typehints-1.22.ebuild 1071 BLAKE2B e730e47467cf409a1eae7e6aa5e203a986ecd9cc22be43fe6617bfdbd075766eb4577d2812b9456a37f11440f5dbac792ff394b5b847b7ae888d426bf972cc2c SHA512 c66835c68ce571d9b7bee6c57105fde478c26ea7a1a57e2d4173ad6a18be0e1c623364352e6cbe7cc7f95c67177b737d5827e5e6df49d86b351738ad2d0657a4
 EBUILD sphinx-autodoc-typehints-1.23.0.ebuild 928 BLAKE2B bbefd07f74245951b46242b01f26b7e1ac878069e791e27a4ee9aea652c50d6b2aab6131206639f6b29deada8e047a097ad6ff197a3e5c20387d30fdd944a110 SHA512 20117f8a36326ef677a74034dde671e47ca0e8c38c52a985963d1c60705045962ccfb5c3d88d8cfb7e051e4c5e3bdbfba43731f38ee358e6485250bafdd4a845
 EBUILD sphinx-autodoc-typehints-1.23.1.ebuild 929 BLAKE2B 8eee52cefb2f5a8faad5258488bd7eb2e6585bf9d52b72669230f1c28f10fe196a3eccdd52ccf78044f5471ff5225555355edac3323d6d7d91afccbb6adcc5b5 SHA512 d618763aad568f58787a0a683d027a365dccbd835d8e08c9f37f9d9dd12445603413635f552e10f3609952a952b329e55ec89fe255a4e16a684fb31e6a6ef570
+EBUILD sphinx-autodoc-typehints-1.23.2.ebuild 929 BLAKE2B 8eee52cefb2f5a8faad5258488bd7eb2e6585bf9d52b72669230f1c28f10fe196a3eccdd52ccf78044f5471ff5225555355edac3323d6d7d91afccbb6adcc5b5 SHA512 d618763aad568f58787a0a683d027a365dccbd835d8e08c9f37f9d9dd12445603413635f552e10f3609952a952b329e55ec89fe255a4e16a684fb31e6a6ef570
 MISC metadata.xml 682 BLAKE2B f8b48894f28411a17c73956bb75d43906c893b33d3dc611dfcc46e7a71ac43824aa54f660ab4f49c9870248b2b9ff405a2a3229f92975337e69201868eed3378 SHA512 87a0ea2b2e4cb2b5f0d1593b2c4bd96b46dabb8baae71a6ba18cfd83dedb2a1d5f0ae0f8711144967a5d44015e9ae7ca013dc0aa54e20604633ae062d95649ef
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.2.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.2.ebuild
new file mode 100644
index 000000000000..c12ff85ed759
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.2.ebuild
@@ -0,0 +1,38 @@
+# 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_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/sphinx-5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nptyping-2.5[${PYTHON_USEDEP}]
+		>=dev-python/sphobjinv-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
diff --git a/dev-python/time-machine/Manifest b/dev-python/time-machine/Manifest
index a5b6c78a3cdc..2f3773be17a0 100644
--- a/dev-python/time-machine/Manifest
+++ b/dev-python/time-machine/Manifest
@@ -1,3 +1,5 @@
+DIST time-machine-2.10.0.gh.tar.gz 28770 BLAKE2B ba4ff7dd2559530e86e38d23600209f2e860a1541c9ef5536d07092678018c210ec5e0c63bc615e81b62e8179324953d023ba247c501aa94e16beb0345cacf8f SHA512 4a3120432cb6aacb1e022415094a4fb204d2f1b39c378307a0de34505d470982d81e1d2d940d0b9745c3edcd563ff55f9ab1d602bd1dea720a474fee5fa1e4af
 DIST time-machine-2.9.0.gh.tar.gz 28043 BLAKE2B 9a9a521c94b72a7464853661da791b6f57f5155ddc62ffceeb82f808903f4c337e6bf48fe8300bb4f9f5673fd175fd85038a4e80a39e8f3e096c12c27ee790ec SHA512 ecc780a72d279b49d026a8f3f89210cb4c90e02c5a517c08eadbabcb65216a24c603ace39afd76ea1e6ccdef589d5997581d0db7477bb28fe4d1e0510daf17a0
+EBUILD time-machine-2.10.0.ebuild 674 BLAKE2B 6d36190a66f13da17b9c8b755275ccba14bda8558fc5b5d7f57f5cf33fd64a21b75f564097a7e47122009748530746c1384c084d157d5a68033f1a2d2b93e66e SHA512 e399d9c6b9af06b6fd67760c0046be313d43c031195fc45c1e782448da35fb0004861d84e116d17ac37caabc34b0b4a0bc8d81ef1c3a0aa1a423a2aaca4ad2b8
 EBUILD time-machine-2.9.0.ebuild 666 BLAKE2B 31b2cc19c14d0a6265e9f232e3473912a9597530acd7ec92df6d768eb96c85d1aa404212ad0b3a8a16a96006f4db94bdf70ec532f1dd3ae49ec0540b2b52b2a9 SHA512 f39aadc323edc83a608048cf5557846ce4b5f45d30f8188e19d086715dfd9bec5c9d5f3fe229b5e3882a0fc2dca0870e50bcc158417f0078a2d32cb6749281ed
 MISC metadata.xml 379 BLAKE2B 98883d810d13745555166c9901f0ac15bd1ace4754e67ddb090983d97808a8362f61d91e82e7c903920cf42037c3df2655b211caaff904fb3ac4d2494ebf2fd3 SHA512 74d7de420c0bc5c03a3524bfe9b888fec8e5ec353d89b8a8e5d5d2dbd736ef8d34c45f026fe493dfe87ebcc7754c30d9b3ef7fda1abea91cbf9599bdeb4ed3c9
diff --git a/dev-python/time-machine/time-machine-2.10.0.ebuild b/dev-python/time-machine/time-machine-2.10.0.ebuild
new file mode 100644
index 000000000000..d6f96f71fc73
--- /dev/null
+++ b/dev-python/time-machine/time-machine-2.10.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Travel through time in your tests"
+HOMEPAGE="
+	https://github.com/adamchainz/time-machine/
+	https://pypi.org/project/time-machine/
+"
+SRC_URI="
+	https://github.com/adamchainz/time-machine/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 2ec0d258c93a..f16d6d09d6a6 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -3,9 +3,11 @@ DIST tox-4.5.1.tar.gz 170137 BLAKE2B 38ab00eb577e66211db0ecf8931087a8c5a14f8219e
 DIST tox-4.5.2.tar.gz 170336 BLAKE2B 1dcd2bbd7d153dbf0ac7bb48cdd1826d5fb915b7ef6d30a943138e06bb5d82d67db551f8c6d0342a5a81d91ddfd7da6ad8272fc016eaea27bcd4d69f6be9c605 SHA512 44a6c9821975205258402eaaa2010a0acde98190c77db0361da6c67d793de90871786fe2d78c6c9ee83100d7399e1eac857e2edaf94c64c81fb535ff871a363c
 DIST tox-4.6.0.tar.gz 170401 BLAKE2B ae9decd66677fc4e0422687dcd166a27df2f5617c4dbad1d99762542e0d7e1cbcb27892fce74217f85d3e93176475fa39a22a6dd99ccf141a12832862b436a02 SHA512 465db889630d1aa36329b41cf91537e7ca27fe0901b77b8b24d180ab854f2b7c062ae62bdcc931a33235b617e7c709d9290f0769b133b5cd40e398aea9a8d918
 DIST tox-4.6.1.tar.gz 172090 BLAKE2B ee86b8972ee273f07ab0197ab2f0b6ce4505206eebc412f6ec68007e1cf5ac270662e4cb61aa6eb5b08df07a5b20a28c498f9e730fe08fd04339ba918a7712e5 SHA512 b6571790275ee6d7f33dfd72c587b70476fc4ea0798a5331831bea69087cacd21eed546197bfb4a32cb4fe182b63b759977f194e19b56fb346ed251a00be9d6b
+DIST tox-4.6.2.tar.gz 172333 BLAKE2B 0fa9e7782eb18b525ff7f226b0fa9b8001f69f8b620b86a19bc2c19c349b2c8c7440a1de220387bccaa7a9044796db57ae63d16851c98a73ced2c495a01b5f3e SHA512 3e4663972f8c51a634f00c57c8b9b6704a628e912ef2e1854a8dfbd7bce13e44822984af9f69cb5b8a306ede545a565044cfeb8803cff41a530de7958fc07878
 EBUILD tox-3.28.0.ebuild 1916 BLAKE2B ff8aa55245a3f654897ad4c8f5861a55410b2b9442bf3f85aaa0ee236f576efcea1a2ed697c715c7182679b62a4781c5a0f6236eb92a1b12d6ddc73154612a67 SHA512 2f5999d0263da9efb00216600f8b98fb3c204e11640049d92c6106279baeff452468d2bb78236839bc8bd5540d6f9d01338af26315148d81a788d476ec5dbed5
 EBUILD tox-4.5.1.ebuild 2677 BLAKE2B 0f93d46d9c831f6b320286b38c2f2b5677442c9fd2c756a109355addba5d7e2efb0657c6ae736f391891508e5d247c1f06afb338ae2a2fb639f962c81939a1a5 SHA512 7a2e2f268c69f8438c6265737f1222561e5707350f6822cdc6d15c425c34f59415b5f7c9bc4993c996c885048f590a696f680ef5a9e41f9daa16cd07b62cc591
 EBUILD tox-4.5.2.ebuild 2685 BLAKE2B d431a1d84cd09d18219631d94e24ad049d1e35647a262e70e75bc1851791dfaa68ac76222cec39798460091850998d7312a328335c4c2c354a9b8d72e4ee3893 SHA512 6831ff1bb781bfc16d9402332998cebbbe06915bf1f5d31bcd8f92cc690c93238ba2731fc9378781dad08bffdcedff8f69a288914c2d0a575e2c8021463d18eb
 EBUILD tox-4.6.0.ebuild 2685 BLAKE2B d431a1d84cd09d18219631d94e24ad049d1e35647a262e70e75bc1851791dfaa68ac76222cec39798460091850998d7312a328335c4c2c354a9b8d72e4ee3893 SHA512 6831ff1bb781bfc16d9402332998cebbbe06915bf1f5d31bcd8f92cc690c93238ba2731fc9378781dad08bffdcedff8f69a288914c2d0a575e2c8021463d18eb
 EBUILD tox-4.6.1.ebuild 2689 BLAKE2B 07e3ca76ce7c431596d7a8eabce069f211061a781fd921a1b25d6a567c03cca270dca02f2880fe721fad0905d6c3993ae1995d3c62062054c3bc87819330dbfd SHA512 4c4c6cb7654f548dc41b5ca7e51e9b441f4dcd6964eee1a953f5d86feeb1171f2f562b8a6f37229239d5ff99fd7f8e01fdbdffafe47888da234a28244d7e64e1
+EBUILD tox-4.6.2.ebuild 2634 BLAKE2B eb3681c2ce92f5f7a05da9d10332e85c470407b75859acf43ca399093093af166b98919f292e1a332d0fba3c361593680ce150bdaee4a48a7b89ff9c864a3668 SHA512 039c740f22a298f65432f49cba21621c3c9d0ada8aa766f1ebdba86d20151a8d677fb4c2e705ab6615029aed0d04f70fb1af5d5d3f237af738c6f8bcc49736d9
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.6.2.ebuild b/dev-python/tox/tox-4.6.2.ebuild
new file mode 100644
index 000000000000..a18298633f2c
--- /dev/null
+++ b/dev-python/tox/tox-4.6.2.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=hatchling
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="
+	https://tox.readthedocs.io/
+	https://github.com/tox-dev/tox/
+	https://pypi.org/project/tox/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/cachetools-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.5.3[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-api-1.5.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.{9..10})
+	>=dev-python/virtualenv-20.23.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/build-0.10[${PYTHON_USEDEP}]
+		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.9.5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.11.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-3.3.1[${PYTHON_USEDEP}]
+		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/time-machine-2.10[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# devpi_process is not packaged, and has lots of dependencies
+	cat > "${T}"/devpi_process.py <<-EOF || die
+		def IndexServer(*args, **kwargs): raise NotImplementedError()
+	EOF
+
+	local -x PYTHONPATH=${T}:${PYTHONPATH}
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
+	)
+	local EPYTEST_IGNORE=(
+		# requires devpi*
+		tests/test_provision.py
+	)
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
+	)
+
+	epytest
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 8c8abaeead9d..76aca206fd04 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,7 +1,9 @@
 DIST virtualenv-20.21.0.tar.gz 12070063 BLAKE2B f69d5934191ccd8e9420c37e51b53df7876961d6f13d0f75845530893fd91df29a512e64eaa27135535816250a3149087029e6fe1b15317b8079af9cee2832ea SHA512 77aae5ebc5007093953c30da1eed996e851a65c7dd1f7a3a85961a1bb251b3d7970936eea1efe8babb216d2024072bdbf1c1a97ba8760a04a0abf6e7c3a27d09
 DIST virtualenv-20.22.0.tar.gz 6612036 BLAKE2B aeebf0a80dd96eb78dc4a2ca258e1089a9ce1a4e0bb66b1e8b5093353e298e22dbcc57acea7f5094dee29e4e855c51ce235901fd39d29fbfbc3dd96dcef8b15f SHA512 83d15b03abebd856b1636d0f00443f77882de9fdeb9dff67b72dc839d55f4e7e0668914ef3ac79cdf1d8cf147e29ba97feb720a5ebfcf24dc6cd27ec2e04384d
 DIST virtualenv-20.23.0.tar.gz 6617594 BLAKE2B 370cabd8b8fe24dc7bcaee9c9976d43ca36768824e5fa8c4167f701edba0498fc9faf7af12e8964b57246d2390d995562327067cb30d577ef70adcd9439b3a49 SHA512 90b5aae687984b982dd60d573f9b2cf9a525c135f93d51a9087940d2265a1dd0c59670dcfff9b3aa459a081b0b13d1183360022825f486c9cf2fc86bfc5b8bc3
+DIST virtualenv-20.23.1.tar.gz 6619074 BLAKE2B 0b35a1439b7e2a9eba9c676457a39d22c4318dd4925723bdfcd5ec36cdae236b5bd6aee44a7e4cea5f1febfac7dbf58a7b0e21bb150529f9b851eb065fbddede SHA512 9a19b8f4aff021f5419c10b5954118adb668294cdeffba7a43ed12f76fc6fc8aed8e53df68277a959deb7a4e81f81ed9b4797c17574c347610c8de8d85826af8
 EBUILD virtualenv-20.21.0.ebuild 4761 BLAKE2B 75819c09d97c7f43d32d2840c67d2a42c71b1218e19dbf327f2cb9c9fb705376384de1b4d071302f3d65b16ed5d0dab9fe4504eb68b07dad8446be8240806244 SHA512 ecdb0b5b5073eff31b43a3fc6879d2df6650dc788b6a82d7e15316b394aba08d2c44ea8f66f0481c3086b4702e2eb7438ed86aaa0b9b780a1355d7a9b15bcf4e
 EBUILD virtualenv-20.22.0.ebuild 4870 BLAKE2B 3a6f9f09df74fd47b99ea6b2bab948a6f6d79d8dd052a06c0aa8c4b989dbc24aee5dae8b5b39402370696e800c1724e0e0c1f6e5851823ec2c0fb78df8de494b SHA512 1b3c774ad805c5791bb5baf1a6a6809fb523d5bc519c20ce534cbb2d6c6cefb063641938d6fc99e6cb66c3bc95e1ce24f33588eedcb3578e6380c18444d53364
 EBUILD virtualenv-20.23.0.ebuild 5011 BLAKE2B 09fb27b2ba739808b1d13f2f903938d8b81a923739e662d4dedc9b689310cbf29f876a47079b9b5967a9e2b14090c399526cf70ad3bf2d0895d6b3359d92fb48 SHA512 587c41a7ae0e16a1d3d25d84a8672af41f04d6541fc1227692efb5873bac8f2c9717ced8caff36316ee9efcbd46b1678cc18e9259c8a7c54eb6ed40573c790e1
+EBUILD virtualenv-20.23.1.ebuild 4937 BLAKE2B 5513fc7f431268786f7be8f496c6d0c78a1c3d8ca67580b552b08179ee1006a5412c6f1549575ef262c875fa5a1dd057ce268d2fff5c38d6b27ca761d29f3217 SHA512 9ceb6e0fbf7cfd4b453b6bd448da4310c369fa45e2e26ab035b92fb58275ab7f72cc60bc1527c50dd70d5619b4fe0e95ad5285504fa6cd0bffb72355f032c374
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.23.1.ebuild b/dev-python/virtualenv/virtualenv-20.23.1.ebuild
new file mode 100644
index 000000000000..591d6471b659
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.23.1.ebuild
@@ -0,0 +1,115 @@
+# 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_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/distlib-1[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+	<dev-python/filelock-4[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.12[${PYTHON_USEDEP}]
+	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.5.1[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
+		' pypy3)
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+# https://github.com/pypa/virtualenv/issues/2554
+BDEPEND+="
+	test? (
+		$(python_gen_cond_dep '
+			!!<dev-python/virtualenv-20.22[${PYTHON_USEDEP}]
+		' 3.9)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+		# tests failing without python2 installed
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+	)
+	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
+		tests/unit/create/via_global_ref/test_build_c_ext.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+	local plugins=( -p flaky -p pytest_mock )
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		plugins+=( -p freezegun )
+	else
+		plugins+=( -p time_machine )
+	fi
+	epytest "${plugins[@]}"
+}
diff --git a/dev-python/ypy-websocket/Manifest b/dev-python/ypy-websocket/Manifest
index 3bf72600da73..42af59e932da 100644
--- a/dev-python/ypy-websocket/Manifest
+++ b/dev-python/ypy-websocket/Manifest
@@ -1,7 +1,9 @@
 DIST ypy-websocket-0.10.0.gh.tar.gz 14621 BLAKE2B c027ebd10a2a6ac7098d662435eb26b5c3a466d83c22a9db62a795be72df86ce34f0d233f05fb6179f07cf479222db1266c9a5070130da23f87f7adbbb9b471c SHA512 8267a3598c4c0e7b180f1718e9f84e05734f2e75acc971a531bf91cf9eaef4f0f5a4404ba0444aa7664c639ce877fb7409e0a65716dca046fe9423cc8f079b99
+DIST ypy-websocket-0.11.0.gh.tar.gz 19274 BLAKE2B 61222dd10259c4f35bfd81d8f5391189bbbd8d950f796d6bc7e69e8df8e3167095facf6fbd2c0eb79c4ec8fdc95fbbf4e5c88941283dfcd531db69dfc1cc18f2 SHA512 ff1616f3bf65c4c2909359de4483ae1d27f31b7771e8c83ade039599fd85933664128469a2ecd6d52864887227ab3630c86ba6d1a10273d4a2cffce6e598aa2b
 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.10.0.ebuild 1011 BLAKE2B 856a170b7bc45672d22c2d2952d9202b9516771dc84f3ee4ede04bbca3a001ef4827d3218a2125965a58921e63b01890bb8c80a0058540c440f30fc0e42b6cde SHA512 ec5dd431f1ab7318f288aefcf210b221f1d3b331f5314f244de991d7b0de83f90c6097677c4ec0a538b882ec4a03cd31c5919aab1244f575458eb079bf13ad64
+EBUILD ypy-websocket-0.11.0.ebuild 1011 BLAKE2B 856a170b7bc45672d22c2d2952d9202b9516771dc84f3ee4ede04bbca3a001ef4827d3218a2125965a58921e63b01890bb8c80a0058540c440f30fc0e42b6cde SHA512 ec5dd431f1ab7318f288aefcf210b221f1d3b331f5314f244de991d7b0de83f90c6097677c4ec0a538b882ec4a03cd31c5919aab1244f575458eb079bf13ad64
 EBUILD ypy-websocket-0.8.4.ebuild 879 BLAKE2B fe80cd47734c258da8d959c48ec9bba22f9ce10e2c091c181247b8e4e3664499cce764acbd0b61c149923a6f090bb542ce08662c8433aca7875f2927948eb6c2 SHA512 bfe1656fe6aec60315f1d3037252efbb69b7016ef1a99e48eab316325a1bba26b7a6edf469637af4831689094b1acfd87c8e5260c758fba5247339996f53957d
 EBUILD ypy-websocket-0.9.0.ebuild 1104 BLAKE2B 4d3d27bd15946c0aedd0b32a7023977fb308f615446906745e72cbea1f75e84a5d7f6f31a4058f029f2b3e901e066ff1318212ab39d6a8f04281255a5b2aedb0 SHA512 32f38d19e9f1088f4008ea4efc997bfd5af3b4639ac2ffb0fd129010af1555086512f7f411784d6174ec3f361c41e3d30793dd04c7192f173ffd0123a238456b
 MISC metadata.xml 414 BLAKE2B a58b2ac27d2f9e1a1d06c8fd9dcb6f9d1654fd2665d6d676a734ba228b71f6da488b835b7cb5739a6acad7102a669356e8f872bc96ce40b6ab0104699f8a7379 SHA512 533c2d5a8363cc5575d8ee08a3642f8b6fd11311fdef7d6902cc5e19fb33512ca2d9a6ecde76e909a6192a48449d612bb2b6db7b96ad1d99a89d67b06b749d76
diff --git a/dev-python/ypy-websocket/ypy-websocket-0.11.0.ebuild b/dev-python/ypy-websocket/ypy-websocket-0.11.0.ebuild
new file mode 100644
index 000000000000..075327cc99bf
--- /dev/null
+++ b/dev-python/ypy-websocket/ypy-websocket-0.11.0.ebuild
@@ -0,0 +1,46 @@
+# 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_{10..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 ~x86"
+
+RDEPEND="
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.6.2[${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/uvicorn[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Requires internet and nodejs
+	tests/test_ypy_yjs.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 58e7a6537ad3..610df8a0a4d7 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index b25826f66065..2d92de0b8b6f 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,5 +1,5 @@
-DIST fakefs-1.3.2.tar.gz 54762 BLAKE2B b5b8c00ffbd8974b2eb024deca4a2e48791fb542e2ad47d06d1c56ad1caab1433b240ea6af4a6836638c84bb79869dcd9d74194768d380173efe54f6765b7f7e SHA512 939dc7f28b266d8ef0cd5b4d33c6abc4a766143895d226b6a32af05f2f6e9eded63d86cf39d607094435a1b428297ad11366f645f4bf6789048b7e03357bacc6
 DIST fakefs-1.9.0.tar.gz 56514 BLAKE2B 07e84f54413052b3bf37934b395c6115455ca241d42700dc054729be2ce82eb91944b83e01933fd001b46c9db593f2fd7a9b69f5f49529fde3e1ce967498db5b SHA512 e6be021fec79517127c6f514cc3379fa9c64d75c16d0ac80ed5b677f55625f1ee464eafa0768523a4b364323cfb1aae79814057ee9be3a0d947aac22d39a88f5
-EBUILD fakefs-1.3.2.ebuild 1120 BLAKE2B 4c92c643f3e97de75a8e8ad13d90b8e16d1c27138617112dacbd38698a0996b78197bfd9a5755999dc6a13205d0f054816bbdd82fb520559b2345cb8805e17ad SHA512 831f64f2090ab580a56e3a3811e9b8a565c2acd593cff5e8be565a0841a085ed3b70df0793a203bfcca64384f9891ef134dc9f0260904c05aa68b50a97ca46eb
+DIST fakefs-2.5.0.tar.gz 57850 BLAKE2B fc53d8f3dd40bfbbef81e9c092439a099a9964b4eff8e5fa6d59c2215aca735d02ab24f2a44c2f51fe874c2a3b088190455cff17a3bf9099e9f56effbceed61c SHA512 acc2fd6891964ce6ab3dd307d8bc90dcaa92c9c01328865bfcee5de5959089e7d7dcbb4d52576b5fb81321ad12719c7d3999d6b0102e5e2d9ef88522ca032bdc
 EBUILD fakefs-1.9.0.ebuild 1120 BLAKE2B 7df4041b6aea1999135f4487365a5f9bbbb00e7cab4b618d303a712ed7609a81f627dce41bafcc97548230f1681f74ab38e2f5ce34a4bc0c2616b6dfeee3625d SHA512 b5fddd44abe6b0464648f494f021b1b1374f044767ccba074b7590f8111728945eded741364854b15854ab6e2d6c1dab644512c2e771c8a7c6edbc797d750aad
-MISC metadata.xml 341 BLAKE2B e6dfc98fa1e5de6bb68479d5d65373885b346fead7ea66fc0cb5d6560bf1d2eaf31417c04a2fd3c203e8ed8a679a64413e9b866cacbca2fb17b081f507f6dc95 SHA512 761ace4ce03d41e9fc3e0b0c62274f2aac01c4a3bb17c8f1009292773c5e5d9aa10b8c92d8aea0d03e7c91f4fb88dde607cbf856ab70286e6cfde4e265fd36ba
+EBUILD fakefs-2.5.0.ebuild 1242 BLAKE2B fb869517e53acab3f1a414d7f3cfbc316ebd2202123ab02b2316a9503d0f930cdf0f603e119bdfa8ae526d11a1feb3c8f08dccd9967def10aa782671b939d390 SHA512 b7dbdddb0c109cd27006190743cb5ae65a971c28356f9436c7c4897785634f3043627bd6b7db8213267acceaa290c0e5560e2e5a193a130fc36dcbd3e26dcb3d
+MISC metadata.xml 390 BLAKE2B 0bb4b174c4e97c50f3abdc00222b9b761e71b26bc9da391413ab9fa8d69d1f510d3ff57c44caf2a244e5a63c4e1d71ef1aec0b1448d442be28acca14bb4f129e SHA512 8898c4094b8e0d7f161be59595430ad65fb856f72fce0a6cc5fccc3e494d6c63a370fe4733db20256ab56907918559dcef053d60190039d57b1817e8e24d6edc
diff --git a/dev-ruby/fakefs/fakefs-1.3.2.ebuild b/dev-ruby/fakefs/fakefs-2.5.0.ebuild
index ebe15a72b00a..1d2569ad0fa1 100644
--- a/dev-ruby/fakefs/fakefs-1.3.2.ebuild
+++ b/dev-ruby/fakefs/fakefs-2.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
@@ -14,12 +14,12 @@ RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/fakefs/fakefs"
+SRC_URI="https://github.com/fakefs/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "
@@ -33,11 +33,14 @@ all_ruby_prepare() {
 	rm Gemfile || die
 
 	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
+	sed -i -e '1igem "maxitest"; gem "minitest", "~>5.5"' \
 		-e '/bundler/ s:^:#:' \
 		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
 
 	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid test that uses the console and hangs on user input
+	rm -f test/pry_test.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/fakefs/metadata.xml b/dev-ruby/fakefs/metadata.xml
index 292c4bc1e6c6..eb9aa0596360 100644
--- a/dev-ruby/fakefs/metadata.xml
+++ b/dev-ruby/fakefs/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">defunkt/fakefs</remote-id>
+    <remote-id type="github">fakefs/fakefs</remote-id>
+    <remote-id type="rubygems">fakefs</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/kramdown-parser-gfm/Manifest b/dev-ruby/kramdown-parser-gfm/Manifest
index f5dd4f40dccc..e4444fa62028 100644
--- a/dev-ruby/kramdown-parser-gfm/Manifest
+++ b/dev-ruby/kramdown-parser-gfm/Manifest
@@ -1,4 +1,3 @@
 DIST kramdown-parser-gfm-1.1.0.gem 11776 BLAKE2B 99a77ea02d0f48421cc6c582629f6cdc7504174867cac8927bdc26fd50f851e294c0f71ab985e9d0d6e595906c458b1f96d06903d6765eabf8b6f617c6303f14 SHA512 5662c1a50da7c8e50fd50afb5fe1dcd3bd63f4282d9940f96bb56266b63841c0b09902ce90eb3162aa89c54047970667b17299b3a7cf475bab2641604aa15d8c
 EBUILD kramdown-parser-gfm-1.1.0-r1.ebuild 792 BLAKE2B b7f83f6951a74ec7c62bf2ea81218b7b03890954bb31dd51ecb8a639ac6d8f59f60c6cf8c2a0ee4de1f2da97b36af679fb827ad09a284e04bc50c442bb10d299 SHA512 adec9fdb601135f73e3f51e91945ed5ff470574232bc560a3831e58afa5ae4bba0ecd804c1439bdb331ca9dfda15f99e24d330116f3b9157281b5106b6641f54
-EBUILD kramdown-parser-gfm-1.1.0.ebuild 784 BLAKE2B 6ecf3a6a07fdd79a3fce642b91206e6733b979e6a0d78a9b3dbe8d8bc3813bf479f6e1c9ae78c1c07e3b837327492fffca76b7b9468929102b0c0cbe09ad4a82 SHA512 bbf216631e01daf1415e760fea936175cfc0773026311983d5dfe4d4e14cce5e765eb2c0d822ae3dc21b5011be2fccad9772ad11a2ff622e6b688b16ccd6e243
 MISC metadata.xml 346 BLAKE2B 0908f3e6cd648692e82059b2985581801c675dfe6388de7795c3d16ef3596d243d5cd40164deb219d2d628383338303909fe474fdfbe8d7fd91ac956bef6ab1d SHA512 e75d6ce31c31943a0e1891f34308c4766455bc190ca33f11e16739ee835251d3b62a11ef56d4814eb91aa20526f1fa6c7cf709e96b13bdb2958b059129b958c2
diff --git a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild
deleted file mode 100644
index 55bf3068de4b..000000000000
--- a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild
+++ /dev/null
@@ -1,30 +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"
-
-inherit edo ruby-fakegem
-
-DESCRIPTION="A kramdown parser for the GFM dialect of Markdown"
-HOMEPAGE="https://github.com/kramdown/parser-gfm"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm64"
-SLOT="$(ver_cut 1)"
-IUSE="doc"
-
-ruby_add_rdepend "dev-ruby/kramdown:2"
-ruby_add_bdepend "test? ( dev-ruby/kramdown[latex] )"
-
-all_ruby_prepare() {
-	# Avoid testcase which is no longer compatible with newer rouge
-	rm -f test/testcases/codeblock_fenced.text || die
-
-	# Avoid test broken with current kramdown versions
-	rm -r test/testcases/header_ids.text || die
-}
-
-each_ruby_test() {
-	edo ${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index d04239e86f37..dc2c6b66bcb9 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -1,7 +1,9 @@
 DIST minitest-5.15.0.gem 87040 BLAKE2B 71e7a7952c25fd37067a449867d74a2f18a8a42d1fbd72f24d6db226c54a18e9a21958654d4176176804bedd09ef9d1d3be68f79e29312c3f85d0930d3d68d7b SHA512 5e97a7aa616966ffc60e10cdc0ba123a7e793f10283ec3b6bf36066177036788cb950ad566fbac49e613b93f08b9846534f463017cde966b4890c3a34a2286be
 DIST minitest-5.17.0.gem 93696 BLAKE2B c5979a0d82c4658e4a1584450c899b6a09d99fa145348127902f187e03c6bba73f798fe815186c9ab87a119baa6f3b18acdc1606aa99ec2cf4a1fe548684e93f SHA512 00374b0d0c86d0ec2d285bc4053b6851e1a59e86f7a3ab3db8ccac1db222256edb58514c666763047cec95cf099b1738765a3e9eec9aee3386b187e9fe0f59f9
 DIST minitest-5.18.0.gem 95232 BLAKE2B 5b0f6fb2c304f0d96a6e98c5a4512acbff0a354290e1f2670773f8bdaa8d8b11b8504a15afd03a7bbe89ff1a9478599c2b0b4f0976bf5d52306655581c94ad4d SHA512 309f899b5c5c2573aaf1e84a2225f446e009923b864af8a006eb518f95e758fb6425ec1e5f1790ba8026e041a8fc601551c2f447fa06528399041de119fa2d1a
+DIST minitest-5.18.1.gem 95232 BLAKE2B 97743455cb893b8ccee7e5d40daa803500c243e59d78dcadde6e7af528f1f9b0a39db267b882f1b5467beb3dd5ecb5e0f5bc0d10ecf4901f10c368e5229b3fc2 SHA512 93095188dbde1020a8028e21023056ae9debe7bb868b26333d763958aa32f66910929a44c45c9656552c9efae2a9909cf8640f4c72b9cc53bd49fd5051c9b4a8
 EBUILD minitest-5.15.0-r1.ebuild 751 BLAKE2B 06bf69fff3013d363ddf2ea234021cb7b8750fb62d3dbf073cb6a1f9ce346ee4e67ee1d539d46b0d5eee865295a6700bc538d783a27d6dd976f38a2b6ac315be SHA512 b6092dfdb376ecc0e1324b5357aad142df11c12dc1d061dff589b416229f875fa12bfec14c9383a73c8a07ff5acd293acfba69ce8dbf156e196af2d4893c89bf
 EBUILD minitest-5.17.0.ebuild 877 BLAKE2B 3fa4318158995962db26c5a16eabed8adb3bfbb196bd303cfc63b0def41dad9090a298a56dee2b393f098221cf147a5bc6ffbcd54997bd1eea1038607182a0ba SHA512 2dbc39ab253d4a5365a176783e31cb2b30ebb871c7da067bae5e960a34094f6462151a8f2df4fa9fc792bbbb70d66c849b0f3c9b80e7f934f9c17a2387111f6c
 EBUILD minitest-5.18.0.ebuild 889 BLAKE2B b2685381ee65376d2f01822a37b149a4a38dc4e37fb700aa862f6328893564a5b53d68d4a1243beb4abeaa70a6b495902fe63dfbac24460a921ac06d66abd861 SHA512 216047beccd2ddd5fd2b49465b4e28cd0b8e501aeddcb768cf31e05bd573c515be0f465d8972c0631e018c510faba43e774236f95cd067ab4c7720654946cb66
+EBUILD minitest-5.18.1.ebuild 890 BLAKE2B 46c8637aac4811a7be91c44717eafac7e60537a7058d0034f519f2e5c41d1d417bbb3e1fd8d388808603ddf71ba9873733a3419b726200400b3768139fb30f2a SHA512 261fe2e0f1f0f979377c7ca8818319bc490dfff8378521fd2e127f8601103d951d7c6cd2c9409978d35f78c841e9a6d12fab57fe41b4a14d5f41b015541a94e2
 MISC metadata.xml 396 BLAKE2B aeac1892215d93c002d508741370ca1ef7d086dcf63594490b9d98b1640aa06272327f11d27cfc3dd331c4ac892c6e0de52b846d301844891f0f4fe5f17a2cc5 SHA512 724d808e8ff75f66517230a204c88dccbd7cdcdefbb36b96315fec653a7f0eb57471d0b929130a5e7f33453a96f301e5c5bdc8efd0d2fa11a446b3c39c2b0f97
diff --git a/dev-ruby/minitest/minitest-5.18.1.ebuild b/dev-ruby/minitest/minitest-5.18.1.ebuild
new file mode 100644
index 000000000000..5ce8b74cb5ec
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.18.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+all_ruby_prepare() {
+	# Avoid a test dependency on dev-ruby/hoe, leading to circular dependencies
+	rm -f test/minitest/test_minitest_test_task.rb || die
+}
+
+each_ruby_test() {
+	export -n A
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/moneta/Manifest b/dev-ruby/moneta/Manifest
index b2f092d42272..304bba4959d4 100644
--- a/dev-ruby/moneta/Manifest
+++ b/dev-ruby/moneta/Manifest
@@ -1,7 +1,3 @@
-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
 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/moneta-1.4.1.ebuild b/dev-ruby/moneta/moneta-1.4.1.ebuild
deleted file mode 100644
index d9be5d3e4a3b..000000000000
--- a/dev-ruby/moneta/moneta-1.4.1.ebuild
+++ /dev/null
@@ -1,31 +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_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
-
-GITHUB_USER="minad"
-
-DESCRIPTION="A unified interface to key/value stores"
-HOMEPAGE="https://github.com/minad/moneta"
-SRC_URI="https://github.com/${GITHUB_USER}/moneta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/moneta/moneta-1.5.1.ebuild b/dev-ruby/moneta/moneta-1.5.1.ebuild
deleted file mode 100644
index d9be5d3e4a3b..000000000000
--- a/dev-ruby/moneta/moneta-1.5.1.ebuild
+++ /dev/null
@@ -1,31 +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_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
-
-GITHUB_USER="minad"
-
-DESCRIPTION="A unified interface to key/value stores"
-HOMEPAGE="https://github.com/minad/moneta"
-SRC_URI="https://github.com/${GITHUB_USER}/moneta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index a2d2ddb1c51f..e4adeebb4027 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,8 +1,6 @@
-DIST octokit-4.25.1.tar.gz 3154185 BLAKE2B b1698de8694cd2e147542eb6e7e9784428daa035a6e123c05c135558a669c0d222ef4629cc89de815a51b7b3660a8dd2cb80e8d11b90ac43f661e3e2e078b0c0 SHA512 780393e6765e82f0fbfada3b8800ccb981df4383ebfda0b218c24bac224b39f836c3d9cb94cf2564676000862dec7ab94cd2dbdaff51c37142d1f45140121bf1
 DIST octokit-5.6.1.tar.gz 3171006 BLAKE2B 33fd132f81c7b1e1b3c1a4264b7bc6a7e7dbc2f9ccd4f1d2d734ae10914c5544eb90c629200e6d81b9a33fccc23791147af6660840248235ebe6b946f2ebba13 SHA512 3ed2e3eb61190da521f9246ac0fdb530e15c45cb41e5849f04ba1a92f0da8060a82eb2d90dfcb407436efba5f7f0ea98c69a342c67aa26b62eeab74a1f906c4e
 DIST octokit-6.1.0.tar.gz 3187811 BLAKE2B 70a849fe855ddf46aeaf6d512d675119188bb39e6a439c311531f20f9c52ce8da829e0e1242b29e821d5d6468b360e69b71ec645fdf7b1b217e4607032aa0d0c SHA512 7f362f7c4e021ae38083bfd498d98ddda7c2a36c439c8a924cb0390ede42911e8f0477481f1bde6b208009e27d42501d143d0549eb9731d8fb529c977a91da9d
 DIST octokit-6.1.1.tar.gz 3193336 BLAKE2B 890afac205992c25dd8b48f63ea7a4cf250687318ecb9c0980fc50ff1583943074cea1d9260f139b1a5f86295483f44120421dba8294eba641104301f0188123 SHA512 d91b326d892f80f08598ebb0a03edfd1fb85d36e40dac49593291a6b2ff6a957f5cd2283655c20ff0299f40c75ad7472ff55a14b182bec5f92693b560c2d3c87
-EBUILD octokit-4.25.1.ebuild 977 BLAKE2B 77e153539ba3ec30c494fb19530723fbd579a9e5a44cb05027d281df0389967e4625487f40201a82089bcb17551b56bfdb658895fddd68d8e31e18e39b246419 SHA512 97489cf4a78ecc53ea97e484294aabcbe091cf77cf97e93d60b624c480fec2ec8a18ec52f9457dd99bd892c30fd0485610df2644aeee426fcc7942f61341aeb7
 EBUILD octokit-5.6.1.ebuild 972 BLAKE2B 420072df30461bdc59bb0dcaa166eb5e8df5f4bd51a0dd20bcf9d9e06a955ed190702851c503b1c517d4746f113497e89931b21e22da9089fe75b6e5ec2432b5 SHA512 99c02d044abe07ec8ddb22a7f50be2b49984aa08ccc781e0a47d459ad36234da3d78c3f7afb03c4876c136ae30c25cebc1b3ab5dcfbf7df1cb354af0a9ae11fa
 EBUILD octokit-6.1.0.ebuild 977 BLAKE2B 5af722deed6bc9476ab680637b8e6de58425dd557a441e561e251b7b4da91b1b3d87dfbd9048c15788d9a618941663cf39ab707e0c16f130297168c5357171c9 SHA512 6b70d71bf1972adc4b7ae4e5d9545494709ec1de145ab8de16b301b416b8bdf8c42e73c28b6e3b167538fd88bf049d34671021f0dad0e0df828c04e77867dedd
 EBUILD octokit-6.1.1.ebuild 970 BLAKE2B b16a3b85bf87cf33a317c61d2dbb00fbf982d15173320a0c03846745d696596ff224c4ce48dcc611e15b03d6d8ce8eb97aa56247fe4ae74d3c0d9c77f71cbcee SHA512 67f506c870de3debc95dc6eb48aac88fff198133712adf0ed9d7f2e6775bc59abf0293d3d5006435c681a98e3cd8334610552f7047f9e68f5ac94037e5722332
diff --git a/dev-ruby/octokit/octokit-4.25.1.ebuild b/dev-ruby/octokit/octokit-4.25.1.ebuild
deleted file mode 100644
index 1f905e4ae5f5..000000000000
--- a/dev-ruby/octokit/octokit-4.25.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby toolkit for the Github API"
-HOMEPAGE="https://github.com/octokit/octokit.rb"
-SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S=octokit.rb-${PV}
-
-ruby_add_rdepend "
-	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
-	>=dev-ruby/sawyer-0.9:0
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/jwt
-	dev-ruby/mime-types
-	>=dev-ruby/netrc-0.7.7
-	>=dev-ruby/rbnacl-7.1.1:6
-	dev-ruby/vcr[json]
-	dev-ruby/webmock:3 )"
-
-all_ruby_prepare() {
-	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
-		-e '/pry/ s:^:#:' \
-		-i spec/helper.rb || die
-}
diff --git a/dev-ruby/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index ef815d9708dc..ebb70075fc59 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1,5 +1,3 @@
-DIST rbpdf-1.20.1.tar.gz 12026190 BLAKE2B 5a468e974bc0a15a9a8f621a6ee635a8cf4f81cc94b88a6bf8afd90c4a665c0892381e903158e66ec4a68676491faa80fd99b7d4ffcf0c86defc4a4114603b08 SHA512 19b4fbd8a0c4650c73ba299721a0fe03a10f223da5e0dd2b97549972ea8f381b2d5b4837369d0667cd325392edae1ec795ec67bc852c9b3588ec0c5e686844d7
 DIST rbpdf-1.21.0.tar.gz 12027795 BLAKE2B 25b0423f5162433e1eb3d14e09c85e93c181742829b4983ef910b5d722d1f9d37ba804c2df44c817221f72d4c9d22c8d3bb6ec891057167b9eda3b12e96889df SHA512 3bdeaa58fdd760d280a991677c6af9254df7582a5081098e0c8a7229fb33994e81b386bcc182e917fcce978263917a00ba7cd00655f90111fcd7ff1df012c5d5
-EBUILD rbpdf-1.20.1-r2.ebuild 1341 BLAKE2B 5ee55a1e513653e4e256e701a2b682653c56f648f15056b13c8c1584bbf7e4e137ea4283d9b0881c25e4a13a594ab84cb30b886b138e4b53de24ba6f42e1ff04 SHA512 60e222a328123afc30fd4aa9836a767963a3dc765b1ec5b671dd2a6409d82687ac336d513223b85dec2637e2970f40cae84449bc8309d600ecac4620a3d21ff7
 EBUILD rbpdf-1.21.0.ebuild 1341 BLAKE2B 451582cae18f837175e6ff4fa08a866c3d7bb644d6bc275754c98597a0276a5d2355102646d94ad6f27f70b65bc59621d8f2f91f6c613adc2a592c315c6ca577 SHA512 767abc7566b1608f7c92287e179e55255c3a67570b583750f3e25fe8aee30f0f2a9e4d686521992b9879a1b5fb4edc4727d63984c0e102fb0951683b85e14181
 MISC metadata.xml 418 BLAKE2B ddda722ead67832580df88c0be4f37055f5dade79d4ec39d83e005cb601031c98738ea0e21e748b47e734820b75eb55ebea778a6c94ccaaf31ea39dcc1bf4047 SHA512 0be187ae5be0cc427cac7b1b9440db51566ccd0df018eb71cda5bc055e9541ab2582bb37e980b4df566468736d15e06424cf47490d267d3a52be103f88e2f961
diff --git a/dev-ruby/rbpdf/rbpdf-1.20.1-r2.ebuild b/dev-ruby/rbpdf/rbpdf-1.20.1-r2.ebuild
deleted file mode 100644
index 155f953d2af4..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.20.1-r2.ebuild
+++ /dev/null
@@ -1,54 +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"
-
-# Avoid the complexity of the "rake" recipe and run the tests manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby on Rails RBPDF plugin"
-HOMEPAGE="https://github.com/naitoh/rbpdf"
-SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
-ruby_add_rdepend "
-	dev-ruby/actionview
-	dev-ruby/htmlentities
-	=dev-ruby/rbpdf-font-1.19*
-	|| ( dev-ruby/mini_magick dev-ruby/rmagick )
-"
-
-# Two of the tests require png/jpeg support in "magick identify",
-# see bug 738784.
-BDEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png] )"
-
-all_ruby_prepare() {
-	default
-
-	# This test is enabled automagically in the presence of rmagick, and
-	# then fails.
-	rm -f test/rbpdf_image_rmagick_test.rb \
-		|| die "failed to remove rmagick tests"
-}
-
-each_ruby_test() {
-	local cmd='gem "test-unit", ">= 3.0"'
-	cmd+=' and '
-	cmd+='require "test/unit"'
-	cmd+=' and '
-	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
-	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
-}
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 85e907bcb355..b1bcb2432a0d 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1,3 +1,5 @@
+DIST cairo-1.17.12.gem 199168 BLAKE2B 3183fc448cf15d0437f1b846670dc7494479bf81ba84a2ae475bb5a0683f1012d0e44c95b3311cea5d0ec9cdd75faa7159d7d0649dbe0813166a8d6a16ddda74 SHA512 6bad8c0f15e8617266a85f0ba0bf41db1b508bdb174aa8dbfad8a560a1510cec852502cf39e93b0317c046035bfd97552b92167debb7de4d887c319648b10b56
 DIST cairo-1.17.8.gem 198656 BLAKE2B c999f862753d17c186f766f82ede6c7fb3c773018c314825762b68025bf806e6a466b8895ddfa3046f7ac3f3af501d6feaebcb8241779de9c3a0d153589d0993 SHA512 a2b756dc1cf1abb98e4b60b9b56f5f610058bd840b67c991d6bfb3da2523b0f77a5854147f9d14ca461d573e51fbe3ba35c83659af5c031086710970fac6665a
+EBUILD rcairo-1.17.12.ebuild 1779 BLAKE2B 14dd4d085e2a40e04003f1912566c39d23d111746ad09d61fab2972bfbc78939b6dc993be127efc1f5f4b81b83c11d4d0a4b497c34c2e5aaf8b15551c932a418 SHA512 f8b47cf32199bc4e44a816a5b4edce9c9ff2bd0fa3c329acc557082c5ca9a3805a1ea03625d57600902a257a318914907d7fa6c028c297d95f6d8a777bb1db0b
 EBUILD rcairo-1.17.8.ebuild 1785 BLAKE2B 77683c1d98d8d0985dffa5fdb5430687ff8b5bd721e57b106c2761723ac95841e404b6718aab33f0c18754ff062e6df3d80410c3224715c64ad91e730caf82e9 SHA512 acccc64d18defd7ae6978e11738c59548f36aad1ee3ce4f71713bf72eb05e1e23b88c8bc02a14fd8fae4210ebf32da704f8975200d4a97f986621dcde258b286
 MISC metadata.xml 323 BLAKE2B d1322d7bd494ec82a2849f35ec35cb30cd7cf145bbf2ea5a3042ca2da80ea45d4a3eb7870dc19e2d6ccbbe47ebd8c373b4b4237fb21a66114c6d6bba7c20ae8a SHA512 20682bc8ee4d20c7ff908efb1816c9e1dc08b31469121beda675dd6098f5082ad5f338f54ac01f1cce3875b979e0348cd99617c7fa237f0ffbeaecb8d5642856
diff --git a/dev-ruby/rcairo/rcairo-1.17.12.ebuild b/dev-ruby/rcairo/rcairo-1.17.12.ebuild
new file mode 100644
index 000000000000..1ce5a045a312
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.17.12.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_NAME="cairo"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cairo/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="https://cairographics.org/rcairo/"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Ruby-BSD GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+RDEPEND="${RDEPEND}
+	>=x11-libs/cairo-1.2.0[svg(+)]"
+DEPEND="${DEPEND}
+	>=x11-libs/cairo-1.2.0[svg(+)]"
+
+ruby_add_rdepend "dev-ruby/red-colors"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.2.2
+	dev-ruby/ruby-glib2
+	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 dev-ruby/ruby-poppler )"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency
+	sed -e '/native-package-installer/ s:^:#:' \
+		-e '/def required_pkg_config_package/areturn true' \
+		-e '/checking_for/,/^end/ s:^:#:' \
+		-i ext/cairo/extconf.rb || die
+	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
+
+	# Avoid test that requires unpackaged fixture
+	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
+
+	# Bug 790131
+	sed -i -e '/^install-headers:/s!$! $(TIMESTAMP_DIR)/.sitearchdir.time!' \
+		ext/cairo/depend || die
+}
+
+each_ruby_test() {
+	# don't rely on the Rakefile because it's a mess to load with
+	# their hierarchy, do it manually.
+	${RUBY} -Ilib -r ./test/helper \
+		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	insinto $(ruby_get_hdrdir)
+	doins ext/cairo/rb_cairo.h
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/rdiscount/Manifest b/dev-ruby/rdiscount/Manifest
index 0e2a97dc08e4..402e7f70a85f 100644
--- a/dev-ruby/rdiscount/Manifest
+++ b/dev-ruby/rdiscount/Manifest
@@ -1,3 +1,5 @@
+DIST rdiscount-2.2.7.1.gem 74240 BLAKE2B 06779a601c8d13b90f5d9fb1c38712431671eab1cb2ef012dee284ddb6da254a0c788f16295438913d68f3641db2ec48c7cea3bade4f36fdc55b7a6049119fd4 SHA512 e67bbbb7f19ef14a729642e2059f0920b65a3f254507204955ab6d34529ade643ee7adecc3db2c61ca5462d266f88ea336bd228401e3cd0fad98e2e7763dd8d3
 DIST rdiscount-2.2.7.gem 73728 BLAKE2B 0d63372c3e2f4fa1efeef12ec4f8a2b12b9fccd7506ac6609d7e8fea958e04cfa1cc96a484ffba17d643838705d52c1557604ca015fded282ec860a7fc2481a5 SHA512 4f60dc0dbfb6b8f95f80d577c872c2a747d7d15e9fc1f1bd3640f1207a5d262068754dcb6d7b53348fd69de20b85534a390aace35d1eff31112bfbe0f77569d1
+EBUILD rdiscount-2.2.7.1.ebuild 1112 BLAKE2B a99b5c85fc50845508ea24333efb3cbcfa34ce71ef3d6891a14d1fd00efb80159ff0f25038cfaad8d16343f5413c0188adde7652091695e47728f27370e3c79e SHA512 4bbeccc79d3742b2add9fadb5e09a23f6772d5d448a2b1dcfd0a5f0f0e3fe8857986e3cec11ce486fc1f302e69b4a94bec5e3a8d97e4ef44a2f5fb3f14f81d80
 EBUILD rdiscount-2.2.7.ebuild 1111 BLAKE2B ce803ed2e4fcf664ced891d93791df3ca2c013113c8d3f94f942a5c0c301aed535c5cabd0bcbaca9af9a097bb3fe48260a7ceea60f08a3afdb0fa05d3c099294 SHA512 7279c56e6e5a214b5c221e61b4c76f772539be2d34cf76b6e8868c17965308a848e5ed03b4dd1f10dc4b66bc744732a4b56385d7f70c3d186c454aa41f910c8b
 MISC metadata.xml 345 BLAKE2B 83db3067d2cf0eeb028bd4793935cb94fe99eb2bff345e02fce72c35613c5c14dc266a8b366a3b518f007b6310ddc3130b3ac1f9a3e52c4940d83bfd6eac1889 SHA512 b771eeb7ff43472f242114cec8f8b1e8dd09715e0b35c1095bfd7d61b1149ec32fc05ea7153704369a270bd267d42ae0e532fab16fc7e6ca11a4454800d72900
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.7.1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.7.1.ebuild
new file mode 100644
index 000000000000..2bdd888ed424
--- /dev/null
+++ b/dev-ruby/rdiscount/rdiscount-2.2.7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+RUBY_FAKEGEM_TASK_DOC="doc man"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of John Gruber's Markdown"
+HOMEPAGE="https://github.com/davidfstr/rdiscount"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	# Hanna is broken for us and therefore we don't have it in portage.
+	sed -i -e 's/hanna/rdoc/' Rakefile || die
+
+	# Remove rule that will force a rebuild when running tests.
+	sed -i -e "/task 'test:unit' => \[:build\]/d" Rakefile || die
+
+	# Provide RUBY variable no longer provided by rake.
+	sed -i -e "1 iRUBY=${RUBY}" Rakefile || die
+
+	# Remove obsolete -rubygems argument, bug 775377
+	sed -i -e '/-rubygems/ s:^:#:' Rakefile || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/rdiscount.1
+}
diff --git a/dev-ruby/tomlrb/Manifest b/dev-ruby/tomlrb/Manifest
index aaa97abdf5af..f6a9c8797e0c 100644
--- a/dev-ruby/tomlrb/Manifest
+++ b/dev-ruby/tomlrb/Manifest
@@ -1,7 +1,3 @@
-DIST tomlrb-2.0.1.tar.gz 21386 BLAKE2B a9f50d800f7e55c6e6e69fe0a68d1ac843d4aa3b1b68e50c86eb03209c2dd9239f2780fb03152a8638198bf8474593f815025106935a4d81befb5e342f9451f9 SHA512 9690b5689d37cc4634e65a906b1c0bb3692afa96fd92e2dd0d487f2f16dacc64e992e114822edcff270b3ddb8bacd2c6e20e2d12112cd8641c5190ea6ee4e4db
-DIST tomlrb-2.0.2.tar.gz 22856 BLAKE2B dd7ffa3ae0d06a6376947df0472865ec34db815613f2a0a439f91f32421193e89069f31c28ea0bf948cdb4ef259c4d06de02dcd12411bf774b96abfb5a05bb31 SHA512 db00c54d9358d10484ffbd812fcb1ac2d13e631ed2b3e709fee336e8240cf2a7740b6dd0190e38eb6c93b1ba7c7f5a91b5909a546928c600114644fa0d821cf2
 DIST tomlrb-2.0.3.tar.gz 22929 BLAKE2B e67dd81f2d8a49e6c2d296d030d80809d10e780d1fb65e29744ba37ba35a58b8b34fe6bfc4046754ed0f919db2649b68d4feda8b31c35dd09d3df9d607100f68 SHA512 43b02de19b8816fad4e94656ee9ec22e0401cb62b982baa0ac9f4a6af2072e4e8df54ec657016c4dc407e6d977a27eab5b954a7f4ec7bb70b26062022bda96ea
-EBUILD tomlrb-2.0.1.ebuild 650 BLAKE2B 46b008791238db1840eceb695b0cf3331e2cffbecb89fe09e56d83b070523100bb5904f2f2dd11a355d141481c9fdefe2f691e9856e16186233791b932cd7580 SHA512 047174181fc573c17fce51c8aa2e141d96ca36d29fd7c2264b65be14f33d2dec50a55bac349337c58074b13f02d154fd611e6a104f876a2dd1f173db4d8e9dd2
-EBUILD tomlrb-2.0.2.ebuild 650 BLAKE2B d702d3acfb5086392f55c674e53f5a4ecfac8fcab959c63fa692f653192f1bbf5ec2e69f63b4282f2e43cfc979229fe0294a9a3c4109e70644641ffd9fc89692 SHA512 87cccba9b2b350300f8ed45373968129f603aee02df153399dea74a4300e38ca74c4ec2d99563fbda40d1d56ea57cab188d4b7398d25f927f90a5af65a33701d
-EBUILD tomlrb-2.0.3.ebuild 650 BLAKE2B d702d3acfb5086392f55c674e53f5a4ecfac8fcab959c63fa692f653192f1bbf5ec2e69f63b4282f2e43cfc979229fe0294a9a3c4109e70644641ffd9fc89692 SHA512 87cccba9b2b350300f8ed45373968129f603aee02df153399dea74a4300e38ca74c4ec2d99563fbda40d1d56ea57cab188d4b7398d25f927f90a5af65a33701d
+EBUILD tomlrb-2.0.3.ebuild 650 BLAKE2B 66029c8521fb832153007856d45545092015a8bd57d74a975397999cebc8f9087891d6f13772ccb1764cccc0b42233373a8137baafd3032dd81b4e5260457c98 SHA512 042d6b755849e0ae1693cec61c0594caefcbb4b6ab92404d09e3661521b4893576469d873b4009528481bb48603326b9e8a03ee40f67cba708cb0d47cb171823
 MISC metadata.xml 342 BLAKE2B 603c1ce55bc673a27907657f0d61e865aff3a63662610cf0e094d56e311eb0896fa5ced43072359804ea62c741a243cf138c500b8b9ca1513c505776917e3d37 SHA512 ebb4a10c4a93729d88273ed0ecb9832b5f94d71f96b1aee567f4d9b6e11b81b43cf43cf87b04406d9f003ccd7fa18bf9c2f57e8c630042e54a55381821039a56
diff --git a/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild b/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild
deleted file mode 100644
index 5521fd7d69ec..000000000000
--- a/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild
+++ /dev/null
@@ -1,28 +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 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="tomlrb.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A racc based toml parser"
-HOMEPAGE="https://github.com/fbernier/tomlrb/"
-SRC_URI="https://github.com/fbernier/tomlrb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/reporters/I s:^:#:' test/minitest_helper.rb || die
-}
diff --git a/dev-ruby/tomlrb/tomlrb-2.0.2.ebuild b/dev-ruby/tomlrb/tomlrb-2.0.2.ebuild
deleted file mode 100644
index 61130ab444a3..000000000000
--- a/dev-ruby/tomlrb/tomlrb-2.0.2.ebuild
+++ /dev/null
@@ -1,28 +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 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="tomlrb.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A racc based toml parser"
-HOMEPAGE="https://github.com/fbernier/tomlrb/"
-SRC_URI="https://github.com/fbernier/tomlrb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/reporters/I s:^:#:' test/minitest_helper.rb || die
-}
diff --git a/dev-ruby/tomlrb/tomlrb-2.0.3.ebuild b/dev-ruby/tomlrb/tomlrb-2.0.3.ebuild
index 61130ab444a3..ec6c0a16087e 100644
--- a/dev-ruby/tomlrb/tomlrb-2.0.3.ebuild
+++ b/dev-ruby/tomlrb/tomlrb-2.0.3.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 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b5c55a4c3a6a..de0f31f994f6 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index ebc58340963e..54bb94c3ae1d 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -9,5 +9,5 @@ DIST byacc-20230521.tgz.asc 729 BLAKE2B 493e2d775e927981175d8bde4e9e152b16e8471b
 EBUILD byacc-20221229.ebuild 834 BLAKE2B 4e373bfdcf15851555698369570490646c54eff81701da58ab86edc7df1a593530d4776107c171546f68afd81be9730b138c1cec266dcc52810db6a783b6d41b SHA512 80e5c72133769e022240d7aaf6b7a9550b1acf35623157d3c6a78c9c071408dd1a043022680c95248d831a7ae832b3e850ae887940d79976cf25b52409137690
 EBUILD byacc-20230201.ebuild 834 BLAKE2B 4e373bfdcf15851555698369570490646c54eff81701da58ab86edc7df1a593530d4776107c171546f68afd81be9730b138c1cec266dcc52810db6a783b6d41b SHA512 80e5c72133769e022240d7aaf6b7a9550b1acf35623157d3c6a78c9c071408dd1a043022680c95248d831a7ae832b3e850ae887940d79976cf25b52409137690
 EBUILD byacc-20230219.ebuild 834 BLAKE2B 4e373bfdcf15851555698369570490646c54eff81701da58ab86edc7df1a593530d4776107c171546f68afd81be9730b138c1cec266dcc52810db6a783b6d41b SHA512 80e5c72133769e022240d7aaf6b7a9550b1acf35623157d3c6a78c9c071408dd1a043022680c95248d831a7ae832b3e850ae887940d79976cf25b52409137690
-EBUILD byacc-20230521.ebuild 882 BLAKE2B a36fdd014a0669eaa02f9b561deaab9e023ce762157846b2b0b93033aecdecfec219a34d021cbf5fcd0267bd87cfe243ed7bd0c9c7837739cc9368eef8d67841 SHA512 9cffe92bae246f2f8d1035bd462775493c98e3076e91ca70e2c3c61880433cb770469bb848d2c07bf6e4630744a2747601170ce93df05d38e8dbc46ab0d83a05
+EBUILD byacc-20230521.ebuild 879 BLAKE2B b7ed332a08e30da5046cc112ab788c0e55bc3c4061603ad9346e8b487de7d833e050c0276c512ff731f9f26063e9508d7db7cc9858717a03f023fb8c85db5b44 SHA512 5e72f307dee5578cfc0d2248cf46e6e21a97543df653a9a355f11d935cba39d61f2194a270103a80bf6b18436fc5ebbc679b708211a330dc9dcd3a4648a5e109
 MISC metadata.xml 424 BLAKE2B f7c1172e12c784d254658b3743db6fec9d6ef008891fe84114c71c1d0edf24a37f00ad61a1705716bbaf6c912b763756995185f2cffd95c831b8ca57abec6d68 SHA512 8bbdcf35f0499db09f1d55d038d93f8c3aa516e0baa74ec078c7a3032d4885110530be47cdd309de1a44b8c92e6dca3f4353d3ff1d3da04b052d492c91549067
diff --git a/dev-util/byacc/byacc-20230521.ebuild b/dev-util/byacc/byacc-20230521.ebuild
index 4867e8a76bbd..3d5b7f97934f 100644
--- a/dev-util/byacc/byacc-20230521.ebuild
+++ b/dev-util/byacc/byacc-20230521.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 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index deacd14cef0d..d0c679f474d2 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -37,7 +37,7 @@ DIST cmake-3.27.0_rc2-docs.tar.xz 520656 BLAKE2B 8519d64d6d3ecd75f61b03982f7671f
 EBUILD cmake-3.24.3.ebuild 8764 BLAKE2B 1e01eaa1235409c615720617502c46dad64d5f77a5cb0867f9b11acbbecf97f09488ee4cf4a06d8119b40baa37402f2c28b2578756e3ae58593928e1eb15d769 SHA512 3781a9acf3f2b146f1083fc2194eda25abc73adcde57295b8826a2993fe688f767ac0975729ac13086bc7ffeeee0f379048f1e0b0da2b7afcae2cb21fcb7ab06
 EBUILD cmake-3.25.3.ebuild 8764 BLAKE2B d29be64c9d149d845107044caad0a922ad598f05b9c85a66ff380f8ccf40215f7a2542e98ec2534a6019d59e041378babab6432bc15a798d72cb285c48de6835 SHA512 15756816696d4c04bb1efb4868399f9b0796fa64092f387bde6183cf4c4c63186c3db92b12d15bf8e016cc63c53791c18d6eacf18f6cbcd5594d9736ef38895a
 EBUILD cmake-3.26.3.ebuild 8790 BLAKE2B 704de209db19e0fa1bf7369156c804bd1da4d354a4949da60e1897fb896fdae5f31412f0deec5a714dfb5c93f3cba7be65a05678e7d3dc324c5193db3e409a57 SHA512 24bd510a618bf07f66a45d9906f8351ae7d865975b0310a52cb18c157cb2b732b0e19a2ed57da84b96f89529d343e1c388d9132c4f6a4eb51c29fab64704e7c1
-EBUILD cmake-3.26.4-r1.ebuild 8811 BLAKE2B 6ea038adab11c7bfc6bb31483a29440c0bc0896acbc9782bc63567a4cd523d95076d68c64283fd21a997219e5a5d5364c18c1f64d15322047557a016f88d2b5e SHA512 f7f8d5704089ccddea2967b0eb13b51be75df2e56c9a9fbdea3da5386d023df38c910a3efe5cc0cfe2fa83ed70222a3d5b18e4f6280f42b0b79aba5fda96763d
+EBUILD cmake-3.26.4-r1.ebuild 8810 BLAKE2B 0a85862efdfef4c192cdb823978aa6fe9ae65aa8bd177f9609ad2ee56eb8d392a0213b497b8cf7b4ed3f919532e1469bb797fe2e58e1d66fd7e0b38221ff8048 SHA512 721f156e2da33297ba690627e9e63aed350b9d02e29ea1cba041dfba10d23f0d983085cd5b43a0612db79725553161685d03ccd62df5d627e0f2a46d4b5deb3e
 EBUILD cmake-3.27.0_rc1.ebuild 8848 BLAKE2B 62bbb6e9cfbcbb15a5f3b896aa9b6c77c83bc933f3fce5bbcd7de783005cab9a43539e96b593786cd987846f6ac253a4303602805a1e572a04f3ab64f85e4bb6 SHA512 8858b29223579bebc2b9c9d55abd36e91b696cdc6653111f5cb15fb97605585bf4ec69c39364a5bb4226d134608dc582824fbf58da8b468132426c472570598a
 EBUILD cmake-3.27.0_rc2.ebuild 8848 BLAKE2B 62bbb6e9cfbcbb15a5f3b896aa9b6c77c83bc933f3fce5bbcd7de783005cab9a43539e96b593786cd987846f6ac253a4303602805a1e572a04f3ab64f85e4bb6 SHA512 8858b29223579bebc2b9c9d55abd36e91b696cdc6653111f5cb15fb97605585bf4ec69c39364a5bb4226d134608dc582824fbf58da8b468132426c472570598a
 EBUILD cmake-9999.ebuild 8848 BLAKE2B 62bbb6e9cfbcbb15a5f3b896aa9b6c77c83bc933f3fce5bbcd7de783005cab9a43539e96b593786cd987846f6ac253a4303602805a1e572a04f3ab64f85e4bb6 SHA512 8858b29223579bebc2b9c9d55abd36e91b696cdc6653111f5cb15fb97605585bf4ec69c39364a5bb4226d134608dc582824fbf58da8b468132426c472570598a
diff --git a/dev-util/cmake/cmake-3.26.4-r1.ebuild b/dev-util/cmake/cmake-3.26.4-r1.ebuild
index 4af9aa167779..96da2f99e873 100644
--- a/dev-util/cmake/cmake-3.26.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.26.4-r1.ebuild
@@ -48,7 +48,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 382aa6609524..45e3d726a839 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -4,5 +4,5 @@ DIST patchelf-0.17.2.tar.gz 143954 BLAKE2B 7ed684c63955a0b9cfe293fb966f7f08a90c7
 DIST patchelf-0.18.0.tar.gz 331312 BLAKE2B e6ce4ec3bd89c280bb37230dbeb566b803f09900006e79f7dba74f138f66e17746d331baea4def6a43163024b3d86aa8dbac9b2c6545ac146298a8b84373d03b SHA512 6a917d7336b1e8c59f42d4cd1dc725df1378d77657fce13cb31547da1d4805b9df8a834a7b8408fda8aa1dbeb37d0cdca74d8698844ea2f44149f800b802dea6
 EBUILD patchelf-0.17.0.ebuild 594 BLAKE2B 029d3c714b64216953a3688c4c9d0d28066bf46c436949a6537251ef59d99dd64475b85154d3a63c89f91bde4613938240f69f2c2026177506f1f9f6d0dc42aa SHA512 d3802dd03f4da721e2b50fd1245d418418ecbb706c05e19831e869884faa02db3506847420c4162dc0b9c1973c1fbb5f0dd67537c3aa17af508cf833aba3adfc
 EBUILD patchelf-0.17.2.ebuild 600 BLAKE2B 4f472b56c8021bf9ab7a50d0b9ade888ef0d116096e885bb88362b5259350b77070015666b26892bbbffa966bb21c33b5271586ef14840873fe84237af1b1651 SHA512 2d51ffd0b08da7cf184ad35b8c37ef305cce289fee9d176f1f4b438e4ba8ec9e36e28adbd5c3e375c952100ca1ba732d0e0e09202d71ec2ea37c7205852f8907
-EBUILD patchelf-0.18.0.ebuild 666 BLAKE2B 476b407feb02d69360baf275be70d1d0f517d0773631d2dcd070525def0825335ead8f5d15b41af6c3596b39db744f19d1aca0d3d7ffe5f6b8488f21fa9a5773 SHA512 77269d0f2ba25ad8af498bc11bb2c7229fa038174c88d637b08f05918b2dc72b9dd515621cb72c1af25815f492b6e25c3c8bf2ca2934d2aaa4b67b0f85f3de0c
+EBUILD patchelf-0.18.0.ebuild 661 BLAKE2B 0a91f662113b1de11effbad22e1299ff5494e22320b402d95366843d24f89d34396107313bd7bce87192fd5d7dd2b8055d8437195d099debaa3cb03aab739bd7 SHA512 f8328299701928994fb978c5eac45e404d1b82db10d15cd92e2ef12e6db251db982cfb854aa1bdcfa859dea00aac6c2ffe6ef3a4dcf4e503aebb92397ea355f6
 MISC metadata.xml 304 BLAKE2B f3c4f3a80192390cdeff546ea23f4a03454f17e4900799e10740420f2e158146a6fd8e02b8f77d07fe38646e23eff734d4a7a8571fa23d738e6c000fbe347ec3 SHA512 4a52dc190d6576ddf580830240cbe20c826b609228cc3ca8014f94ff1759a2b1382294b7d5a0c8e3160e7e7e26d055f82855e40076de3b7e410290e119333927
diff --git a/dev-util/patchelf/patchelf-0.18.0.ebuild b/dev-util/patchelf/patchelf-0.18.0.ebuild
index d816ec3fcc88..5df499d5e4c6 100644
--- a/dev-util/patchelf/patchelf-0.18.0.ebuild
+++ b/dev-util/patchelf/patchelf-0.18.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="https://github.com/NixOS/patchelf"
 SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux"
 LICENSE="GPL-3"
 
 PATCHES=(
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index bb04c07f8e6e..512b00a813b1 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index d25d7651a800..038848348344 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,9 +1,10 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
+AUX gmmlib-22.3.7_ambiguating.patch 1350 BLAKE2B 2976bdb8610aefe4be84103e8b801d4cd920fa3184fb781bd16d56b34a0cf477f26756d5ba90aeb37b3bdf506ce8335075fabb61f76e5a6013ad1317456e1772 SHA512 472dca32c360c012af28778f1512a6c5b60c154cf31d717501a933965a7f790a5a5dd3d51eb0692ae412827f13932f2e2373bf38caf3ec2d971e6d65890227e4
 DIST intel-gmmlib-22.3.5.tar.gz 843587 BLAKE2B 671f09a2be66962762dc47c8ab51dbc3454f197b2f8a8da73e09d1f1cef2284d69ca97ff78a6b9fd1c7c93baf0b5773a89e0e7fa22f7bf106e7205f0f681e5f4 SHA512 1440fd9afdf9bdb6b9ab45529ec48cd434d7a9410cbf026c3dc7dc60b09a8fa067993540b953c354805a766ff001ef56c756a4c37d465a2ca801f6cc179ca532
 DIST intel-gmmlib-22.3.7.tar.gz 845054 BLAKE2B 0a5c284bc5aa32a6b79d0e36689665b8fb6157765e26f33b7aef800e515c6dc26527c011512d633d5d6160463f9f16a720a4e23fcbc9bb35c853a25a41a339ec SHA512 145e54da5c80c6f750847c496146c5853f92b90d1fa66695140052e0264d884069a459cf27bea7b742f1ac10817c00a369067512b9f2666c8b3c6cadf0233a2e
 EBUILD gmmlib-22.3.5.ebuild 813 BLAKE2B 22a076971e6ad350428a30d4f235bd31fd63d546be2da6210af2a9a79dc12220096ef79e8be7b2913cb86da7ce3bf1a45e5ee1975a4c12a6f99effe9c18e0a5c SHA512 68e563aba1012af8f0474e34da6cfa40cd7e1f07bd4835e9f5bcfb0aaaa92b6e20c8b0fdbf8ab4c34b059c443203246af32e448975bcc8d5bb02217b4d0ffae8
-EBUILD gmmlib-22.3.7.ebuild 814 BLAKE2B ce6b3be2c671e8ae86bb64c7d9cf337003bc38fcb9c89a43a692f2885bf4cfffdd6c748daef4f39ab72a1b8c96af3ec149571e3e1cefb93fdfee563fd97e386f SHA512 c4c6b82b137f753de446287aa2ae69a6da36fa8e518d6c185cbec27d7e3a9301f9a59b515fc4a70a51669649404d1588f7bc75fc0f3a2801ff8f73a52d9dc876
+EBUILD gmmlib-22.3.7.ebuild 860 BLAKE2B 8f899c93e19ca9230efacc8b2a67f82b94c71806108e0ac736e51aa4b6d3acb35b702f77bb4379140dac631aca01ed60f96bf7b2f0a6eb70dd96ba1a59b62e33 SHA512 113c4c4a6934a67c24156f6d23cf6aefa9ef8bcd74a96581fa0a72b4b5ef8e59c6797877631889691202962a1ac015fde6b569f87691bb2b03ca393697a355ac
 EBUILD gmmlib-9999.ebuild 893 BLAKE2B efb2985d5a9a68f687ef642de812d57558c81ce194fbb9583e738c57e3ac8768ee0fb85f031bb01d6c26fc0fa2c03a820d49404c9cb14e5531f7bc0b393cfa47 SHA512 8972b9dc98de7def5ffaebfa82965e82bec35ea6c1c4642b0143b339752e466825b7898bdd13759dfd8e77cb2b15d6161d15b3f7e7448fd17f63fdac201933d2
 MISC metadata.xml 478 BLAKE2B 22fa7744f1f6ae793034225645314ed7f0a5499cc33b570a00aa2c076cb3fdc9c2663654df4998a30fc76f7d833ed4f2022fd8b2869539e25c47f64e6b0f438a SHA512 0c46a6af2f254ee9c314f08654739003f58283e3ec00a8a3e628225e14065d359d0816a05aba1754379dea826d1bf2d501fb35ba58c5020f036917771ea035d9
diff --git a/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch b/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch
new file mode 100644
index 000000000000..889573ed94a5
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-22.3.7_ambiguating.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/908592
+https://github.com/intel/gmmlib/issues/103
+https://github.com/intel/gmmlib/pull/104
+
+From 2526286f29d8ad3d3a5833bdc29e23e5f3300b34 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Mon, 12 Jun 2023 11:49:51 +0200
+Subject: [PATCH] Fix ambiguating new declaration LockMAContextSyncMutex()
+
+This fixes https://github.com/intel/gmmlib/issues/103 introduced by
+commit 5e12695c2c "Multi-threaded fixes for GMM Context info"
+
+Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
+--- a/Source/GmmLib/inc/External/Common/GmmInfo.h
++++ b/Source/GmmLib/inc/External/Common/GmmInfo.h
+@@ -627,8 +627,8 @@ typedef struct _GMM_ADAPTER_INFO_
+         GMM_ADAPTER_INFO *              GetAdapterNode(ADAPTER_BDF sBdf);   // Replacement for GetAdapterIndex, now get adapter node from the linked list
+ 
+         // Mutexes which protect the below thread unsafe functions
+-        GMM_STATUS                      LockMAContextSyncMutex();
+-        GMM_STATUS                      UnLockMAContextSyncMutex();
++        GMM_STATUS GMM_STDCALL          LockMAContextSyncMutex();
++        GMM_STATUS GMM_STDCALL          UnLockMAContextSyncMutex();
+ 
+         // thread unsafe functions; these must be protected with LockMAContextSyncMutex
+         GMM_ADAPTER_INFO *              GetAdapterNodeUnlocked(ADAPTER_BDF sBdf);
+
diff --git a/media-libs/gmmlib/gmmlib-22.3.7.ebuild b/media-libs/gmmlib/gmmlib-22.3.7.ebuild
index 21abbf34e428..9cd65afb169d 100644
--- a/media-libs/gmmlib/gmmlib-22.3.7.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.3.7.ebuild
@@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
 	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
 	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+	"${FILESDIR}"/${PN}-22.3.7_ambiguating.patch
 )
 
 multilib_src_configure() {
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b021fd2a53b5..fbe7d04d33b8 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/helm/Manifest b/media-sound/helm/Manifest
index 4d8775a4b58e..e252e5af75b4 100644
--- a/media-sound/helm/Manifest
+++ b/media-sound/helm/Manifest
@@ -1,5 +1,6 @@
 AUX helm-0.9.0-fix-gcc91.patch 6514 BLAKE2B 54c3c5baf336ee1c2739922be6040d69309db94394967be335103fe325c96afe69f05fbdde0516c153bc47763fc3686c9e0461c6b12dbec59476c85a003e4397 SHA512 4c12575c6a58c6a03644b9c7d560e3a794fa3575ac10eb9301ca911a58a86eb5c721f0e4c8c1c5bfcf81b6efba25ed7bdba2a12fe68ec49eb18581067cec06bb
+AUX helm-0.9.0-musl.patch 4733 BLAKE2B 2b53b447329916a79f7c3efd3e0d9fac5900d657d1e57ff4d75f7cd65c8f45f914e5f5ab79cad05047c46ebc0c6a04a23675416148d1b9251b42a8494d7c8f49 SHA512 4434dbdaefae36198c2102c7b837e32c0be5ad858fe2791bd6cdd730d1c3a24a9cfab9adbc1d1bea4a84ad5cea2a14055c37ecbf85946a2d11ab1e11945d1d1b
 AUX helm-0.9.0-nomancompress.patch 698 BLAKE2B 3b68312c117fb8c1e8496ae02145a66466849de77d51159064b65e51b208b503530ac5b92c1a50e4e8fdc6113121bd26ca20e491adde72f1f1b5b626258c92ec SHA512 e2b0143be141e26a093369c151a87d002508442543482d81e4b67f67475232ec53bc80e11ecad096952e4941efc82889b8cf267a0bfebb13104204b02a50aaed
 DIST helm-0.9.0.tar.gz 15544141 BLAKE2B 1b6811f32cf36a1c1f954cc071cd64f3dca656ee0bd420c01d0be3db516210a92adc3694ac49731cf2d7cf057a9eccf2c2dcefc14d24cf8582a3eb69efe1d0e1 SHA512 241c6bf3aec422e9ccaf7c7113eec7e30a11baadd30fe8f05f0abfac9c41d0c8a9fb284f0cae49bcaf0d3d08aa952737f6ff3eb7d48c2b2e22c60932738aeaa4
-EBUILD helm-0.9.0-r1.ebuild 1082 BLAKE2B 369e46465cebda9688ce332d36cbeb42a5f1c21d1b90a43bf0853744fd7e64618b58d40825a94755794e9fcf98b4278bfac4595ead361b35070aff1625a6a3a1 SHA512 674efef8d4fc8d579093d551f7df10b4d0227f89e2595bd53931ddadd837fc9106f98322887ec6ba976350f352916ff3f315ee2a31a5247d040b3346a32098b1
+EBUILD helm-0.9.0-r2.ebuild 1113 BLAKE2B c12b89e76c0897cc5ddf3a925fd412eabc735eceffb5d6107d7f55ad04fff19b9401c1edfb69db3d43b832307db8b044c917efeac7f8519327c7dc5872f13980 SHA512 f0676a26c5ddee72e3e205f86c59aa0c03189bb967201931d1bc2114998b11642cd6141852db1367610026596371356a8f5a52bae9127b5666834774b1e471de
 MISC metadata.xml 346 BLAKE2B fc26a0eab6a4cf03acaeffbff89155cf20791424374d5443bc82c80820019f0b40b98fa872da40d1012a4a403c25cd93843932f4da53aedef933a974f5a36d38 SHA512 00c7608c5dfd76ec27e8677a2191d4cf78181cf8befbb0799cace3ce7a0361f14121869171e18e3d40db0b593bc2a37949981eb82368411291da0a21c7cdae2d
diff --git a/media-sound/helm/files/helm-0.9.0-musl.patch b/media-sound/helm/files/helm-0.9.0-musl.patch
new file mode 100644
index 000000000000..f089041c1da7
--- /dev/null
+++ b/media-sound/helm/files/helm-0.9.0-musl.patch
@@ -0,0 +1,129 @@
+Upstream (JUCE, bundled): https://github.com/juce-framework/JUCE/pull/1239
+
+From 393de14d3fb55e462eeae24a4e64978a8a30cd4f Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Thu, 15 Jun 2023 19:01:32 +0000
+Subject: [PATCH] JUCE: Add support for musl
+
+---
+ JUCE/modules/juce_core/juce_core.cpp          |  2 +-
+ .../native/juce_linux_SystemStats.cpp         | 34 +++++++++++++++++--
+ .../juce_core/native/juce_posix_SharedCode.h  |  2 +-
+ .../juce_core/system/juce_SystemStats.cpp     |  2 +-
+ .../juce_core/system/juce_TargetPlatform.h    |  9 +++++
+ 5 files changed, 43 insertions(+), 6 deletions(-)
+
+diff --git a/JUCE/modules/juce_core/juce_core.cpp b/JUCE/modules/juce_core/juce_core.cpp
+index 9f87047..c6f28ce 100644
+--- a/JUCE/modules/juce_core/juce_core.cpp
++++ b/JUCE/modules/juce_core/juce_core.cpp
+@@ -93,7 +93,7 @@
+  #include <net/if.h>
+  #include <sys/ioctl.h>
+ 
+- #if ! JUCE_ANDROID
++ #if ! (JUCE_ANDROID || JUCE_MUSL)
+   #include <execinfo.h>
+  #endif
+ #endif
+diff --git a/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp b/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
+index 4b8f4bd..55906eb 100644
+--- a/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -126,9 +126,37 @@ static String getLocaleValue (nl_item key)
+     return result;
+ }
+ 
+-String SystemStats::getUserLanguage()    { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
+-String SystemStats::getUserRegion()      { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
+-String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); }
++String SystemStats::getUserLanguage()
++{
++   #if JUCE_GLIBC
++    return getLocaleValue (_NL_ADDRESS_LANG_AB);
++   #else
++    if (auto langEnv = getenv ("LANG"))
++        return String::fromUTF8 (langEnv).upToLastOccurrenceOf (".UTF-8", false, true);
++
++    return {};
++   #endif
++}
++
++String SystemStats::getUserRegion()
++{
++   #if JUCE_GLIBC
++    return getLocaleValue (_NL_ADDRESS_COUNTRY_AB2);
++   #else
++    return {};
++   #endif
++}
++
++String SystemStats::getDisplayLanguage()
++{
++    auto result = getUserLanguage();
++    auto region = getUserRegion();
++
++    if (region.isNotEmpty())
++        result << "-" << region;
++
++    return result;
++}
+ 
+ //==============================================================================
+ void CPUInformation::initialise() noexcept
+diff --git a/JUCE/modules/juce_core/native/juce_posix_SharedCode.h b/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
+index 876e681..59c49ba 100644
+--- a/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
++++ b/JUCE/modules/juce_core/native/juce_posix_SharedCode.h
+@@ -235,7 +235,7 @@ int juce_siginterrupt (int sig, int flag)
+ //==============================================================================
+ namespace
+ {
+-   #if JUCE_LINUX || (JUCE_IOS && ! __DARWIN_ONLY_64_BIT_INO_T) // (this iOS stuff is to avoid a simulator bug)
++   #if JUCE_GLIBC || (JUCE_IOS && ! __DARWIN_ONLY_64_BIT_INO_T) // (this iOS stuff is to avoid a simulator bug)
+     typedef struct stat64 juce_statStruct;
+     #define JUCE_STAT     stat64
+    #else
+diff --git a/JUCE/modules/juce_core/system/juce_SystemStats.cpp b/JUCE/modules/juce_core/system/juce_SystemStats.cpp
+index 7e05277..cac9a14 100644
+--- a/JUCE/modules/juce_core/system/juce_SystemStats.cpp
++++ b/JUCE/modules/juce_core/system/juce_SystemStats.cpp
+@@ -120,7 +120,7 @@ String SystemStats::getStackBacktrace()
+ {
+     String result;
+ 
+-   #if JUCE_ANDROID || JUCE_MINGW
++   #if JUCE_ANDROID || JUCE_MINGW || JUCE_MUSL
+     jassertfalse; // sorry, not implemented yet!
+ 
+    #elif JUCE_WINDOWS
+diff --git a/JUCE/modules/juce_core/system/juce_TargetPlatform.h b/JUCE/modules/juce_core/system/juce_TargetPlatform.h
+index ae9d7e1..9dca4bc 100644
+--- a/JUCE/modules/juce_core/system/juce_TargetPlatform.h
++++ b/JUCE/modules/juce_core/system/juce_TargetPlatform.h
+@@ -33,6 +33,7 @@
+     - Either JUCE_LITTLE_ENDIAN or JUCE_BIG_ENDIAN.
+     - Either JUCE_INTEL or JUCE_ARM
+     - Either JUCE_GCC or JUCE_CLANG or JUCE_MSVC
++    - Either JUCE_GLIBC or JUCE_MUSL will be defined on Linux depending on the system's libc implementation.
+ */
+ 
+ //==============================================================================
+@@ -177,6 +178,14 @@
+   #elif __MMX__ || __SSE__ || __amd64__
+     #define JUCE_INTEL 1
+   #endif
++
++  #if JUCE_LINUX
++    #ifdef __GLIBC__
++      #define JUCE_GLIBC 1
++    #else
++      #define JUCE_MUSL 1
++    #endif
++  #endif
+ #endif
+ 
+ //==============================================================================
+-- 
+2.41.0
+
diff --git a/media-sound/helm/helm-0.9.0-r1.ebuild b/media-sound/helm/helm-0.9.0-r2.ebuild
index eb8bb1120649..46ef109dc534 100644
--- a/media-sound/helm/helm-0.9.0-r1.ebuild
+++ b/media-sound/helm/helm-0.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,6 +34,7 @@ DOCS=( changelog README.md )
 PATCHES=(
 	"${FILESDIR}/${P}-nomancompress.patch"
 	"${FILESDIR}/${P}-fix-gcc91.patch"
+	"${FILESDIR}/${P}-musl.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index b98670f4d56c..2af1be06f5c2 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,5 +1,6 @@
 DIST playerctl-2.3.1.tar.gz 73595 BLAKE2B d6d60d82fb0a8951fba4a3de91ff1e3f4bdba7177563b65b2da53525af4ca40f42755c577f652aaa24d2de308f56a495c8f87840ad67d6cda840cba1411abdb0 SHA512 06a10d193c83f60a9a9c50dddfb0a74e00be8cde34ddaa9d75582b7ce487ac564d1ff0675f6cb0c27d968e7d435b6a427818ac14e0cdd94b86af8f5d89661a93
 DIST playerctl-2.4.1.tar.gz 77371 BLAKE2B ae9f691d714d6235bd7dc3e3d9a2ed21190482bd2aa8642c108ade0c09902ccb20196d0180ed3b1ffe680ca4e6a4ee293de1a6f10d54878589e3d8c81ca81c53 SHA512 2d84f657b07c948cd6990d9e79c4eb6e83f97c387ac53c2322fc0adbeb853950fa935332233329e7555db7d157f3ced6498cc102edaffd78849ca1f7d4c49bdc
 EBUILD playerctl-2.3.1.ebuild 1202 BLAKE2B a6aa753d25f13e67f3c07ad2c84eb5a8cfca681fdf79b104697e775495fdcd79834a0f455bf9975713768e15b37c3d895468f897dc58dcb5cb6501f9fc1d7542 SHA512 d542fecca06ef234072c715be3ccca5771864eeb05112750ac30376e95655e4833d6fe1d44f060a4f556b853f1d27f7cfdc956f1179ac1a0f3639a8eba33b418
+EBUILD playerctl-2.4.1-r1.ebuild 2361 BLAKE2B 8af9d735a9d2e7d818dea55fdeff55816bada0ee1e9476a8a5e6b0db18eacf271de759bc85cc9c99c467f2b1e821570d3da6f0c83c2581ea12555fca38fcbc34 SHA512 bb586f4b92f0f084844fc6ba23e5056553109e34ffb53462fa34d1532245ad57f5825462d626f3ba27457fa0a5c4aa41d298e6623b6f653117f29da9b14179e6
 EBUILD playerctl-2.4.1.ebuild 1212 BLAKE2B a4e2c1675096a87e8c44b3d9bd48a71f5f5da1fb9a2ddc8205b97cc4b4c463017d7639c99a5a7e0f688ac493e05dbf0dca3f3fa8a1dcaae62ffe35d820872c65 SHA512 fdaea7744cac060bc85b341f738a16c8ec5d5fb5681f96bd9a38f106f8c1e994f176e41b1ed56fea547a3d6f5973521ce1e2c74a5b8d6aec09f3ffa77bfbc9eb
 MISC metadata.xml 344 BLAKE2B 291e21642ebc0aed630579a079c007dc54669960a8b2e68f8a62f199a1cf308f0d020118fedfbd5693010d2de61f1c7b6488acf720508422493cf3e83f1ac466 SHA512 d7df9fd6e2a27888c608dd8a39461145489bbaef13fe83d0bde941adba3a496106b62ae33562a89bbb0dfa718785104f57a11fba3cc73a18edbeb5990a7c6a5f
diff --git a/media-sound/playerctl/playerctl-2.4.1-r1.ebuild b/media-sound/playerctl/playerctl-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..e1337e2c4146
--- /dev/null
+++ b/media-sound/playerctl/playerctl-2.4.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit bash-completion-r1 meson python-any-r1 virtualx xdg-utils
+
+DESCRIPTION="A CLI utility to control media players over MPRIS"
+HOMEPAGE="https://github.com/acrisci/playerctl"
+SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc introspection test"
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		$(python_gen_any_dep '
+			dev-python/dbus-next[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Requires a lenient dbus config systemwide
+	# See test/data/dbus-system.conf and how its used in Dockerfile
+	"test/test_basics.py::test_system_list_players"
+	# Daemon tests are inconsistent, occasional failure occurs in upstream CI as well.
+	"test/test_daemon.py"
+)
+
+python_check_deps() {
+	python_has_version \
+		"dev-python/dbus-next[${PYTHON_USEDEP}]" \
+		"dev-python/pytest[${PYTHON_USEDEP}]" \
+		"dev-python/pytest-asyncio[${PYTHON_USEDEP}]" \
+		"dev-python/pytest-timeout[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddatadir=share
+		-Dbindir=bin
+		-Dbash-completions=false
+		-Dzsh-completions=false
+		$(meson_use doc gtk-doc)
+		$(meson_use introspection)
+	)
+
+	xdg_environment_reset # bug #596166
+	meson_src_configure
+}
+
+src_test() {
+	local dbus_params=(
+		$(dbus-daemon --session --print-address --fork --print-pid)
+	)
+	local -x DBUS_SESSION_BUS_ADDRESS=${dbus_params[0]}
+
+	export PATH="${BUILD_DIR}/playerctl/:${PATH}"
+
+	virtx epytest
+
+	kill "${dbus_params[1]}" || die
+}
+
+src_install() {
+	meson_src_install
+
+	docinto examples
+	dodoc -r "${S}"/examples/.
+	docompress -x "/usr/share/doc/${PF}/examples"
+
+	newbashcomp data/playerctl.bash "${PN}"
+	insinto /usr/share/zsh/site-functions
+	newins data/playerctl.zsh _playerctl
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index df1511769423..8ed79763c5c4 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 30a7cbe47394..71ba81dc83a1 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,6 +1,7 @@
 AUX 0.3.70/parser-check-pointer.patch 731 BLAKE2B de916ae5e8f39759e7e2216cd47e96b254e924851836a594b5922739e4b11f0dd809969defba10fadc99306700497d06957084b4edd04f22c2e1a7d37e988509 SHA512 77225841a84cdec4163297a6094365b537775d6824b7ecf6dfca0b71785ec36358c24ed6e51aec6d6d68968dd6d5b7707745b76ef86d1a76e686320b76b4e3ca
 AUX 0.3.71/jack-update-bufsize-samplerate.patch 1577 BLAKE2B 1bb11301fa7c04482fc8684c1ab07134da52891dba2c357bafd261b829ca255c7bbeab0fb70988813d1c895dab6108498b3ef8c479fdec60c843eb1e6b00f3f5 SHA512 13b8d44bf0ebd4a3d913eff083fbaeed96cff67315f04d9e44e1c92bfe83a04757a11291bcb1c30ef26f698248396212d1f3480290b84573159ffedf51c5fd00
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
+AUX gentoo-pipewire-launcher.1 1400 BLAKE2B a469d6eb75e5362d44c2cad66169f89fdb93cdf511e3019f669531812b9fce007032388ef2b3927dce8977ab69bfdb51af357b0648c661c079175d5f62cc2ea9 SHA512 de1b4621b59f6505950324746090de21d5fdaced7cb45cae5b9bd6f312aba031590fd71e1c54ca4b8558649556fbab304c9b88ee1e3831ce29530ddb040d3abe
 AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
 AUX gentoo-pipewire-launcher.in-r1 1729 BLAKE2B 0deaf286b480e8153994d78a4b53b8d51c0d8b5aaf7f5db282e90923844512b1e060a346940551a8c498339361d5343071d57537a80a0c612c21813245e82be7 SHA512 f02cf0842cd4470c0be6607ad17ac2e5622ae9b90d8d04aa0590fabce5cdef9b6d749692829b40b8a11814357474009552f64ffa9dd90a4082cd35f2ec75e61d
 AUX gentoo-pipewire-launcher.in-r2 2613 BLAKE2B cfedf49fcdf117c0792314eb3db531354f9437c175c00bb536a14913dcaa110ec98ff8b05cf32058e1581bb38fff26b74f260fdded9ba619a734b09905423ee8 SHA512 af9a99c288e522e8ac5c7bf0362cbe3a81ac3ad5791855a5114b99089f67ac2fecb20d5eabc428f50284f11fb9365e9a967e0b3843075444a789c6c27c41e111
@@ -12,5 +13,6 @@ DIST pipewire-0.3.70.tar.bz2 1573378 BLAKE2B 3824106cba9c1b0a82c6d8889b2b1473f4b
 DIST pipewire-0.3.71.tar.bz2 1592332 BLAKE2B ff6483a040285cd7a7cc10878cc88b61a0e01c0376ab64ef84f753b300b61da23211bc1b50208da7f1054d6ddf08092e81cbf29df508aad3bc93f20742a2f735 SHA512 465388faaf0f7fcce21fdbcd7a1705ef524c35e267c3f123b1025c34133fc418194abb9e22d89e60c9acc1417b25d655112fd9ef342e26ca9b8bc26013b09cb3
 EBUILD pipewire-0.3.70-r2.ebuild 17540 BLAKE2B c72f6bd813b69016c7e76dceee8d1a599fe0cfcc9cbba69e475df97609b29367c5a59e1be6052362985f145f676cda9e5621bfa2360674b8e31dba7bc2f80626 SHA512 ea444201b17236bb193e87d20b84c71ab4ffcd9638530707120c25e4f662a450e57e2ea1317b810482a0d124a3208320107991bc2bfea881085ad249b7560e02
 EBUILD pipewire-0.3.71-r2.ebuild 17641 BLAKE2B f25bbbac377b63de4b9d73e2431a939a29af67025ec736d5f63b24d219ef76b1b58c73bea8f4107e117385a66ab9e639cef78af5f2fc3c357a7b1b9579dd1681 SHA512 0dcc22b48fc7aaab765286b87fe87dee46148fd41d33ab5a3b75f6495f1acd5f01a6b8c2d552db9540ef0254981d2405d1f7ceba9a7ddbf623401d636b92dcac
-EBUILD pipewire-9999.ebuild 17646 BLAKE2B 781f6dd95704d24068683b6ea5e46250f921e4e9be95f0eb5f32dedf9ed8e45dd2bbd53e61cf1f0b59d7181f542a3182eb769bc5ed1ff37bcd883defeddae57a SHA512 6b118a2d14d40389776149ff7fb7664173fe7b1de3247a372255dd479b95dce7414700657a1f70cdb1069a04cc680080d236b9972fd8b791eda8b979e0d63227
+EBUILD pipewire-0.3.71-r3.ebuild 17696 BLAKE2B 6123a1a6d7664aaf5c6488b74267c92ba76f9a8cf96375f3f81d00fef0cd5005415bf7a8addb80200fd2ba8138d1c9c06bfc3daea11730a6baa9f6455e20a367 SHA512 1b812f71c1bc78b1364013996c9191429aac8811024bef1b12cbb0a24935f05f5d8177c796a9b83f102f25d22f4520456e03fdeafb2d2cfe74b2ac57752419d8
+EBUILD pipewire-9999.ebuild 17696 BLAKE2B 6123a1a6d7664aaf5c6488b74267c92ba76f9a8cf96375f3f81d00fef0cd5005415bf7a8addb80200fd2ba8138d1c9c06bfc3daea11730a6baa9f6455e20a367 SHA512 1b812f71c1bc78b1364013996c9191429aac8811024bef1b12cbb0a24935f05f5d8177c796a9b83f102f25d22f4520456e03fdeafb2d2cfe74b2ac57752419d8
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.1 b/media-video/pipewire/files/gentoo-pipewire-launcher.1
new file mode 100644
index 000000000000..d2c30dc961bc
--- /dev/null
+++ b/media-video/pipewire/files/gentoo-pipewire-launcher.1
@@ -0,0 +1,43 @@
+.TH "gentoo-pipewire-launcher" "1" "2023-06-15"
+.SH "NAME"
+gentoo\-pipewire\-launcher \- start instances of PipeWire, PipeWire-Pulse and WirePlumber
+.SH "SYNOPSIS"
+.BR gentoo\-pipewire\-launcher
+[restart]
+.SH "DESCRIPTION"
+\fIgentoo\-pipewire\-launcher\fR starts instances of PipeWire and
+WirePlumber.
+Two instances of PipeWire are started: one as the core sound-server, and
+one for PulseAudio emulation (cf.\&
+.BR pipewire-pulse (1)\fR).
+.PP
+It must be run in an environment with an active D-Bus session bus,
+i.e. one in which the
+.B DBUS_SESSION_BUS_ADDRESS
+environment variable is set appropriately.
+.PP
+\fIgentoo\-pipewire\-launcher\fR
+tries to avoid restarting, in order to avoid audio dropouts.
+However, a restart can be forced by calling
+\fIgentoo\-pipewire\-launcher\fR
+with an argument of \(oqrestart\(cq.
+.PP
+.B ${XDG_CONFIG_HOME}/gentoo\-pipewire\-launcher.conf
+can be used to specify absolute paths of files to which log output
+should be sent, by specifying values for one or more of the
+.B GENTOO_PIPEWIRE_LOG\fR,
+.B GENTOO_PIPEWIRE_PULSE_LOG\fR,
+and
+.B GENTOO_WIREPLUMBER_LOG
+variables, one per line.
+.SH "REPORTING BUGS"
+Please report bugs via https://bugs.gentoo.org/
+.SH "FILES"
+.TP
+.B ${XDG_CONFIG_HOME}/gentoo\-pipewire\-launcher.conf
+configures locations of files for log output.
+.SH "SEE ALSO"
+.BR pipewire (1),
+.BR pipewire-pulse (1),
+.BR wireplumber (1),
+.BR pipewire.conf (5)
diff --git a/media-video/pipewire/pipewire-0.3.71-r3.ebuild b/media-video/pipewire/pipewire-0.3.71-r3.ebuild
new file mode 100644
index 000000000000..33887a9e61c1
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.71-r3.ebuild
@@ -0,0 +1,465 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2
+modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+#   which provides adequate guarantee that alsa-lib will be able to provide audio services.
+#   If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+#   When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity.
+REQUIRED_USE="
+	ffmpeg? ( extra )
+	bluetooth? ( dbus )
+	jack-sdk? ( !jack-client )
+	modemmanager? ( bluetooth )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	dbus? ( dev-util/gdbus-codegen )
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+# While udev could technically be optional, it's needed for a numebr of options,
+# and not really worth it, bug #877769.
+RDEPEND="
+	acct-group/audio
+	acct-group/pipewire
+	media-libs/alsa-lib
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		dev-libs/glib
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/opus
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? ( >=media-libs/libsndfile-1.0.20 )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flatpak? ( dev-libs/glib )
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gsettings? ( >=dev-libs/glib-2.26.0:2 )
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	lv2? ( media-libs/lilv )
+	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
+	pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] )
+	sound-server? ( !media-sound/pulseaudio-daemon )
+	readline? ( sys-libs/readline:= )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? ( acct-user/pipewire )
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	# Used for upstream backports
+	[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature gsettings)
+		$(meson_native_use_feature systemd)
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Dcompress-offload=disabled # TODO: tinycompress unpackaged
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
+		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth opus)
+		$(meson_native_use_feature bluetooth bluez5-codec-opus)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		# http://www.bluez.org/le-audio-support-in-pipewire/
+		-Dbluez5-codec-lc3=disabled
+		-Dbluez5-codec-lc3plus=disabled
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_native_use_feature ffmpeg pw-cat-ffmpeg)
+		$(meson_native_use_feature flatpak)
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature readline)
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		-Dlibmysofa=disabled # libmysofa is unpackaged
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# We still have <5.16 kernels packaged in Gentoo and 6.1 (LTS) only
+		# just became stable, with 5.15 being the previous LTS. Many people
+		# are still on it.
+		-Dpam-defaults-install=true
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test --timeout-multiplier 10
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		dodir /etc/wireplumber/main.lua.d
+		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
+
+		dodir /etc/wireplumber/bluetooth.lua.d
+		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+	fi
+
+	if use system-service; then
+		newtmpfiles - pipewire.conf <<-EOF || die
+			d /run/pipewire 0755 pipewire pipewire - -
+		EOF
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r2 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r2 gentoo-pipewire-launcher
+
+		doman "${FILESDIR}"/gentoo-pipewire-launcher.1
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
+
+pkg_preinst() {
+	HAD_SOUND_SERVER=0
+	HAD_SYSTEM_SERVICE=0
+
+	if has_version "media-video/pipewire[sound-server(-)]" ; then
+		HAD_SOUND_SERVER=1
+	fi
+
+	if has_version "media-video/pipewire[system-service(-)]" ; then
+		HAD_SYSTEM_SERVICE=1
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+
+	use system-service && tmpfiles_process pipewire.conf
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -le 0.3.66-r1 ; then
+			elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions"
+			elog "and limits needed to function smoothly:"
+			elog
+			elog "1. Please make sure your user is in the 'pipewire' group for"
+			elog "the best experience with realtime scheduling (PAM limits behavior)!"
+			elog "You can add your account with:"
+			elog " usermod -aG pipewire <youruser>"
+			elog
+			elog "2. For the best experience with fast user switching, it is recommended"
+			elog "that you remove your user from the 'audio' group unless you rely on the"
+			elog "audio group for device access control or ACLs.:"
+			elog " usermod -rG audio <youruser>"
+			elog
+
+			if ! use jack-sdk ; then
+				elog
+				elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+				elog "alternative libraries have been installed to a non-default location."
+				elog "To use them, put pw-jack <application> before every JACK application."
+				elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+				elog "provider is still needed to compile the JACK applications themselves."
+				elog
+			fi
+
+			if use systemd ; then
+				ewarn
+				ewarn "PipeWire daemon startup has been moved to a launcher script!"
+				ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+				ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+				ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+				ewarn
+				ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+				ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+				ewarn "advised that a D-Bus user session is set up before starting the script."
+				ewarn
+			fi
+
+			if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+				elog
+				elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+				elog "are recommended to edit pulseaudio client configuration files:"
+				elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+				elog "if it exists, and disable autospawning of the original daemon by setting:"
+				elog
+				elog "  autospawn = no"
+				elog
+				elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+				elog
+				elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+				elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+				elog "command:"
+				elog
+				elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+				elog
+			fi
+
+			if has_version 'net-misc/ofono' ; then
+				ewarn "Native backend has become default. Please disable oFono via:"
+				if systemd_is_booted ; then
+					ewarn "systemctl disable ofono"
+				else
+					ewarn "rc-update delete ofono"
+				fi
+			fi
+		fi
+	done
+
+	if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
+		# TODO: We could drop most of this if we set up systemd presets?
+		# They're worth looking into because right now, the out-of-the-box experience
+		# is automatic on OpenRC, while it needs manual intervention on systemd.
+		if use sound-server && use systemd ; then
+			elog
+			elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+			elog
+			elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+			elog
+			elog "To use PipeWire, the user units must be manually enabled"
+			elog "by running this command as each user you use for desktop activities:"
+			elog
+			elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+			elog
+			elog "A reboot is recommended to avoid interferences from still running"
+			elog "PulseAudio daemon."
+			elog
+			elog "Both new users and those upgrading need to enable WirePlumber"
+			elog "for relevant users:"
+			elog
+			elog "  systemctl --user disable pipewire-media-session.service"
+			elog "  systemctl --user --force enable wireplumber.service"
+			elog
+			elog "Root user may replace --user with --global to change system default"
+			elog "configuration for all of the above commands."
+			elog
+		fi
+
+		if ! use sound-server ; then
+			ewarn
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+			ewarn
+		fi
+	fi
+
+	if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
+		ewarn
+		ewarn "You have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of the"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information, and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 7289c71e58b0..33887a9e61c1 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -299,6 +299,8 @@ multilib_src_install_all() {
 		exeinto /usr/bin
 		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r2 gentoo-pipewire-launcher
 
+		doman "${FILESDIR}"/gentoo-pipewire-launcher.1
+
 		# Disable pipewire-pulse if sound-server is disabled.
 		if ! use sound-server ; then
 			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b5845821d502..61bb1f25ceb0 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 466ff6c1bd96..ce20ed2674bf 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 17 Jun 2023 00:09:49 +0000
+Sat, 17 Jun 2023 06:09:49 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3dfc5e31b181..60cbdf2a1c0c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546124 BLAKE2B b8c960a7f19f0cac8ea254b9330e3a1add1f4be28ff0a9b4020f5e68f250a6b511280b7dd1dec4e472c73320abae493b0ab8441075c681803abfb19ea280332e SHA512 0dccc4f920463740ab2803f55b50f1cf0df2af9d58750c12c98fe5963dc8738d5a3e8d6a895c2e0d3ba8230bb61557b6e88b4fa56b2f05f5697577b68a9413df
-TIMESTAMP 2023-06-17T00:09:52Z
+TIMESTAMP 2023-06-17T06:09:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSM+dBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSNTjJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAFsxAAqIwiqDB8c+ThBCIqtVcx1ezAFuNXNPWkGaKTc4707HSTRjTh/3Z+EBvB
-oqYV4d7UFZHLMnaBwLgP/6bhRGlMnDQOtWCLX7KlQtciKvmODUDofvNSNSRebYwf
-sQNzD6SYqSbUOpv2ofjFEWjwCvyS2FmrsqhyOB7rx4/MvvFh4X8G/+jZWUIc1I5m
-3cm2C9WlV9hyO8VECit4wd9OVzRTbDupoEz+dWXaK4ORHeMqw8taQ0+INr3a2Ero
-rv2dUzMc25+OPgc+KlWq6PsYHELjo3keheZsggNgW/rJbtVJH1yhhLpnvFNT/XHU
-w+Yon9upUooQ+O6OZpQTa5FhpLskJquJClhV5rBFbaeue2waw1W0l138n4ToNJMR
-FOelH0cQicaVBqxTDQlM0yzXpGemgDFcUJwBkvCnzd0XyiBBg7s6qYwQBQAs1oDh
-ccrRb2/UHmuPhmqduzdGgXHZHK3CzBsDKsnM1GWpC09P7TjilSF7T6bDaYB+ztlP
-3KhphFSaMj6cZclSXFH9NxJB1UfqBF8/vlq2nCK3NdV5ezSlbCTb3rVp26D02gBD
-Coq721LS54xTspii+jjSZjCXb9bFbVEq4MgD68vTfrwyk93vp60GY3cJcehvOcT+
-rwpPxiN34nwAAgjbzNwxjWFMQvfKPd+kFeo43cwSHZCOVJj/18Y=
-=1ZXv
+klAafA//f+8eK7iBiML9tXmlLZbSumnEz2+PhwmSIKG4HoUcBNlL9JlrYqAdCGcZ
++QSt30EN/dN5x9VIN9eDohywj9zAL0dWSw+cmO+0ez40Kxqjk8qP7m6ZJbd4K4K1
+i1hu4DF6xE5b1Wd4FiC3uaze1vEP21KAdKmlJlAZj43AAVlvfWcGfCNzZh/2/sWa
+vM/IEqmr53Dt5ogTk7aYBtqH1uR+qKajD4C0CoyjLBTxUTvrtFOM2G7cv7eVg3y0
+5Mh5L8z7mGAegp3KTEW3xLXENft+fEc/tfOaqbnQxjaqWKMR0oSmpqhVjBvlcXAj
+JnVnjdjarZlUIcd9h8b6ooGykp1TvEd8CrmgJv5Ru14/jGYsSGWtlmdicoCBK7tl
+QZSfqaEpeh12CGGtRtsk0hxvN15prr5FLePvN9biZ3tACq2gDP7CIwQ74O+XZVfg
+c3HxVVsReHxy/9xjT15j/uZBsnWcf75mNU8UQZUXRejMBwBdL+itpnTJXOAUKR/j
+N/PM0MngHMDToRVVDMPKMVWETACnHmXKPRR2a+KmriIbOuk8uHVFFeEylih2c4db
+UFxA+Aokf7I5/vpnOu1l+KS8nwuWuOQWdXYkZo41SqGSgVtli33+DuxEsLBcStx4
+3g0qdNCF/LxvHmWLQ6b6A8BfjjIeMG3LPi/U7CXSv0KdXONvsNw=
+=57vs
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 466ff6c1bd96..ce20ed2674bf 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 17 Jun 2023 00:09:49 +0000
+Sat, 17 Jun 2023 06:09:49 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b6b0b1bf2578..e0c7b61aa845 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 8d3d9db9c574..cfc1dcad47d8 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.155 b/metadata/md5-cache/app-admin/awscli-1.27.155
new file mode 100644
index 000000000000..3145376389e3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.155
@@ -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.155[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.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[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.155[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.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3: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.155.tar.gz -> aws-cli-1.27.155.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.13_p3-r1 b/metadata/md5-cache/app-admin/sudo-1.9.13_p3-r1
index ac29fbfde064..19f8b6af70e1 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.13_p3-r1
+++ b/metadata/md5-cache/app-admin/sudo-1.9.13_p3-r1
@@ -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
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 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	ad475baa777c9978fa035216c8264a10	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=b5277b435d176d5c420599867b7f97bf
+_md5_=b22e672483f95fb23c25148d23103344
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index b5745dff3b31..46e83af03ea5 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/cpio-2.14 b/metadata/md5-cache/app-arch/cpio-2.14
index df880cb98a75..0d6e28a15877 100644
--- a/metadata/md5-cache/app-arch/cpio-2.14
+++ b/metadata/md5-cache/app-arch/cpio-2.14
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/cpio/cpio.html
 INHERIT=autotools
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-3+
 PDEPEND=app-alternatives/cpio
 SLOT=0
 SRC_URI=mirror://gnu/cpio/cpio-2.14.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=13bd58d948590914986b81e875dd9520
+_md5_=b6da1ebdae630c7fca976cc464e7cd35
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.4.3 b/metadata/md5-cache/app-arch/xz-utils-5.4.3
index d5ca81d5be90..db9c62e6c7c8 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.4.3
+++ b/metadata/md5-cache/app-arch/xz-utils-5.4.3
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://tukaani.org/xz/
 INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript verify-sig
 IUSE=doc +extra-filters nls 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 split-usr verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 SLOT=0
 SRC_URI=https://github.com/tukaani-project/xz/releases/download/v5.4.3/xz-5.4.3.tar.gz mirror://sourceforge/lzmautils/xz-5.4.3.tar.gz https://tukaani.org/xz/xz-5.4.3.tar.gz verify-sig? ( https://github.com/tukaani-project/xz/releases/download/v5.4.3/xz-5.4.3.tar.gz.sig https://tukaani.org/xz/xz-5.4.3.tar.gz.sig )
 _eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=c58b02116ae2e5cf727cf6f8c08d32d1
+_md5_=e45b9c45020480b75bc3921c962cd3f7
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 4cc9b788ea0f..7703ae5c5e63 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-4.06c b/metadata/md5-cache/app-forensics/aflplusplus-4.06c-r1
index 94bd67d9abaa..fdc84f58d661 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-4.06c
+++ b/metadata/md5-cache/app-forensics/aflplusplus-4.06c-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup test
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=sys-devel/llvm-13:= || ( sys-devel/clang:13 sys-devel/clang:14 sys-devel/clang:16 ) !app-forensics/afl test? ( dev-util/cmocka ) !!sys-devel/llvm:0
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=sys-devel/llvm-14:= || ( sys-devel/clang:14 sys-devel/clang:15 sys-devel/clang:16 ) !app-forensics/afl test? ( dev-util/cmocka ) !!sys-devel/llvm:0
 DESCRIPTION=A fork of AFL, the popular compile-time instrumentation fuzzer
 EAPI=8
 HOMEPAGE=https://github.com/AFLplusplus/AFLplusplus
@@ -7,10 +7,10 @@ INHERIT=toolchain-funcs llvm optfeature python-single-r1
 IUSE=test python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=sys-devel/llvm-13:= || ( sys-devel/clang:13 sys-devel/clang:14 sys-devel/clang:16 ) !app-forensics/afl
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=sys-devel/llvm-14:= || ( sys-devel/clang:14 sys-devel/clang:15 sys-devel/clang:16 ) !app-forensics/afl
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/4.06c.tar.gz -> aflplusplus-4.06c.tar.gz https://dev.gentoo.org/~sam/distfiles/app-forensics/aflplusplus/aflplusplus-4.06c-patches.tar.xz
 _eclasses_=llvm	5b4ee8759b4e9eec5cb48b46975ca56c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=773dd48ae2951e1b9cc7ad6dcb0d55b8
+_md5_=4669c92dfce29cd6b1ba673f2df9c121
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-4.07c b/metadata/md5-cache/app-forensics/aflplusplus-4.07c
new file mode 100644
index 000000000000..ec27a7505c48
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/aflplusplus-4.07c
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile install postinst setup test
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=sys-devel/llvm-14:= || ( sys-devel/clang:14 sys-devel/clang:15 sys-devel/clang:16 ) !app-forensics/afl test? ( dev-util/cmocka ) !!sys-devel/llvm:0
+DESCRIPTION=A fork of AFL, the popular compile-time instrumentation fuzzer
+EAPI=8
+HOMEPAGE=https://github.com/AFLplusplus/AFLplusplus
+INHERIT=toolchain-funcs llvm optfeature python-single-r1
+IUSE=test python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=sys-devel/llvm-14:= || ( sys-devel/clang:14 sys-devel/clang:15 sys-devel/clang:16 ) !app-forensics/afl
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/4.07c.tar.gz -> aflplusplus-4.07c.tar.gz https://dev.gentoo.org/~sam/distfiles/app-forensics/aflplusplus/aflplusplus-4.07c-patches.tar.xz
+_eclasses_=llvm	5b4ee8759b4e9eec5cb48b46975ca56c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=02d28f04a129e0ccd84271ad856e9234
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 72cefc7671f7..b39fef3c2ad2 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/ansifilter-2.19 b/metadata/md5-cache/app-text/ansifilter-2.19
new file mode 100644
index 000000000000..019da001de95
--- /dev/null
+++ b/metadata/md5-cache/app-text/ansifilter-2.19
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Handles text files containing ANSI terminal escape codes
+EAPI=8
+HOMEPAGE=http://www.andre-simon.de/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=toolchain-funcs qmake-utils xdg
+IUSE=gui
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+SLOT=0
+SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.19.tar.bz2
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=cfb2e2bc40b3a5324a7869a3dc4023e1
diff --git a/metadata/md5-cache/app-text/highlight-4.6 b/metadata/md5-cache/app-text/highlight-4.6
new file mode 100644
index 000000000000..fc3653c4b9d7
--- /dev/null
+++ b/metadata/md5-cache/app-text/highlight-4.6
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig gui? ( dev-qt/linguist-tools:5 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-libs/boost
+DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight
+EAPI=8
+HOMEPAGE=http://www.andre-simon.de/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=lua-single qmake-utils toolchain-funcs xdg
+IUSE=examples gui lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-3
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+SLOT=0
+SRC_URI=http://www.andre-simon.de/zip/highlight-4.6.tar.bz2
+_eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5cb201432c090eebd07285047709549a
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 9177d945fc5e..abd96a354e5d 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/mono-6.12.0.122 b/metadata/md5-cache/dev-lang/mono-6.12.0.122
index 627564ce29f6..60ae688d8ddd 100644
--- a/metadata/md5-cache/dev-lang/mono-6.12.0.122
+++ b/metadata/md5-cache/dev-lang/mono-6.12.0.122
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bc app-alternatives/yacc pax-kernel? ( sys-apps/elfix ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+BDEPEND=dev-util/cmake sys-devel/bc app-alternatives/yacc pax-kernel? ( sys-apps/elfix ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
 DEPEND=app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ia64? ( sys-libs/libunwind ) !minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) nls? ( sys-devel/gettext )
 DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
@@ -12,4 +12,4 @@ RDEPEND=app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-6.12.0.122.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	mono-env	cef880fd27385e7e80934656e8789627	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f903f44bc858fe1daa1f41d7b46db088
+_md5_=e265bf9c65e5670166f568df9ec2c265
diff --git a/metadata/md5-cache/dev-lang/mono-6.12.0.182 b/metadata/md5-cache/dev-lang/mono-6.12.0.182
new file mode 100644
index 000000000000..b679be1f117c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mono-6.12.0.182
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/cmake sys-devel/bc app-alternatives/yacc pax-kernel? ( sys-apps/elfix ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ia64? ( sys-libs/libunwind ) !minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) nls? ( sys-devel/gettext )
+DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
+EAPI=7
+HOMEPAGE=https://mono-project.com
+INHERIT=autotools check-reqs linux-info mono-env pax-utils multilib-minimal
+IUSE=doc minimal nls pax-kernel xen abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux
+LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
+RDEPEND=app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ia64? ( sys-libs/libunwind ) !minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) nls? ( sys-devel/gettext ) app-misc/ca-certificates
+SLOT=0
+SRC_URI=https://download.mono-project.com/sources/mono/mono-6.12.0.182.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	mono-env	cef880fd27385e7e80934656e8789627	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=9662132eaf0a7eb4e33912850fac7369
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 053a4ea08c4d..67ebaaea4c8d 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.47 b/metadata/md5-cache/dev-libs/libgpg-error-1.47
index a1dfe820f521..ff729708a37c 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.47
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.47
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnupg.org/related_software/libgpg-error
 INHERIT=autotools multilib-minimal toolchain-funcs prefix verify-sig
 IUSE=common-lisp nls static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.47.tar.bz2 verify-sig? ( mirror://gnupg/libgpg-error/libgpg-error-1.47.tar.bz2.sig )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=963b7f7deb1f3ce85419b89a5933f10a
+_md5_=94e68288754ad9750163fe80ed128d70
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 3ae95da6b995..5981268fda32 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-2.20.800-r1 b/metadata/md5-cache/dev-perl/XML-LibXML-2.20.800-r1
index 3c361430fec7..4d364443a539 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXML-2.20.800-r1
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-2.20.800-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/XML-LibXML
 INHERIT=perl-module
 IUSE=minimal test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 virtual/perl-IO virtual/perl-Scalar-List-Utils >=dev-perl/XML-NamespaceSupport-1.70.0 >=dev-perl/XML-SAX-1.20.0-r1 dev-perl/XML-SAX-Base >=dev-libs/libxml2-2.6.21:2= virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0208.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6f2f0734c4b23cc8ab779013a4427ace
+_md5_=9023833231ce008bb2e383520edddbf8
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 163597832ec4..76ef794544a5 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/PyQt6-6.5.0 b/metadata/md5-cache/dev-python/PyQt6-6.5.0
deleted file mode 100644
index aede13e47335..000000000000
--- a/metadata/md5-cache/dev-python/PyQt6-6.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/PyQt-builder-1.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.5:6 sys-devel/gcc dbus? ( virtual/pkgconfig ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.7.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-qt/qtbase-6.5:6=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.5:6[designer] ) help? ( >=dev-qt/qttools-6.5:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.5:6 ) opengl? ( gles2-only? ( media-libs/libglvnd ) ) positioning? ( >=dev-qt/qtpositioning-6.5:6 ) qml? ( >=dev-qt/qtdeclarative-6.5:6 ) quick3d? ( >=dev-qt/qtquick3d-6.5:6 ) serialport? ( >=dev-qt/qtserialport-6.5:6 ) svg? ( >=dev-qt/qtsvg-6.5:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.5:6 ) websockets? ( >=dev-qt/qtwebsockets-6.5:6 ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=8
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/
-INHERIT=distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
-IUSE=+dbus debug qml designer examples gles2-only +gui help multimedia +network opengl positioning +printsupport quick quick3d serialport spatialaudio +sql +ssl svg testlib webchannel websockets +widgets +xml python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtbase-6.5:6=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.5:6[designer] ) help? ( >=dev-qt/qttools-6.5:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.5:6 ) opengl? ( gles2-only? ( media-libs/libglvnd ) ) positioning? ( >=dev-qt/qtpositioning-6.5:6 ) qml? ( >=dev-qt/qtdeclarative-6.5:6 ) quick3d? ( >=dev-qt/qtquick3d-6.5:6 ) serialport? ( >=dev-qt/qtserialport-6.5:6 ) svg? ( >=dev-qt/qtsvg-6.5:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.5:6 ) websockets? ( >=dev-qt/qtwebsockets-6.5:6 ) >=dev-python/PyQt6-sip-13.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=designer? ( gui widgets ) help? ( gui widgets ) multimedia? ( gui network ) opengl? ( gui ) printsupport? ( gui widgets ) qml? ( network ) quick3d? ( gui qml ) quick? ( gui qml ) spatialaudio? ( multimedia ) sql? ( widgets ) svg? ( gui ) testlib? ( gui widgets ) webchannel? ( network ) websockets? ( network ) widgets? ( gui ) || ( python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt6/PyQt6-6.5.0.tar.gz
-_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2c3a4acd563e7c362189742465018640	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=2be2a471a4bae13bd01496355a86b067
diff --git a/metadata/md5-cache/dev-python/PyQt6-6.5.1 b/metadata/md5-cache/dev-python/PyQt6-6.5.1
index 28a222b30a56..1711cf49766d 100644
--- a/metadata/md5-cache/dev-python/PyQt6-6.5.1
+++ b/metadata/md5-cache/dev-python/PyQt6-6.5.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/PyQt-builder-1.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.5:6 sys-devel/gcc dbus? ( virtual/pkgconfig ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.7.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/PyQt-builder-1.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.5:6 dbus? ( virtual/pkgconfig ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.7.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-qt/qtbase-6.5:6=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.5:6[designer] ) help? ( >=dev-qt/qttools-6.5:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.5:6 ) opengl? ( gles2-only? ( media-libs/libglvnd ) ) positioning? ( >=dev-qt/qtpositioning-6.5:6 ) qml? ( >=dev-qt/qtdeclarative-6.5:6 ) quick3d? ( >=dev-qt/qtquick3d-6.5:6 ) serialport? ( >=dev-qt/qtserialport-6.5:6 ) svg? ( >=dev-qt/qtsvg-6.5:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.5:6 ) websockets? ( >=dev-qt/qtwebsockets-6.5:6 ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 DESCRIPTION=Python bindings for the Qt framework
@@ -13,4 +13,4 @@ REQUIRED_USE=designer? ( gui widgets ) help? ( gui widgets ) multimedia? ( gui n
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt6/PyQt6-6.5.1.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2c3a4acd563e7c362189742465018640	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=ec21ed2d26f0d0dcb5b0d0ba6ae5c638
+_md5_=f85d1bcc7cae4fcc0959b12af9b7bd31
diff --git a/metadata/md5-cache/dev-python/PyQt6-WebEngine-6.5.0 b/metadata/md5-cache/dev-python/PyQt6-WebEngine-6.5.0
index e0eb1e5dc942..b0d0b65b8493 100644
--- a/metadata/md5-cache/dev-python/PyQt6-WebEngine-6.5.0
+++ b/metadata/md5-cache/dev-python/PyQt6-WebEngine-6.5.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/PyQt-builder-1.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.5:6 sys-devel/gcc python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.7.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/PyQt-builder-1.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.5:6 python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.7.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/PyQt6-6.5.0[gui,ssl,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.5:6= >=dev-qt/qtwebengine-6.5:6[widgets] quick? ( dev-python/PyQt6[qml] ) widgets? ( dev-python/PyQt6[network,printsupport,webchannel,widgets] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 DESCRIPTION=Python bindings for QtWebEngine
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt6_WebEngine/PyQt6_WebEngine-6.5.0.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2c3a4acd563e7c362189742465018640	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6c7396186642b35f57782c572f8c5a47
+_md5_=2b39f9e0ae6fed58427ce01b417a4285
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.155 b/metadata/md5-cache/dev-python/boto3-1.26.155
new file mode 100644
index 000000000000..d81dfb4e2035
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.155
@@ -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.155[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.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[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.155[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.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3: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.155.tar.gz -> boto3-1.26.155.gh.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=19c6bcfc191ce918489bff494ff185c2
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.155 b/metadata/md5-cache/dev-python/botocore-1.29.155
new file mode 100644
index 000000000000..324fdfc821d3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.155
@@ -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.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[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.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3: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.155.tar.gz -> botocore-1.29.155.gh.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=0a0fb1a94ac28cee470da7b1644eba68
diff --git a/metadata/md5-cache/dev-python/django-otp-1.2.2 b/metadata/md5-cache/dev-python/django-otp-1.2.2
new file mode 100644
index 000000000000..f0ac536723db
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-otp-1.2.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[sqlite] ) dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qrcode[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=dev-python/django-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
+EAPI=8
+HOMEPAGE=https://github.com/django-otp/django-otp/ https://pypi.org/project/django-otp/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/django-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/django-otp/django_otp-1.2.2.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2c3a4acd563e7c362189742465018640	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=928b390a34df158fbb5731fc3ebc65a6
diff --git a/metadata/md5-cache/dev-python/django-redis-5.3.0 b/metadata/md5-cache/dev-python/django-redis-5.3.0
new file mode 100644
index 000000000000..91fb7e31ffbf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-redis-5.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/redis dev-python/lz4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-django[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/django-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/redis-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Full featured redis cache backend for Django
+EAPI=8
+HOMEPAGE=https://github.com/jazzband/django-redis/ https://pypi.org/project/django-redis/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/django-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/redis-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/django-redis/django-redis-5.3.0.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2c3a4acd563e7c362189742465018640	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=0d5a24e820eddad76fcdc93d689293a6
diff --git a/metadata/md5-cache/dev-python/google-auth-2.20.0 b/metadata/md5-cache/dev-python/google-auth-2.20.0-r1
index 249ebedb46c2..249ebedb46c2 100644
--- a/metadata/md5-cache/dev-python/google-auth-2.20.0
+++ b/metadata/md5-cache/dev-python/google-auth-2.20.0-r1
diff --git a/metadata/md5-cache/dev-python/gsd-3.0.0 b/metadata/md5-cache/dev-python/gsd-3.0.0
new file mode 100644
index 000000000000..cf80a075a3f3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gsd-3.0.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/numpy-1.24.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/numpy-1.24.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+DESCRIPTION=GSD - file format specification and a library to read and write it
+EAPI=8
+HOMEPAGE=https://github.com/glotzerlab/gsd/ https://pypi.org/project/gsd/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/numpy-1.24.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/glotzerlab/gsd/releases/download/v3.0.0/gsd-3.0.0.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=6e30edfde0c1c3120e1dc400d5e4b9a7
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.33 b/metadata/md5-cache/dev-python/jsonpatch-1.33
new file mode 100644
index 000000000000..67bdfb639be7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.33
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/jsonpointer-1.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04
+EAPI=8
+HOMEPAGE=https://github.com/stefankoegl/python-json-patch/ https://pypi.org/project/jsonpatch/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/jsonpointer-1.9[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/stefankoegl/python-json-patch/archive/v1.33.tar.gz -> python-json-patch-1.33.gh.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=0c16172eaf30fe0fc952cf703f350dc3
diff --git a/metadata/md5-cache/dev-python/pytest-freezer-0.4.6 b/metadata/md5-cache/dev-python/pytest-freezer-0.4.6
new file mode 100644
index 000000000000..a088462e0f24
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-freezer-0.4.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/freezegun-1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pytest plugin providing a fixture interface for spulec/freezegun
+EAPI=8
+HOMEPAGE=https://github.com/pytest-dev/pytest-freezer/ https://pypi.org/project/pytest-freezer/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/freezegun-1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-freezer/pytest_freezer-0.4.6.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2c3a4acd563e7c362189742465018640	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=58c0913a30dbe6d8af01bfa640461f7f
diff --git a/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.23.2 b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.23.2
new file mode 100644
index 000000000000..6580c5894690
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.23.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/nptyping-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphobjinv-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/sphinx-5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Type hints support for the Sphinx autodoc extension
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/sphinx-autodoc-typehints/ https://pypi.org/project/sphinx-autodoc-typehints/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sphinx-5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx-autodoc-typehints/sphinx_autodoc_typehints-1.23.2.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2c3a4acd563e7c362189742465018640	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=6f02cc50ac45a7f6c9cafe2813fc2372
diff --git a/metadata/md5-cache/dev-python/time-machine-2.10.0 b/metadata/md5-cache/dev-python/time-machine-2.10.0
new file mode 100644
index 000000000000..c471b78c7182
--- /dev/null
+++ b/metadata/md5-cache/dev-python/time-machine-2.10.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+DESCRIPTION=Travel through time in your tests
+EAPI=8
+HOMEPAGE=https://github.com/adamchainz/time-machine/ https://pypi.org/project/time-machine/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/adamchainz/time-machine/archive/2.10.0.tar.gz -> time-machine-2.10.0.gh.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=7de76a80da2bddd2f7b98f2934a5bef1
diff --git a/metadata/md5-cache/dev-python/tox-4.6.2 b/metadata/md5-cache/dev-python/tox-4.6.2
new file mode 100644
index 000000000000..947b48e6bd0f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-4.6.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/hatch-vcs-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/build-0.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flaky-3.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.9.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-3.11.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/re-assert-1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-python/time-machine-2.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/time-machine-2.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/cachetools-5.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-23.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-3.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.5.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.23.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=virtualenv-based automation of test activities
+EAPI=8
+HOMEPAGE=https://tox.readthedocs.io/ https://github.com/tox-dev/tox/ https://pypi.org/project/tox/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/cachetools-5.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-23.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-3.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.5.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.23.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/t/tox/tox-4.6.2.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2c3a4acd563e7c362189742465018640	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=9f651b82d7a24f34f12cf6ca3d3abb45
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.23.1 b/metadata/md5-cache/dev-python/virtualenv-20.23.1
new file mode 100644
index 000000000000..d5ad2c175c42
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.23.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pip-22.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pytest-freezer-0.4.6[python_targets_pypy3(-)?] ) >=dev-python/pytest-mock-3.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/time-machine[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( python_targets_pypy3? ( !!<dev-python/virtualenv-20.22[python_targets_pypy3(-)?] ) ) test? ( <dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.12[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=8
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=<dev-python/distlib-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/filelock-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/filelock-3.12[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/platformdirs-4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-3.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-20.23.1.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2c3a4acd563e7c362189742465018640	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=8dd4acc7f1373db35c32d104849daed6
diff --git a/metadata/md5-cache/dev-python/ypy-websocket-0.11.0 b/metadata/md5-cache/dev-python/ypy-websocket-0.11.0
new file mode 100644
index 000000000000..d90b72e911ff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ypy-websocket-0.11.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uvicorn[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websockets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/anyio-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiosqlite-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosqlite-0.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/y-py-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[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_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=<dev-python/anyio-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiosqlite-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosqlite-0.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/y-py-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/y-crdt/ypy-websocket/archive/v0.11.0.tar.gz -> ypy-websocket-0.11.0.gh.tar.gz
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=b57041592a8cceafdb536e6349ec4f9e
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 24afdb244a88..4980503e2662 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/fakefs-1.3.2 b/metadata/md5-cache/dev-ruby/fakefs-1.3.2
deleted file mode 100644
index f7593d60a16f..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-1.3.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby30(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A fake filesystem. Use it in your tests
-EAPI=8
-HOMEPAGE=https://github.com/defunkt/fakefs
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 doc test
-KEYWORDS=amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/defunkt/fakefs/archive/v1.3.2.tar.gz -> fakefs-1.3.2.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=49a6c4e045183b371feda4ee2cbde3de
diff --git a/metadata/md5-cache/dev-ruby/fakefs-2.5.0 b/metadata/md5-cache/dev-ruby/fakefs-2.5.0
new file mode 100644
index 000000000000..9c905223c86e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/fakefs-2.5.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby30(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby31(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby32(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby32(-)] ) ) 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_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_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_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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) 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 fake filesystem. Use it in your tests
+EAPI=8
+HOMEPAGE=https://github.com/fakefs/fakefs
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=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_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_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=https://github.com/fakefs/fakefs/archive/v2.5.0.tar.gz -> fakefs-2.5.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=ddfc2483086684433739e6f914efa0d1
diff --git a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0 b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
deleted file mode 100644
index e9d81d220477..000000000000
--- a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( dev-ruby/kramdown:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/kramdown[ruby_targets_ruby30(-),latex] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A kramdown parser for the GFM dialect of Markdown
-EAPI=7
-HOMEPAGE=https://github.com/kramdown/parser-gfm
-INHERIT=edo ruby-fakegem
-IUSE=doc test ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-ruby/kramdown:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://rubygems.org/gems/kramdown-parser-gfm-1.1.0.gem
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=ced1f583effeece85ca27f310a401c9f
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.18.1 b/metadata/md5-cache/dev-ruby/minitest-5.18.1
new file mode 100644
index 000000000000..9f75908ba52a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/minitest-5.18.1
@@ -0,0 +1,17 @@
+BDEPEND=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_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_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_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_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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) 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=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
+EAPI=8
+HOMEPAGE=https://github.com/minitest/minitest
+INHERIT=ruby-fakegem
+IUSE=doc test 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=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_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_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://rubygems.org/gems/minitest-5.18.1.gem
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=0ba37b511f65e53e04cfd62f39210e4a
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.4.1 b/metadata/md5-cache/dev-ruby/moneta-1.4.1
deleted file mode 100644
index 440091fb8e7d..000000000000
--- a/metadata/md5-cache/dev-ruby/moneta-1.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A unified interface to key/value stores
-EAPI=7
-HOMEPAGE=https://github.com/minad/moneta
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 test
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/minad/moneta/archive/v1.4.1.tar.gz -> moneta-1.4.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=77821d333160d60c002e87eacb05f929
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.5.1 b/metadata/md5-cache/dev-ruby/moneta-1.5.1
deleted file mode 100644
index 07ec4e885252..000000000000
--- a/metadata/md5-cache/dev-ruby/moneta-1.5.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A unified interface to key/value stores
-EAPI=7
-HOMEPAGE=https://github.com/minad/moneta
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 test
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/minad/moneta/archive/v1.5.1.tar.gz -> moneta-1.5.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=77821d333160d60c002e87eacb05f929
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.25.1 b/metadata/md5-cache/dev-ruby/octokit-4.25.1
deleted file mode 100644
index 4c8c628a80fb..000000000000
--- a/metadata/md5-cache/dev-ruby/octokit-4.25.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby30? ( || ( dev-ruby/faraday:2[ruby_targets_ruby30(-)] dev-ruby/faraday:1[ruby_targets_ruby30(-)] ) >=dev-ruby/sawyer-0.9:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/jwt[ruby_targets_ruby30(-)] dev-ruby/mime-types[ruby_targets_ruby30(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby30(-)] >=dev-ruby/rbnacl-7.1.1:6[ruby_targets_ruby30(-)] dev-ruby/vcr[ruby_targets_ruby30(-),json] dev-ruby/webmock:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Ruby toolkit for the Github API
-EAPI=8
-HOMEPAGE=https://github.com/octokit/octokit.rb
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( || ( dev-ruby/faraday:2[ruby_targets_ruby30(-)] dev-ruby/faraday:1[ruby_targets_ruby30(-)] ) >=dev-ruby/sawyer-0.9:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.25.1.tar.gz -> octokit-4.25.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=d7cf6d39efe39fe561bf7e24f5f668ca
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2 b/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
deleted file mode 100644
index df668207ae2f..000000000000
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby30(-)] ) ) test? ( ruby_targets_ruby30? ( dev-ruby/actionview[ruby_targets_ruby30(-)] dev-ruby/htmlentities[ruby_targets_ruby30(-)] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby30(-)] || ( dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/rmagick[ruby_targets_ruby30(-)] ) ) ) test? ( virtual/imagemagick-tools[jpeg,png] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Ruby on Rails RBPDF plugin
-EAPI=7
-HOMEPAGE=https://github.com/naitoh/rbpdf
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby30 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-ruby/actionview[ruby_targets_ruby30(-)] dev-ruby/htmlentities[ruby_targets_ruby30(-)] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby30(-)] || ( dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/rmagick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/naitoh/rbpdf/archive/1.20.1.tar.gz -> rbpdf-1.20.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=ecd4de46d6431e9908e2c2533d371c86
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.17.12 b/metadata/md5-cache/dev-ruby/rcairo-1.17.12
new file mode 100644
index 000000000000..801dd6d8ae92
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.17.12
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby30? ( dev-ruby/red-colors[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/red-colors[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/red-colors[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby30(-)] dev-ruby/ruby-glib2[ruby_targets_ruby30(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby30(-)] dev-ruby/ruby-poppler[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby31(-)] dev-ruby/ruby-glib2[ruby_targets_ruby31(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby31(-)] dev-ruby/ruby-poppler[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby32(-)] dev-ruby/ruby-glib2[ruby_targets_ruby32(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby32(-)] dev-ruby/ruby-poppler[ruby_targets_ruby32(-)] ) ) 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_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_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_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=x11-libs/cairo-1.2.0[svg(+)] 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_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Ruby bindings for cairo
+EAPI=8
+HOMEPAGE=https://cairographics.org/rcairo/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=|| ( Ruby-BSD GPL-2 )
+RDEPEND=>=x11-libs/cairo-1.2.0[svg(+)] ruby_targets_ruby30? ( dev-ruby/red-colors[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/red-colors[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/red-colors[ruby_targets_ruby32(-)] ) 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_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_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/cairo-1.17.12.gem
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=db511f0a6c24b957ee92043b810f001f
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.7.1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.7.1
new file mode 100644
index 000000000000..7555a7f27d9a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.7.1
@@ -0,0 +1,17 @@
+BDEPEND=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_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_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_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_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) 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=Implementation of John Gruber's Markdown
+EAPI=8
+HOMEPAGE=https://github.com/davidfstr/rdiscount
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=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_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_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/rdiscount-2.2.7.1.gem
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=0efdc16ab182781c771cf96f45514843
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.1 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
deleted file mode 100644
index 44aaffdf7368..000000000000
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A racc based toml parser
-EAPI=7
-HOMEPAGE=https://github.com/fbernier/tomlrb/
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.1.tar.gz -> tomlrb-2.0.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=9f2a2244ff97bb5c21bd1edbf33efcd4
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.2 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.2
deleted file mode 100644
index e6b0ceb8ba8a..000000000000
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( 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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A racc based toml parser
-EAPI=8
-HOMEPAGE=https://github.com/fbernier/tomlrb/
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.2.tar.gz -> tomlrb-2.0.2.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e5ccd9755a41895097655b82beacaaac
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.3 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.3
index 02510d274422..65b7fc829ad7 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.3
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.3
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=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_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_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_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_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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=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_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=A racc based toml parser
 EAPI=8
 HOMEPAGE=https://github.com/fbernier/tomlrb/
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=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_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_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.3.tar.gz -> tomlrb-2.0.3.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=e5ccd9755a41895097655b82beacaaac
+_md5_=5a091c512ea0130e58ce3dd17322b2c9
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index f2fe60645999..8dd0cfc13961 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-20230521 b/metadata/md5-cache/dev-util/byacc-20230521
index 7cc699246286..f3cfac331cf4 100644
--- a/metadata/md5-cache/dev-util/byacc-20230521
+++ b/metadata/md5-cache/dev-util/byacc-20230521
@@ -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 ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/byacc/byacc-20230521.tgz verify-sig? ( https://invisible-island.net/archives/byacc/byacc-20230521.tgz.asc )
 _eclasses_=verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=bbafadd535a8e8aa24f296292f1ca1e8
+_md5_=0fae6ed4752515129928470da282a5a9
diff --git a/metadata/md5-cache/dev-util/cmake-3.26.4-r1 b/metadata/md5-cache/dev-util/cmake-3.26.4-r1
index 37706fbcf94b..24cf2798e399 100644
--- a/metadata/md5-cache/dev-util/cmake-3.26.4-r1
+++ b/metadata/md5-cache/dev-util/cmake-3.26.4-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://cmake.org/
 INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
 IUSE=doc emacs ncurses qt5 test test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.26/cmake-3.26.4.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.26.4-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-SHA-256.txt.asc )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	7fb5980de96325cbab639f5b2187357c	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5e00217c1449913355b76fb5c70e168b
+_md5_=0bd3df452b73284cdcaf6f108e248803
diff --git a/metadata/md5-cache/dev-util/patchelf-0.18.0 b/metadata/md5-cache/dev-util/patchelf-0.18.0
index 3b8f71708313..258f0a2eb2e4 100644
--- a/metadata/md5-cache/dev-util/patchelf-0.18.0
+++ b/metadata/md5-cache/dev-util/patchelf-0.18.0
@@ -4,9 +4,9 @@ DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executab
 EAPI=8
 HOMEPAGE=https://github.com/NixOS/patchelf
 INHERIT=autotools
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/NixOS/patchelf/archive/0.18.0.tar.gz -> patchelf-0.18.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=8779dabf7a106438ff2d51a8b582b08f
+_md5_=98cf653cff1a1d9250866f2d70514bc4
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index d5431aeccda0..c93e01394cfd 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/gmmlib-22.3.7 b/metadata/md5-cache/media-libs/gmmlib-22.3.7
index 20b2163fffd6..09dc283cc4b3 100644
--- a/metadata/md5-cache/media-libs/gmmlib-22.3.7
+++ b/metadata/md5-cache/media-libs/gmmlib-22.3.7
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/12.3
 SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.3.7.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4e4448149b663e3ae02af0a78114642b
+_md5_=4202ce2397be5a3e7a1a890c603856d2
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index c14f1ae3009f..2db32b41bf35 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/helm-0.9.0-r1 b/metadata/md5-cache/media-sound/helm-0.9.0-r2
index d826b5b75244..0c1060f260c8 100644
--- a/metadata/md5-cache/media-sound/helm-0.9.0-r1
+++ b/metadata/md5-cache/media-sound/helm-0.9.0-r2
@@ -10,4 +10,4 @@ RDEPEND=media-libs/alsa-lib media-libs/freetype media-libs/lv2 virtual/jack virt
 SLOT=0
 SRC_URI=https://github.com/mtytel/helm/archive/v0.9.0.tar.gz -> helm-0.9.0.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a4dd21724cad8cebe73f385dbdb45bb0
+_md5_=d158399ac16949f21b6a0838e705cab9
diff --git a/metadata/md5-cache/media-sound/playerctl-2.4.1-r1 b/metadata/md5-cache/media-sound/playerctl-2.4.1-r1
new file mode 100644
index 000000000000..f2f834dfdf1c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/playerctl-2.4.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) test? ( || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) sys-apps/dbus || ( ( >=dev-lang/python-3.11.3:3.11 dev-python/dbus-next[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] dev-python/pytest-asyncio[python_targets_python3_11(-)] dev-python/pytest-timeout[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 dev-python/dbus-next[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-asyncio[python_targets_python3_10(-)] dev-python/pytest-timeout[python_targets_python3_10(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=dev-libs/glib-2.38:2 introspection? ( dev-libs/gobject-introspection:= )
+DESCRIPTION=A CLI utility to control media players over MPRIS
+EAPI=8
+HOMEPAGE=https://github.com/acrisci/playerctl
+INHERIT=bash-completion-r1 meson python-any-r1 virtualx xdg-utils
+IUSE=doc introspection test test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/glib-2.38:2 introspection? ( dev-libs/gobject-introspection:= )
+RESTRICT=!test? ( test ) test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/acrisci/playerctl/archive/v2.4.1.tar.gz -> playerctl-2.4.1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	meson	18d046bdb14e1bdb22cce6e5d953e364	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4b29190b1370dcf28a039e4512dacfbd
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index e353c3f2c67b..cf2f39dc531e 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.71-r3 b/metadata/md5-cache/media-video/pipewire-0.3.71-r3
new file mode 100644
index 000000000000..bf6521ee3d2f
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.71-r3
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) || ( ( >=dev-lang/python-3.11.3:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ) dbus? ( dev-util/gdbus-codegen ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=acct-group/audio acct-group/pipewire media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[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/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Multimedia processing graphs
+EAPI=8
+HOMEPAGE=https://pipewire.org/
+INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+IUSE=bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+PDEPEND=>=media-video/wireplumber-0.4.8-r3
+RDEPEND=acct-group/audio acct-group/pipewire media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[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/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi ) virtual/tmpfiles
+REQUIRED_USE=ffmpeg? ( extra ) bluetooth? ( dbus ) jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.71/pipewire-0.3.71.tar.bz2
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	18d046bdb14e1bdb22cce6e5d953e364	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=26e47c1fb1e4974549ff204a61d6c26e
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index 9f012916a4eb..a2924ab79985 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=ffmpeg? ( extra ) bluetooth? ( dbus ) jack-sdk? ( !jack-client ) mo
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	meson	18d046bdb14e1bdb22cce6e5d953e364	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=2081aadb7154961f2e6c955e279ff067
+_md5_=26e47c1fb1e4974549ff204a61d6c26e
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index abfb27a641b9..d6989dee3ab5 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libproxy-0.5.0 b/metadata/md5-cache/net-libs/libproxy-0.5.0
deleted file mode 100644
index 058c530e9027..000000000000
--- a/metadata/md5-cache/net-libs/libproxy-0.5.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gi-docgen ) vala? ( || ( dev-lang/vala:0.56 ) ) >=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=>=dev-libs/glib-2.71.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gnome? ( gnome-base/gsettings-desktop-schemas ) duktape? ( dev-lang/duktape:= net-misc/curl ) introspection? ( dev-libs/gobject-introspection ) test? ( net-libs/libsoup:3.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(-)?] )
-DESCRIPTION=Library for automatic proxy configuration management
-EAPI=8
-HOMEPAGE=https://github.com/libproxy/libproxy
-INHERIT=meson-multilib vala
-IUSE=duktape gnome gtk-doc +introspection kde test vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.71.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gnome? ( gnome-base/gsettings-desktop-schemas ) duktape? ( dev-lang/duktape:= net-misc/curl ) introspection? ( dev-libs/gobject-introspection ) kde? ( kde-frameworks/kconfig:5 )
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/libproxy/libproxy/archive/refs/tags/libproxy-0.5.0.tar.gz
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	18d046bdb14e1bdb22cce6e5d953e364	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	vala	db97951caa799e73a831a5f48e717da8
-_md5_=ab7d7b4664d660f3425da776ebab1ae3
diff --git a/metadata/md5-cache/net-libs/libproxy-0.5.1 b/metadata/md5-cache/net-libs/libproxy-0.5.2
index d108f47bf614..b317b3c37434 100644
--- a/metadata/md5-cache/net-libs/libproxy-0.5.1
+++ b/metadata/md5-cache/net-libs/libproxy-0.5.2
@@ -12,6 +12,6 @@ RDEPEND=>=dev-libs/glib-2.71.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/libproxy/libproxy/archive/refs/tags/0.5.1.tar.gz -> libproxy-0.5.1.tar.gz
+SRC_URI=https://github.com/libproxy/libproxy/archive/refs/tags/0.5.2.tar.gz -> libproxy-0.5.2.tar.gz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	18d046bdb14e1bdb22cce6e5d953e364	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	vala	db97951caa799e73a831a5f48e717da8
 _md5_=e4bc03fe6ec50834318a40dba9b15aed
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 9783efcb6bcd..da2ef2d9dd01 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/dhcp-4.4.3_p1-r4 b/metadata/md5-cache/net-misc/dhcp-4.4.3_p1-r4
index cfaeea1ac4ae..830074b8c15b 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.3_p1-r4
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.3_p1-r4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.isc.org/dhcp
 INHERIT=systemd toolchain-funcs flag-o-matic tmpfiles
 IUSE=+client ipv6 ldap selinux +server ssl vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MPL-2.0 BSD SSLeay GPL-2
 RDEPEND=acct-group/dhcp acct-user/dhcp sys-libs/zlib:= client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap:= ssl? ( dev-libs/openssl:= ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax ) virtual/tmpfiles
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.3-P1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=54b645fa31adc4ffa760514c84c7cb5f
+_md5_=75b28a9ea4d49e47ba3484336588b1cb
diff --git a/metadata/md5-cache/net-misc/keychain-2.8.5-r2 b/metadata/md5-cache/net-misc/keychain-2.8.5-r2
index 7e6a279f3775..6df9e9187906 100644
--- a/metadata/md5-cache/net-misc/keychain-2.8.5-r2
+++ b/metadata/md5-cache/net-misc/keychain-2.8.5-r2
@@ -3,8 +3,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 EAPI=8
 HOMEPAGE=https://www.funtoo.org/Keychain
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/funtoo/keychain/archive/2.8.5.tar.gz -> keychain-2.8.5.tar.gz
-_md5_=972089f2d14bc28d7ee3e0674eec75a8
+_md5_=e83e127d73113f13889e0753a461ab8e
diff --git a/metadata/md5-cache/net-misc/memcached-1.6.21-r1 b/metadata/md5-cache/net-misc/memcached-1.6.21-r1
new file mode 100644
index 000000000000..6d83f6869975
--- /dev/null
+++ b/metadata/md5-cache/net-misc/memcached-1.6.21-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) ssl? ( >=dev-libs/openssl-1.1.0g:= ) acct-user/memcached test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )
+DESCRIPTION=High-performance, distributed memory object caching system
+EAPI=7
+HOMEPAGE=http://memcached.org/
+INHERIT=autotools flag-o-matic systemd
+IUSE=debug sasl seccomp selinux slabs-reassign ssl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) ssl? ( >=dev-libs/openssl-1.1.0g:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.memcached.org/files/memcached-1.6.21.tar.gz https://www.memcached.org/files/old/memcached-1.6.21.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=fce6c1b1e6f769028888014ca56fcb94
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 002e37506557..89c7fb885176 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/squid-5.9 b/metadata/md5-cache/net-proxy/squid-5.9
new file mode 100644
index 000000000000..54f94bb41509
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/squid-5.9
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare pretend setup
+DEPEND=acct-group/squid acct-user/squid dev-libs/libltdl sys-libs/tdb virtual/libcrypt:= caps? ( >=sys-libs/libcap-2.16 ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) ldap? ( net-nds/openldap:= ) gnutls? ( >=net-libs/gnutls-3.1.5:= ) logrotate? ( app-admin/logrotate ) nis? ( net-libs/libtirpc:= net-libs/libnsl:= ) kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/nettle:= !gnutls? ( dev-libs/openssl:= ) ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=A full-featured web proxy cache
+EAPI=8
+HOMEPAGE=http://www.squid-cache.org/
+INHERIT=autotools flag-o-matic linux-info pam systemd toolchain-funcs
+IUSE=caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/squid acct-user/squid dev-libs/libltdl sys-libs/tdb virtual/libcrypt:= caps? ( >=sys-libs/libcap-2.16 ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) ldap? ( net-nds/openldap:= ) gnutls? ( >=net-libs/gnutls-3.1.5:= ) logrotate? ( app-admin/logrotate ) nis? ( net-libs/libtirpc:= net-libs/libnsl:= ) kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/nettle:= !gnutls? ( dev-libs/openssl:= ) ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) perl? ( dev-lang/perl ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite )
+REQUIRED_USE=tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://www.squid-cache.org/Versions/v5/squid-5.9.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=ebf8be0127657f4350a85755442927ee
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index f26cdb9c0ffa..2e69a295664a 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/arborx-1.2 b/metadata/md5-cache/sci-libs/arborx-1.2
deleted file mode 100644
index aa7d4321e8c5..000000000000
--- a/metadata/md5-cache/sci-libs/arborx-1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= mpi? ( virtual/mpi[cxx] ) sci-libs/trilinos
-DESCRIPTION=Library for performance portable algorithms for geometric search
-EAPI=8
-HOMEPAGE=https://github.com/arborx/ArborX
-INHERIT=cmake
-IUSE=mpi
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/boost:= mpi? ( virtual/mpi[cxx] ) sci-libs/trilinos
-SLOT=0
-SRC_URI=https://github.com/arborx/ArborX/archive/refs/tags/v1.2.tar.gz -> arborx-1.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e64108fa776c6f99387ba0ab3d3d5e20
diff --git a/metadata/md5-cache/sci-libs/arborx-1.4.1 b/metadata/md5-cache/sci-libs/arborx-1.4.1-r1
index 4aad2835fe55..111d0f7da9c6 100644
--- a/metadata/md5-cache/sci-libs/arborx-1.4.1
+++ b/metadata/md5-cache/sci-libs/arborx-1.4.1-r1
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/boost:= mpi? ( virtual/mpi[cxx] ) sci-libs/trilinos
 SLOT=0
 SRC_URI=https://github.com/arborx/ArborX/archive/refs/tags/v1.4.1.tar.gz -> arborx-1.4.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2363a6ddb0ae603ec754f4a5c6693920
+_md5_=0ee739749ce7f22c1f70786b4e3664ae
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 08bffceb7fcd..d943e47f2999 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-jiatan-20230505 b/metadata/md5-cache/sec-keys/openpgp-keys-jiatan-20230505
index cc8ed22d011d..c28b3c873e78 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-jiatan-20230505
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-jiatan-20230505
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used by Jia Tan
 EAPI=8
 HOMEPAGE=https://tukaani.org/xz/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://tukaani.org/misc/jia_tan_pubkey.txt
-_md5_=73c20b62091e0a7e898933a304e67cca
+_md5_=5e0b507b3e7051addaf247c7694c21f9
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-midipix-20210426 b/metadata/md5-cache/sec-keys/openpgp-keys-midipix-20210426
index 4cb01a740c61..e31413be837f 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-midipix-20210426
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-midipix-20210426
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used to sign midipix releases
 EAPI=7
 HOMEPAGE=https://midipix.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-midipix/openpgp-keys-midipix-20210426-6482133FE45A8A91EEB0733716997AE880F70A46.asc
-_md5_=28965a3094e1b4dd23505fbf4bf8f4fe
+_md5_=d3f45aa4cc14af1853293059d4c6db5f
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-wget-20230511 b/metadata/md5-cache/sec-keys/openpgp-keys-wget-20230511
index bbf569149bec..9a5a6428aa12 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-wget-20230511
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-wget-20230511
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used by GNU wget
 EAPI=7
 HOMEPAGE=https://savannah.gnu.org/projects/wget/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=wget&download=1 -> openpgp-keys-wget-20230511.asc
-_md5_=990854b091f6b1d8fd0014af6e93118d
+_md5_=bb8b3f290f60b0fc0d3dbfc8ff3f14dd
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 08c025a8a118..4f21ba0edcbe 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/dmidecode-3.5-r2 b/metadata/md5-cache/sys-apps/dmidecode-3.5-r2
index b5f32cebff5e..b64e2b1a0ff2 100644
--- a/metadata/md5-cache/sys-apps/dmidecode-3.5-r2
+++ b/metadata/md5-cache/sys-apps/dmidecode-3.5-r2
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://www.nongnu.org/dmidecode/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=selinux
-KEYWORDS=-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=-* ~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-dmidecode )
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/dmidecode/dmidecode-3.5.tar.xz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=bd162f8194687d1a3545c6b8ec443da4
+_md5_=50a0527e17f7ac0c27e8728c91c05386
diff --git a/metadata/md5-cache/sys-apps/gawk-5.2.2 b/metadata/md5-cache/sys-apps/gawk-5.2.2
index fcfa8cf309cb..007f822d79e1 100644
--- a/metadata/md5-cache/sys-apps/gawk-5.2.2
+++ b/metadata/md5-cache/sys-apps/gawk-5.2.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
 INHERIT=verify-sig
 IUSE=mpfr pma nls readline verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-3+
 RDEPEND=mpfr? ( dev-libs/gmp:= dev-libs/mpfr:= ) readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-5.2.2.tar.xz verify-sig? ( mirror://gnu/gawk/gawk-5.2.2.tar.xz.sig )
 _eclasses_=verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=3afedef2ee6021271d47cfa597aa9507
+_md5_=ed248894928e43e87234e1c229bc3cd7
diff --git a/metadata/md5-cache/sys-apps/hwdata-0.371 b/metadata/md5-cache/sys-apps/hwdata-0.371
index 4fbd77e391a9..39c31008c788 100644
--- a/metadata/md5-cache/sys-apps/hwdata-0.371
+++ b/metadata/md5-cache/sys-apps/hwdata-0.371
@@ -3,10 +3,10 @@ DESCRIPTION=Hardware identification and configuration data
 EAPI=8
 HOMEPAGE=https://github.com/vcrhonek/hwdata
 INHERIT=edo
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vcrhonek/hwdata/archive/refs/tags/v0.371.tar.gz -> hwdata-0.371.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3
-_md5_=627a8b63f5c762f29957820525feb3e9
+_md5_=763706bf12ed8d9f8d075abbf04ea634
diff --git a/metadata/md5-cache/sys-apps/less-633 b/metadata/md5-cache/sys-apps/less-633
index 1199765021ee..422e30b1a2b1 100644
--- a/metadata/md5-cache/sys-apps/less-633
+++ b/metadata/md5-cache/sys-apps/less-633
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.greenwoodsoftware.com/less/
 INHERIT=autotools
 IUSE=pcre
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:= pcre? ( dev-libs/libpcre2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.greenwoodsoftware.com/less/less-633.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c0bc0eb86e91bc3e881aa15d44323043
+_md5_=68ee14e503ac5991c019cfb1d5d16e1d
diff --git a/metadata/md5-cache/sys-apps/shadow-4.13-r4 b/metadata/md5-cache/sys-apps/shadow-4.13-r4
new file mode 100644
index 000000000000..56f865e84955
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/shadow-4.13-r4
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils sys-devel/gettext verify-sig? ( sec-keys/openpgp-keys-sergehallyn ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst preinst prepare unpack
+DEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:= ) audit? ( >=sys-process/audit-2.6:= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:= ) skey? ( sys-auth/skey:= ) selinux? ( >=sys-libs/libselinux-1.28:= sys-libs/libsemanage:= ) xattr? ( sys-apps/attr:= ) >=sys-kernel/linux-headers-4.14
+DESCRIPTION=Utilities to deal with user accounts
+EAPI=8
+HOMEPAGE=https://github.com/shadow-maint/shadow
+INHERIT=libtool pam verify-sig
+IUSE=acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:= ) audit? ( >=sys-process/audit-2.6:= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:= ) skey? ( sys-auth/skey:= ) selinux? ( >=sys-libs/libselinux-1.28:= sys-libs/libsemanage:= ) xattr? ( sys-apps/attr:= ) !<sys-apps/man-pages-5.11-r1 !=sys-apps/man-pages-5.12-r0 !=sys-apps/man-pages-5.12-r1 nls? ( !<app-i18n/man-pages-it-5.06-r1 !<app-i18n/man-pages-ja-20180315-r1 !<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1 ) pam? ( >=sys-auth/pambase-20150213 ) su? ( !sys-apps/util-linux[su(-)] )
+REQUIRED_USE=?? ( cracklib pam )
+SLOT=0/4
+SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.13/shadow-4.13.tar.xz verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/4.13/shadow-4.13.tar.xz.asc )
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	4efe951aa8ce2c16288d7c915196fe29	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=284c6dbc332cc74f2e002f512d45c1ce
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 62241a65e709..5930fd321f26 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/autoconf-wrapper-20221207-r1 b/metadata/md5-cache/sys-devel/autoconf-wrapper-20221207-r1
index 3549a589ee95..b31083693eab 100644
--- a/metadata/md5-cache/sys-devel/autoconf-wrapper-20221207-r1
+++ b/metadata/md5-cache/sys-devel/autoconf-wrapper-20221207-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Wrapper for autoconf to manage multiple autoconf versions
 EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/autotools-wrappers.git
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/autotools-wrappers-at-20221207.tar.gz
-_md5_=069fc0b454c1cbf3d45995f354b81235
+_md5_=3fbbebf0f410c6767d1e2a728acca325
diff --git a/metadata/md5-cache/sys-devel/gdb-12.1-r4 b/metadata/md5-cache/sys-devel/gdb-12.1-r4
deleted file mode 100644
index 6b4fbc83ff58..000000000000
--- a/metadata/md5-cache/sys-devel/gdb-12.1-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-apps/texinfo app-alternatives/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
-DESCRIPTION=GNU debugger
-EAPI=8
-HOMEPAGE=https://sourceware.org/gdb/
-INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-IUSE=cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=GPL-3+ LGPL-2.1+
-RDEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnu/gdb/gdb-12.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-12.1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gdb/gdb-12.1-patches-1.tar.xz mirror://gentoo/gdb-12.1-patches-1.tar.xz
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=bc626bfe039c02afdf28936a82f5398b
diff --git a/metadata/md5-cache/sys-devel/gdb-13.1-r1 b/metadata/md5-cache/sys-devel/gdb-13.1-r1
deleted file mode 100644
index 99ccae299e82..000000000000
--- a/metadata/md5-cache/sys-devel/gdb-13.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-apps/texinfo app-alternatives/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=GNU debugger
-EAPI=8
-HOMEPAGE=https://sourceware.org/gdb/
-INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-IUSE=cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=GPL-3+ LGPL-2.1+
-RDEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnu/gdb/gdb-13.1.tar.xz https://sourceware.org/pub/gdb/releases/gdb-13.1.tar.xz
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=9152b02063ac0d32eef1a04f15dfd432
diff --git a/metadata/md5-cache/sys-devel/gdb-13.1.90_p20230325 b/metadata/md5-cache/sys-devel/gdb-13.1.90_p20230325
deleted file mode 100644
index b786fe953e2b..000000000000
--- a/metadata/md5-cache/sys-devel/gdb-13.1.90_p20230325
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-apps/texinfo app-alternatives/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/mpfr:= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:= >=sys-libs/readline-7:= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=GNU debugger
-EAPI=8
-HOMEPAGE=https://sourceware.org/gdb/
-INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-IUSE=cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=GPL-3+ LGPL-2.1+
-RDEPEND=dev-libs/mpfr:= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:= >=sys-libs/readline-7:= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-13.1.90.20230325.tar.xz https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-13.1.90.20230325.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gdb/gdb-weekly-13.1.90.20230325.tar.xz
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=624f0d6b01a4b977fca5881421525eca
diff --git a/metadata/md5-cache/sys-devel/gdb-13.1.90_p20230429 b/metadata/md5-cache/sys-devel/gdb-13.1.90_p20230429
deleted file mode 100644
index f3687d80d32a..000000000000
--- a/metadata/md5-cache/sys-devel/gdb-13.1.90_p20230429
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-apps/texinfo app-alternatives/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/mpfr:= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:= >=sys-libs/readline-7:= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=GNU debugger
-EAPI=8
-HOMEPAGE=https://sourceware.org/gdb/
-INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-IUSE=cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=GPL-3+ LGPL-2.1+
-RDEPEND=dev-libs/mpfr:= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:= >=sys-libs/readline-7:= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-13.1.90.20230429.tar.xz https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-13.1.90.20230429.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gdb/gdb-weekly-13.1.90.20230429.tar.xz
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=284ff9e36a7984768b2bd9262b2bab68
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-20230121 b/metadata/md5-cache/sys-devel/gnuconfig-20230121
index 97793dba8194..9f931d6b7843 100644
--- a/metadata/md5-cache/sys-devel/gnuconfig-20230121
+++ b/metadata/md5-cache/sys-devel/gnuconfig-20230121
@@ -2,8 +2,8 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Updated config.sub and config.guess file from GNU
 EAPI=8
 HOMEPAGE=https://savannah.gnu.org/projects/config
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-3+-with-autoconf-exception
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/gnuconfig/gnuconfig-20230121.tar.xz
-_md5_=3b3500e6cdbd4d9fb66652de58f9211b
+_md5_=cb2e199f02ac1abee8f6075707344b46
diff --git a/metadata/md5-cache/sys-devel/slibtool-0.5.34 b/metadata/md5-cache/sys-devel/slibtool-0.5.34
index ebc7f38518ed..6e0c2c09f536 100644
--- a/metadata/md5-cache/sys-devel/slibtool-0.5.34
+++ b/metadata/md5-cache/sys-devel/slibtool-0.5.34
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://git.foss21.org/slibtool
 INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dl.midipix.org/slibtool/slibtool-0.5.34.tar.xz verify-sig? ( https://dl.midipix.org/slibtool/slibtool-0.5.34.tar.xz.sig )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=77b3205162a8101bb7fc9115811d55b5
+_md5_=e12eeac3f8aaf031308935e9173bca5c
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 0ec8714172c4..2c476e9b6511 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.3.1 b/metadata/md5-cache/sys-fs/btrfs-progs-6.3.1
index 1d5e2f796daa..105637f9d4d6 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-6.3.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-6.3.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_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_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=python? ( ^^ ( 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.3.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=44d00c4117396caa9e59b58f7c037463
+_md5_=31e6a8c5d7b86bb745ddcc41d9a636f3
diff --git a/metadata/md5-cache/sys-fs/exfatprogs-1.2.1 b/metadata/md5-cache/sys-fs/exfatprogs-1.2.1
index fb62513d350b..958250aa57af 100644
--- a/metadata/md5-cache/sys-fs/exfatprogs-1.2.1
+++ b/metadata/md5-cache/sys-fs/exfatprogs-1.2.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Userspace utilities for new exfat filesystem (kernel 5.7+)
 EAPI=8
 HOMEPAGE=https://github.com/exfatprogs/exfatprogs
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=!sys-fs/exfat-utils
 SLOT=0
 SRC_URI=https://github.com/exfatprogs/exfatprogs/releases/download/1.2.1/exfatprogs-1.2.1.tar.xz
-_md5_=9f4874f3ece87734ec04e5a732b77fde
+_md5_=d35332ee29a2ababeb5598d06f773c6c
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-6.3.0 b/metadata/md5-cache/sys-fs/xfsprogs-6.3.0
index 8e06640c6b1e..c29edca662c5 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-6.3.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-6.3.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/
 INHERIT=flag-o-matic systemd usr-ldscript
 IUSE=icu libedit nls selinux split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/inih dev-libs/userspace-rcu:= >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) selinux? ( sec-policy/selinux-xfs )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-6.3.0.tar.xz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
-_md5_=d896cc2ee1812e72408d04dc40bee3a9
+_md5_=2f148eee5b30789a4e6de88efdd741b1
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index edd8378a9097..9564c3fc8093 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/minizip-ng-4.0.0-r1 b/metadata/md5-cache/sys-libs/minizip-ng-4.0.0-r1
index bd46b027db45..da4f3366b375 100644
--- a/metadata/md5-cache/sys-libs/minizip-ng-4.0.0-r1
+++ b/metadata/md5-cache/sys-libs/minizip-ng-4.0.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/zlib-ng/minizip-ng/archive/refs/tags/4.0.0.tar.gz -> minizip-ng-4.0.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8a2a11ddd070c2d9680dfe43a0a46113
+_md5_=df87401c1d09fcbdcb406a81346bbb1c
diff --git a/metadata/md5-cache/sys-libs/newlib-4.3.0.20230120-r2 b/metadata/md5-cache/sys-libs/newlib-4.3.0.20230120-r2
new file mode 100644
index 000000000000..8b7ac1d7fdea
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/newlib-4.3.0.20230120-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install setup
+DESCRIPTION=Newlib is a C library intended for use on embedded systems
+EAPI=7
+HOMEPAGE=https://sourceware.org/newlib/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=nls threads unicode headers-only nano
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=NEWLIB LIBGLOSS GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=ftp://sourceware.org/pub/newlib/newlib-4.3.0.20230120.tar.gz
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=3c192675e7bd770e0fb4ae6c9e54638a
diff --git a/metadata/md5-cache/sys-libs/zlib-ng-2.1.2-r1 b/metadata/md5-cache/sys-libs/zlib-ng-2.1.2-r1
index 6e4ba536fd26..908f0e29bf98 100644
--- a/metadata/md5-cache/sys-libs/zlib-ng-2.1.2-r1
+++ b/metadata/md5-cache/sys-libs/zlib-ng-2.1.2-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zlib-ng/zlib-ng/archive/2.1.2.tar.gz -> zlib-ng-2.1.2.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e0c8fd12626e5d4a12d7f6fcf847a44d
+_md5_=b17304f7f55549f1d11998a9255783eb
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index ddb1560ed47c..db2a3d5aa451 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/nut-2.8.0-r1 b/metadata/md5-cache/sys-power/nut-2.8.0-r1
new file mode 100644
index 000000000000..3a8dcffa7bcc
--- /dev/null
+++ b/metadata/md5-cache/sys-power/nut-2.8.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig man? ( app-text/asciidoc ) test? ( dev-util/cppunit ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare pretend setup
+DEPEND=acct-group/nut acct-user/nut dev-libs/libltdl virtual/udev cgi? ( >=media-libs/gd-2[png] ) i2c? ( sys-apps/i2c-tools ) ipmi? ( sys-libs/freeipmi ) modbus? ( dev-libs/libmodbus ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( >=dev-libs/openssl-1:= ) tcpd? ( sys-apps/tcp-wrappers ) usb? ( virtual/libusb:1 ) xml? ( >=net-libs/neon-0.25.0:= ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Network-UPS Tools
+EAPI=8
+HOMEPAGE=https://networkupstools.org/
+INHERIT=bash-completion-r1 flag-o-matic linux-info optfeature systemd tmpfiles toolchain-funcs udev
+IUSE=cgi doc ipmi serial i2c +man snmp +usb modbus selinux split-usr ssl tcpd test xml zeroconf
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/nut acct-user/nut dev-libs/libltdl virtual/udev cgi? ( >=media-libs/gd-2[png] ) i2c? ( sys-apps/i2c-tools ) ipmi? ( sys-libs/freeipmi ) modbus? ( dev-libs/libmodbus ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( >=dev-libs/openssl-1:= ) tcpd? ( sys-apps/tcp-wrappers ) usb? ( virtual/libusb:1 ) xml? ( >=net-libs/neon-0.25.0:= ) zeroconf? ( net-dns/avahi ) selinux? ( sec-policy/selinux-nut ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://networkupstools.org/source/2.8/nut-2.8.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=00f5ea65ad9201e61ac6a5e72ae19841
diff --git a/metadata/md5-cache/sys-power/nut-9999 b/metadata/md5-cache/sys-power/nut-9999
new file mode 100644
index 000000000000..2784ab0d9e77
--- /dev/null
+++ b/metadata/md5-cache/sys-power/nut-9999
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig man? ( app-text/asciidoc ) test? ( dev-util/cppunit ) virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=acct-group/nut acct-user/nut dev-libs/libltdl virtual/udev cgi? ( >=media-libs/gd-2[png] ) gpio? ( dev-libs/libgpiod ) i2c? ( sys-apps/i2c-tools ) ipmi? ( sys-libs/freeipmi ) modbus? ( dev-libs/libmodbus ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_single_target_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( >=dev-libs/openssl-1:= ) systemd? ( >=sys-apps/systemd-253 ) tcpd? ( sys-apps/tcp-wrappers ) usb? ( virtual/libusb:1 ) xml? ( >=net-libs/neon-0.25.0:= ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Network-UPS Tools
+EAPI=8
+HOMEPAGE=https://networkupstools.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=bash-completion-r1 desktop flag-o-matic linux-info optfeature python-single-r1 systemd tmpfiles toolchain-funcs udev wrapper xdg git-r3
+IUSE=gpio cgi doc ipmi serial i2c +man snmp +usb modbus selinux split-usr ssl tcpd test xml zeroconf python monitor systemd python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+LICENSE=GPL-2
+PROPERTIES=live
+RDEPEND=acct-group/nut acct-user/nut dev-libs/libltdl virtual/udev cgi? ( >=media-libs/gd-2[png] ) gpio? ( dev-libs/libgpiod ) i2c? ( sys-apps/i2c-tools ) ipmi? ( sys-libs/freeipmi ) modbus? ( dev-libs/libmodbus ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_single_target_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( >=dev-libs/openssl-1:= ) systemd? ( >=sys-apps/systemd-253 ) tcpd? ( sys-apps/tcp-wrappers ) usb? ( virtual/libusb:1 ) xml? ( >=net-libs/neon-0.25.0:= ) zeroconf? ( net-dns/avahi ) monitor? ( python_single_target_python3_10? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[gui,widgets,python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/PyQt5[gui,widgets,python_targets_python3_12(-)] ) ) selinux? ( sec-policy/selinux-nut ) virtual/tmpfiles
+REQUIRED_USE=monitor? ( python ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) snmp? ( python )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6d5a7702ef4ce67f661952786aa9241e
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index a3fe0de814a9..8f922d6c27cb 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/qtile-0.22.1-r2 b/metadata/md5-cache/x11-wm/qtile-0.22.1-r2
index 561f40689f8a..56d918f44fba 100644
--- a/metadata/md5-cache/x11-wm/qtile-0.22.1-r2
+++ b/metadata/md5-cache/x11-wm/qtile-0.22.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( media-gfx/imagemagick[X] x11-base/xorg-server[xephyr] ) test? ( >=dev-python/cairocffi-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-next[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/xcffib-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[X,xcb(+)] x11-libs/libnotify[introspection] x11-libs/pango pulseaudio? ( media-sound/pulseaudio ) wayland? ( =dev-python/pywlroots-0.15*[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( media-gfx/imagemagick[X] x11-base/xorg-server[xephyr] ) test? ( <dev-python/cairocffi-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-next[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/xcffib-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[X,xcb(+)] x11-libs/libnotify[introspection] x11-libs/pango pulseaudio? ( media-sound/pulseaudio ) wayland? ( =dev-python/pywlroots-0.15*[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A full-featured, hackable tiling window manager written in Python
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 virtualx pypi
 IUSE=pulseaudio wayland test python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=amd64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/cairocffi-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-next[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/xcffib-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[X,xcb(+)] x11-libs/libnotify[introspection] x11-libs/pango pulseaudio? ( media-sound/pulseaudio ) wayland? ( =dev-python/pywlroots-0.15*[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+RDEPEND=<dev-python/cairocffi-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-next[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/xcffib-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[X,xcb(+)] x11-libs/libnotify[introspection] x11-libs/pango pulseaudio? ( media-sound/pulseaudio ) wayland? ( =dev-python/pywlroots-0.15*[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/q/qtile/qtile-0.22.1.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2c3a4acd563e7c362189742465018640	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=20c3cf7c9f4b8f363ab3c12476991258
+_md5_=6d5a4d4573042b406d262b0a7fae6e2b
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e5b8fa29a8a8..59a74aee4d7b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-06-17T00:09:52Z
+TIMESTAMP 2023-06-17T06:09:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSM+dBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSNTjJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA0mg//caWFidXYqN2iavI1SuP1ohnKaljoxpZdSaIUHjS3bMPJ/j9dU1SqXzF6
-uudSkffyWbMmWH8DfV1U82mBlfkGiphg2g7EPWKrFESkWBFTjjeYacFos5YkuYkC
-d2EQXpQRGMwun/AAi3MEKrm24583CJn3YSji6MyciTgxUgDdlPIFPw2cdzR6i9FR
-KTsmucPoQlB5fe0grIUD0gU8NV7m8HbLu2WHFv3CbvAX9/WZ0zh95TX3B+gks5Ik
-+fuzH1wC5UX2GrvPv3HfmwUHvwEPorD0VB02+Fifov22rchA3qvVxY4JcoRV/Fie
-sTECIa006C1i98z1owY/avX798WXeRsogbfzlIqL1kj/ISwwzqSjL2QvLlN4xkl6
-PgXx2Umvk2Vl8MsSFYqYoI5m9tlkCCnijRRM5lWHd12Fu/ECREtnahSAibwzxAQc
-d5YgeQ658RNKA2OkB0nAeK53vaKRh2r4wH7ydxapo8w2ZpKX1Ol93H4nidlzrLMH
-+QgNHyPH+Wbn3W7UR4h9B1H/PvFbcg68uPWt1tLs5ReiP5j3pXvcyQwjNhQ5ezSf
-OuXm1eO/AgmNQGVEG8yOkpaLHlnwCH02ZyTXeBVwa7IZb0ywyab65JqMsK4stJFQ
-34oHTiVQwP1qKSucqpR+WpoSGx5+zTqiXyTiq7TSH2BMVP46lks=
-=PTVe
+klA6BQ/7B5zZUdg+TTsm6vaUrfXrs0s/OQjt1D6ZbZiD6OmYv4lGWXK47t4z9Plc
+iWvegnK7eFgIWF+1BTcUwr8+dEat883/54sOqZIyd8kkVwjoQlL1Fjo7hT1YfC97
+FczpuhJjZRBWAVyLsjtVxHi3FA+K8E7DZ4SoA84xMueA5h1jTBpy6YnzYT/Yk0jK
+azlV/z+oh+9dFq1nbiE1ByFx8PaZNW/zPa6l6jxYv0HgLueAATxXRl2Fpf6zggUY
+53NDjkBR/2GUYg9QUnz+AT1u5k16mxzBrtxBmY/t4Brly7NZ1KJfx9+IaR9BN30c
+jstbsp/cFwrHQSAJ7JJCB4yHNvRHnUrn4RUVTBMsTbPuNmW3YxNriTJJcjsgyBsd
+nRJJRfvzKD7aSH4Pyn1sXCe5O7pDHxAhu5BQ9FK2H8uOlrnEe0m6CCSyT14eeBPH
+UYsyPKN8tIWSuJEg/hj/ePJ8hMmpOC5zDGuG/wSvAJJpqNPM4S3VbgZEOUZjscsv
+IqyI8bkEKwpIZdBTOL2iZuxFCViYMw6JqGVlU+fpNzJjM6JQAT10uDUXNnSZ8eup
+NsU2Ph6LZfzXRBCiK+UAIEKDfvNxRt0CDBMFX/fv1Q9XzYzPE5qvNjAgtyDt2wV6
+2n106M7GixRuOXOLlos5IzoXTOOqh7lZ13t/mdu9zh8xn7RgcG4=
+=Wc/O
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 466ff6c1bd96..ce20ed2674bf 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 17 Jun 2023 00:09:49 +0000
+Sat, 17 Jun 2023 06:09:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f3570655cc2e..79a7cdc8d745 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jun 17 12:09:49 AM UTC 2023
+Sat Jun 17 06:09:49 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a727a9f60e66..7627dfc4fd6e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 17 Jun 2023 00:15:01 +0000
+Sat, 17 Jun 2023 06:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d30fcbaa1833..83f4ab1d85fe 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-5d408bd0436acd30fdfa84c8b48045f45c270bb7 1686956333 2023-06-16T22:58:53+00:00
+89fa13f11185ddc2e34df3948ff07f53cec3b969 1686981541 2023-06-17T05:59:01+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 35be11e220ee..9839308fbe32 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1686960601 Sat 17 Jun 2023 12:10:01 AM UTC
+1686982201 Sat 17 Jun 2023 06:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 466ff6c1bd96..ce20ed2674bf 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 17 Jun 2023 00:09:49 +0000
+Sat, 17 Jun 2023 06:09:49 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 02bc8f9602a0..e8f47d473be4 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 40689f2dcfc6..050460bdcc03 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -4,9 +4,7 @@ AUX libproxy-0.4.18-Fix-building-without-duktape.patch 1006 BLAKE2B b6b8a704a61e
 AUX libproxy-0.4.18-avoid-nm-build-dep.patch 3592 BLAKE2B 7f7f8af5aebbfb176b405db4c666e894b3adf879ba186f3f08a7b82508d67227905cd1fb31af761c8c0d24e362bfe84341243c2ce5fb6c1ea11dead16f6c9e0c SHA512 64a1823b1710ce3be1019ea077b5ce9e1b0f1ff97b8e940bb4187613af797d198ffcd1f66f21399b23a3a0b1133b7fc71ac80c86ff67bd1d9735abcfb5bcb61a
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.18.tar.gz 98037 BLAKE2B 12505cc7afe9ca27bb387df31d7368ed3ac83696255e6bd8fdbca1528fb6fe83510cdf7c6bda09939dcb55daefba24cf9c52435f664c6cba01daad87ddff3f2a SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754
-DIST libproxy-0.5.0.tar.gz 58746 BLAKE2B aaaaa93217d4b3112b9c2761d7156de1359278b764bdfb3ba0942653e930e4cb60c00adf936fa1210668dc584c6e34fccfe405acdbabfff1927fd25b9de953b7 SHA512 699d09d747c3e56247b1d0a8dee0cd7c122199cc4296aa61753a4e52b4346ad5d98d608f953d28a5779e7d49f64be639e22c696ac82d48bbdaa7b743501b18e6
-DIST libproxy-0.5.1.tar.gz 59939 BLAKE2B dc219c9df624a82544ce26b0629c0bc012e34d82fb6fd49bdb07450ba98d1e4a29ff1bdf3a1d3e6645139ddd8e4953f36584e10f64119584d335a7a6cb5d34a9 SHA512 830e4bb1879c6afd1fbebc24de2ca75a597096a8eadb45dd3965b9f8121110039379342facebddce1b679a9b6ceb065089f0fbe38b55411a2c53ac36ef979ab7
+DIST libproxy-0.5.2.tar.gz 60024 BLAKE2B 7484b61f5eb3dbb148bce69c6d5d30d218c9392c559661c7e01e02339546c246afb47ab28956d90076d835f4a72ec260690cd0d3a52b8302ec238f1bb1eb87c0 SHA512 10d2d435288e8259bc16e6fc678bbd5edee7de8ef4235de29ed7740493690b33c3b1820f1a9befb60254069946e3ff3cc6130c7d19f34fff8062aec16dc1cbc8
 EBUILD libproxy-0.4.18.ebuild 2599 BLAKE2B b2c0bb69661b2ea22a2cc2410f14d0c46d65476eaafe06267299f88d66168c038db7b40026c969d4b8e6f2944fd439243a5db36eb0c03465be7e1145f9de65b3 SHA512 ff204c657a1cb240b77265cca2e6ed110ab150df3155457e1c3140302a31e53cd64f42893d36d9901be0e09eaf2d68e3a0f032157861ca8f4e181f58e0fc1d10
-EBUILD libproxy-0.5.0.ebuild 1911 BLAKE2B ef0b25a424dcca1ef1851a4bb5b046fdc269229d63137ab4ba56b61f35472a56a276523479e18a47c05c94ab86bb4d69774f4cd1d63c74d194d1faccba865c71 SHA512 0e2f9a09634ef078194dce9016ae8cb53581dcf3779f65c48eb5b543e9b586218dcb351c77e0d25197963f8f82a8666336dddf080c6f97a171a3c5d60894c8e6
-EBUILD libproxy-0.5.1.ebuild 1754 BLAKE2B 96e57f417aa4a7a4706cc09ebe234c3f7113e37f93b96ee42beee0c4437c0b4ac9158f28290d347370ed51871725882caf0327174dcf04a5e8b166dd868e36d2 SHA512 6d031cbe11dbd4c23495fcf5f1c1c127d51823a4ad75c21e725207a49e95c8d6a9a712e3085a76a426021b1dda83f2299a274453bcbe9848d326811a4d23589a
+EBUILD libproxy-0.5.2.ebuild 1754 BLAKE2B 96e57f417aa4a7a4706cc09ebe234c3f7113e37f93b96ee42beee0c4437c0b4ac9158f28290d347370ed51871725882caf0327174dcf04a5e8b166dd868e36d2 SHA512 6d031cbe11dbd4c23495fcf5f1c1c127d51823a4ad75c21e725207a49e95c8d6a9a712e3085a76a426021b1dda83f2299a274453bcbe9848d326811a4d23589a
 MISC metadata.xml 770 BLAKE2B ae78ea34cf603f837bcb20532febb873d54c9f0e96867c82a2ab095fa94e8c1a1b64d83c6e4f29fbe26c5a21cc3d04b722add5fb88ab74a781ad15fc50f300ee SHA512 90c1cf64ad650e58e172832383a8ceaf396274610d65e0486f9fc19534dda1e5a4356b18139dc62483d7df46769143acd4ccfc35ebe0d18e64dc8a71bd5e5789
diff --git a/net-libs/libproxy/libproxy-0.5.0.ebuild b/net-libs/libproxy/libproxy-0.5.0.ebuild
deleted file mode 100644
index cc9bdefca67c..000000000000
--- a/net-libs/libproxy/libproxy-0.5.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib vala
-
-DESCRIPTION="Library for automatic proxy configuration management"
-HOMEPAGE="https://github.com/libproxy/libproxy"
-SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="duktape gnome gtk-doc +introspection kde test vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.71.3:2[${MULTILIB_USEDEP}]
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-	duktape? (
-		dev-lang/duktape:=
-		net-misc/curl
-	)
-	introspection? ( dev-libs/gobject-introspection )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( net-libs/libsoup:3.0[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	kde? ( kde-frameworks/kconfig:5 )
-"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gi-docgen )
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-Guard-PxManager-test-with-pacrunner-duktape-option-2.patch
-)
-
-src_prepare() {
-	use vala && vala_setup
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool gtk-doc docs)
-		$(meson_use test tests)
-		-Dconfig-env=true
-		$(meson_use gnome config-gnome)
-		-Dconfig-windows=false
-		-Dconfig-sysconfig=true
-		-Dconfig-osx=false
-		$(meson_use kde config-kde)
-		$(meson_native_use_bool duktape pacrunner-duktape)
-		$(meson_native_use_bool vala vapi)
-		$(meson_use duktape curl)
-		$(meson_native_use_bool introspection)
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/${PN}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
diff --git a/net-libs/libproxy/libproxy-0.5.1.ebuild b/net-libs/libproxy/libproxy-0.5.2.ebuild
index 485c43212d51..485c43212d51 100644
--- a/net-libs/libproxy/libproxy-0.5.1.ebuild
+++ b/net-libs/libproxy/libproxy-0.5.2.ebuild
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5a9e16ea45d3..6c51a15eae66 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 98515fa9dec5..e4b4f3bbd19d 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -24,5 +24,5 @@ AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
 EBUILD dhcp-4.4.3_p1-r3.ebuild 8492 BLAKE2B 46592e05bbd2fd7607efa50e671b3794c385608043b1d0e941e96bb501694a97ef1b345333cc592f743b2a7023ac04d7e8a061c722683e80adedb471e8f8dc6d SHA512 6a6011d0a0a7c54f8dde3122b74b77dfd0540cbdd54265702d04126b19313aa455cc9526bcb7598ab8d6d5c8450738a6d126b9d95de9a34bd5b264ef7e6ba994
-EBUILD dhcp-4.4.3_p1-r4.ebuild 8550 BLAKE2B a9583d50f9d739c1964259dcf3eb05d0042b533d89ea0b86c19e6ff940328b67b69eda9e91eee6c176ac178196a5bc58255c271cbf1f7d94a5abf2bc50c6e700 SHA512 eca3c0dad1e20bc9ab73f106f45770f9b0bc47eac978a4b5d6ef225764e1aa6339378f8dfd4f880e059088aab2baaa49ba133133fb9e5f3b8424699fa7ee1003
+EBUILD dhcp-4.4.3_p1-r4.ebuild 8548 BLAKE2B 60a3d7c23eab145eec884fe615b21bda80711b943c0532387b53e8215c660993597f8d80f9212e75d534992cb2fcf3f88107be14b4632482a0444a1c44abdbf3 SHA512 a9b94eb0caba31ff6230c098b7fd4faa8b972a3956dca79a8448d72838ea9f866b82b90be9644864fc960bb454e9d8662b7d3478f0a97da9cf17a0a8490be84b
 MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index 4140099005c0..70aaa8b57cd9 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
 
 BDEPEND="
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index c0603200d761..dd778ac01525 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -3,5 +3,5 @@ AUX keychain-2.8.5-malformed-ssh-key.patch 993 BLAKE2B fd959123205865d4c467dd680
 AUX keychain-2.8.5-typos.patch 3639 BLAKE2B 98d4ad974d29808fab53ac155b98b9a70fd15434d33d55d52c453f1d26bd2f227d685829eb8610a65dacff05b08d760626db6f2de6ce5a928114cb9bddba0a95 SHA512 36dfb7b8c99cd41229280a3c77fabc226eae9b29f2e843b6f28a99361d3c384cc9f47aeeecb0cec417a8222365f56b2b39fee6122b7602f76bfba077c020d783
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
 EBUILD keychain-2.8.5-r1.ebuild 574 BLAKE2B 43c0e2982f7fb6222e54190d07730f555137db686311fbae753820b6bb094a6dd5c729528543fef2e13b17a9947a0f99168a304e631e81cc9e27d8e1be142e3b SHA512 4f1e7adf7c7d099f4f7dac8b09342db8c9478c337538fece2870932b228bef901a5c7d5578934a5e61aa0fc8c47ac73ca7b3999db2221ac169da37d59e500d03
-EBUILD keychain-2.8.5-r2.ebuild 750 BLAKE2B 15ee462235319fe76a9ca123ad2886f341e48c16c55a3903e21fbdbb9bac69a10d3bd648c8c20daebdc2d86bc746a78968731fd7c345d9c16d047580e71b91c3 SHA512 a315ed38166fda2f7118e75a94bea6949e705c7e1976995db1afbdff76a92da7025540df58393dbe3dc0819ea3393a8311a13424126df86b70bcd9192e9e10b1
+EBUILD keychain-2.8.5-r2.ebuild 749 BLAKE2B bd3017c379a7dc95ada3d6eb658d7862e988512783938713eea40de54f624b76c98fca0affef6156ac4a5f4bc92a43e67015fc2053f3c1047705115f9e3374a9 SHA512 92f8770e5604fa95e19b3eca44430f04586336353f122a8a59133df9a20580710c5f5104be92de02e7c06123adefba1d381fed08cead042a31a3a3d49b9c491b
 MISC metadata.xml 527 BLAKE2B 244df1b2a5ab0820d287c8cd2b56829cab27026eca673cffc5191f945bdc9cea69fe65d5de87ef147d9060a01a044110176d8377835775cbe5425796b671f836 SHA512 90e1a381903b19a64317859afcc629a22ac9c414bb61ce333966c8d2f39fc728e98d21e2695df130da645802daafa146649fa2a5a03720b53e8e3d110f589d6b
diff --git a/net-misc/keychain/keychain-2.8.5-r2.ebuild b/net-misc/keychain/keychain-2.8.5-r2.ebuild
index b4b0fddd5acb..9d1a154269b1 100644
--- a/net-misc/keychain/keychain-2.8.5-r2.ebuild
+++ b/net-misc/keychain/keychain-2.8.5-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="dev-lang/perl"
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 223b6684ae0d..8b122a5aa7c0 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -12,5 +12,6 @@ DIST memcached-1.6.21.tar.gz 1127623 BLAKE2B 13feb4872f5d196c1c3ded0159c16c2b096
 EBUILD memcached-1.6.18.ebuild 2975 BLAKE2B 1ddeee044758f6c594acfbfb8ceb825fc1d5fa9a35c895d8844c31f9ec5224a3fec61f0478c5fa633f0a7fe787eece323609542db13cb7d1db35c27ae2b5648c SHA512 eed2bfd686b15c2fe5dd400a614080a645fa545d49f3b49f687c547300072a9b82eb5a2beff213e2bda5e860a620edca851258f5ca5b0e5201ebdb9e81d32610
 EBUILD memcached-1.6.19.ebuild 2975 BLAKE2B 1ddeee044758f6c594acfbfb8ceb825fc1d5fa9a35c895d8844c31f9ec5224a3fec61f0478c5fa633f0a7fe787eece323609542db13cb7d1db35c27ae2b5648c SHA512 eed2bfd686b15c2fe5dd400a614080a645fa545d49f3b49f687c547300072a9b82eb5a2beff213e2bda5e860a620edca851258f5ca5b0e5201ebdb9e81d32610
 EBUILD memcached-1.6.20.ebuild 2982 BLAKE2B 2eaa1cbc10cfde4ad6c8ada1c300a6969928db4dafc11af6b400026e8e57481e062822de1204196c9d8a84a727846bddfc087b4defdbd8c14d8664cfa6054648 SHA512 d9477a08513a46e775ce4e361ba6ffd346c09e4e05177e2846b6e5c7760e3db238bb7f30b57da8e77482b0f0a3031d66a92b2a66dafa06ab7ee3ee63c4db8688
+EBUILD memcached-1.6.21-r1.ebuild 2876 BLAKE2B e79ecdffce82de619be65ee499124afd3ca233a10fbd5ddce1c63cac2718d5a0c29345377428ba2f21454560f0df3587f4c623c401b131b8abd7acad3e74ab87 SHA512 22a1f09114cf612bfb220412261fd8d58065c12458934055a5148b7a790decaae18e5bd14afc47c6ce2648516a3daa32899e80dc5628aa6b156b1cbb2ecbd3d3
 EBUILD memcached-1.6.21.ebuild 2982 BLAKE2B 2eaa1cbc10cfde4ad6c8ada1c300a6969928db4dafc11af6b400026e8e57481e062822de1204196c9d8a84a727846bddfc087b4defdbd8c14d8664cfa6054648 SHA512 d9477a08513a46e775ce4e361ba6ffd346c09e4e05177e2846b6e5c7760e3db238bb7f30b57da8e77482b0f0a3031d66a92b2a66dafa06ab7ee3ee63c4db8688
 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de
diff --git a/net-misc/memcached/memcached-1.6.21-r1.ebuild b/net-misc/memcached/memcached-1.6.21-r1.ebuild
new file mode 100644
index 000000000000..9a7f346eea40
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.21-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )
+	ssl? ( >=dev-libs/openssl-1.1.0g:= )"
+DEPEND="${RDEPEND}
+	acct-user/memcached
+	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+
+	eautoreconf
+
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		--disable-werror \
+		$(use_enable sasl) \
+		$(use_enable ssl tls)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 1aef0bccbb42..3ddd9c420d36 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index dca60381d4fd..d7eba7ac1dbe 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -11,7 +11,9 @@ AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdb
 DIST squid-4.17.tar.xz 2464204 BLAKE2B e227dfbac846dff66f04c6c72d81d667076107653721d14804f079518cef68efc53f5404fbe3306efb0c775a10638661c300a8e7cd3d7ab43c0e57a344387674 SHA512 cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a
 DIST squid-5.7.tar.xz 2566560 BLAKE2B 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299 SHA512 624a39041a6ceda6c470dc0937616f1aa67200f3db02b4d74095d8d706ed31d6df5e0417dcacde45f6be40b617bee018849793d52c96a626aab32a2b182972aa
 DIST squid-5.8.tar.xz 2447560 BLAKE2B c9d1ae9464e68beabdf7ae1641a70d6c614bc4d4f4bae3fc5946c2bf61510634992cbd5abe63f071104edb2fa487a6c5c7fb8fbf8f06ac723a6522ec9ade8b68 SHA512 81a9a7d1dfcb58476369e08e99feb76411dd3242a3374feb175408fa0dc8161545a9a903603219c6fa2bcfb615461901e093428e97ac74cf4c596a7065d3247d
+DIST squid-5.9.tar.xz 2569204 BLAKE2B 898a34357f8019291379ea37c66fa312e1a6437e8f643987dd4e54d7d52728248e16129b00195c5f6e0378c0f32c9f9ade3f98ca0ec4bb952f9f443357face82 SHA512 7dc366ef6b2a397ca6adec993c05876949de5f5e72a8a4409c9c9c52c42a8a4b37f58e85a171eebd36a166951f6c764176cfebec30019b299abe34a5adc4e5ac
 EBUILD squid-4.17-r1.ebuild 8183 BLAKE2B ca1794b42ea7605d0fc0dae80a5d6071fc7929528d1619848fccd1a05c600057695596026d96efa21a3076b543ac8df20fecbba054a41182cdf317ca2059317b SHA512 7a94968e331c85dd6028d9c958c016c214d936176fae3c2453e8caab31df24bc2b3fa558934b2dc88ceec157af63323fb3ab7e10f893984414f49674fe5b1f6e
 EBUILD squid-5.7-r1.ebuild 9416 BLAKE2B 06d2d220c5d79bb6cd08e90ff3cdd131e60cbe43e7ee7d80efc7433b105d5f70b8c58d7693e7d34609fc65150668763d5a82f2193a49890aa3a726a2120d4c7a SHA512 92d96fb49886f2ef0df9ecd8b8c988b5ae8534849f42ba6ab7bba472537e5b2b7af4b9ceb1d77f596427c09642e411ccd560592a8a70222ad9a33bbd1b154224
 EBUILD squid-5.8.ebuild 9528 BLAKE2B dd6c51b261cc4ac0b1d4a0b76139a0b05babfb2c0fda6dfd29020a195114423e6aaebe3a2444626cbe297b8030fd0044bfbadc47ccf71ea9cee03897bcd19665 SHA512 281c3d5e18ccc6ebfd2650b29a3f07e9d7f6ae400270670fbbc4b285827dc97c1ca2a596bc2ee1c7e8d3ad8459e344b5732267dfc2dc5155b9c66aa972279d25
+EBUILD squid-5.9.ebuild 9528 BLAKE2B dd6c51b261cc4ac0b1d4a0b76139a0b05babfb2c0fda6dfd29020a195114423e6aaebe3a2444626cbe297b8030fd0044bfbadc47ccf71ea9cee03897bcd19665 SHA512 281c3d5e18ccc6ebfd2650b29a3f07e9d7f6ae400270670fbbc4b285827dc97c1ca2a596bc2ee1c7e8d3ad8459e344b5732267dfc2dc5155b9c66aa972279d25
 MISC metadata.xml 1351 BLAKE2B 8a6ea8bc939b5900572bd323fb3be78e0dfa9b4d7436f2d5e27fa59905f57af5cd9b7fe9a2903f8f57859a88176aab17c1a5d507a69765aab0f5320ceec69c96 SHA512 db7a47668d220a16f10d25319ffc4cd33270209d7d00f488d45680150f094d70776c4bf3c7b203b6ec8c69be18e5ac3a78d3d4367ec90a9ffb91ffd29f66890f
diff --git a/net-proxy/squid/squid-5.9.ebuild b/net-proxy/squid/squid-5.9.ebuild
new file mode 100644
index 000000000000..f7f2f01d3c06
--- /dev/null
+++ b/net-proxy/squid/squid-5.9.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+
+MY_PV_MAJOR=$(ver_cut 1)
+# Upstream patch ID for the most recent bug-fixed update to the formal release.
+#r=-20181117-r0022167
+r=
+if [[ -z ${r} ]]; then
+	SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
+else
+	SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
+	S="${S}${r}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
+IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )"
+
+DEPEND="
+	acct-group/squid
+	acct-user/squid
+	dev-libs/libltdl
+	sys-libs/tdb
+	virtual/libcrypt:=
+	caps? ( >=sys-libs/libcap-2.16 )
+	ecap? ( net-libs/libecap:1 )
+	esi? (
+		dev-libs/expat
+		dev-libs/libxml2
+	)
+	ldap? ( net-nds/openldap:= )
+	gnutls? ( >=net-libs/gnutls-3.1.5:= )
+	logrotate? ( app-admin/logrotate )
+	nis? (
+		net-libs/libtirpc:=
+		net-libs/libnsl:=
+	)
+	kerberos? ( virtual/krb5 )
+	pam? ( sys-libs/pam )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? (
+		dev-libs/nettle:=
+		!gnutls? (
+			dev-libs/openssl:=
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="
+	${DEPEND}
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	perl? ( dev-lang/perl )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-squid )
+	sqlite? ( dev-perl/DBD-SQLite )
+"
+DEPEND+=" valgrind? ( dev-util/valgrind )"
+BDEPEND="
+	dev-lang/perl
+	ecap? ( virtual/pkgconfig )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.3-gentoo.patch
+	"${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch
+)
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Fixup various paths
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/purge.1 || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		src/acl/external/unix_group/ext_unix_group_acl.8 \
+		src/acl/external/session/ext_session_acl.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am || die
+	sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die
+
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--datadir=/usr/share/squid
+		--libexecdir=/usr/libexec/squid
+		--localstatedir=/var
+		--sysconfdir=/etc/squid
+		--with-default-user=squid
+		--with-logdir=/var/log/squid
+		--with-pidfile=/run/squid.pid
+
+		--enable-build-info="Gentoo ${PF} (r: ${r:-NONE})"
+		--enable-log-daemon-helpers
+		--enable-url-rewrite-helpers
+		--enable-cache-digests
+		--enable-delay-pools
+		--enable-disk-io
+		--enable-eui
+		--enable-icmp
+		--enable-ipv6
+		--enable-follow-x-forwarded-for
+		--enable-removal-policies="lru,heap"
+		--disable-strict-error-checking
+		--disable-arch-native
+
+		--with-large-files
+		--with-build-environment=default
+
+		--with-tdb
+
+		--without-included-ltdl
+		--with-ltdl-include="${ESYSROOT}"/usr/include
+		--with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir)
+
+		$(use_with caps libcap)
+		$(use_enable snmp)
+		$(use_with ssl openssl)
+		$(use_with ssl nettle)
+		$(use_with gnutls)
+		$(use_enable ssl-crtd)
+		$(use_with systemd)
+		$(use_with test cppunit)
+		$(use_enable ecap)
+		$(use_enable esi)
+		$(use_enable esi expat)
+		$(use_enable esi libxml2)
+		$(use_enable htcp)
+		$(use_with valgrind valgrind-debug)
+		$(use_enable wccp)
+		$(use_enable wccpv2)
+	)
+
+	# Basic modules
+	local basic_modules=(
+		NCSA
+		POP3
+		getpwnam
+
+		$(usev samba 'SMB')
+		$(usev ldap 'SMB_LM LDAP')
+		$(usev pam 'PAM')
+		$(usev sasl 'SASL')
+		$(usev nis 'NIS')
+		$(usev radius 'RADIUS')
+	)
+
+	use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc"
+
+	if use mysql || use postgres || use sqlite; then
+		basic_modules+=( DB )
+	fi
+
+	# Digests
+	local digest_modules=(
+		file
+
+		$(usev ldap 'LDAP eDirectory')
+	)
+
+	# Kerberos
+	local negotiate_modules=( none )
+
+	myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 )
+
+	if use kerberos; then
+		# We intentionally overwrite negotiate_modules here to lose
+		# the 'none'.
+		negotiate_modules=( kerberos wrapper )
+
+		if has_version app-crypt/heimdal; then
+			myeconfargs+=(
+				--without-mit-krb5
+				--with-heimdal-krb5
+			)
+		else
+			myeconfargs+=(
+				--with-mit-krb5
+				--without-heimdal-krb5
+			)
+		fi
+	fi
+
+	# NTLM modules
+	local ntlm_modules=( none )
+
+	if use samba ; then
+		# We intentionally overwrite ntlm_modules here to lose
+		# the 'none'.
+		ntlm_modules=( SMB_LM )
+	fi
+
+	# External helpers
+	local ext_helpers=(
+		file_userip
+		session
+		unix_group
+		delayer
+		time_quota
+
+		$(usev samba 'wbinfo_group')
+		$(usev ldap 'LDAP_group eDirectory_userip')
+	)
+
+	use ldap && use kerberos && ext_helpers+=( kerberos_ldap_group )
+	if use mysql || use postgres || use sqlite; then
+		ext_helpers+=( SQL_session )
+	fi
+
+	# Storage modules
+	local storeio_modules=(
+		aufs
+		diskd
+		rock
+		ufs
+	)
+
+	#
+	local transparent
+	if use kernel_linux; then
+		myeconfargs+=(
+			--enable-linux-netfilter
+			$(usev qos '--enable-zph-qos --with-netfilter-conntrack')
+		)
+	fi
+
+	tc-export_build_env BUILD_CXX
+	export BUILDCXX="${BUILD_CXX}"
+	export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
+	tc-export CC AR
+
+	# Should be able to drop this workaround with newer versions.
+	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
+	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
+
+	# Bug #719662
+	append-atomic-flags
+
+	print_options_without_comma() {
+		# IFS as ',' will cut off any trailing commas
+		(
+			IFS=','
+			options=( $(printf "%s," "${@}") )
+			echo "${options[*]}"
+		)
+	}
+
+	myeconfargs+=(
+		--enable-storeio=$(print_options_without_comma "${storeio_modules[@]}")
+		--enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}")
+		--enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}")
+		--enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}")
+		--enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}")
+		--enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}")
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	systemd_dounit tools/systemd/squid.service
+
+	# Need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+
+	# Pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# These scripts depend on perl
+	if ! use perl; then
+		local perl_scripts=(
+			basic_pop3_auth ext_delayer_acl helper-mux
+			log_db_daemon security_fake_certverify
+			storeid_file_rewrite url_lfs_rewrite
+		)
+
+		local script
+		for script in "${perl_scripts[@]}"; do
+			rm "${ED}"/usr/libexec/squid/${script} || die
+		done
+	fi
+
+	# Cleanup
+	rm -r "${D}"/run "${D}"/var/cache || die
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc src/auth/negotiate/kerberos/README README.kerberos
+	newdoc src/auth/basic/RADIUS/README README.RADIUS
+	newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group
+	dodoc RELEASENOTES.html
+
+	if use pam; then
+		newpamd "${FILESDIR}"/squid.pam squid
+	fi
+
+	newconfd "${FILESDIR}"/squid.confd-r2 squid
+	newinitd "${FILESDIR}"/squid.initd-r6 squid
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/squid.logrotate squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}"/squid.cron squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
+
+	# Hack for bug #834503 (see also bug #664940)
+	# Please keep this for a few years until it's no longer plausible
+	# someone is upgrading from < squid 5.7.
+	mv "${ED}"/usr/share/squid/errors{,.new} || die
+}
+
+pkg_preinst() {
+	# Remove file in EROOT that the directory collides with.
+	rm -rf "${EROOT}"/usr/share/squid/errors || die
+
+	# Following the collision protection check, reverse
+	# src_install's rename in ED.
+	mv "${ED}"/usr/share/squid/errors{.new,} || die
+}
+
+pkg_postinst() {
+	elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
+
+	if [[ ${#r} -gt 0 ]]; then
+		elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 96d06a8e7891..d4d340359745 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index e5401b0ecb9a..b915ffe657b6 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-06-17)
+# Qt 5 not keyworded here
+app-text/highlight gui
+
 # Matt Turner <mattst88@gentoo.org> (2023-05-30)
 # sys-apps/dbus-broker is not keyworded
 app-accessibility/at-spi2-core dbus-broker
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 348be7575f72..2e398197e12e 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-06-17)
+# Qt 5 not keyworded here
+app-text/ansifilter gui
+app-text/highlight gui
+
 # Matt Turner <mattst88@gentoo.org> (2023-05-30)
 # sys-apps/dbus-broker is not keyworded
 app-accessibility/at-spi2-core dbus-broker
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0549814ba0e1..f0bff17c21dc 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8416,7 +8416,13 @@ sys-libs/zlib:minizip - include the minizip library for quick and dirty zip extr
 sys-libs/zlib-ng:compat - Enable compatibility to sys-libs/zlib
 sys-power/apcupsd:modbus - Enable MODBUS support over USB
 sys-power/intel-undervolt:elogind - Use elogind hook to apply voltage after system sleep
-sys-power/nut:ipmi - Support IPMI-based UPSes.
+sys-power/nut:gpio - Includes all UPS drivers that use GPIO.
+sys-power/nut:i2c - Includes all UPS drivers that use I2C.
+sys-power/nut:ipmi - Includes all UPS drivers that use ipmi.
+sys-power/nut:modbus - Includes all UPS drivers that use MODBUS.
+sys-power/nut:monitor - Add a QT5 gui monitor.
+sys-power/nut:serial - Includes all UPS drivers that use SERIAL.
+sys-power/nut:snmp - Includes all UPS drivers that use SNMP.
 sys-power/nut:ups_drivers_al175 - Driver for Eltek UPS models with AL175 alarm module
 sys-power/nut:ups_drivers_apcsmart - Driver for American Power Conversion Smart Protocol UPS equipment
 sys-power/nut:ups_drivers_apcsmart-old - Driver for American Power Conversion Smart Protocol UPS equipment
@@ -8468,6 +8474,8 @@ sys-power/nut:ups_drivers_tripplitesu - Driver for Tripp-Lite SmartOnline (SU) U
 sys-power/nut:ups_drivers_upscode2 - Driver for UPScode II compatible UPS equipment
 sys-power/nut:ups_drivers_usbhid-ups - Driver for USB/HID UPS equipment
 sys-power/nut:ups_drivers_victronups - Driver for IMV/Victron UPS unit Match, Match Lite, NetUps
+sys-power/nut:usb - Includes all UPS drivers that use USB.
+sys-power/nut:xml - Includes all UPS drivers that use XML.
 sys-power/nvclock:gtk - Install the GTK+ based graphical interface
 sys-power/nvclock:nvcontrol - Add NVCONTROL support for OpenGL options
 sys-power/suspend:crypt - Allows suspend and resume from encrypted disk
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b2c5cc2dc89a..667bbeb049a2 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/arborx/Manifest b/sci-libs/arborx/Manifest
index a1dac6907a05..401a07ae2185 100644
--- a/sci-libs/arborx/Manifest
+++ b/sci-libs/arborx/Manifest
@@ -1,5 +1,3 @@
-DIST arborx-1.2.tar.gz 380705 BLAKE2B eb0006e69edb6cfd1d402dfe5a58db76954c34f847ce8acd1c0f2bd2044a29a434fc01df67829fce4ec911f5c882c1625aa7a50bc39a5d33dfb2c26d6a4cbb4f SHA512 d48650b11fc26770c43f4821999647acb0c7675367e416ad025ab21eb50da66c732f03bc6decf840d25dac26ff7f1f5dca77b7514dffc619cef8d401e83a8795
 DIST arborx-1.4.1.tar.gz 408999 BLAKE2B 83e172f89ac8ff82d4add40fd036457d9c563b44c11b15d86aa884dc03742f3e22a13cc4b6f068ef377fcd8e63d239f704dd1821772079d2f9f8c169b1f31fae SHA512 3799deed5eae1e6092c19a62894207ac0ccd81ba84c8d42734fa3d0e5a3fc9d6a8f7b1442d2203b06f4e251970569f67506d419fb6695039c11e78dfd740e565
-EBUILD arborx-1.2.ebuild 695 BLAKE2B 62fb238c7a17acea04504f84e7538e38231661c7b00567ff1bb448c5c4478ce3a3cca6a01944bdc01790090953a241a14478fa439b4b7273672d4259d9c10b01 SHA512 245bd0312e60faf5ab15c90eb58aa7c4742ec4f8ac45888f0474b5b06494cb6da5b8eeda92cc19f9e6479ef7c4e9eb39a0287575f3c0b65a9076f38578bae057
-EBUILD arborx-1.4.1.ebuild 695 BLAKE2B 00a1d58905fb5c021c109bead4c41828f3d743f9e98604a6801c84be41f122e0a29aeffadb9a6871102a6e74f8f277030dc4d404a57a51a879c10208a86a28f0 SHA512 f724da8754921ed76ae0cc039c3916fd90dc77fb38f91f2cce783d0109316cf3112144535e867ef4661af9676e30bcd0dc6248a763f9391a244eeaddda106ca6
+EBUILD arborx-1.4.1-r1.ebuild 845 BLAKE2B d0061660d675f729745d2466ad15dc647ea8c9a551b2fc0bb6f711c732597c8b31d5977ee7280703c82c9791302e0a647eab08427607c68c2192e77fa41c4235 SHA512 0773cbaba6627998e3c0ef369adb2fb54d02e8dc7b0013997d353b5f06e9fe58bdcded3b36322326068d2c928d6da2a49d903b7347a3bc2905c392ba05a7a206
 MISC metadata.xml 645 BLAKE2B 6dcc46ed6bd5b10596436f09667e159530d359fdc768350751cf3376ecfe1e0ff30477895ce367c0f0a8e35b531b8f2e42a8517992553b6cec6a16def3fc2b32 SHA512 c5bba621b5f13c28774f413d64542d2e35fbfe11b18a3f5b98799bcdc1e25dd0a258e583842f24e3b8d1ad359d8ff068a141db448af2cef04e772a82df9e1ec6
diff --git a/sci-libs/arborx/arborx-1.2.ebuild b/sci-libs/arborx/arborx-1.2.ebuild
deleted file mode 100644
index 68330b8a5df7..000000000000
--- a/sci-libs/arborx/arborx-1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Library for performance portable algorithms for geometric search"
-HOMEPAGE="https://github.com/arborx/ArborX"
-
-SRC_URI="https://github.com/${PN}/ArborX/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="mpi"
-
-RDEPEND="dev-libs/boost:=
-	mpi? ( virtual/mpi[cxx] )
-	sci-libs/trilinos"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/ArborX-${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DARBORX_ENABLE_MPI="$(usex mpi)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/sci-libs/arborx/arborx-1.4.1.ebuild b/sci-libs/arborx/arborx-1.4.1-r1.ebuild
index c27f694b4071..84b2bc0e85a4 100644
--- a/sci-libs/arborx/arborx-1.4.1.ebuild
+++ b/sci-libs/arborx/arborx-1.4.1-r1.ebuild
@@ -24,6 +24,13 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/ArborX-${PV}
 
+src_prepare() {
+	cmake_src_prepare
+
+	# replace hardcoded "lib/" directory:
+	sed -i -e "s#lib/#$(get_libdir)/#g" CMakeLists.txt || die "sed failed"
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DARBORX_ENABLE_MPI="$(usex mpi)"
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 8dc9101848fb..968ffc8c1a9b 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-jiatan/Manifest b/sec-keys/openpgp-keys-jiatan/Manifest
index 2195f0266a40..82c8c32db424 100644
--- a/sec-keys/openpgp-keys-jiatan/Manifest
+++ b/sec-keys/openpgp-keys-jiatan/Manifest
@@ -1,3 +1,3 @@
 DIST jia_tan_pubkey.txt 3143 BLAKE2B 1e0cc16ffabc11e341c733c09b7bc9571e3d2209f2387f27905adc153eff763d8ab9929cee5bfda86d30f05d1fd1e5ae3d2087679f17fc8f8288b094572cc596 SHA512 556bda914f966fe7b72105b475b59231254256f860ec28f5606ffb3df34884621f365c95eb881c74a2ff5434a8e45efa3e6bbc8cb9d8147dccc608566ddefeb7
-EBUILD openpgp-keys-jiatan-20230505.ebuild 539 BLAKE2B ec88d8af9d6c3c92f4028be1ab72a75b4ab1f978a31682e340bb5d1b1249f80d8c33807f3e1b3fc68c568aadd454985ccb9d64761a45a577bbf7410fedc8de24 SHA512 65912156e95f0b46638e57602ca39e4f12a84095c1a6240f3eb39890e4b01929cce1067ff72312d1aab21abb5c0b76aeb009493f20fb6daaf616db94b92afbb0
+EBUILD openpgp-keys-jiatan-20230505.ebuild 537 BLAKE2B cbc928a5d3152e35a9a3e732f1b6dfe596677813ea19630b8e96211d5484a79cbb624bea7c5020fcaa807f28c297b9c150fd3d5aea61f933de7ed66040441d7f SHA512 775e28dda3882f0f71c99a376c2dcc792743f88b2591cd8b272d244881e6873d2bbc55423d6c503dff888872dd7eafd841ea6aedb34289cf3d2273d2675d133d
 MISC metadata.xml 282 BLAKE2B 85c3312405ada57a85e03b06a59523c8d4069551f91e6b70f182d5af92ffc26b946c2987554001649eb41d605864a5cb3c172ebbb02f3c1a11ca1ed805889550 SHA512 5eac09aed8093684086d644c321b236d5da019a650ad322d33236b543bd5641edfc43cbdeee4654e093f9f6393eae034110ca51eb560b87a178fba74244d7fdb
diff --git a/sec-keys/openpgp-keys-jiatan/openpgp-keys-jiatan-20230505.ebuild b/sec-keys/openpgp-keys-jiatan/openpgp-keys-jiatan-20230505.ebuild
index 4c7ed6e765b2..77e97f98561c 100644
--- a/sec-keys/openpgp-keys-jiatan/openpgp-keys-jiatan-20230505.ebuild
+++ b/sec-keys/openpgp-keys-jiatan/openpgp-keys-jiatan-20230505.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sec-keys/openpgp-keys-midipix/Manifest b/sec-keys/openpgp-keys-midipix/Manifest
index c88accd15a96..927b08732da2 100644
--- a/sec-keys/openpgp-keys-midipix/Manifest
+++ b/sec-keys/openpgp-keys-midipix/Manifest
@@ -1,3 +1,3 @@
 DIST openpgp-keys-midipix-20210426-6482133FE45A8A91EEB0733716997AE880F70A46.asc 5316 BLAKE2B f1ab82aad33fa2a2ccb8954a87caaf07d90533c087f80473bd83b739cab1d4573c0ddf88c04dab92e2f430c7bcc34ffe91adcd37ec29fccc5ee2d8ab44ca003b SHA512 4dc51f065f24851736d574497e19f05eabd21ba3b4d9449f0c723f4b956b5303813118e7ac1420278c60328ba98e95d0020cb95058a1e9f02aa845e0d80be9d3
-EBUILD openpgp-keys-midipix-20210426.ebuild 661 BLAKE2B d6d3d8a78eac8d96cee0c6124911752d10e3868c436e19f86a9395bc9f603394e6beccbdea4fc42413f47acd9f5c4a4800aab1dfb293539396b7e509bc9572bf SHA512 57f7579966616f1c87700598804b5f29a48be7bd4479bfea0c5f63d0cf8370ffbc4f5e675129d780b01087d88c4f4037cc2d3abcc9460e7810c6ad0e11ee1107
+EBUILD openpgp-keys-midipix-20210426.ebuild 659 BLAKE2B bdc87c3874828e6e38e232a5ee9fcde46cbd8013f9f0aa392b614d53d622dbca9064859c88decbee3c2ad29835ec5e493554d7719a586f418bb41211d73136f3 SHA512 fa283c9642a8a4a89fb9bd892399b321b4c067824e9d20c40a7366102653a7bbad5b6314379cb7c3ffe5685d34cd2c8db8384cd5b9a5bff97c1403630f833de1
 MISC metadata.xml 264 BLAKE2B 630ac0044f623dc63de725aae23da036b649a2d65331c06fbe9eb66d18ad1a4d3fd804cdffc4703500662b01272063af346680d2550f2fb6a262d6acee8c6789 SHA512 3cf1981080b4a7634537d20a3e837fa802c52ae5ee750531cc4aa3f8478cda78579375602bc058abbd75f9393f9681b79603c3ddd9af809a1e72f7336a708056
diff --git a/sec-keys/openpgp-keys-midipix/openpgp-keys-midipix-20210426.ebuild b/sec-keys/openpgp-keys-midipix/openpgp-keys-midipix-20210426.ebuild
index ba0ff7061ca2..f286e5bf13f6 100644
--- a/sec-keys/openpgp-keys-midipix/openpgp-keys-midipix-20210426.ebuild
+++ b/sec-keys/openpgp-keys-midipix/openpgp-keys-midipix-20210426.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
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 src_install() {
 	local files=(
diff --git a/sec-keys/openpgp-keys-wget/Manifest b/sec-keys/openpgp-keys-wget/Manifest
index be12cc0eb231..43b91e4b5a1a 100644
--- a/sec-keys/openpgp-keys-wget/Manifest
+++ b/sec-keys/openpgp-keys-wget/Manifest
@@ -3,5 +3,5 @@ DIST openpgp-keys-wget-20230313.asc 72073 BLAKE2B e35ed2340caa7a3221cb7abd71a827
 DIST openpgp-keys-wget-20230511.asc 123495 BLAKE2B 9fe3f9a6935cbcec8a8d13f83cb350f8b8be9dbd3dac20db3c7c88cc2b765748e55d59cdaad1a4cb2e0ebbc95a1d7c511ca4e408f941fd3e952b4201fd4ee004 SHA512 92d7de286fcb8bd116542f7c569627467a3a3283d56343cf9293398789339be4cf7a6484734bb554a0604a3451cd7d499cf574b38f808cb93bf5b55414d14952
 EBUILD openpgp-keys-wget-20220407.ebuild 591 BLAKE2B 8fb1f61d7853bfa45611519c9b77a466ef68738605db67dbaeae56b816c77ff9c3a4f7922996f93b84cc778bd8fb9aea6e71eaf7bdfdc9a54aa412471f050523 SHA512 b062e9409d122c45a5ad04bfeb45012549de155ce949892ee6b1e328945b00c2fa738ab8f3b7dfc542bd56ca37d8cbc2639338bd55ca1625d015ebd8e9fa671b
 EBUILD openpgp-keys-wget-20230313.ebuild 591 BLAKE2B e6cb99c012031925221960e8d05c570ebf4522aba5c3fed3e5cbe7a210db6ee430b7beeda526cb76aff6f5804d8cc604d0113a6e1cf00e9d6a3018be646f575b SHA512 4502d49a8af8c49290321d5eabe469bdbc14f84c48fb3dd7120c98c43a8eeb0a966fa8eb149d48858605aa2364f929f202f98ea8e81f008aac01e70a853c8138
-EBUILD openpgp-keys-wget-20230511.ebuild 599 BLAKE2B d2802a49c929fae03ea4fd0c8e42b8b9167109e9eaf73d8d4d608cde8a65c23198a522bbb6b50162e609d2489cdfd2105c1b50555aada7d1270bcd998e8afa94 SHA512 be87636d2b15a6c1a6f1abb18c5536e28d63eb045410b4e3496183eec4c9bfad22079158373e69db768bde53cc6e35cd49b13d7d9f930abd274944385cfec451
+EBUILD openpgp-keys-wget-20230511.ebuild 591 BLAKE2B e6cb99c012031925221960e8d05c570ebf4522aba5c3fed3e5cbe7a210db6ee430b7beeda526cb76aff6f5804d8cc604d0113a6e1cf00e9d6a3018be646f575b SHA512 4502d49a8af8c49290321d5eabe469bdbc14f84c48fb3dd7120c98c43a8eeb0a966fa8eb149d48858605aa2364f929f202f98ea8e81f008aac01e70a853c8138
 MISC metadata.xml 282 BLAKE2B 85c3312405ada57a85e03b06a59523c8d4069551f91e6b70f182d5af92ffc26b946c2987554001649eb41d605864a5cb3c172ebbb02f3c1a11ca1ed805889550 SHA512 5eac09aed8093684086d644c321b236d5da019a650ad322d33236b543bd5641edfc43cbdeee4654e093f9f6393eae034110ca51eb560b87a178fba74244d7fdb
diff --git a/sec-keys/openpgp-keys-wget/openpgp-keys-wget-20230511.ebuild b/sec-keys/openpgp-keys-wget/openpgp-keys-wget-20230511.ebuild
index 5a5999a660d7..64241b925ad8 100644
--- a/sec-keys/openpgp-keys-wget/openpgp-keys-wget-20230511.ebuild
+++ b/sec-keys/openpgp-keys-wget/openpgp-keys-wget-20230511.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2ddd3683c165..b3aac307d84e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index e39574b53876..50f9725a054e 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -3,5 +3,5 @@ DIST dmidecode-3.4.tar.xz 61420 BLAKE2B f9f0429c5128692c2d1d560580552285ea900c1c
 DIST dmidecode-3.5.tar.xz 65068 BLAKE2B 07cc4c069dc1cba36160de158c4d0390df9b77b4192f5847df0756f9e097a7fbc751cd7b5b073df7661267ab78ea0d9be2831d70ddda8d1981c628f3cfee8802 SHA512 690c9bea391f6bbfc8cd48e8db408a61d5b551a07a2823c29d03a09607fc2043cc1bea44ee9fd27fd0e7bc0b287bf9de9f22a1a66053f5b1e63d77c03d93e1ae
 EBUILD dmidecode-3.4-r1.ebuild 1254 BLAKE2B 61d66053e0b1ce8067c8a9ea9f2f4bf73adabbd48de1b3681a0e9f5f87688ec91bd968f373a512df710c94c99992a3577804b106d3a730797b5b026c519de4cc SHA512 db523a6849344cd14fd6df62e29ea2f6d5efd57a4b919848da555c88e65d9ddccb2844f036998c1652a2796c978adc24b51397213432ccfa9620c6003268334e
 EBUILD dmidecode-3.5-r1.ebuild 1254 BLAKE2B 61d66053e0b1ce8067c8a9ea9f2f4bf73adabbd48de1b3681a0e9f5f87688ec91bd968f373a512df710c94c99992a3577804b106d3a730797b5b026c519de4cc SHA512 db523a6849344cd14fd6df62e29ea2f6d5efd57a4b919848da555c88e65d9ddccb2844f036998c1652a2796c978adc24b51397213432ccfa9620c6003268334e
-EBUILD dmidecode-3.5-r2.ebuild 1331 BLAKE2B a50dd318b4597a208946b503c7c71d27b5f92f21db33cb0f051014f7c46fe2143d7232c68fd255ddfe9dff963ca9b178710a19f6b5f568ad56944dc90ddf2fba SHA512 6aaf14f225ac57bf9f444daa9529143e17a931d7002b18b42799177f66cd597de677c5a2a007021b87c737e9e8d2afc2d3e82bfe35c6a69981058bb132dc549f
+EBUILD dmidecode-3.5-r2.ebuild 1330 BLAKE2B f36092eaed66063a5ba80863ae803adb65c280566884f5f34f1ba8842c014b5c203cd6ce6fddddbd598e3237aa6d708f9441805004062a1036383f9702a6ba7c SHA512 4ec7628a10615f19c7bb5e6f85d07a468e0830bb630544ecc565ee2ae48d5ca979c4523f273d5cfb260c82e7ad94dce080f5c0f84941e0099b9a87febc599f28
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/dmidecode/dmidecode-3.5-r2.ebuild b/sys-apps/dmidecode/dmidecode-3.5-r2.ebuild
index d7c7e894b84d..b2ffe976bb4b 100644
--- a/sys-apps/dmidecode/dmidecode-3.5-r2.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="-* ~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 7f8a85ed5510..05bcb58e550d 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -3,5 +3,5 @@ DIST gawk-5.2.1.tar.xz.sig 488 BLAKE2B 5dcdc9ae90d4744a968cc750526a9c1c38915f85c
 DIST gawk-5.2.2.tar.xz 3402872 BLAKE2B 49dd69d3e2414867d60fe42b74b39bc6858114aeeb9305ade7bfd64f1933b3c93d59d127362b614cb4b73e29279ed3b4ea9fa0da94fce98ca9925980d17b5d0c SHA512 90611e4daba7226d5ce8230843bf479dc71c0101740c005d851ef7c5b935b6cd4c42089b858abc1619adc05ed25fc7234f993690a76d2ea0b8e61bcbb7dc5a58
 DIST gawk-5.2.2.tar.xz.sig 488 BLAKE2B ad737580d7eeb556187a3eeb269decb484398ca91b0fbf08da7f78bba92328ca2fb566b00f8e880fb7c5f0f956e49f8ab9fddc73209902c420666d5413e8a467 SHA512 563911c3771feddf64810ef2480705fd470c90380c0e258940cedeef3f15d594ef657ddab267a6d958321333d466b77c9b83be2392549c959245324950fb32ed
 EBUILD gawk-5.2.1.ebuild 3506 BLAKE2B 1363dfbda07f8249a123c3892dd844ca7427d8f506f7b43a22897b5eebc7202535fc28b7bf75db0ae60296c06f36f3b6ae44dd3b672670628f0d7bff2e5a6d6f SHA512 404bc69c26e5b621b0e069eab6639a901d064947ed447eb77f1a720afc1fe3c6fc5401c985ce102b7b39a15d22613adc41af87d3511ced29d72893474b35a3eb
-EBUILD gawk-5.2.2.ebuild 3516 BLAKE2B 92b7450832c583fb7508674c799e3ca467a8a9ba886a0fa3ad5fe1f489cce6f8157b1a771ff473597d95d2b3098dc5e01ab7360a0e0f68e894e749f6ca2ac17e SHA512 2bd928949ce69a5fc77793849749844e3b7420c8fbeeb11a11a693b51f5745d897f84049550cded50f6bfe9b8b0c7e5df9c1996924835444a39c177c3d2762c7
+EBUILD gawk-5.2.2.ebuild 3514 BLAKE2B 2a6c272609c8da33d3bac85cb94484322162b893e4443630210986e01ece7a45b94290a9f9b26f49d770ab468782cbea43e839f6f3303fdb1ad61869746169d3 SHA512 057bc60383001ec95d7046250d27793f91a687e3dacb2758fb1653916679e1ad5ff7c3e19818fa8986fb323e2b100f9563eb6f70750658faa66bca619d6f1fb4
 MISC metadata.xml 654 BLAKE2B e04183a376da2006e727296257a18431f2e4f29fdabcee48edebb1c9dbf099c846af6bfe90d9e551ec4536c2dd034a80b47e6a1b8e442a89c1228929bef7d956 SHA512 9bb5a19c4b9a8ff7669c7ae7320a88d64eb68b4897f06d2046f71efe562a4846cb8c611bcc03b0111dfde19b40275f3357a5cd6285d4d5f0b4464a9c8b3eacb2
diff --git a/sys-apps/gawk/gawk-5.2.2.ebuild b/sys-apps/gawk/gawk-5.2.2.ebuild
index 8b74b93b6779..93ef4711cb84 100644
--- a/sys-apps/gawk/gawk-5.2.2.ebuild
+++ b/sys-apps/gawk/gawk-5.2.2.ebuild
@@ -29,7 +29,7 @@ else
 	SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index 63172c9fafde..c9b3612caddd 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -5,5 +5,5 @@ DIST hwdata-0.371.tar.gz 2340297 BLAKE2B bb92b6d4f66879eacc1efae13ff1a5fe5801461
 EBUILD hwdata-0.367.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
 EBUILD hwdata-0.369.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
 EBUILD hwdata-0.370.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
-EBUILD hwdata-0.371.ebuild 702 BLAKE2B 8734f2398aa66f05a6f68ace57d21a1cb515babef49888824257eb354da537d84f396c38a216ec071b6caa5b38a841c4049e3108d2ffd99cdfbc3bff8c64c045 SHA512 6dffe93d4582d6bd7c50d0a57bc6d067693c897dbd33c1ffc75b514065b64fad66d805d26f69d6af927813920b9ad5072f5a6eda118cb0942d66ec78c1a76088
+EBUILD hwdata-0.371.ebuild 694 BLAKE2B e65d661084c4d61beaf449b8f7b8db5ba3bea6d2ccb93776d93dc077f26f74bcca40e89eafddacac44f67faaa568012c3c01c679bcc5dcb210889356b4d7d81b SHA512 087f7c7157e38023f3f3121237dc930fb69abca7b0523907a01463d011380d0f78d15bb4ace04deb08082af5d03fa7a1371d196ca34e31bc4d14b36e681ea077
 MISC metadata.xml 328 BLAKE2B cf72c9663e944154e41475067b5e89dbfcd50f0c771e17dddfb6042a2ccb10693d7ef6eb7508e9ec7a50cbc59e8e47698030a5c1e18accd79040d4318416eb54 SHA512 f366d006f709fabe624840768aa780982884ba8a74f3ac121e323995e218a577dc5a4d34d9dcbec44571580d388967d78350d4540316444ddaf014b99db804e7
diff --git a/sys-apps/hwdata/hwdata-0.371.ebuild b/sys-apps/hwdata/hwdata-0.371.ebuild
index afddd20d2fd1..b5d599c17b39 100644
--- a/sys-apps/hwdata/hwdata-0.371.ebuild
+++ b/sys-apps/hwdata/hwdata-0.371.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="test"
 
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 27d724d121b0..76afa523971a 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -8,6 +8,6 @@ DIST less-633.tar.gz 375733 BLAKE2B e9df180794af365f86734c6b8fde766c1bba42b11171
 EBUILD less-608-r1.ebuild 1587 BLAKE2B 68675bd30388ab95aa57d8fc90bcd98fc6b27f26e9bd77d193880726fbcb9b141b8d916164bca303b12f330fa88dd62afb93d9eaff23f8b626bbbfb73d5c2bc5 SHA512 f05b649f662a46232fd2ba93335ff906ed7457b4f3581a48d0d273f1744ca39d1cdd90502a1a6e6770cba17091663107a5071b974217485fd1bc3218dfe55537
 EBUILD less-608-r2.ebuild 1634 BLAKE2B 87c9824276ec63f523bef354cdc92a91f6771e43adcf141c8a8e0b6ae20eb2391a15bdd8c37d18527d04135c873fe4330207bcbd331fabf20f7c3e0cbfc03343 SHA512 5f97824ddd3760ddc995d2eff9d915f023e9162a803e1fcc098abc2cd56745b250df1b37646e7cb533c74bbd3436bc4784e70f3cd7cd76716dfe7a32acdc6279
 EBUILD less-632.ebuild 2188 BLAKE2B 3157e4c5b111b0f1b8e1ef9a9a437474f5380af2b6bbc7e1011d102b6d6cefd788fe2c60bb7d272f0fcdf69db0fd1692c66a42bb47b648f94dfe3281ecdebdc6 SHA512 299d40de3ac0c4d3a9321dca6efbc44aad50066fabe324c0e0cea407469adf374b26887cd4ca1347cec99eb6c2037d3fff2e8cbc764d44ee509759b27f588b1e
-EBUILD less-633.ebuild 2196 BLAKE2B 5029b2a8d8dbaa4b10272dd8327ce8c3447729ebbfdf06ac7783a036e03719fe6707039100054c1a9cd4014317b2a1e0f5d6c1baf9c545e9c62963a6115ee9a6 SHA512 7a41769096ec6a680541f67101781672037f688078e02adefcb36a93db2610298ae456482f63d23dfee4ae696fcb090bf127e75783d038d63cf18f95ba10dcb4
+EBUILD less-633.ebuild 2194 BLAKE2B b7261757e810322aa389f42a15f16154796ed18626dfc5031280f93acd52a9a1ac3cef39f2057fdfe455c6709e5f11fa8b18e6d084a420bdf0274089a4c8933e SHA512 fa24c9d0ce41ca8b8fa1a9f51a5df458e57a9978070eeb70472307915f1e2fefce19f9181f94f8a8edeb358368784f4f93b9a59413f48d31266dde7ec04e4aec
 EBUILD less-9999.ebuild 2196 BLAKE2B 5029b2a8d8dbaa4b10272dd8327ce8c3447729ebbfdf06ac7783a036e03719fe6707039100054c1a9cd4014317b2a1e0f5d6c1baf9c545e9c62963a6115ee9a6 SHA512 7a41769096ec6a680541f67101781672037f688078e02adefcb36a93db2610298ae456482f63d23dfee4ae696fcb090bf127e75783d038d63cf18f95ba10dcb4
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/less-633.ebuild b/sys-apps/less/less-633.ebuild
index 40f831510273..5516c5c8127f 100644
--- a/sys-apps/less/less-633.ebuild
+++ b/sys-apps/less/less-633.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}"/${MY_P/?beta}
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
 if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="pcre"
 # As of 623_beta, lesstest is not included in dist tarballs
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 147b488b3aff..7d8294ec2b08 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -5,7 +5,10 @@ AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085
 AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1
 AUX shadow-4.13-CVE-2023-29383.patch 3022 BLAKE2B 7ad4eeef9bbaf49b8388b7bbcfd2b814ed8862056242085d7261064f7447e610f3476cb45fb57acbe0b5eb1486389bdf93dcc196853c7fe4555750d2c0dcd1c8 SHA512 dd042d4be4dcbcdf63293598530225454cc7818e7ed6c59ab00fb19517b8ec503f6f82de0d347cc03dfcd1d65a1f65f623181838710db6d4fec84b14d7ffe530
 AUX shadow-4.13-configure-clang16.patch 1129 BLAKE2B 701c7e417c57265d9a7a2ee8eb6620ef6846018de24edacc04d0d4f63ff2e7e0a67382c459003d2bfa11e4dd3a49a227464315a4ef115da58c27889d7bdd7226 SHA512 057ea8a546953bea88ecb0b787b37d24113ea4881a9f86e55318647f85f8b56e204dbf3815811897d0cad2a8e50427c9fa84b6389e332e26c8cacc690835a942
+AUX shadow-4.13-password-leak.patch 5271 BLAKE2B 9f47502e0463e7c00d29c0a42071c49a23e82364d244a9fd61358c605f68bc30beb22fe501f9db19cadfa0c658bd46ddd777cdae058b500d70e9443263ca5f0b SHA512 40a7259467bd63d691e46f59e53348150d4b0f806375144cff9c51a28c95c9bc8c43da76245afb7f4cbfa292e7e19d43458290fe14bd32c985f844de64c76e61
+AUX shadow-4.13-usermod-prefix-gid.patch 1206 BLAKE2B 8efa85ab6c4eee199b5cd21f706d39910393ae9f2bd8af9a2e49d058be6ec41bd37d1624ec85a94b6adb24597bc599f3b0e624286c10aa8b1e0022795cd1b89a SHA512 e38332b073497f53ccafff1d8c31910b3d9b692ac267758536585499f6ce68bed45097558689f3dbda6ddeaf762bf20072de6124ef053fbe807aa3543553142f
 DIST shadow-4.13.tar.xz 1762908 BLAKE2B 315ab8a7e598aeefb50c11293e20cfa0982c3c3ae21c35ae243d09a4facf97a13c1d672990876e74ef94f5284402acf14997663743e2aaefa6cfc4369b7d24dc SHA512 2949a728c3312bef13d23138d6b79caf402781b1cb179e33b5be546c1790971ec20778d0e9cd3dbe09691d928ffcbe88e60da42fab58c69a90d5ebe5e3e2ab8e
 DIST shadow-4.13.tar.xz.asc 488 BLAKE2B de1f8285c5713a772343a2a7c638d1d13429dd4fa867d4f91d4922aa0d083b4a3110d38e8a8ab82137fdf4fecb12ba3677f3fb235401fc6438ae663fbd9bfbd2 SHA512 f8549c4e699c65721d53946d61b6127712572f7ad9ee13018ef3a25307002992aa727471c948d1bb22dcddf112715bed387d28f436123f30e153ae6bc0cd3648
 EBUILD shadow-4.13-r3.ebuild 6691 BLAKE2B d0c7fc3f67abff01e1d4e837e48070f7e2ffb9d1c207ddfa0473fce913f5696dad249392a86d4c0e7f4d2d549544b2496707d5070138eee3a2921c102b385197 SHA512 933cf33c7134e40bd1d3f8802590605a2df5c0c6943358098b9e7cb62a97e7f89e4aa8a903a92c64182f92aca888dbbd2c326b8ea4eb5501f2805c36f70c74ef
+EBUILD shadow-4.13-r4.ebuild 6780 BLAKE2B d2b3959e69149603a2d6463e079518f015391dd68516f7ebd6cfb896011b9aaf5396f46f62a2a605ca61e76dcc1f2253804d03f8c6aee8b463ab288e655d7674 SHA512 60976e91c3bd9bf5dae03ddd32cdbd713139cb1abfe784e29ce9e15e24ea1b1a899d78604667268e85fadd86143fca8a055f68b60de648ea49d3641a78af5dc7
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/files/shadow-4.13-password-leak.patch b/sys-apps/shadow/files/shadow-4.13-password-leak.patch
new file mode 100644
index 000000000000..25b5ec39c5f8
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.13-password-leak.patch
@@ -0,0 +1,135 @@
+https://github.com/shadow-maint/shadow/commit/65c88a43a23c2391dcc90c0abda3e839e9c57904
+
+From 65c88a43a23c2391dcc90c0abda3e839e9c57904 Mon Sep 17 00:00:00 2001
+From: Alejandro Colomar <alx@kernel.org>
+Date: Sat, 10 Jun 2023 16:20:05 +0200
+Subject: [PATCH] gpasswd(1): Fix password leak
+
+How to trigger this password leak?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When gpasswd(1) asks for the new password, it asks twice (as is usual
+for confirming the new password).  Each of those 2 password prompts
+uses agetpass() to get the password.  If the second agetpass() fails,
+the first password, which has been copied into the 'static' buffer
+'pass' via STRFCPY(), wasn't being zeroed.
+
+agetpass() is defined in <./libmisc/agetpass.c> (around line 91), and
+can fail for any of the following reasons:
+
+-  malloc(3) or readpassphrase(3) failure.
+
+   These are going to be difficult to trigger.  Maybe getting the system
+   to the limits of memory utilization at that exact point, so that the
+   next malloc(3) gets ENOMEM, and possibly even the OOM is triggered.
+   About readpassphrase(3), ENFILE and EINTR seem the only plausible
+   ones, and EINTR probably requires privilege or being the same user;
+   but I wouldn't discard ENFILE so easily, if a process starts opening
+   files.
+
+-  The password is longer than PASS_MAX.
+
+   The is plausible with physical access.  However, at that point, a
+   keylogger will be a much simpler attack.
+
+And, the attacker must be able to know when the second password is being
+introduced, which is not going to be easy.
+
+How to read the password after the leak?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Provoking the leak yourself at the right point by entering a very long
+password is easy, and inspecting the process stack at that point should
+be doable.  Try to find some consistent patterns.
+
+Then, search for those patterns in free memory, right after the victim
+leaks their password.
+
+Once you get the leak, a program should read all the free memory
+searching for patterns that gpasswd(1) leaves nearby the leaked
+password.
+
+On 6/10/23 03:14, Seth Arnold wrote:
+> An attacker process wouldn't be able to use malloc(3) for this task.
+> There's a handful of tools available for userspace to allocate memory:
+>
+> -  brk / sbrk
+> -  mmap MAP_ANONYMOUS
+> -  mmap /dev/zero
+> -  mmap some other file
+> -  shm_open
+> -  shmget
+>
+> Most of these return only pages of zeros to a process.  Using mmap of an
+> existing file, you can get some of the contents of the file demand-loaded
+> into the memory space on the first use.
+>
+> The MAP_UNINITIALIZED flag only works if the kernel was compiled with
+> CONFIG_MMAP_ALLOW_UNINITIALIZED.  This is rare.
+>
+> malloc(3) doesn't zero memory, to our collective frustration, but all the
+> garbage in the allocations is from previous allocations in the current
+> process.  It isn't leftover from other processes.
+>
+> The avenues available for reading the memory:
+> -  /dev/mem and /dev/kmem (requires root, not available with Secure Boot)
+> -  /proc/pid/mem (requires ptrace privileges, mediated by YAMA)
+> -  ptrace (requires ptrace privileges, mediated by YAMA)
+> -  causing memory to be swapped to disk, and then inspecting the swap
+>
+> These all require a certain amount of privileges.
+
+How to fix it?
+~~~~~~~~~~~~~
+
+memzero(), which internally calls explicit_bzero(3), or whatever
+alternative the system provides with a slightly different name, will
+make sure that the buffer is zeroed in memory, and optimizations are not
+allowed to impede this zeroing.
+
+This is not really 100% effective, since compilers may place copies of
+the string somewhere hidden in the stack.  Those copies won't get zeroed
+by explicit_bzero(3).  However, that's arguably a compiler bug, since
+compilers should make everything possible to avoid optimizing strings
+that are later passed to explicit_bzero(3).  But we all know that
+sometimes it's impossible to have perfect knowledge in the compiler, so
+this is plausible.  Nevertheless, there's nothing we can do against such
+issues, except minimizing the time such passwords are stored in plain
+text.
+
+Security concerns
+~~~~~~~~~~~~~~~~
+
+We believe this isn't easy to exploit.  Nevertheless, and since the fix
+is trivial, this fix should probably be applied soon, and backported to
+all supported distributions, to prevent someone else having more
+imagination than us to find a way.
+
+Affected versions
+~~~~~~~~~~~~~~~~
+
+All.  Bug introduced in shadow 19990709.  That's the second commit in
+the git history.
+
+Fixes: 45c6603cc86c ("[svn-upgrade] Integrating new upstream version, shadow (19990709)")
+Reported-by: Alejandro Colomar <alx@kernel.org>
+Cc: Serge Hallyn <serge@hallyn.com>
+Cc: Iker Pedrosa <ipedrosa@redhat.com>
+Cc: Seth Arnold <seth.arnold@canonical.com>
+Cc: Christian Brauner <christian@brauner.io>
+Cc: Balint Reczey <rbalint@debian.org>
+Cc: Sam James <sam@gentoo.org>
+Cc: David Runge <dvzrv@archlinux.org>
+Cc: Andreas Jaeger <aj@suse.de>
+Cc: <~hallyn/shadow@lists.sr.ht>
+Signed-off-by: Alejandro Colomar <alx@kernel.org>
+--- a/src/gpasswd.c
++++ b/src/gpasswd.c
+@@ -898,6 +898,7 @@ static void change_passwd (struct group *gr)
+ 		erase_pass (cp);
+ 		cp = agetpass (_("Re-enter new password: "));
+ 		if (NULL == cp) {
++			memzero (pass, sizeof pass);
+ 			exit (1);
+ 		}
+ 
diff --git a/sys-apps/shadow/files/shadow-4.13-usermod-prefix-gid.patch b/sys-apps/shadow/files/shadow-4.13-usermod-prefix-gid.patch
new file mode 100644
index 000000000000..50cbe699d15e
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.13-usermod-prefix-gid.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/903083
+https://github.com/shadow-maint/shadow/pull/691
+https://github.com/shadow-maint/shadow/commit/bd2d0079c90241f24671a7946a3ad175dc1a3aeb
+
+From fcb04de38a0ddc263288a1c450b35bfb1503d523 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 25 Mar 2023 21:16:55 -0400
+Subject: [PATCH] usermod: respect --prefix for --gid option
+
+The --gid option accepts a group name or id. When a name is provided, it
+is resolved to an id by looking up the name in the group database
+(/etc/group).
+
+The --prefix option overides the location of the passwd and group
+databases. I suspect the --gid option was overlooked when wiring up the
+--prefix option.
+
+useradd --gid already respects --prefix; this change makes usermod
+behave the same way.
+
+Fixes: b6b2c756c91806b1c3e150ea0ee4721c6cdaf9d0
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+--- a/src/usermod.c
++++ b/src/usermod.c
+@@ -1072,7 +1072,7 @@ static void process_flags (int argc, char **argv)
+ 				fflg = true;
+ 				break;
+ 			case 'g':
+-				grp = getgr_nam_gid (optarg);
++				grp = prefix_getgr_nam_gid (optarg);
+ 				if (NULL == grp) {
+ 					fprintf (stderr,
+ 					         _("%s: group '%s' does not exist\n"),
diff --git a/sys-apps/shadow/shadow-4.13-r4.ebuild b/sys-apps/shadow/shadow-4.13-r4.ebuild
new file mode 100644
index 000000000000..aa20387a875e
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.13-r4.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Upstream sometimes pushes releases as pre-releases before marking them
+# official. Don't keyword the pre-releases!
+# Check https://github.com/shadow-maint/shadow/releases.
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sergehallyn.asc
+inherit libtool pam verify-sig
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="https://github.com/shadow-maint/shadow"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz.asc )"
+
+LICENSE="BSD GPL-2"
+# Subslot is for libsubid's SONAME.
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+REQUIRED_USE="?? ( cracklib pam )"
+
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl:= )
+	audit? ( >=sys-process/audit-2.6:= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:= )
+	nls? ( virtual/libintl )
+	pam? ( sys-libs/pam:= )
+	skey? ( sys-auth/skey:= )
+	selinux? (
+		>=sys-libs/libselinux-1.28:=
+		sys-libs/libsemanage:=
+	)
+	xattr? ( sys-apps/attr:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.14
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	!<sys-apps/man-pages-5.11-r1
+	!=sys-apps/man-pages-5.12-r0
+	!=sys-apps/man-pages-5.12-r1
+	nls? (
+		!<app-i18n/man-pages-it-5.06-r1
+		!<app-i18n/man-pages-ja-20180315-r1
+		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
+	)
+	pam? ( >=sys-auth/pambase-20150213 )
+	su? ( !sys-apps/util-linux[su(-)] )
+"
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+	verify-sig? ( sec-keys/openpgp-keys-sergehallyn )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure-clang16.patch
+	"${FILESDIR}"/${P}-CVE-2023-29383.patch
+	"${FILESDIR}"/${P}-usermod-prefix-gid.patch
+	"${FILESDIR}"/${P}-password-leak.patch
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-account-tools-setuid
+		--disable-static
+		--with-btrfs
+		--without-group-name-max-length
+		--without-tcb
+		$(use_enable nls)
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with bcrypt)
+		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
+		$(use_with pam libpam)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with su)
+		$(use_with xattr attr)
+	)
+
+	econf "${myeconfargs[@]}"
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=${1} val=${2}
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
+	emake DESTDIR="${D}" -C man install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	if use split-usr ; then
+		# move passwd to / to help recover broke systems #64441
+		# We cannot simply remove this or else net-misc/scponly
+		# and other tools will break because of hardcoded passwd
+		# location
+		dodir /bin
+		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+		dosym ../../bin/passwd /usr/bin/passwd
+	fi
+
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chsh chfn ; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chpasswd newusers ; do
+			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
+		done
+
+		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
+
+		# Comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
+		# Remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man -type f \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd} || die
+		if use su ; then
+			rm "${ED}"/etc/pam.d/su || die
+		fi
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man -type f \
+		'(' -name id.1 -o -name getspnam.3 ')' \
+		-delete || die
+
+	if ! use su ; then
+		find "${ED}"/usr/share/man -type f -name su.1 -delete || die
+	fi
+
+	cd "${S}" || die
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Missing entries from /etc/passwd can cause odd system blips.
+	# See bug #829872.
+	if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then
+		ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
+	fi
+
+	# Enable shadow groups.
+	if [[ ! -f "${EROOT}"/etc/gshadow ]] ; then
+		if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
+			grpconv -R "${EROOT:-/}"
+		else
+			ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	[[ ! -f "${EROOT}"/etc/subgid ]] &&
+		touch "${EROOT}"/etc/subgid
+	[[ ! -f "${EROOT}"/etc/subuid ]] &&
+		touch "${EROOT}"/etc/subuid
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 2faf79709022..304a7abc8010 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 3307d7d9313d..05e9591675c8 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST autotools-wrappers-at-20221207.tar.gz 3646 BLAKE2B 82bec40e03ae5ec133252fd3c05c3fed537bb415e800918df9c9d783d48a9d76cbe60c53dd7daf6d94653d79fc52be8c089183dda996e8a72dd03ffa83098613 SHA512 12ea99721e6fc60a3ed7351d6c228aaf6e4eef0bd0444eda8cd742f74fa91150ef07bb52f6bcad4a350269e8032f5d4e204d2f2108b0d9c441ddd7f9755862b7
-EBUILD autoconf-wrapper-20221207-r1.ebuild 1202 BLAKE2B acddd203aeb1ac28f474b5d0b414db0f2a486fd0abf97b7b12d8e3fde4d351db106b4d4884472637b1aa87d1427445c3519bf92ed099c06e53c07ad21da09c00 SHA512 347c990481d24e892b4c775a181c04f2a0349de7a9b36970f74dbda45239e196168327c15db61e9fd32a8098195ebbc1b000740709cdb1b9332cb2a151ebc8a1
+EBUILD autoconf-wrapper-20221207-r1.ebuild 1194 BLAKE2B 86596d540b375e4b7e75bf7e6a28e43b471f9d7a053e1cf91e73521d92ace5e47fc04bfaf27968106d79cf06b1c32b8e458c43fac7464c69aa39f22fc51f1f19 SHA512 f2540eea9bfe89de49c41b5d35748696eb786f64601e304b659d7da252ef5e2a98fcc7b82af20dfe5f86885a6880dbcd4529dbf161cdfed03302f6c5933f9235
 EBUILD autoconf-wrapper-20221207.ebuild 1024 BLAKE2B 6bc00dfd4936efe1cbf77abe56423bbc4d82e90dfa671409778fc41d1fdb2582aed9d391167c4a96f419cbdcef49601bb44233e56fa0b0876997decc5d62820b SHA512 b592ebf31e139c37c074f60ce4b96052ac89ec7a5548420ba3e76014f438eb6624190b807b4b324447e19a237564ae85e45fa5a1f02dc5228d3944d782443712
 EBUILD autoconf-wrapper-99999999.ebuild 1202 BLAKE2B acddd203aeb1ac28f474b5d0b414db0f2a486fd0abf97b7b12d8e3fde4d351db106b4d4884472637b1aa87d1427445c3519bf92ed099c06e53c07ad21da09c00 SHA512 347c990481d24e892b4c775a181c04f2a0349de7a9b36970f74dbda45239e196168327c15db61e9fd32a8098195ebbc1b000740709cdb1b9332cb2a151ebc8a1
 MISC metadata.xml 435 BLAKE2B 006f03645ce3cb9a4f7cad6411f3487500f58f351bbacfb6e1e3de494214fccb8b478a2cea35d289ee0a487fa7eaf31ca444cbf82d1d9eeee1822928e223009b SHA512 3b699336ca3dbf40bcfddb1db91f8d3803574c9c6765b477b93e50d756ac3c441e5bedfbbc71fcbea697a2f31b9a41fcbbb01a38d5acc8d29b48779a405f8f6c
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild
index 91dc59284670..893b84bce967 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 5eac1e09535d..10efb5a9e9ee 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,19 +1,5 @@
-AUX gdb-12.1-configure-clang16.patch 2893 BLAKE2B 15079fc458db3f57a99340800afccebb03a4d3067a9f14e44b8915588dc7c4f528047601d9c53257ea1e84a4b3b2eb17de08c43cc45334176e5cb37ccda0438e SHA512 c55b9afdaea5f482ceef34263b08ecda96109fa55208b2eca744734a29b4b364d44384e4e15b3a625fed6e781abe77775ead7773f1544371893f2a80ff2016d6
-AUX gdb-12.1-core-file-detach.patch 5853 BLAKE2B 4442a9d6357f751f9953236a068ffc5e8a1f57eef1bf9e118d572614164486197db44cb6e5f1ab20906ae97ca1c4805a01ce5c2c3cbd1509bb383c108b6b8b1e SHA512 e044053dec340e6373b4a3546adf36ea121bb63a5277d6a1f24f5551edb0cf408f3f862076d6760b27501d54025063afd4a9375914c3f2321f5410466a89f75b
-AUX gdb-12.1-readline-8.2-build.patch 926 BLAKE2B f483dd1054b019d44dd4731ba22113551d3530a9da1af8c5e83aeae3ba820d96b8a1c2cb7758ecc3fbe8a56cdc7232cdece809d15c30dbfffadc30d81738a7ca SHA512 f865349953181fe3502abbe6042ebab249e2ebbc4c0017ebad756aadfd63e72f57b009fe2e7d036543f326e54518a656101bef572d03a7a7170c9ec305807ed8
-AUX gdb-13.1-Wenum-constexpr-conversion-clang16.patch 5795 BLAKE2B 22f8d242a13f7068ffe367d945be320e3f5e289adcfd60de24bcf53eb90a2b2334b7f3c71e3ab323064b64eb1a3b19f707fa70ab9e725d8391d05ea5d3e25035 SHA512 87c121615e6bf535c4a5988fcdc8214d8e2ddb6cd48eafd314ba963f57d9d1ac0f77b73e71e63e9cb16224d304b30baf78c7ef541b19f40b0dee796d3d640aef
-AUX gdb-13.1-musl-lfs.patch 808 BLAKE2B 5379e315f551ff8aa02f812afd7d9987970a6f495c454f61e56a831989f3b793fcb0d4e2f5eb0f49b83c00971cd79d8f267e2e64d8f5625ebea3d2da59485534 SHA512 3103a3fe48368171545dcbacaa2be0cb9e25494121a0056dbff75d7ebd459e98e0bf5e81a16916ce82b119101bd6aa0c81f71630c5c13da65b7adadf4a85ae81
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
-DIST gdb-12.1-patches-1.tar.xz 12340 BLAKE2B 071ff492f6cf7b0969d76db6f7414eeec564daf773c3334fb0d3f669e328bb4ae403ba8c709f3e33a56caa92273f762a5597a34dd7e7a1056f473b7ede2d8e59 SHA512 dc4a1a8d501dd1adfdcd6dcbd2559f1e2cc6aadeb18eacb2e9152f6858510e7392253db9568fe782da6d160221412e3e13dfd42a47a2a4a1addba2c1804a45b5
-DIST gdb-12.1.tar.xz 22470332 BLAKE2B 7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd SHA512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d
-DIST gdb-13.1.tar.xz 23665472 BLAKE2B ab3a77ef35d21597dd1299787eebc422c3ca9764d0866223752c3036c0f9e198bf25ab4730bf6e7025bc2db148c66e98b191e15abc2d69c3088aed146728beef SHA512 e65054ffbc0357eeed4b17e1edc5ef45aa73c9ddf3b1210651e3d859576e27c1d27b266800fe26328eda58857455ccd8632f4000cfc5f63f90854096290187ca
 DIST gdb-13.2.tar.xz 23664644 BLAKE2B bf5216ba2286448a46f9e0a405367c5a678e6d7540204722d355b618018b7b75a2ebc5b51353304c5ded02a3979223a81781d305f5afa5be82516cdc2863d49f SHA512 8185d3e11ab60dafff5860a5016577bfe7dd7547ef01ebc867bc247603d82b74ff74c4f29492c7d2aee57076f52be33e289f4c6b414a4b870d4b3004909f4c34
-DIST gdb-weekly-13.1.90.20230325.tar.xz 24816144 BLAKE2B 2273ca1e6b3b563721c1497b30ae9c1c1d6fa88d1a50745a528163d54b45cc0582d3a053f279339dcc5d86b17dabe16c2be63488ac72ed7636af5988919c4b5e SHA512 19a1f1e0d4fc6f7a87c421e487990e3bc6c5ad5fae933be0e4f0ba8eec06b6bc3b0fc814d55e6059dfc2b7414ef0e7191967503dd0eda9021ccabc6d55030f49
-DIST gdb-weekly-13.1.90.20230429.tar.xz 24806568 BLAKE2B 537faf7f354ac8adae879899d1a871a303d6ef8faa5ffa66970b2ab95d82750829de5f1cc9b7fb0aab12bb9f10219b3d255a52127e50dd28fef25b47ce2d9364 SHA512 1f0bad14a0862a5c119971025add895b8814421c95ab9095159382805ee8592f1695e84aad2bf5f711c807400eae50a9a6fa6ff45f329c885003f0209c44e493
-EBUILD gdb-12.1-r4.ebuild 8106 BLAKE2B b6a20b1ae36bdceb5373d73363ff17ed194cfdb6f77876ff8de95d783c35446ece3ea87e10001f97eb62a1901e4910bb5f33f28a9d6c81f21b9e4e43cdf32d05 SHA512 c8b44d109e4a5ef7fc6cd904d2dea066e07445896b84e50b08f7644a09a0c17d8d00811083d96be2a82d36b15c622746ebb34e2016243570d7930adba0dfc134
-EBUILD gdb-13.1-r1.ebuild 8342 BLAKE2B 8f73f337ab6eb6cd9488f6e40adb24983a9179214d311dc196eb856fb58ad0562dc5a12569c34e77df91087fa770c09d3767abd10be170a503e47bccf1c847c4 SHA512 126021123b282594ac9e3b13b178ef78e0e4e23e1da7c38bff81cad659f2773e5de445f6556a2c4c55b8a542f079d1c05be66950259c1f95d0f17588ca20b2f4
-EBUILD gdb-13.1.90_p20230325.ebuild 8714 BLAKE2B fe0f4d620fed5bb3686f32a7fc075efa6fdec2c0764bf8a58432e32a1647f23ee785f23c78f426826f8b7fdc04ee5900b377abfafe061875ec2c5f24d8edfe1e SHA512 44c394daaa9ab38178f7c5c35201041fc640491c17d222d80056ee57e949790595fe5935c86805fd3f562fe0aa9f9a691c30aebc65b6ef3be61bea87831472be
-EBUILD gdb-13.1.90_p20230429.ebuild 8763 BLAKE2B 6341c8ac37a0a4f55b2c3201937e40e05820064e2621b1c465753ecc438d006b1d67fd7efcf65121123b397d2ed29408d3341e35ed7e0e6277a120f58ff0a48f SHA512 942a023cb2d6c755b891c771aa1fb7cf6c15a67b901964f92dc29de6ca8b6cb9149c0967d8976c4136ff5bd7eb33ad75517266e47fe7f1e968a1ee03f7c8b139
 EBUILD gdb-13.2.ebuild 8648 BLAKE2B f5d2ab303fb9fbbbe83aa34627418d9d68715336b2ca4dc7a599e978dfc5dcb5b4c514fba37ec7c8dbb3dd74171a2670b232379593612f1e7f691783b1d7f9af SHA512 9fe1903c5705560be32886cb590454e93bb9bd0f5ad0dbb67379c728e5693b3535fad78dcccbe84171da06317a2d07260c354377f9cfe65e9a74d0f125cb0c7d
 EBUILD gdb-9999.ebuild 8656 BLAKE2B 1cae4462b766233d95bb582c5f9a55237b779285f9aa72b9d361331014eda3f608cab2435182b566acb34ed7ee326b9b4b406ba516bd6a58cac53824b3195f5b SHA512 a1e45f5ed2e6fd5e85a6447e69280d325465c71eb10772efc794e8c8b262ad78e41bce944cb8132fead0e57d4dd2a4715b075c50ae6c1d2bfc8c30bdf85feb9c
 MISC metadata.xml 1242 BLAKE2B 368d8798d7d3b610653f635eb36ee5517912e8a2cb392622b32ac0aa90f336e3b391ba25811dee110644e50fabec0d64f6bcf3b219cdd240ec806e709a198eed SHA512 192fa340899680413c3d6c886ecd7d2262475a33aecc452192e5fe1d8e3eb5cf17546e57181e720128cf9b39cd8e4b1b1a73cb1f0c9887866c0ce88b288636e2
diff --git a/sys-devel/gdb/files/gdb-12.1-configure-clang16.patch b/sys-devel/gdb/files/gdb-12.1-configure-clang16.patch
deleted file mode 100644
index 3b2c15de4895..000000000000
--- a/sys-devel/gdb/files/gdb-12.1-configure-clang16.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0075c53724f78c78aa1692cc8e3bf1433eeb0b9f
-https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=885b6660c17fb91980b5682514ef54668e544b02
-https://bugzilla.redhat.com/show_bug.cgi?id=2143992
-
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Keith Seitz <keiths@redhat.com>
-Date: Tue, 29 Nov 2022 13:43:34 -0800
-Subject: gdb-rhbz2143992-libiberty-fix-c89isms-in-configure.patch
-
-;; libiberty: Fix C89-isms in configure tests
-;; (Florian Weimer, RHBZ 2143992)
-
-    libiberty/
-
-            * acinclude.m4 (ac_cv_func_strncmp_works): Add missing
-            int return type and parameter list to the definition of main.
-            Include <stdlib.h> and <string.h> for prototypes.
-            (ac_cv_c_stack_direction): Add missing
-            int return type and parameter list to the definitions of
-            main, find_stack_direction.  Include <stdlib.h> for exit
-            prototype.
-            * configure: Regenerate.
-
---- a/libiberty/acinclude.m4
-+++ b/libiberty/acinclude.m4
-@@ -24,6 +24,8 @@ AC_CACHE_CHECK([for working strncmp], ac_cv_func_strncmp_works,
- [AC_TRY_RUN([
- /* Test by Jim Wilson and Kaveh Ghazi.
-    Check whether strncmp reads past the end of its string parameters. */
-+#include <stdlib.h>
-+#include <string.h>
- #include <sys/types.h>
- 
- #ifdef HAVE_FCNTL_H
-@@ -51,7 +53,8 @@ AC_CACHE_CHECK([for working strncmp], ac_cv_func_strncmp_works,
- 
- #define MAP_LEN 0x10000
- 
--main ()
-+int
-+main (void)
- {
- #if defined(HAVE_MMAP) || defined(HAVE_MMAP_ANYWHERE)
-   char *p;
-@@ -157,7 +160,10 @@ if test $ac_cv_os_cray = yes; then
- fi
- 
- AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
--[AC_TRY_RUN([find_stack_direction ()
-+[AC_TRY_RUN([#include <stdlib.h>
-+
-+int
-+find_stack_direction (void)
- {
-   static char *addr = 0;
-   auto char dummy;
-@@ -169,7 +175,9 @@ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
-   else
-     return (&dummy > addr) ? 1 : -1;
- }
--main ()
-+
-+int
-+main (void)
- {
-   exit (find_stack_direction() < 0);
- }],
---- a/libiberty/configure
-+++ b/libiberty/configure
-@@ -6918,7 +6918,10 @@ else
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--find_stack_direction ()
-+#include <stdlib.h>
-+
-+int
-+find_stack_direction (void)
- {
-   static char *addr = 0;
-   auto char dummy;
-@@ -6930,7 +6933,9 @@ find_stack_direction ()
-   else
-     return (&dummy > addr) ? 1 : -1;
- }
--main ()
-+
-+int
-+main (void)
- {
-   exit (find_stack_direction() < 0);
- }
-@@ -7755,6 +7760,8 @@ else
- 
- /* Test by Jim Wilson and Kaveh Ghazi.
-    Check whether strncmp reads past the end of its string parameters. */
-+#include <stdlib.h>
-+#include <string.h>
- #include <sys/types.h>
- 
- #ifdef HAVE_FCNTL_H
-@@ -7782,7 +7789,8 @@ else
- 
- #define MAP_LEN 0x10000
- 
--main ()
-+int
-+main (void)
- {
- #if defined(HAVE_MMAP) || defined(HAVE_MMAP_ANYWHERE)
-   char *p;
-
diff --git a/sys-devel/gdb/files/gdb-12.1-core-file-detach.patch b/sys-devel/gdb/files/gdb-12.1-core-file-detach.patch
deleted file mode 100644
index c0f8a8ee0269..000000000000
--- a/sys-devel/gdb/files/gdb-12.1-core-file-detach.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=0fe74cb9ad35add9c6da4df5c9879f254d918a6a
-
-From: Pedro Alves <pedro@palves.net>
-Date: Wed, 22 Jun 2022 18:44:37 +0100
-Subject: [PATCH] Fix core-file -> detach -> crash (corefiles/29275)
-
-After loading a core file, you're supposed to be able to use "detach"
-to unload the core file.  That unfortunately regressed starting with
-GDB 11, with these commits:
-
- 1192f124a308 - gdb: generalize commit_resume, avoid commit-resuming when threads have pending statuses
- 408f66864a1a - detach in all-stop with threads running
-
-resulting in a GDB crash:
-
- ...
- Thread 1 "gdb" received signal SIGSEGV, Segmentation fault.
- 0x0000555555e842bf in maybe_set_commit_resumed_all_targets () at ../../src/gdb/infrun.c:2899
- 2899          if (proc_target->commit_resumed_state)
- (top-gdb) bt
- #0  0x0000555555e842bf in maybe_set_commit_resumed_all_targets () at ../../src/gdb/infrun.c:2899
- #1  0x0000555555e848bf in scoped_disable_commit_resumed::reset (this=0x7fffffffd440) at ../../src/gdb/infrun.c:3023
- #2  0x0000555555e84a0c in scoped_disable_commit_resumed::reset_and_commit (this=0x7fffffffd440) at ../../src/gdb/infrun.c:3049
- #3  0x0000555555e739cd in detach_command (args=0x0, from_tty=1) at ../../src/gdb/infcmd.c:2791
- #4  0x0000555555c0ba46 in do_simple_func (args=0x0, from_tty=1, c=0x55555662a600) at ../../src/gdb/cli/cli-decode.c:95
- #5  0x0000555555c112b0 in cmd_func (cmd=0x55555662a600, args=0x0, from_tty=1) at ../../src/gdb/cli/cli-decode.c:2514
- #6  0x0000555556173b1f in execute_command (p=0x5555565c5916 "", from_tty=1) at ../../src/gdb/top.c:699
-
-The code that crashes looks like:
-
- static void
- maybe_set_commit_resumed_all_targets ()
- {
-   scoped_restore_current_thread restore_thread;
-
-   for (inferior *inf : all_non_exited_inferiors ())
-     {
-       process_stratum_target *proc_target = inf->process_target ();
-
-       if (proc_target->commit_resumed_state)
-           ^^^^^^^^^^^
-
-With 'proc_target' above being null.  all_non_exited_inferiors filters
-out inferiors that have pid==0.  We get here at the end of
-detach_command, after core_target::detach has already run, at which
-point the inferior _should_ have pid==0 and no process target.  It is
-clear it no longer has a process target, but, it still has a pid!=0
-somehow.
-
-The reason the inferior still has pid!=0, is that core_target::detach
-just unpushes, and relies on core_target::close to actually do the
-getting rid of the core and exiting the inferior.  The problem with
-that is that detach_command grabs an extra strong reference to the
-process stratum target, so the unpush_target inside
-core_target::detach doesn't actually result in a call to
-core_target::close.
-
-Fix this my moving the cleaning up the core inferior to a shared
-routine called by both core_target::close and core_target::detach.  We
-still need to cleanup the inferior from within core_file::close
-because there are paths to it that want to get rid of the core without
-going through detach.  E.g., "core-file" -> "run".
-
-This commit includes a new test added to gdb.base/corefile.exp to
-cover the "core-file core" -> "detach" scenario.
-
-Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29275
-
-Change-Id: Ic42bdd03182166b19f598428b0dbc2ce6f67c893
---- a/gdb/corelow.c
-+++ b/gdb/corelow.c
-@@ -120,6 +120,9 @@ public:
- 
- private: /* per-core data */
- 
-+  /* Get rid of the core inferior.  */
-+  void clear_core ();
-+
-   /* The core's section table.  Note that these target sections are
-      *not* mapped in the current address spaces' set of target
-      sections --- those should come only from pure executable or
-@@ -290,10 +293,8 @@ core_target::build_file_mappings ()
- /* An arbitrary identifier for the core inferior.  */
- #define CORELOW_PID 1
- 
--/* Close the core target.  */
--
- void
--core_target::close ()
-+core_target::clear_core ()
- {
-   if (core_bfd)
-     {
-@@ -307,6 +308,14 @@ core_target::close ()
- 
-       current_program_space->cbfd.reset (nullptr);
-     }
-+}
-+
-+/* Close the core target.  */
-+
-+void
-+core_target::close ()
-+{
-+  clear_core ();
- 
-   /* Core targets are heap-allocated (see core_target_open), so here
-      we delete ourselves.  */
-@@ -592,9 +601,15 @@ core_target_open (const char *arg, int from_tty)
- void
- core_target::detach (inferior *inf, int from_tty)
- {
--  /* Note that 'this' is dangling after this call.  unpush_target
--     closes the target, and our close implementation deletes
--     'this'.  */
-+  /* Get rid of the core.  Don't rely on core_target::close doing it,
-+     because target_detach may be called with core_target's refcount > 1,
-+     meaning core_target::close may not be called yet by the
-+     unpush_target call below.  */
-+  clear_core ();
-+
-+  /* Note that 'this' may be dangling after this call.  unpush_target
-+     closes the target if the refcount reaches 0, and our close
-+     implementation deletes 'this'.  */
-   inf->unpush_target (this);
- 
-   /* Clear the register cache and the frame cache.  */
---- a/gdb/testsuite/gdb.base/corefile.exp
-+++ b/gdb/testsuite/gdb.base/corefile.exp
-@@ -207,6 +207,16 @@ gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(.*\\).*" "up in corefile.exp (
- 
- gdb_test "core" "No core file now."
- 
-+# Test that we can unload the core with the "detach" command.
-+
-+proc_with_prefix corefile_detach {} {
-+    clean_restart $::binfile
-+
-+    gdb_test "core-file $::corefile" "Core was generated by .*" "load core"
-+    gdb_test "detach" "No core file now\\." "detach core"
-+}
-+
-+corefile_detach
- 
- # Test a run (start) command will clear any loaded core file.
- 
-@@ -222,6 +232,8 @@ proc corefile_test_run {} {
- 	return
-     }
- 
-+    clean_restart $::binfile
-+
-     gdb_test "core-file $corefile" "Core was generated by .*" "run: load core again"
-     gdb_test "info files" "\r\nLocal core dump file:\r\n.*" "run: sanity check we see the core file"
- 
diff --git a/sys-devel/gdb/files/gdb-12.1-readline-8.2-build.patch b/sys-devel/gdb/files/gdb-12.1-readline-8.2-build.patch
deleted file mode 100644
index fad27ee4ca85..000000000000
--- a/sys-devel/gdb/files/gdb-12.1-readline-8.2-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=1add37b567a7dee39d99f37b37802034c3fce9c4
-https://bugs.gentoo.org/842252
-
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Sun, 20 Mar 2022 14:01:54 +0100
-Subject: [PATCH] Add support for readline 8.2
-
-In readline 8.2 the type of rl_completer_word_break_characters changed to
-include const.
---- a/gdb/completer.c
-+++ b/gdb/completer.c
-@@ -36,7 +36,7 @@
-    calling a hook instead so we eliminate the CLI dependency.  */
- #include "gdbcmd.h"
- 
--/* Needed for rl_completer_word_break_characters() and for
-+/* Needed for rl_completer_word_break_characters and for
-    rl_filename_completion_function.  */
- #include "readline/readline.h"
- 
-@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw ()
-       rl_basic_quote_characters = NULL;
-     }
- 
--  return rl_completer_word_break_characters;
-+  return (char *) rl_completer_word_break_characters;
- }
- 
- char *
diff --git a/sys-devel/gdb/files/gdb-13.1-Wenum-constexpr-conversion-clang16.patch b/sys-devel/gdb/files/gdb-13.1-Wenum-constexpr-conversion-clang16.patch
deleted file mode 100644
index adc09f83ea68..000000000000
--- a/sys-devel/gdb/files/gdb-13.1-Wenum-constexpr-conversion-clang16.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-https://bugs.gentoo.org/894174
-https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ae61525fcf456ab395d55c45492a106d1275873a
-
-From ae61525fcf456ab395d55c45492a106d1275873a Mon Sep 17 00:00:00 2001
-From: Simon Marchi <simon.marchi@efficios.com>
-Date: Thu, 23 Feb 2023 12:35:40 -0500
-Subject: [PATCH] gdbsupport: ignore -Wenum-constexpr-conversion in
- enum-flags.h
-
-When building with clang 16, we get:
-
-      CXX    gdb.o
-    In file included from /home/smarchi/src/binutils-gdb/gdb/gdb.c:19:
-    In file included from /home/smarchi/src/binutils-gdb/gdb/defs.h:65:
-    /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/enum-flags.h:95:52: error: integer value -1 is outside the valid range of values [0, 15] for this enumeration type [-Wenum-constexpr-conversion]
-        integer_for_size<sizeof (T), static_cast<bool>(T (-1) < T (0))>::type
-                                                       ^
-
-The error message does not make it clear in the context of which enum
-flag this fails (i.e. what is T in this context), but it doesn't really
-matter, we have similar warning/errors for many of them, if we let the
-build go through.
-
-clang is right that the value -1 is invalid for the enum type we cast -1
-to.  However, we do need this expression in order to select an integer
-type with the appropriate signedness.  That is, with the same signedness
-as the underlying type of the enum.
-
-I first wondered if that was really needed, if we couldn't use
-std::underlying_type for that.  It turns out that the comment just above
-says:
-
-    /* Note that std::underlying_type<enum_type> is not what we want here,
-       since that returns unsigned int even when the enum decays to signed
-       int.  */
-
-I was surprised, because std::is_signed<std::underlying_type<enum_type>>
-returns the right thing.  So I tried replacing all this with
-std::underlying_type, see if that would work.  Doing so causes some
-build failures in unittests/enum-flags-selftests.c:
-
-      CXX    unittests/enum-flags-selftests.o
-    /home/smarchi/src/binutils-gdb/gdb/unittests/enum-flags-selftests.c:254:1: error: static assertion failed due to requirement 'gdb::is_same<selftests::enum_flags_tests::check_valid_expr254::archetype<enum_flags<s
-    elftests::enum_flags_tests::RE>, selftests::enum_flags_tests::RE, enum_flags<selftests::enum_flags_tests::RE2>, selftests::enum_flags_tests::RE2, enum_flags<selftests::enum_flags_tests::URE>, selftests::enum_fla
-    gs_tests::URE, int>, selftests::enum_flags_tests::check_valid_expr254::archetype<enum_flags<selftests::enum_flags_tests::RE>, selftests::enum_flags_tests::RE, enum_flags<selftests::enum_flags_tests::RE2>, selfte
-    sts::enum_flags_tests::RE2, enum_flags<selftests::enum_flags_tests::URE>, selftests::enum_flags_tests::URE, unsigned int>>::value == true':
-    CHECK_VALID (true,  int,  true ? EF () : EF2 ())
-    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    /home/smarchi/src/binutils-gdb/gdb/unittests/enum-flags-selftests.c:91:3: note: expanded from macro 'CHECK_VALID'
-      CHECK_VALID_EXPR_6 (EF, RE, EF2, RE2, UEF, URE, VALID, EXPR_TYPE, EXPR)
-      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/valid-expr.h:105:3: note: expanded from macro 'CHECK_VALID_EXPR_6'
-      CHECK_VALID_EXPR_INT (ESC_PARENS (typename T1, typename T2,           \
-      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/valid-expr.h:66:3: note: expanded from macro 'CHECK_VALID_EXPR_INT'
-      static_assert (gdb::is_detected_exact<archetype<TYPES, EXPR_TYPE>,    \
-      ^              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This is a bit hard to decode, but basically enumerations have the
-following funny property that they decay into a signed int, even if
-their implicit underlying type is unsigned.  This code:
-
-    enum A {};
-    enum B {};
-
-    int main() {
-      std::cout << std::is_signed<std::underlying_type<A>::type>::value
-                << std::endl;
-      std::cout << std::is_signed<std::underlying_type<B>::type>::value
-                << std::endl;
-      auto result = true ? A() : B();
-      std::cout << std::is_signed<decltype(result)>::value << std::endl;
-    }
-
-produces:
-
-    0
-    0
-    1
-
-So, the "CHECK_VALID" above checks that this property works for enum flags the
-same way as it would if you were using their underlying enum types.  And
-somehow, changing integer_for_size to use std::underlying_type breaks that.
-
-Since the current code does what we want, and I don't see any way of doing it
-differently, ignore -Wenum-constexpr-conversion around it.
-
-Change-Id: Ibc82ae7bbdb812102ae3f1dd099fc859dc6f3cc2
---- a/gdbsupport/enum-flags.h
-+++ b/gdbsupport/enum-flags.h
-@@ -91,9 +91,12 @@ template<> struct integer_for_size<8, 1> { typedef int64_t type; };
- template<typename T>
- struct enum_underlying_type
- {
-+  DIAGNOSTIC_PUSH
-+  DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION
-   typedef typename
-     integer_for_size<sizeof (T), static_cast<bool>(T (-1) < T (0))>::type
-     type;
-+  DIAGNOSTIC_POP
- };
- 
- namespace enum_flags_detail
---- a/include/diagnostics.h
-+++ b/include/diagnostics.h
-@@ -76,6 +76,11 @@
- # define DIAGNOSTIC_ERROR_SWITCH \
-   DIAGNOSTIC_ERROR ("-Wswitch")
- 
-+# if __has_warning ("-Wenum-constexpr-conversion")
-+#  define DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION \
-+   DIAGNOSTIC_IGNORE ("-Wenum-constexpr-conversion")
-+# endif
-+
- #elif defined (__GNUC__) /* GCC */
- 
- # define DIAGNOSTIC_IGNORE_DEPRECATED_DECLARATIONS \
-@@ -155,4 +160,8 @@
- # define DIAGNOSTIC_ERROR_SWITCH
- #endif
- 
-+#ifndef DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION
-+# define DIAGNOSTIC_IGNORE_ENUM_CONSTEXPR_CONVERSION
-+#endif
-+
- #endif /* DIAGNOSTICS_H */
--- 
-2.31.1
diff --git a/sys-devel/gdb/files/gdb-13.1-musl-lfs.patch b/sys-devel/gdb/files/gdb-13.1-musl-lfs.patch
deleted file mode 100644
index d7778e305903..000000000000
--- a/sys-devel/gdb/files/gdb-13.1-musl-lfs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/905922
-https://sourceware.org/bugzilla/show_bug.cgi?id=30450
-https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=2e977d9901393ea1bacbe1896af0929e968bc811
-
-From 2e977d9901393ea1bacbe1896af0929e968bc811 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 22 Feb 2023 16:28:22 -0800
-Subject: [PATCH] gdbserver/linux-low.cc: Fix a typo in ternary operator
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/gdbserver/linux-low.cc
-+++ b/gdbserver/linux-low.cc
-@@ -5390,7 +5390,7 @@ proc_xfer_memory (CORE_ADDR memaddr, unsigned char *readbuf,
-       if (lseek (fd, memaddr, SEEK_SET) != -1)
- 	bytes = (readbuf != nullptr
- 		 ? read (fd, readbuf, len)
--		 ? write (fd, writebuf, len));
-+		 : write (fd, writebuf, len));
- #endif
- 
-       if (bytes < 0)
--- 
-2.31.1
diff --git a/sys-devel/gdb/gdb-12.1-r4.ebuild b/sys-devel/gdb/gdb-12.1-r4.ebuild
deleted file mode 100644
index 4126e99a43d7..000000000000
--- a/sys-devel/gdb/gdb-12.1-r4.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-
-export CTARGET=${CTARGET:-${CHOST}}
-
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-case ${PV} in
-	9999*)
-		# live git tree
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		SRC_URI=""
-		;;
-	*.*.50.2???????)
-		# weekly snapshots
-		SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
-		;;
-	*)
-		# Normal upstream release
-		SRC_URI="mirror://gnu/gdb/${P}.tar.xz
-			ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
-		;;
-esac
-
-PATCH_DEV="sam"
-PATCH_VER="1"
-
-DESCRIPTION="GNU debugger"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="
-	${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
-"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/mpfr:0=
-	dev-libs/gmp:=
-	>=sys-libs/ncurses-5.2-r2:0=
-	>=sys-libs/readline-7:0=
-	sys-libs/zlib
-	elibc_glibc? ( net-libs/libnsl:= )
-	lzma? ( app-arch/xz-utils )
-	python? ( ${PYTHON_DEPS} )
-	guile? ( >=dev-scheme/guile-2.0 )
-	xml? ( dev-libs/expat )
-	source-highlight? (
-		dev-util/source-highlight
-	)
-	xxhash? (
-		dev-libs/xxhash
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	app-alternatives/yacc
-	nls? ( sys-devel/gettext )
-	source-highlight? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
-	"${FILESDIR}"/${P}-readline-8.2-build.patch
-	"${FILESDIR}"/${P}-core-file-detach.patch
-	"${FILESDIR}"/${P}-configure-clang16.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	[[ -d "${WORKDIR}"/${P}-patches-${PATCH_VER} ]] && eapply "${WORKDIR}"/${P}-patches-${PATCH_VER}
-
-	strip-linguas -u bfd/po opcodes/po
-
-	# Avoid using ancient termcap from host on Prefix systems
-	sed -i -e 's/termcap tinfow/tinfow/g' \
-		gdb/configure{.ac,} || die
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	local myconf=(
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# gnulib's or gdb's configure.
-		--disable-dependency-tracking
-
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. bug #490566
-		--disable-{binutils,etc,gas,gold,gprof,ld}
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		$(use_enable test unit-tests)
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-
-		# We need to set both configure options, --with-sysroot and --libdir,
-		# to fix cross build issues that happen when configuring gmp.
-		# We explicitly need --libdir. Having only --with-sysroot without
-		# --libdir would not fix the build issues.
-		# For some reason, it is not enough to set only --with-sysroot,
-		# also not enough to pass --with-gmp-xxx options.
-		--with-sysroot="${ESYSROOT}"
-		--libdir="${ESYSROOT}/usr/$(get_libdir)"
-	)
-
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-
-	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	# gdbserver only works for native targets (CHOST==CTARGET).
-	# it also doesn't support all targets, so rather than duplicate
-	# the target list (which changes between versions), use the
-	# "auto" value when things are turned on, which is triggered
-	# whenever no --enable or --disable is given
-	if is_cross || use !server ; then
-		myconf+=( --disable-gdbserver )
-	fi
-
-	myconf+=(
-		--enable-64-bit-bfd
-		--disable-install-libbfd
-		--disable-install-libiberty
-		--enable-obsolete
-		# This only disables building in the readline subdir.
-		# For gdb itself, it'll use the system version.
-		--disable-readline
-		--with-system-readline
-		# This only disables building in the zlib subdir.
-		# For gdb itself, it'll use the system version.
-		--without-zlib
-		--with-system-zlib
-		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-		$(use_with xml expat)
-		$(use_with lzma)
-		$(use_enable nls)
-		$(use_enable sim)
-		$(use_enable source-highlight)
-		$(use multitarget && echo --enable-targets=all)
-		$(use_with python python "${EPYTHON}")
-		$(use_with xxhash)
-		$(use_with guile)
-	)
-
-	# source-highlight is detected with pkg-config: bug #716558
-	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-	# ensure proper compiler is detected for Clang builds: bug #831202
-	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	# Run the unittests (nabbed invocation from Fedora's spec file) at least
-	emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"'
-
-	# Too many failures
-	# In fact, gdb's test suite needs some work to get passing.
-	# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
-	# As of 11.2, on amd64: "# of unexpected failures    8600"
-	# Also, ia64 kernel crashes when gdb testsuite is running.
-	#emake -k check
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	find "${ED}"/usr -name libiberty.a -delete || die
-
-	# Delete translations that conflict with binutils-libs. bug #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete || die
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-
-	# Install it by hand for now:
-	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
-
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/PROBLEMS
-	docinto sim
-	dodoc sim/{MAINTAINERS,README-HACKING}
-
-	if use server ; then
-		docinto gdbserver
-		dodoc gdbserver/README
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
-
-	if use python ; then
-		python_optimize "${ED}"/usr/share/gdb/python/gdb
-	fi
-}
-
-pkg_postinst() {
-	# Portage doesn't unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gdb/gdb-13.1-r1.ebuild b/sys-devel/gdb/gdb-13.1-r1.ebuild
deleted file mode 100644
index a19b1dd0eeee..000000000000
--- a/sys-devel/gdb/gdb-13.1-r1.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# See https://sourceware.org/gdb/wiki/DistroAdvice for general packaging
-# tips & notes.
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-
-export CTARGET=${CTARGET:-${CHOST}}
-
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-case ${PV} in
-	9999*)
-		# live git tree
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		SRC_URI=""
-		;;
-	*.*.50_p2???????|*.*.90_p2???????)
-		# Weekly snapshots
-		MY_PV="${PV/_p/.}"
-		SRC_URI="
-			https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-${MY_PV}.tar.xz
-			https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz
-		"
-		S="${WORKDIR}/${PN}-${MY_PV}"
-		;;
-	*.*.9?)
-		# Prereleases
-		MY_PV="${PV/_p/.}"
-		SRC_URI="
-			https://sourceware.org/pub/gdb/snapshots/branch/gdb-${MY_PV}.tar.xz
-		"
-		S="${WORKDIR}/${PN}-${MY_PV}"
-		;;
-	*)
-		# Normal upstream release
-		SRC_URI="
-			mirror://gnu/gdb/${P}.tar.xz
-			https://sourceware.org/pub/gdb/releases/${P}.tar.xz
-		"
-
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-esac
-
-PATCH_DEV=""
-PATCH_VER=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="
-	${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
-"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/mpfr:0=
-	dev-libs/gmp:=
-	>=sys-libs/ncurses-5.2-r2:0=
-	>=sys-libs/readline-7:0=
-	sys-libs/zlib
-	elibc_glibc? ( net-libs/libnsl:= )
-	lzma? ( app-arch/xz-utils )
-	python? ( ${PYTHON_DEPS} )
-	guile? ( >=dev-scheme/guile-2.0 )
-	xml? ( dev-libs/expat )
-	source-highlight? (
-		dev-util/source-highlight
-	)
-	xxhash? (
-		dev-libs/xxhash
-	)
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	app-alternatives/yacc
-	nls? ( sys-devel/gettext )
-	source-highlight? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
-	"${FILESDIR}"/${P}-Wenum-constexpr-conversion-clang16.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	strip-linguas -u bfd/po opcodes/po
-
-	# Avoid using ancient termcap from host on Prefix systems
-	sed -i -e 's/termcap tinfow/tinfow/g' \
-		gdb/configure{.ac,} || die
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	local myconf=(
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# gnulib's or gdb's configure.
-		--disable-dependency-tracking
-
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. bug #490566
-		--disable-{binutils,etc,gas,gold,gprof,gprofng,ld}
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		$(use_enable test unit-tests)
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-
-		# Helps when cross-compiling. Not to be confused with --with-sysroot.
-		--with-build-sysroot="${ESYSROOT}"
-	)
-
-	is_cross && myconf+=(
-		--with-sysroot="\${prefix}/${CTARGET}"
-		--includedir="\${prefix}/include/${CTARGET}"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	# gdbserver only works for native targets (CHOST==CTARGET).
-	# it also doesn't support all targets, so rather than duplicate
-	# the target list (which changes between versions), use the
-	# "auto" value when things are turned on, which is triggered
-	# whenever no --enable or --disable is given
-	if is_cross || use !server ; then
-		myconf+=( --disable-gdbserver )
-	fi
-
-	myconf+=(
-		--enable-64-bit-bfd
-		--disable-install-libbfd
-		--disable-install-libiberty
-		--enable-obsolete
-		# This only disables building in the readline subdir.
-		# For gdb itself, it'll use the system version.
-		--disable-readline
-		--with-system-readline
-		# This only disables building in the zlib subdir.
-		# For gdb itself, it'll use the system version.
-		--without-zlib
-		--with-system-zlib
-		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-		$(use_with xml expat)
-		$(use_with lzma)
-		$(use_enable nls)
-		$(use_enable sim)
-		$(use_enable source-highlight)
-		$(use multitarget && echo --enable-targets=all)
-		$(use_with python python "${EPYTHON}")
-		$(use_with xxhash)
-		$(use_with guile)
-		$(use_with zstd)
-
-		# Find libraries using the toolchain sysroot rather than the configured
-		# prefix. Needed when cross-compiling.
-		#
-		# Check which libraries to apply this to with:
-		# "${S}"/gdb/configure --help | grep without-lib | sort
-		--without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix
-	)
-
-	# source-highlight is detected with pkg-config: bug #716558
-	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-	# ensure proper compiler is detected for Clang builds: bug #831202
-	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	# Run the unittests (nabbed invocation from Fedora's spec file) at least
-	emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"'
-
-	# Too many failures
-	# In fact, gdb's test suite needs some work to get passing.
-	# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
-	# As of 11.2, on amd64: "# of unexpected failures    8600"
-	# Also, ia64 kernel crashes when gdb testsuite is running.
-	#emake -k check
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	find "${ED}"/usr -name libiberty.a -delete || die
-
-	# Delete translations that conflict with binutils-libs. bug #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete || die
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-
-	# Install it by hand for now:
-	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
-
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/PROBLEMS
-	docinto sim
-	dodoc sim/{MAINTAINERS,README-HACKING}
-
-	if use server ; then
-		docinto gdbserver
-		dodoc gdbserver/README
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
-
-	if use python ; then
-		python_optimize "${ED}"/usr/share/gdb/python/gdb
-	fi
-}
-
-pkg_postinst() {
-	# Portage doesn't unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild b/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild
deleted file mode 100644
index 7f50bf391455..000000000000
--- a/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# See https://sourceware.org/gdb/wiki/DistroAdvice for general packaging
-# tips & notes.
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-
-export CTARGET=${CTARGET:-${CHOST}}
-
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-case ${PV} in
-	9999*)
-		# live git tree
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		SRC_URI=""
-		;;
-	*.*.50_p2???????|*.*.90_p2???????)
-		# Weekly snapshots
-		MY_PV="${PV/_p/.}"
-		SRC_URI="
-			https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-${MY_PV}.tar.xz
-			https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz
-			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-weekly-${MY_PV}.tar.xz
-		"
-		S="${WORKDIR}/${PN}-${MY_PV}"
-
-		# e.g. 13.1.90_p20230325 is a snapshot on the stable branch, so it's fine
-		if [[ ${PV} == *.[123456789].9?_p2??????? ]] ; then
-			REGULAR_RELEASE=1
-		fi
-		;;
-	*.*.9?)
-		# Prereleases
-		MY_PV="${PV/_p/.}"
-		SRC_URI="
-			https://sourceware.org/pub/gdb/snapshots/branch/gdb-${MY_PV}.tar.xz
-			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-${MY_PV}.tar.xz
-		"
-		S="${WORKDIR}/${PN}-${MY_PV}"
-		;;
-	*)
-		# Normal upstream release
-		SRC_URI="
-			mirror://gnu/gdb/${P}.tar.xz
-			https://sourceware.org/pub/gdb/releases/${P}.tar.xz
-		"
-
-		REGULAR_RELEASE=1
-esac
-
-PATCH_DEV=""
-PATCH_VER=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="
-	${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
-"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
-if [[ -n ${REGULAR_RELEASE} ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/mpfr:=
-	dev-libs/gmp:=
-	>=sys-libs/ncurses-5.2-r2:=
-	>=sys-libs/readline-7:=
-	sys-libs/zlib
-	elibc_glibc? ( net-libs/libnsl:= )
-	lzma? ( app-arch/xz-utils )
-	python? ( ${PYTHON_DEPS} )
-	guile? ( >=dev-scheme/guile-2.0 )
-	xml? ( dev-libs/expat )
-	source-highlight? (
-		dev-util/source-highlight
-	)
-	xxhash? (
-		dev-libs/xxhash
-	)
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	app-alternatives/yacc
-	nls? ( sys-devel/gettext )
-	source-highlight? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
-	"${FILESDIR}"/${PN}-13.1-Wenum-constexpr-conversion-clang16.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	strip-linguas -u bfd/po opcodes/po
-
-	# Avoid using ancient termcap from host on Prefix systems
-	sed -i -e 's/termcap tinfow/tinfow/g' \
-		gdb/configure{.ac,} || die
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	local myconf=(
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# gnulib's or gdb's configure.
-		--disable-dependency-tracking
-
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. bug #490566
-		--disable-{binutils,etc,gas,gold,gprof,gprofng,ld}
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		$(use_enable test unit-tests)
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-
-		# Helps when cross-compiling. Not to be confused with --with-sysroot.
-		--with-build-sysroot="${ESYSROOT}"
-	)
-
-	is_cross && myconf+=(
-		--with-sysroot="\${prefix}/${CTARGET}"
-		--includedir="\${prefix}/include/${CTARGET}"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	# gdbserver only works for native targets (CHOST==CTARGET).
-	# it also doesn't support all targets, so rather than duplicate
-	# the target list (which changes between versions), use the
-	# "auto" value when things are turned on, which is triggered
-	# whenever no --enable or --disable is given
-	if is_cross || use !server ; then
-		myconf+=( --disable-gdbserver )
-	fi
-
-	myconf+=(
-		--enable-64-bit-bfd
-		--disable-install-libbfd
-		--disable-install-libiberty
-		--enable-obsolete
-		# This only disables building in the readline subdir.
-		# For gdb itself, it'll use the system version.
-		--disable-readline
-		--with-system-readline
-		# This only disables building in the zlib subdir.
-		# For gdb itself, it'll use the system version.
-		--without-zlib
-		--with-system-zlib
-		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-		$(use_with xml expat)
-		$(use_with lzma)
-		$(use_enable nls)
-		$(use_enable sim)
-		$(use_enable source-highlight)
-		$(use multitarget && echo --enable-targets=all)
-		$(use_with python python "${EPYTHON}")
-		$(use_with xxhash)
-		$(use_with guile)
-		$(use_with zstd)
-
-		# Find libraries using the toolchain sysroot rather than the configured
-		# prefix. Needed when cross-compiling.
-		#
-		# Check which libraries to apply this to with:
-		# "${S}"/gdb/configure --help | grep without-lib | sort
-		--without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix
-	)
-
-	# source-highlight is detected with pkg-config: bug #716558
-	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-	# ensure proper compiler is detected for Clang builds: bug #831202
-	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	# Run the unittests (nabbed invocation from Fedora's spec file) at least
-	emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"'
-
-	# Too many failures
-	# In fact, gdb's test suite needs some work to get passing.
-	# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
-	# As of 11.2, on amd64: "# of unexpected failures    8600"
-	# Also, ia64 kernel crashes when gdb testsuite is running.
-	#emake -k check
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	find "${ED}"/usr -name libiberty.a -delete || die
-
-	# Delete translations that conflict with binutils-libs. bug #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete || die
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-
-	# Install it by hand for now:
-	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
-
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/PROBLEMS
-	docinto sim
-	dodoc sim/{MAINTAINERS,README-HACKING}
-
-	if use server ; then
-		docinto gdbserver
-		dodoc gdbserver/README
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
-
-	if use python ; then
-		python_optimize "${ED}"/usr/share/gdb/python/gdb
-	fi
-}
-
-pkg_postinst() {
-	# Portage doesn't unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gdb/gdb-13.1.90_p20230429.ebuild b/sys-devel/gdb/gdb-13.1.90_p20230429.ebuild
deleted file mode 100644
index 1593ff281134..000000000000
--- a/sys-devel/gdb/gdb-13.1.90_p20230429.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# See https://sourceware.org/gdb/wiki/DistroAdvice for general packaging
-# tips & notes.
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-
-export CTARGET=${CTARGET:-${CHOST}}
-
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-case ${PV} in
-	9999*)
-		# live git tree
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		SRC_URI=""
-		;;
-	*.*.50_p2???????|*.*.90_p2???????)
-		# Weekly snapshots
-		MY_PV="${PV/_p/.}"
-		SRC_URI="
-			https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-${MY_PV}.tar.xz
-			https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz
-			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-weekly-${MY_PV}.tar.xz
-		"
-		S="${WORKDIR}/${PN}-${MY_PV}"
-
-		# e.g. 13.1.90_p20230325 is a snapshot on the stable branch, so it's fine
-		if [[ ${PV} == *.[123456789].9?_p2??????? ]] ; then
-			REGULAR_RELEASE=1
-		fi
-		;;
-	*.*.9?)
-		# Prereleases
-		MY_PV="${PV/_p/.}"
-		SRC_URI="
-			https://sourceware.org/pub/gdb/snapshots/branch/gdb-${MY_PV}.tar.xz
-			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-${MY_PV}.tar.xz
-		"
-		S="${WORKDIR}/${PN}-${MY_PV}"
-		;;
-	*)
-		# Normal upstream release
-		SRC_URI="
-			mirror://gnu/gdb/${P}.tar.xz
-			https://sourceware.org/pub/gdb/releases/${P}.tar.xz
-		"
-
-		REGULAR_RELEASE=1
-esac
-
-PATCH_DEV=""
-PATCH_VER=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="
-	${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
-"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
-if [[ -n ${REGULAR_RELEASE} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/mpfr:=
-	dev-libs/gmp:=
-	>=sys-libs/ncurses-5.2-r2:=
-	>=sys-libs/readline-7:=
-	sys-libs/zlib
-	elibc_glibc? ( net-libs/libnsl:= )
-	lzma? ( app-arch/xz-utils )
-	python? ( ${PYTHON_DEPS} )
-	guile? ( >=dev-scheme/guile-2.0 )
-	xml? ( dev-libs/expat )
-	source-highlight? (
-		dev-util/source-highlight
-	)
-	xxhash? (
-		dev-libs/xxhash
-	)
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	app-alternatives/yacc
-	nls? ( sys-devel/gettext )
-	source-highlight? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
-	"${FILESDIR}"/${PN}-13.1-Wenum-constexpr-conversion-clang16.patch
-	"${FILESDIR}"/${PN}-13.1-musl-lfs.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	strip-linguas -u bfd/po opcodes/po
-
-	# Avoid using ancient termcap from host on Prefix systems
-	sed -i -e 's/termcap tinfow/tinfow/g' \
-		gdb/configure{.ac,} || die
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	local myconf=(
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# gnulib's or gdb's configure.
-		--disable-dependency-tracking
-
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. bug #490566
-		--disable-{binutils,etc,gas,gold,gprof,gprofng,ld}
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		$(use_enable test unit-tests)
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-
-		# Helps when cross-compiling. Not to be confused with --with-sysroot.
-		--with-build-sysroot="${ESYSROOT}"
-	)
-
-	is_cross && myconf+=(
-		--with-sysroot="\${prefix}/${CTARGET}"
-		--includedir="\${prefix}/include/${CTARGET}"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	# gdbserver only works for native targets (CHOST==CTARGET).
-	# it also doesn't support all targets, so rather than duplicate
-	# the target list (which changes between versions), use the
-	# "auto" value when things are turned on, which is triggered
-	# whenever no --enable or --disable is given
-	if is_cross || use !server ; then
-		myconf+=( --disable-gdbserver )
-	fi
-
-	myconf+=(
-		--enable-64-bit-bfd
-		--disable-install-libbfd
-		--disable-install-libiberty
-		--enable-obsolete
-		# This only disables building in the readline subdir.
-		# For gdb itself, it'll use the system version.
-		--disable-readline
-		--with-system-readline
-		# This only disables building in the zlib subdir.
-		# For gdb itself, it'll use the system version.
-		--without-zlib
-		--with-system-zlib
-		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-		$(use_with xml expat)
-		$(use_with lzma)
-		$(use_enable nls)
-		$(use_enable sim)
-		$(use_enable source-highlight)
-		$(use multitarget && echo --enable-targets=all)
-		$(use_with python python "${EPYTHON}")
-		$(use_with xxhash)
-		$(use_with guile)
-		$(use_with zstd)
-
-		# Find libraries using the toolchain sysroot rather than the configured
-		# prefix. Needed when cross-compiling.
-		#
-		# Check which libraries to apply this to with:
-		# "${S}"/gdb/configure --help | grep without-lib | sort
-		--without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix
-	)
-
-	# source-highlight is detected with pkg-config: bug #716558
-	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-	# ensure proper compiler is detected for Clang builds: bug #831202
-	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	# Run the unittests (nabbed invocation from Fedora's spec file) at least
-	emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"'
-
-	# Too many failures
-	# In fact, gdb's test suite needs some work to get passing.
-	# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
-	# As of 11.2, on amd64: "# of unexpected failures    8600"
-	# Also, ia64 kernel crashes when gdb testsuite is running.
-	#emake -k check
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	find "${ED}"/usr -name libiberty.a -delete || die
-
-	# Delete translations that conflict with binutils-libs. bug #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete || die
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-
-	# Install it by hand for now:
-	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
-
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/PROBLEMS
-	docinto sim
-	dodoc sim/{MAINTAINERS,README-HACKING}
-
-	if use server ; then
-		docinto gdbserver
-		dodoc gdbserver/README
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
-
-	if use python ; then
-		python_optimize "${ED}"/usr/share/gdb/python/gdb
-	fi
-}
-
-pkg_postinst() {
-	# Portage doesn't unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 80bb659977ab..dd7eec75f2ea 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,6 +1,6 @@
 DIST gnuconfig-20221007.tar.xz 71208 BLAKE2B 9112bd82af083043d5eae3a5ffde8174df842f3a817b1b42c17e3202a9189cff8e9f422e956e1cdd82e326949a23e27a353f72f98a6f63818e5a67096f650fed SHA512 91ca2faca02d5d78f937da70a4af026b1ba585519b9eaa2463cacd79f0f6a85ef6e1f7e0bed4243474b6e880c0b6387ca09f00eb2d40a27c3a26b6817b1bb70a
 DIST gnuconfig-20230121.tar.xz 71276 BLAKE2B c136c11f2836cc01c4a75b54853b14943b1e4b29a99102360b436854b1a6e445f578fea494b5c7fe2f744d35941c0ea888a08a386dff716b99dd231a308bffcf SHA512 5ac6c50b9c0abe7c007717aeff2d2d6a8e616d7c8514ed22489ad0164c16966cf44f2312bc3295765f5beaf98bb14022d91c5c59e9fb41e920617092a22d42ec
 EBUILD gnuconfig-20221007.ebuild 1257 BLAKE2B 82af44f5f04430331c079439d61f91efb75df5796df101308794383f0861b2e1b810acbb933621cc69890a9af40cc50c55f1ad5da836c2ce0482bfcea538ebc5 SHA512 26c6cf48a932db0d08c5267e1abb5a9580d31764295a650793a287a6ed4ee5dfbd9567e0d4e6e68b17ac6d70e717794a38148d3251fffb3bba049a97f264e3f8
-EBUILD gnuconfig-20230121.ebuild 1265 BLAKE2B b9bba9dfc73c65d5e3a4194e1992f532a819335c4e10d013a851f41499f45c291c9180e4a380a228b6d01721c0c0f0f0685a60793b24f532affb3eb83b1d3483 SHA512 22860796aaeec1925f8e47e158fe3f7be71b5e2cb49565ad90e6a5ab89420e015068b961f455c68e1ead7ba58ca14aa326b3f6e35d695f8ecb9b358891a1be11
+EBUILD gnuconfig-20230121.ebuild 1257 BLAKE2B 4892261caadc58274ef06516ca74201c285542b585a4c9f73a4bc49f1e478abe141680dcdff43c5ddc51471924087c757f84ff6208979fb89712c1a6e50df87e SHA512 eee196b0e9f67afb3be5b2f6f50ee1d8494595d6a271ee466d90b763ca4bd031ffa8d3b85d860e2c1ded6e22f113251ff961122bddc904809923d6c28381a3be
 EBUILD gnuconfig-99999999.ebuild 1265 BLAKE2B b9bba9dfc73c65d5e3a4194e1992f532a819335c4e10d013a851f41499f45c291c9180e4a380a228b6d01721c0c0f0f0685a60793b24f532affb3eb83b1d3483 SHA512 22860796aaeec1925f8e47e158fe3f7be71b5e2cb49565ad90e6a5ab89420e015068b961f455c68e1ead7ba58ca14aa326b3f6e35d695f8ecb9b358891a1be11
 MISC metadata.xml 347 BLAKE2B 06b801ace1e56e47232a0efa9ae446193955866c1232d576729d4419932a4d338e7840408ef1ecfbabe4f518a18dc25abad921b4d185f5e7a9bd8b46bdb75b32 SHA512 14cbe44269cf0ffffc3c133172b84c6ebb5d17e7bb42f1dd9339abf009005b5a716cdae32c52867246d5f1b5e96a2b16a9e97f25b6d502e0380ceed7ed590fbe
diff --git a/sys-devel/gnuconfig/gnuconfig-20230121.ebuild b/sys-devel/gnuconfig/gnuconfig-20230121.ebuild
index bbfd2430e73e..36482deca301 100644
--- a/sys-devel/gnuconfig/gnuconfig-20230121.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20230121.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 99999999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/slibtool/Manifest b/sys-devel/slibtool/Manifest
index fd9757dfa73d..8e5384899d8e 100644
--- a/sys-devel/slibtool/Manifest
+++ b/sys-devel/slibtool/Manifest
@@ -1,5 +1,5 @@
 DIST slibtool-0.5.34.tar.xz 79720 BLAKE2B 3a692d7485dcf2277f7ed99fe1ad67cf5fd33d8fe0a527d64634b0e7f956a5f58b92d812396f00d872ceb8509e058ae1a026f16a65feb2e79a9fff7bd60290da SHA512 3f7f6e4f45c4c2ae5ba5533152f08269cd77ca6fa2f3a515802bc23c7ac505b2d7340098fa98962c79035129cfd4077205596309f4acd1d634b9a1d6e2c0e96c
 DIST slibtool-0.5.34.tar.xz.sig 833 BLAKE2B 52df017d8ae3056e259a5283b0a4cea119a5ab4ce95e6c894d0d2e98fc10db101039a57c9a2a771f677c9d0afaad9273095ebdb078fca146a3d67ea25e9261fb SHA512 9f8415431a0b43e7be9a808dd6ed138a9b34b7b2c4af3ab406bdbc456ec31c877f13bc0b056ab9a50bec0b0cf1b654a133085f8523e70c8cb7d3851652d34ff7
-EBUILD slibtool-0.5.34.ebuild 1079 BLAKE2B 119665787b3ab0ccca1293aabc4e16dcf734c2c762e01a441949f3e4c29f942d91347e2f1128d10c16e7e14a5da3ae60455d8c0191cf85ffb649b41a77f4813e SHA512 f8c949361ca2a934c575e418d49a26210ba44730c48cfd2c6cdc784ea410bfd018e40c08e94840af10a9ebdd8b028f9f743b67dbfeaba116bad380fe27fe6b59
+EBUILD slibtool-0.5.34.ebuild 1077 BLAKE2B 33a9f0e86f882983091fb8857fa1d74c15ca1258ffe7ffa2e7af5043c383213c3ab32adb6672890ca47ff46cb5fa2b5ba2808ba7aba1640688efe1d1ca322287 SHA512 b6952aef8427519728b767739f83c49e5d320f315faa8e3b0a6d733db747047bf0e862e20b017b7dd72a5c559b7c6dfe26f695c7b5983672bb18f057d62ea36a
 EBUILD slibtool-9999.ebuild 1015 BLAKE2B 206a1b02d9b18b8fb5a84c183e22648c0e018b80477d04c38cb5158635ea46b9bb85f80abbfc83af17b84c428cf4ab1224ff951f15d6addd1076a4a1796f3389 SHA512 906f76a9e0fb20ef0650d3346543973450bc7ef03b5ae997f5c9ee56e3e03d87458daa14110d0c09abc154871ef4da664a6cb2e6416411cf657b52b7eb5dcfe8
 MISC metadata.xml 496 BLAKE2B 8ee62c41383efeccd6d577cb031630f935810e45dd3887c93482b1880d03bf87a252f7a18ba3708b0b0521e2e2e0380d6871721672802189550173a1fe89229b SHA512 d707829a4daf977fb19facd83e5f1582ff422141e0c754867218edf9bc36b208c3ddc5d66159857609128c13a1ac3b51d497e5b89ab6cb0431e25cb7a43d48a5
diff --git a/sys-devel/slibtool/slibtool-0.5.34.ebuild b/sys-devel/slibtool/slibtool-0.5.34.ebuild
index 747b80b4a308..5b9927080d62 100644
--- a/sys-devel/slibtool/slibtool-0.5.34.ebuild
+++ b/sys-devel/slibtool/slibtool-0.5.34.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://dl.midipix.org/slibtool/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-midipix )"
 fi
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b1f4f2d50b0f..fe0317caeb1f 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 2e8434fe1aab..9e837874ea58 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -5,7 +5,7 @@ DIST btrfs-progs-v6.3.1.tar.xz 3155540 BLAKE2B 5f8ec51f11d705bb4ada2e00014393348
 DIST btrfs-progs-v6.3.2.tar.xz 3160148 BLAKE2B e6815eeb90c1dbf9a6c4a5aa72262c18b2031a9305efc9024b1fe7b770a256e1d4cb3b01646a0a523f0e26af2d499382bf42420385c56593ace515a6c225f54d SHA512 d8580250994b3e399babec4478515686f1e3cc2e4fc01ccbc7b00a51b6131452d209cb7f43dbbac5375286546d182fcdf7884bbc1a8ad6889c3f15d85ba8f8d5
 EBUILD btrfs-progs-6.2.1.ebuild 3580 BLAKE2B e66421da8398d9b6856958d4c13ac3fd8271e9773987e13540dfbe1bc69a99780b2654d0b95842770bf1195792592afc19c949ab07786d4748d9ef06fb5e9d86 SHA512 174ab73eabf5af68987a3fd2f13a09d913d947150407cce8a4c6f9af4e2437bb5fe287acaf074cb19e7ecc8477aafa229b13195ba8a9d6674f1a7858b7d759fb
 EBUILD btrfs-progs-6.2.2.ebuild 3547 BLAKE2B dbc2f3076b4162ca8f14f2226aa775d0e3ded2b5bf35c2e3e1cde8934b03ae6a21aacfcabad01f4178fa7f9df9cccbd8109fe23bfb3920e30d39c20a8307861a SHA512 62e0e184aee370bed2f67bc7c4263bf5f15983978d20862047d0db50fece0aeb69569e4b082e2cb13681454e22c9fbad0cabff4b050219e3d4193c5a1c838898
-EBUILD btrfs-progs-6.3.1.ebuild 3553 BLAKE2B a9a3dbcf35d320f5a4bff03a0956d056b1ab997b903bd544023c630e242d801896bd9d6c561693c44f57176a123a9191286ef29aafeb1eda4ae7d7e8f074c51f SHA512 b562bc54b02440f127558948ff3fdc46f0e705482729a76539904c72628e556bb818b25f991a8c7c38005878408b6c1a95a55d99c3c7c513be1862181db07050
+EBUILD btrfs-progs-6.3.1.ebuild 3550 BLAKE2B e6c961bd331bcd5b769e358a1e568f2fbd750897a016cd1c90fa5dea6e7b82ee6e7e04eed94a5df2eaa2acbde0e298118d2f619db88155f0f10c8c0f41cef326 SHA512 f4bb30e3240bd467663e569c6311e876f054cd749a39a4f931d017bc26f29e33207b3d28b6c032c339a524a9ffc8bd209404e14334678633296c830212d8eab3
 EBUILD btrfs-progs-6.3.2.ebuild 3548 BLAKE2B bdfb2571f3adecb4705993b2f0fb144ff75e8711e8369adb20d98666c3be6328f1c144adfb32f9ec21eb7e84f6343b468018a099d94516d4725e396ced29872c SHA512 904ba037a89a919293632720d38499a5b4893b488d8ce68ea2cc2c27b73943b70b3d1a05ddc1d425a517839f95fee52bd0b3fbe5067da065d9ded10d9ca106fa
 EBUILD btrfs-progs-9999.ebuild 3548 BLAKE2B bdfb2571f3adecb4705993b2f0fb144ff75e8711e8369adb20d98666c3be6328f1c144adfb32f9ec21eb7e84f6343b468018a099d94516d4725e396ced29872c SHA512 904ba037a89a919293632720d38499a5b4893b488d8ce68ea2cc2c27b73943b70b3d1a05ddc1d425a517839f95fee52bd0b3fbe5067da065d9ded10d9ca106fa
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.3.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.3.1.ebuild
index c1f11dd5dd51..06cf5910ddb8 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.3.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.3.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-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index f10d1a549df3..9098b8477095 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -3,6 +3,6 @@ DIST exfatprogs-1.2.0.tar.xz 272716 BLAKE2B d8b4188ee2fd96b4b0abab52540e894f5527
 DIST exfatprogs-1.2.1.tar.xz 274108 BLAKE2B 8c505c7e0cfd7c2e64c1923f058031bba86e909ae2f22db0acfc9feee9d510087b87c259e7707b761d3ed0cfaa8471527a1d90723486b94d1910b515ba06e832 SHA512 5ddc327e5257389e9cd11f6b16978a91dbc1d4096575fe1ccc77851310639e464537ea750c304821e078557fd1a8c4ce8f1cc47d6ab238ee0d7ad98b4ff0061f
 EBUILD exfatprogs-1.1.3.ebuild 623 BLAKE2B 0a18440e3d1b53f3b8da000793db3de0cd5792dc225394fd9a522b618d332be16096240b61cada89b3153ba61fa2388d66283a6c988d101d485e133219e3bc7c SHA512 1201ba29fdd440594cccc4330f3764ef3e7263f690311ab39fbd80d1fb8eae415de0c205bdbf0cff2dfd6efb2caffe07ce2b39ef0d60dd9e0049c9f69866ada7
 EBUILD exfatprogs-1.2.0.ebuild 619 BLAKE2B 4bacee75d18dc5a60b85082de9bb3264ace66425d1874c47f802a77ff38098c96f5eae357fca42489df6b8ccebaff759d0b43c16b339fcd05f2e1461b5a96f66 SHA512 98f50ae22ec440cd2f795e12e48178432a1bbf0e4adba917322dcaa8487d6ff115feb05bfcd755462dc9a6b94d1e769c452f61b42b8b83a81d63716fac004b65
-EBUILD exfatprogs-1.2.1.ebuild 623 BLAKE2B fd60956a2805a0fac3657504fc0096db94087a8f357f061fc4e755cd5c17cbdecf81026c2818a6dc762be7d8df2243e3d714fef2651af1b08fe1e7c9daf03dea SHA512 92313904d1bda952a5ec17cf49b1e49d0a5449b8d5e17cd6959ae73d99513fe3c8c66e428be95bf9eb4a9d338d20a8b09407f05d812cf5f93501419cbe6d9b24
+EBUILD exfatprogs-1.2.1.ebuild 621 BLAKE2B 1c53decf872e0157878652c14ae0a3828fb24c6723681b6b3d92c134db68428b0e63e20f9dc41fc58b18738d60f95a8aa779339d666fd64b21aadd0a345f30a4 SHA512 8dcaf46f29f5538e193061a91634b0a3809e3cbb91905c1c000674f80e99f26a17b2333fc82c4f73cb5293d5cec17cb53c52058921ccde186153a1cec1fdfdef
 EBUILD exfatprogs-9999.ebuild 616 BLAKE2B 91c306c2f4b3021dde2621ffc22c8a4848e060cbc0d105e0f10b83f5426ef4d7b9c1c5a42998c93e9c95bc68222224639fab76ca2074fc2974eeb52b08db9554 SHA512 6915a80d52ecfb9425a38faffc3c3e5769a7780751a6b808e3b9ebb1695bc26c2cec91b8b5761394654f57f162f47cda65440399a7edb40959fb288ef655502b
 MISC metadata.xml 344 BLAKE2B 6f45e027a37eb3d01018cfd5b1d07691129367cb969896e42303b38ca81bbdc8aef68f1dc542b2a5aefa793d2f28c60c8c5dc2261b75b817973302dd7e817541 SHA512 5ce136106ee694a1a8725e3498189a1162aa249a91b4597a3cd6f87c202b6a30fd1bd6daa13e9f80fe108f3e024ca995502b9b18b30bbad47722b18fa325fa1d
diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.1.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.1.ebuild
index 38c4ccbcd880..63cb26414ec7 100644
--- a/sys-fs/exfatprogs/exfatprogs-1.2.1.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-1.2.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index b98184d8dbec..4ff42ade7762 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -5,5 +5,5 @@ DIST xfsprogs-6.2.0.tar.xz 1324216 BLAKE2B 847ad267b3667604c9c6a30857605e9cef0f1
 DIST xfsprogs-6.3.0.tar.xz 1328452 BLAKE2B 47a4ec45c88f26b32debd52283602d8244f996c071853b6bf7cf905f917436b1324bc9b58338346c8255201629d69e771d6c3bfd81f33f4f3c3907251d0a6c8c SHA512 dbb3e77d0d9cf184a0e647b8231350401a7549a23a0bfd9121cf2a1b48e85f71d98329dff440fc6e984bcecfdcc2a72f0f27c4989560f3c55359f21f3fb434bb
 EBUILD xfsprogs-6.1.1.ebuild 2341 BLAKE2B 12fe7c625284cc2368b928f9badb2fdb762b14ba6355afb160b7b43ed2763941b7ffdbae2ac84b01df622e4bb902bfbc77529c591eff6622a15a4294e102e4c6 SHA512 2517098e1bf9f51c9baf7ee5fe4bd8428872d415365f67e46d9a6930f1c7d82119e3463af6ee21dba0d368500d1e3232eb4af69eb498fae96af7131e5c525213
 EBUILD xfsprogs-6.2.0.ebuild 2359 BLAKE2B 4827f85c30911f45c0e2b312a90b3424f6ed80d0947df4f713b2f410a6d3c8c4f496a46d8adcf786e20522da2528fbd0ab999e6365a748f4888ad76dddbe98c2 SHA512 a2b7afb3265929938276dfad70b819f168eedc637643ca9880f4d74271015b3ad1d8f8ae32a77d077ad907b7b1b7228d6f8fe35ba243ed1b062a2d1b2854eb3c
-EBUILD xfsprogs-6.3.0.ebuild 2367 BLAKE2B f4fb5ae8beae365feb7d0b16ba034a089d43b440450fb9f2814cd7f44d868c0770d7415ac0bcdc421db9270131674d05d827603ac6877f449baf6fafd58999a3 SHA512 53c579ac829b01058b9dfa26d7547ea68f89ac3569e2a000988fdb9072b5bf7560eefefc040b555bdb03cab3a94cd2e9bc85651c785d1deef694a2b0ec6b1274
+EBUILD xfsprogs-6.3.0.ebuild 2365 BLAKE2B 4abfafee2572705c8470ffb288b03a261cbf852cd4d666d39da2e24fc939ace7734e42f67eba0d998726027f58f77238c88fa8631709a3d0638063992e79290e SHA512 b0e3df50c6986d3d73150f2a86f8c9f4e8a675d4a94b00f495c6f8ee3e33b81d568759010623c05536f58d7420b74248218882757874bfd8347a6efc3a199332
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild
index 1d995689b970..eb698bd6e1ef 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="icu libedit nls selinux"
 
 RDEPEND="dev-libs/inih
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index d114efb7cf18..e2da0a15cb66 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index 7cede0e4e997..52332b899d5d 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1,5 +1,5 @@
 DIST minizip-ng-3.0.10.tar.gz 771145 BLAKE2B 6bab59f830b8be929b6293c9408dd70165ffe094a71bcff82eab71f9d077f4d5360f6081e0ca631090810dfc58a81b03926c797e5c156d0f1437df78292a1f09 SHA512 38021137bebb8805279e729e0801ee15133e6379bdd1862d0dea60f13fb1d63402477f3ea9a6c22fc8c85eb13dd9b38d9536680806850060a44a5a9f015fa829
 DIST minizip-ng-4.0.0.tar.gz 766989 BLAKE2B c46bccb277ee5c712710aae41a7b46af4d60fb8fecad7489b97fc4475059f5f8cfbb1aa2d3693d25ada90f3089535e0d060c7a918df1d0fd635d57cbc93a317d SHA512 be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05
 EBUILD minizip-ng-3.0.10.ebuild 2552 BLAKE2B 7fd09980a0724edd98ddfcca947b67932893b2d9eaa350ef6907e3499a420cdfdebb17c3e8938b466db0d3a10de549c19c396b30adb5f234800ab2736cf3fa81 SHA512 bcb836b1031bd5be51be1b502f8489c12b34293a61499cc4174b68002e41b93a9607e1eb5a0f0a2530ccaf38a5e96e22d905032863393ee294de2e1229d52acf
-EBUILD minizip-ng-4.0.0-r1.ebuild 2671 BLAKE2B 7425c19e3eb2c4f043631156b797056d7adcdb82b9588adda9bc9a2d713b010ace28e8ea2b57f31a8e3bcb28bc4256d28ea1bee30e3a910080df7e06c005c3d6 SHA512 5654162ba3f1a9dc73c08c44c619e47e8b7620054a1b5e4218ff5a368195ce0391f00254b5e485089aec9aea72d8f54ef1540f05fb11e618fa8febbeed6b00af
+EBUILD minizip-ng-4.0.0-r1.ebuild 2785 BLAKE2B 2fc368c38c1e29d218ff701e93513e9fb024a8748eb00024beb828664a5023c362c13afa4cd99f7f82af8aa2dab8bf2912b355e79d2be5c8ba6613b26e293507 SHA512 95d36935eaab77f76983cac788ade07cfab1541a9c50d94b4418e99472828bd614df927fb71ba83888c841127acd068aa56cd0b60255d2d37809e1a2a22ee8c5
 MISC metadata.xml 638 BLAKE2B 8a74cb73b53a8fa34aa5ad31ff7770fe47a6224161b6cce692d837004ffcbad15de7d318b3eb9dfa6db0f6f83eae0ed6238df19c27a82daeb7d958113f96478f SHA512 596d4f19cd3680b59ba2f94a8ebedb1fa84f5ca9e3d5125c76b5e787cd8b2e560152bf8151bfe140d03beae6a244b7a87210cc211c8493e0766852c776eef721
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild
index a0229283ac8f..041a8c77f778 100644
--- a/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild
@@ -15,6 +15,8 @@ SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz ->
 LICENSE="ZLIB"
 SLOT="0/4"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+# TODO: Needs SONAME fixing for compat
+# https://github.com/zlib-ng/minizip-ng/issues/358#issuecomment-1593970564
 IUSE="compat openssl test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/newlib/Manifest b/sys-libs/newlib/Manifest
index 1d035869d1b4..a8062617a1d1 100644
--- a/sys-libs/newlib/Manifest
+++ b/sys-libs/newlib/Manifest
@@ -1,9 +1,11 @@
 AUX newlib-3.3.0-no-nano-cxx.patch 1338 BLAKE2B ff16751b01784a38dc07aa79120c38f0274bb14caeeb653cecca4b3ca69c60a72e0e1918fea8f2c0f4734293817539122fa41b349f61ceabb3cb9ae878a11d13 SHA512 08dfc7d854dc75c8b875fa7c1829078c8df8988b4ba2b20739d387c656ca63b8b344487861d23658e31b72f911d05c2f57abe51bdf3b2dedcc88ce072c6595c8
+AUX newlib-4.3.0.20230120-libc-arm-setjmp-gcc-backwards-compat.patch 2411 BLAKE2B db79f5e534f70bc6338a647a242498d0e175624671c41ae9abf9030b046ffc50e576c7a25fe44e6607cdf42c072995e7d685889ae442097ad1c469919d59936c SHA512 91c684078904a38b0791bf788f48145eff9ccb393a8d1e181d5a66b3e359732576f257bd5908cd02844459cf12bbb2b43fbcd9b9095c36c08e6408aa68be95d1
 DIST newlib-4.1.0.tar.gz 18648429 BLAKE2B c4d4d734bceeacf05b75d450d4316392d0000266812f98f99cd3f9f0926ac9848e1dc145361827d1d6951edfe5f109923c982d9f284f927ffc5fd5e5edaf8be6 SHA512 6a24b64bb8136e4cd9d21b8720a36f87a34397fd952520af66903e183455c5cf19bb0ee4607c12a05d139c6c59382263383cb62c461a839f969d23d3bc4b1d34
 DIST newlib-4.2.0.20211231.tar.gz 18921589 BLAKE2B fb85a368d082e2b9005d5d295d6854eb7d0e351cfade6516e6a06b18656d9139d7629f55a6d5f63337c6bce511a2373e797bed96847f19941b26cacfb1c8d3bc SHA512 0c3efd7b74a6b8457a717cbb6aa6c5ff268eeaba375535465c6bd6502c3d32b54a9bc3ba7f2c6990f78e29152eee2f62acb39b674d24f9ddf440374a1ec9d2e8
 DIST newlib-4.3.0.20230120.tar.gz 8832922 BLAKE2B b5493f25e44049f4e1222698894e7e67756928062e05f5d16bcd52b2221e5c04a80a9e0cbc3fc6e92d67fe6b3813e06b6d3a6d39e8742e02b8f13ff84d809de1 SHA512 4a06309d36c2255fef8fc8f2d133cafa850f1ed2eddfb27b5d45f5d16af69e0fca829a0b4c9b34af4ed3a28c6fcc929761e0ee823a4229f35c2853d432b5e7ef
 EBUILD newlib-4.1.0-r2.ebuild 4487 BLAKE2B 0ee16a23ff8e7048ccba6dd769530b8b6f23f574b0895e6233a450c5c4e83ad252a06d1f7d272976d6f11f269c6d7d9d555bcfabb3d527bc1aa55d4119ad29ae SHA512 b90f0ae3f65915833a342116ecdd985b28a13b8ad95613c92fed0b0be5eaf58fca362b1db4e655ed5f68e0da82212da1649f97871c8c948d3bd6bcf6055276ff
 EBUILD newlib-4.2.0.20211231-r1.ebuild 4507 BLAKE2B 7c8c62f00175bf2a49eebc0af2b38ecf0f5849e870ab0bfe1972eb48bf5a634e159f5dec867433ac6edeea94d55a34a6bdc0ead3094801a24c4f9c5dcd349592 SHA512 514d6ab7776619894849a724d196f156b03ee63f4564fa627500aed07fdda07791944d3280377a229fc12cd5d3fb983dbc1a05fecefea3d961a67dbb54ec6acf
 EBUILD newlib-4.3.0.20230120-r1.ebuild 4424 BLAKE2B 74b269b222db0dc5fad2c8eaab1c023cccc5fefe0cd14c2490b8e5f1125c07345f4c39a3aa67c972c737880901b60b1cd923d282b070645a198acfe12271aa04 SHA512 9d00014a5668ce2b8ebcfea42ae6ae3c7de773d351e4e30a8504d763b39f1b41907720b6e793445fc0414c9cceafe7f4bcf474df4120684e7915acb7dd3898df
+EBUILD newlib-4.3.0.20230120-r2.ebuild 4487 BLAKE2B 706fe34982dcf6b7affdc61424b163946e8a1d91bfdd0a0bb128e7dabe4a198c0723bb062136a9e9d1f88d525648e2bff2a66b9dfabac559d20d85c3a8fc3803 SHA512 50e1efaa5c93938d1784c25281e8efa97e0cac9072d6ae4592216f09a5c1a4c56d515f144aaa2d2ca58593f41c741bc09bfa8028bc12beed6d9fff092c0e3842
 EBUILD newlib-9999.ebuild 4424 BLAKE2B 74b269b222db0dc5fad2c8eaab1c023cccc5fefe0cd14c2490b8e5f1125c07345f4c39a3aa67c972c737880901b60b1cd923d282b070645a198acfe12271aa04 SHA512 9d00014a5668ce2b8ebcfea42ae6ae3c7de773d351e4e30a8504d763b39f1b41907720b6e793445fc0414c9cceafe7f4bcf474df4120684e7915acb7dd3898df
 MISC metadata.xml 414 BLAKE2B 0e367a5f7b225bd2d381433ff239e076c3de8feb795ddb586d867bbc9a1b990379a3f27a39ede9549c7e328262004101e4392560717f596c941e9a152848eacb SHA512 44000ecc340eb2da9391ac9b226486e0f95aeb8de5bc7633882fef97943e0348bbb04ada64a15c82d2995d8aaedac5da1fa8c9d453c4ab3d2efc51ce06ab6477
diff --git a/sys-libs/newlib/files/newlib-4.3.0.20230120-libc-arm-setjmp-gcc-backwards-compat.patch b/sys-libs/newlib/files/newlib-4.3.0.20230120-libc-arm-setjmp-gcc-backwards-compat.patch
new file mode 100644
index 000000000000..3eab820db787
--- /dev/null
+++ b/sys-libs/newlib/files/newlib-4.3.0.20230120-libc-arm-setjmp-gcc-backwards-compat.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/891589
+https://sourceware.org/pipermail/newlib/2022/020035.html
+https://sourceware.org/git/?p=newlib-cygwin.git;a=commit;h=c6e601de84ea9f2be2b026c609cc3c1fe82a3103
+
+From c6e601de84ea9f2be2b026c609cc3c1fe82a3103 Mon Sep 17 00:00:00 2001
+From: "Victor L. Do Nascimento" <victor.donascimento@arm.com>
+Date: Fri, 3 Feb 2023 11:15:26 +0000
+Subject: [PATCH] libc: arm: Implement setjmp GCC backwards compatibility.
+
+When compiling Newlib for arm targets with GCC 12.1 onward, the
+passing of architecture extension information to the assembler is
+automatic, making the use of .fpu and .arch_extension directives
+in assembly files redundant.
+
+With older versions of GCC, however, these directives must be
+hard-coded into the `arm/setjmp.S' file to allow the assembly of
+instructions concerning the storage and subsequent reloading of the
+floating point registers to/from the jump buffer, respectively.
+
+This patch conditionally adds the `.fpu vfpxd' and `.arch_extension
+mve' directives based on compile-time preprocessor macros concerning
+GCC version and target architectural features, such that both the
+assembly and linking of setjmp.S succeeds for older versions of
+Newlib.
+--- a/newlib/libc/machine/arm/setjmp.S
++++ b/newlib/libc/machine/arm/setjmp.S
+@@ -64,6 +64,28 @@
+ 
+ 	.syntax unified
+ 
++/*  GCC 12.1 and later will tell the assembler exactly which floating
++    point (or MVE) unit is required and we don't want to override
++    that.  Conversely, older versions of the compiler don't pass this
++    information so we need to enable the VFP version that is most
++    appropriate.  The choice here should support all suitable VFP
++    versions that the older toolchains can handle.  */
++#if __GNUC__ && __GNUC__ < 12
++/*  Ensure that FPU instructions are correctly compiled and, likewise,
++    the appropriate build attributes are added to the resulting object
++    file.  Check whether the MVE extension is present and whether
++    we have support for hardware floating point-operations.  VFPxd
++    covers all the cases we need in this file for hardware
++    floating-point and should be compatible with all required FPUs
++    that we need to support.  */
++# if __ARM_FP
++	.fpu vfpxd
++# endif
++# if __ARM_FEATURE_MVE
++	.arch_extension mve
++# endif
++#endif
++
+ #if __ARM_ARCH_ISA_THUMB == 1 && !__ARM_ARCH_ISA_ARM
+ /* ARMv6-M-like has to be implemented in Thumb mode.  */
+ 
+-- 
+2.39.3
diff --git a/sys-libs/newlib/newlib-4.3.0.20230120-r2.ebuild b/sys-libs/newlib/newlib-4.3.0.20230120-r2.ebuild
new file mode 100644
index 000000000000..942c2fe4601b
--- /dev/null
+++ b/sys-libs/newlib/newlib-4.3.0.20230120-r2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/newlib-cygwin.git"
+	inherit git-r3
+else
+	SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Newlib is a C library intended for use on embedded systems"
+HOMEPAGE="https://sourceware.org/newlib/"
+
+LICENSE="NEWLIB LIBGLOSS GPL-2"
+SLOT="0"
+IUSE="nls threads unicode headers-only nano"
+RESTRICT="strip"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.0-no-nano-cxx.patch
+	"${FILESDIR}"/${P}-libc-arm-setjmp-gcc-backwards-compat.patch
+)
+
+NEWLIBBUILD="${WORKDIR}/build"
+NEWLIBNANOBUILD="${WORKDIR}/build.nano"
+NEWLIBNANOTMPINSTALL="${WORKDIR}/nano_tmp_install"
+
+CFLAGS_FULL="-ffunction-sections -fdata-sections"
+CFLAGS_NANO="-Os -ffunction-sections -fdata-sections"
+
+pkg_setup() {
+	# Reject newlib-on-glibc type installs
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		case ${CHOST} in
+			*-newlib|*-elf) ;;
+			*) die "Use sys-devel/crossdev to build a newlib toolchain" ;;
+		esac
+	fi
+
+	case ${CTARGET} in
+		msp430*)
+			if ver_test $(gcc-version ${CTARGET}) -lt 10.1; then
+				# bug #717610
+				die "gcc for ${CTARGET} has to be 10.1 or above"
+			fi
+			;;
+	esac
+}
+
+src_configure() {
+	# TODO: we should fix this
+	unset LDFLAGS
+	CHOST=${CTARGET} strip-unsupported-flags
+	CCASFLAGS_ORIG="${CCASFLAGS}"
+	CFLAGS_ORIG="${CFLAGS}"
+
+	local myconf=(
+		# The top-level configure doesn't utilize this flag, but subdirs do,
+		# so autodetection for econf doesn't work.  Add ourselves.
+		--disable-silent-rules
+		# Disable legacy syscall stub code in newlib.  These have been
+		# moved to libgloss for a long time now, so the code in newlib
+		# itself just gets in the way.
+		--disable-newlib-supplied-syscalls
+	)
+	[[ ${CTARGET} == "spu" ]] \
+		&& myconf+=( --disable-newlib-multithread ) \
+		|| myconf+=( $(use_enable threads newlib-multithread) )
+
+	mkdir -p "${NEWLIBBUILD}"
+	cd "${NEWLIBBUILD}"
+
+	export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}"
+	export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}"
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable unicode newlib-mb) \
+		$(use_enable nls) \
+		"${myconf[@]}"
+
+	# Build newlib-nano beside newlib (original)
+	# Based on https://tracker.debian.org/media/packages/n/newlib/rules-2.1.0%2Bgit20140818.1a8323b-2
+	if use nano ; then
+		mkdir -p "${NEWLIBNANOBUILD}" || die
+		cd "${NEWLIBNANOBUILD}" || die
+		export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}"
+		export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}"
+		ECONF_SOURCE=${S} \
+		econf \
+			$(use_enable unicode newlib-mb) \
+			$(use_enable nls) \
+			--enable-newlib-reent-small \
+			--disable-newlib-fvwrite-in-streamio \
+			--disable-newlib-fseek-optimization \
+			--disable-newlib-wide-orient \
+			--enable-newlib-nano-malloc \
+			--disable-newlib-unbuf-stream-opt \
+			--enable-lite-exit \
+			--enable-newlib-global-atexit \
+			--enable-newlib-nano-formatted-io \
+			"${myconf[@]}"
+	fi
+}
+
+src_compile() {
+	export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}"
+	export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}"
+	emake -C "${NEWLIBBUILD}"
+
+	if use nano ; then
+		export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}"
+		export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}"
+		emake -C "${NEWLIBNANOBUILD}"
+	fi
+}
+
+src_install() {
+	cd "${NEWLIBBUILD}" || die
+	emake DESTDIR="${D}" install
+
+	if use nano ; then
+		cd "${NEWLIBNANOBUILD}" || die
+		emake DESTDIR="${NEWLIBNANOTMPINSTALL}" install
+		# Rename nano lib* files to lib*_nano and move to the real ${D}
+		local nanolibfiles=""
+		nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|m\|rdimon\|gloss\)\.a" -print)
+		for f in ${nanolibfiles}; do
+			local l="${f##${NEWLIBNANOTMPINSTALL}}"
+			mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die
+		done
+
+		# Move newlib-nano's version of newlib.h to newlib-nano/newlib.h
+		mkdir -p "${ED}/usr/${CTARGET}/include/newlib-nano" || die
+		mv "${NEWLIBNANOTMPINSTALL}/${EPREFIX}/usr/${CTARGET}/include/newlib.h" \
+			"${ED}/usr/${CTARGET}/include/newlib-nano/newlib.h" || die
+	fi
+
+	# minor hack to keep things clean
+	rm -rf "${D}"/usr/share/info || die
+	rm -rf "${D}"/usr/info || die
+}
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 5ace28f5dac5..f0a48ff02a94 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -2,5 +2,5 @@ AUX zlib-ng-2.1.2-cmake.patch 1338 BLAKE2B a082171657f55f792ffba58e05a80df50dcc3
 DIST zlib-ng-2.0.7.tar.gz 853381 BLAKE2B 89672bd35ee54df72ff995c1b4ed188538011be4cd077e464f21a088b0b70b3f95b4259dc546a65e8d4900dc5bd5bb98041875e361000898b34518f7e008b99b SHA512 1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988
 DIST zlib-ng-2.1.2.tar.gz 2404176 BLAKE2B bc0b65520562827b10216110e2020a3341ee0dd853874c19ddb6f9df776fc74a542c1239f77dc3ec2ccb3f92e75f1de7ef104edfecfe37312149b1bc29ae7403 SHA512 2b3073df4eb13d8318f8fa2b7674e4729642488f65dad49d3080ccd830f29e9e3f32a673b42634443ddf9e9ef85cfff4f2f3e182506f950b9ee0a208a92c0465
 EBUILD zlib-ng-2.0.7.ebuild 2133 BLAKE2B 9c74f3a169705f9cc1ed010093cfbc316a4209541384534bc51f95435e8242d7e742978ab87d0f2d5ae6d6eb2fe5a00f63364bfd16feb9b840b98b78c03f6cf3 SHA512 c0c0939ad7e58f55607ac01f7186314a1bc7fee8b37c0589e83d1227e5d136c33cfcdd52e82de9fc93f368a6299ecf98778a2d266ceccbe3d26ce2787d6405f9
-EBUILD zlib-ng-2.1.2-r1.ebuild 2447 BLAKE2B edaef6db3a05cc6330db7d771661a0c71c2bb2078381ff243be684928783aaf337646262db8ab49f1e2e246b267ebbf8f7646ad8e83cbe43f8083bb3eb6c9fb1 SHA512 db211f66b6c50095e56efb6b65b6bb07677f08c409e71e2a95b8335fa2605901662fa9d51a2963fd6760a67cd988797e0f10d5702363ea9a635aed03fa52faf5
+EBUILD zlib-ng-2.1.2-r1.ebuild 2475 BLAKE2B 541a5a506b365ef371298468f01b2a836c945cba840d9af3567915c0dc9bc984c1effe2e0820b0258bc31daa64f9d3fedabca7f346f3e287ed2a296848f0eb99 SHA512 38adf92731d5c70595b7b2c1154441bd54c746b38ce9059ae8a1453759108d8fe1ec7e1627892660f383aa6aa6ea380ac1f719660924f489f9ad87d6c1abe39b
 MISC metadata.xml 431 BLAKE2B 49465a63458ac9b7d807d699d45046fd7dc849796f039956effee297fd4da30109bc6f0644cc46aec680f6a94fb6b839d857b17a2699907fd43317794a12cf78 SHA512 16c8b051776ba1ba37b01eac4127d3a84811b3f4cc9f733480ddd12992bb7119cf3c8a22dc18e4086cf71fe7a16266c21684bc7040070eaf1a8dde1783c8d59e
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild b/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
index f96bd980dbf9..25a52ed3352c 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
@@ -35,6 +35,7 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DZLIB_COMPAT=$(usex compat)
 		-DZLIB_ENABLE_TESTS=$(usex test)
+		-DWITH_GTEST=$(usex test)
 
 		# Unaligned access is controversial and undefined behaviour
 		# Let's keep it off for now
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 7a76a808143d..6a0dc9f181b3 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index e8bcfb1d29cd..97bb05b92825 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -3,13 +3,19 @@ AUX nut-2.2.2-init.d-upsdrv 859 BLAKE2B 7911afe5ab45fa0123b43ac2fe186dbfa4eb9cb2
 AUX nut-2.6.2-lowspeed-buffer-size.patch 553 BLAKE2B 2f758e7b807117e20b465951676ff524d1d2b52b5a69fcb09ad6811730c0038fff4b81cfcc1daaf6f0cfc6d5248be35c4be8b58f9193fe26028361c888ed1535 SHA512 59a953d3c89acccc3d5c028b36de15059f512d0a8074e7fed1d3831570bd09a544e44b5b754b4ad72f8163295db21160c142a83f4d608e40a401c9452823d7b7
 AUX nut-2.6.5-init.d-upsd 671 BLAKE2B a8658d22ffdba585d9fd6de13a347a16e98182bd484c41f6eb8b3e38d94be6a4eea4475f2586d2a7d8146858bc14b2fd0e861a56681ae25a5ce3116a2b7d435c SHA512 79c36537fb40b8284afb8edc28afa0f98fdf96e8def0382278c6242b4602f1911e29a174825ee676f77aa609b6409ce3483a1d188354956d20be9862c4e78180
 AUX nut-2.6.5-init.d-upslog 573 BLAKE2B 2a0e04f83990035beb12eee33cfe7ce4fdcd1f310a7ba6f2255e4ad3a1f76245acf4a66332eea5cce7765d914ce7c14f02da50ebb8fa8640c871a12f492ed28b SHA512 06ca7fa8f3fe729b07a919d2a0ecb573b8ac180c447f927504524fca18894e045492458271b9a15898861cb3839b9fb95b2c843e241c7148bc25331ab8360b36
-AUX nut-2.6.5-init.d-upsmon 557 BLAKE2B a48b215181d6b40691db244d38b5868e69844f5a1ee6f91cb8815c4386ae801f957b2fbaf53fbe5dd98925be42036dbd54dd5d13c0077c8884e018fac24d101a SHA512 9ccf947b2c5e7a73e96148edb7684f21ae84c4212b980f2ba7b88006dc1e3400b1b9017202b87648f928a3e19f4898094622a6683e0995b72f355ccb394280c3
+AUX nut-2.6.5-init.d-upsmon 557 BLAKE2B 2681668f09426397a79ade8fe706c182dcb5c58c8e0189d51f9ccd0eddaf9eae78a083da38625f8868b355f2096ad7566b27cbaf967aa7472a92a760fa9ef767 SHA512 9559af5c12ef23db196762e2f999a463518383506ded48903ca5ad4b06230644668bbaa1fd007784514140ef391f76bb0bd6e11efa5d1698b79c57b7f5f74cf2
 AUX nut-2.7.1-snmpusb-order.patch 1417 BLAKE2B 20c3150559d3810c8bf15a9560ccf950ad1bb26bd58b4f2bcf3736871f4599bc3ad948e5f008b1549184f78d0fa3b417bbc8728660fbb110f4537fce83231bad SHA512 df3701821bc4ef45a5089e4d4439c3367fb23cefce7d06168bd422a8c32a1b373ae9fb3456bd5f90a51a672edf9ce29254a08c2045efe210a11b82399793ec19
 AUX nut-2.7.4-nut-scanner.patch 1615 BLAKE2B dd672f2996ca650a6456084dc92d6a9c6ea1b0fe2d1b812bffcfdefda5e797f3f89e19e325f5a2d9ba066b077b9855d2403e111038bd4024f255f2fee243f500 SHA512 5db031aa5c74e4987824b2ac7a5f6e073de16b8958104ceabb7482a6c6b7779d8380fc30b6189ca2cfee9ab795a7413e537d093b0a338aee73d3385b54d280d7
 AUX nut-2.7.4-py3.patch 1940 BLAKE2B 5bb77bca18ad40a1ba4e579098accb0135c0f4b24436425de3983204554ddb0aeceb473a7a6729048dbfb6175e015129a8bfcce26b169b3e21c905f9f08f079e SHA512 2a4f12954bdf2e50cbfb7a7dd09ed83be27ed2a6d0a2e4244ca8b309614515599c81541b5cfb4c81244b739cf3a47d56cb2746db3fae9e8861c5115c0287041b
 AUX nut-2.7.4-slibtool.patch 2470 BLAKE2B 6baadd663f83209f3abbb4a6b83f170df56da07bb679f6e47571151406c879cfe9a0dbe17fa72678ca66fdcd07ad07bfb8a38e4821cf529e9367a71fad18de69 SHA512 9dfa6c38a56dcf6d743e4ea4eb46ff5e4a81e77eb79df97921662e00c6f4bee4f70a845c3e49ef5ecda31e0e90b8e7f5b450a9c3cd8c5742b093409b894556a8
+AUX nut-2.8.0-fix-man-page-generation.patch 2116 BLAKE2B a7842137c2a5d8103bdb456f576948494697b37c7c8ac9a0e960fe32af50302625ef7bebe4a82252dda8a01503854dfd4fa822d06384eb59efb95466ba946fd4 SHA512 bbeb61a804e39e1a061ad19d28b852214195a9b3a5f70f0841871a197ca25dbf618799298d83898560c843425df9c4bbe20f8b4d6fcd2499af57350b162ba8da
+AUX nut-2.8.0-init.d-upsd 667 BLAKE2B f3ec275cd401df017428c3772fb3f0d51b66173e3d08fdd844e8499bd216b455d6a2846e991c53285092eafc1ad3f43665185c853a438f5331ecd95c2c8c2e30 SHA512 4a58aea9b0119c6ba0949a5d8365cf8785aa49050fb9cb6f6e0ac4d12d1b8e947823d0c41b64500f453fdf236dee6cf60f812c76a65bff9b2ea0f2b713852dc3
 AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cdb33b14ac0c40913b47ea513a8ecaa6eebe3241ae8b324583070d76b6c12d3cf18c043778754b5774af846fb8a33b4d7 SHA512 8945f2f663dc50cfd7041cc7f2c4af5cca4b5ef9cfa1be48c122a623e6eadfc511bbaa60a8bd6b68bb2569c75d5f64613d595ad7444b8d6ec9f773d7743872a1
-AUX nut.powerfail.initd 1306 BLAKE2B 9e9c6eb40c6a313ad625136523de730a75b811841331ae5f7dd42b71b65f591c4ab5b8da6e954ceab42da89f4a20e8655cae57354aec6ab796cec80f60ebb419 SHA512 b9aaab526d0996b36a7a6d76a3ee63c1452b0a1bed358e23f6f7f5534e0da7751281428091efc7dba2004706996850ec18318809fdacb94cd8d73ea22bda52ee
+AUX nut.powerfail.initd 1305 BLAKE2B 88bd2a1b5b3fbb2ab9ea4d408e4cc57399702c587ec8314c5b78aa5ce03d4de0f4850ecd580140bf5a42947853f7f64953e0a2859fb1f83de185682d6b600500 SHA512 9e171fc192efaa16e554725b6bf40377e648400f6f6e860d436218289fadcf96c7209fed76129d0dfec912dc5702cca11c90fea072767135fe1a2ba8e11ef2ac
+AUX systemd_notify.path 1753 BLAKE2B a44167bf491b393474b94ee4c375013cd23d1e1151311eab40ba6ca2c190019631aeb3fd21e20b9ce0a0b98d98506c88ddd9fe043a1000268d8b7b4195d8b489 SHA512 9984fb879a002cd00949dd7e10f5720f3b50ce871312750dbdb8b805903b37b1f8be2c7b2f6b79a13739fba2c28bf0f85427af7c9b7421ebf13cabfb3cd88381
 DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
+DIST nut-2.8.0.tar.gz 3287640 BLAKE2B 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94 SHA512 3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577
 EBUILD nut-2.7.4-r8.ebuild 8850 BLAKE2B 0e298891877dae79a3612cb37d4596c164e36d84d072b130b94861e429b700e0f103c1a1245a3a996dba06d2c2912f4847bccbc6db1a717f759f3ae890cf794c SHA512 79090443c160dc043f88417d6500dd49ee3427a4e685bf86ce6b653d324eaf67425e5fd96acb72d8d59348e264f9ae0b2c514be3999fe81a17c9cb1d94f63866
-MISC metadata.xml 5273 BLAKE2B 8eb36ab7d2c0650fc0fc69cb33a5f845b6adbff85cb6f1d9f3359286d125281a26e6864a3fc57171cec40cce2c82d0d7c7525ab35034cbae1d054b37fee0f3c2 SHA512 1d9653333532ca5090aa8ab5f66c18d46b8c7df2b75fd42b6d55ff252f7596122bf15302c3d5bf8a3dcbe9a1795f4af845c36e2160ee377bbe05ca4031366900
+EBUILD nut-2.8.0-r1.ebuild 5770 BLAKE2B f91d73797be97f5d5165b9da9c0e569175dedbe5e61cb2f6b110081822416980885573458cf656210a88b8bad653450cd337e8a5556f05d7d6d2c9aa276fc0a7 SHA512 a5b0a567f9a1190d73119d0defe10629399de1faddd30924ffb688c3288e09e933afea7f70d6cc71624f67e525477fa9093e649c4496151c894d76f4df7a73d6
+EBUILD nut-9999.ebuild 6921 BLAKE2B 4b9436e707fd4806968b500e49b7b535b953e538936e3ecc2584b59f1dd4c79db173cc54f87bc66a902a40c659144bce70f5366dba6c9ed9b1efaca9c78bb9e8 SHA512 430d445736f9bad1c3866edc1d7f16656f0d278fcc914cfacf2884d6b89da027fe65cc4205c2d719a60fe88cf617ccbcd2291ef58c41ce465823f94be4c261f8
+MISC metadata.xml 6068 BLAKE2B 499dd975b0364733e71175eb061d935f754343d32d6eba547a26659438a0488a25509e907516b73d7bfd9714be28bc2159dd8688d2578611c9b9fca419881446 SHA512 cc42c7645c78516a2b2e82ec09098c88c1f7fbcc68f5685906811b9182dd4869c31c4eb865c5deab8cc105cf24e32161cf7db746fe793e6bea08fbf12f561e79
diff --git a/sys-power/nut/files/nut-2.6.5-init.d-upsmon b/sys-power/nut/files/nut-2.6.5-init.d-upsmon
index 3aafe1676d6e..729df9c5460b 100644
--- a/sys-power/nut/files/nut-2.6.5-init.d-upsmon
+++ b/sys-power/nut/files/nut-2.6.5-init.d-upsmon
@@ -4,7 +4,7 @@
 
 extra_started_commands="reload"
 
-pidfile=/var/run/upsmon.pid
+pidfile=/run/nut/upsmon.pid
 bin=/usr/sbin/upsmon
 
 depend() {
diff --git a/sys-power/nut/files/nut-2.8.0-fix-man-page-generation.patch b/sys-power/nut/files/nut-2.8.0-fix-man-page-generation.patch
new file mode 100644
index 000000000000..ff224a4774bf
--- /dev/null
+++ b/sys-power/nut/files/nut-2.8.0-fix-man-page-generation.patch
@@ -0,0 +1,64 @@
+From c0d9ce265c6ca627039845d9544ebbdf87a00f7f Mon Sep 17 00:00:00 2001
+From: Timo Kokkonen <timo.t.kokkonen@iki.fi>
+Date: Mon, 11 Jul 2022 20:41:12 +0300
+Subject: [PATCH] docs: man: upsd: Fix driver list when building only some of
+ drivers
+
+There are two issues that come up in man page generation when only
+some of the drivers are built.
+
+First is that during configure phase DRIVER_MAN_LIST is collected by
+searching any .8 files matching the driver names. This does not work
+very well as during the first configure call these files don't exist
+yet as none of them are compiled yet. Searching the .txt files where
+they are built from works better.
+
+Second issue is that SRC_DRIVERS_PAGES list needs to contain the
+source files where the driver list is generated from. If only some
+drivers are built, this needs to be populated from the list of files
+we collected to DRIVER_MAN_LIST during configure phase.
+
+Adding these entries will ensure manpage generation will not fail if
+only some of the drivers are built
+
+Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>
+---
+ configure.ac         | 4 ++--
+ docs/man/Makefile.am | 6 ++++++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3aa26c24e..a49ca4417 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1745,8 +1745,8 @@ if test "${WITH_MANS}" = "yes"; then
+ 	else
+ 		DRIVER_MAN_LIST=""
+ 		for i in ${DRIVER_BUILD_LIST}; do
+-			if test -f ${srcdir}/docs/man/$i.8; then
+-				DRIVER_MAN_LIST="${DRIVER_MAN_LIST} $i.8"
++			if test -f ${srcdir}/docs/man/$i.txt; then
++				DRIVER_MAN_LIST="${DRIVER_MAN_LIST} $i.txt"
+ 			fi
+ 		done
+ 		AC_MSG_RESULT(${DRIVER_MAN_LIST})
+diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am
+index 0d693a355..a7345264b 100644
+--- a/docs/man/Makefile.am
++++ b/docs/man/Makefile.am
+@@ -695,6 +695,12 @@ SRC_DRIVERS_PAGES = \
+ 	$(SRC_MODBUS_PAGES) \
+ 	$(SRC_LINUX_I2C_PAGES)
+ 
++if SOME_DRIVERS
++SRC_DRIVERS_PAGES += \
++	$(DRIVER_MAN_LIST)
++endif
++
++
+ # distribute everything, even those not installed by default
+ # Note that 'dist' target requires AsciiDoc!
+ SRC_ALL_PAGES = \
+-- 
+2.35.1
+
diff --git a/sys-power/nut/files/nut-2.8.0-init.d-upsd b/sys-power/nut/files/nut-2.8.0-init.d-upsd
new file mode 100644
index 000000000000..ce09de52d56d
--- /dev/null
+++ b/sys-power/nut/files/nut-2.8.0-init.d-upsd
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2023 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+pidfile=/run/nut/upsd.pid
+bin=/usr/sbin/upsd
+
+depend() {
+	use net
+	before upsmon
+	after upsdrv
+}
+
+start() {
+	ebegin "Starting upsd"
+	# clean up first
+	pkill -u root,nut -x ${bin}
+	sleep 1
+	rm -f ${pidfile}
+	# now start up
+	start-stop-daemon --start --quiet --exec ${bin}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping upsd"
+	start-stop-daemon --stop --quiet --pidfile ${pidfile}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading upsd"
+	start-stop-daemon --stop --signal HUP --oknodo --quiet --pidfile ${pidfile}
+	eend $?
+}
diff --git a/sys-power/nut/files/nut.powerfail.initd b/sys-power/nut/files/nut.powerfail.initd
index fd26b4f76aec..f81b258a7cdb 100644
--- a/sys-power/nut/files/nut.powerfail.initd
+++ b/sys-power/nut/files/nut.powerfail.initd
@@ -45,4 +45,3 @@ start() {
 		ewarn "UPS powerfail script scheduled, and flags found, but ${UPS_CTL} missing."
 	fi
 }
-
diff --git a/sys-power/nut/files/systemd_notify.path b/sys-power/nut/files/systemd_notify.path
new file mode 100644
index 000000000000..657e0075420c
--- /dev/null
+++ b/sys-power/nut/files/systemd_notify.path
@@ -0,0 +1,50 @@
+--- old/configure.ac	2023-06-09 00:53:54.121886669 +0200
++++ new/configure.ac	2023-06-09 00:57:13.149792791 +0200
+@@ -3220,45 +3220,8 @@
+ AC_PATH_PROG([SYSTEMD_ANALYZE_PROGRAM], [systemd-analyze], [/usr/bin/systemd-analyze])
+ 
+ dnl Relevant since 2023: https://github.com/systemd/systemd/pull/25916
+-SYSTEMD_SUPPORTS_DAEMON_TYPE_NOTIFY=no
+-AS_IF([test -x "$SYSTEMD_ANALYZE_PROGRAM"], [
+-	AC_MSG_CHECKING([if your systemd version supports Type=notify])
+-	myFILE="`mktemp systemd-analyze-XXXXXX.service`"
+-	cat > "$myFILE" << EOF
+-@<:@Unit@:>@
+-Description=temp
+-@<:@Service@:>@
+-ExecStart=/bin/true
+-Type=notify
+-EOF
+-	if myOUT="`"$SYSTEMD_ANALYZE_PROGRAM" verify "$myFILE" 2>&1`" \
+-	&& ! (echo "$myOUT" | grep "Failed to parse service type, ignoring") \
+-	; then
+-		SYSTEMD_SUPPORTS_DAEMON_TYPE_NOTIFY=yes
+-	fi
+-	rm -f "$myFILE"
+-	AC_MSG_RESULT([${SYSTEMD_SUPPORTS_DAEMON_TYPE_NOTIFY}])
+-	])
+-
+-SYSTEMD_SUPPORTS_DAEMON_TYPE_NOTIFY_RELOAD=no
+-AS_IF([test -x "$SYSTEMD_ANALYZE_PROGRAM"], [
+-	AC_MSG_CHECKING([if your systemd version supports Type=notify-reload])
+-	myFILE="`mktemp systemd-analyze-XXXXXX.service`"
+-	cat > "$myFILE" << EOF
+-@<:@Unit@:>@
+-Description=temp
+-@<:@Service@:>@
+-ExecStart=/bin/true
+-Type=notify-reload
+-EOF
+-	if myOUT="`"$SYSTEMD_ANALYZE_PROGRAM" verify "$myFILE" 2>&1`" \
+-	&& ! (echo "$myOUT" | grep "Failed to parse service type, ignoring") \
+-	; then
+-		SYSTEMD_SUPPORTS_DAEMON_TYPE_NOTIFY_RELOAD=yes
+-	fi
+-	rm -f "$myFILE"
+-	AC_MSG_RESULT([${SYSTEMD_SUPPORTS_DAEMON_TYPE_NOTIFY_RELOAD}])
+-	])
++SYSTEMD_SUPPORTS_DAEMON_TYPE_NOTIFY=yes
++SYSTEMD_SUPPORTS_DAEMON_TYPE_NOTIFY_RELOAD=yes
+ 
+ AS_IF([test x"${with_libsystemd}" = xyes && test x"${SYSTEMD_SUPPORTS_DAEMON_TYPE_NOTIFY}" = xyes], [
+ 	dnl Built with sd_notify support
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index d310afca661e..4579366e6071 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -8,8 +8,24 @@
 	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>web@inode64.com</email>
+		<name>Fco. Javier Félix</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
-		<flag name="ipmi">Support IPMI-based UPSes.</flag>
+		<flag name="gpio">Includes all UPS drivers that use GPIO.</flag>
+		<flag name="i2c">Includes all UPS drivers that use I2C.</flag>
+		<flag name="ipmi">Includes all UPS drivers that use ipmi.</flag>
+		<flag name="modbus">Includes all UPS drivers that use MODBUS.</flag>
+		<flag name="monitor">Add a QT5 gui monitor.</flag>
+		<flag name="serial">Includes all UPS drivers that use SERIAL.</flag>
+		<flag name="snmp">Includes all UPS drivers that use SNMP.</flag>
+		<flag name="usb">Includes all UPS drivers that use USB.</flag>
+		<flag name="xml">Includes all UPS drivers that use XML.</flag>
 		<flag name="ups_drivers_al175">Driver for Eltek UPS models with AL175 alarm module</flag>
 		<flag name="ups_drivers_bcmxcp">Driver for UPSes supporting the serial BCM/XCP protocol</flag>
 		<flag name="ups_drivers_belkin">Driver for Belkin serial UPS equipment</flag>
diff --git a/sys-power/nut/nut-2.8.0-r1.ebuild b/sys-power/nut/nut-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..653fa007ed62
--- /dev/null
+++ b/sys-power/nut/nut-2.8.0-r1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 flag-o-matic linux-info optfeature systemd
+inherit tmpfiles toolchain-funcs udev
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Network-UPS Tools"
+HOMEPAGE="https://networkupstools.org/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/networkupstools/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="cgi doc ipmi serial i2c +man snmp +usb modbus selinux split-usr ssl tcpd test xml zeroconf"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-group/nut
+	acct-user/nut
+	dev-libs/libltdl
+	virtual/udev
+	cgi? ( >=media-libs/gd-2[png] )
+	i2c? ( sys-apps/i2c-tools )
+	ipmi? ( sys-libs/freeipmi )
+	modbus? ( dev-libs/libmodbus )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? ( >=dev-libs/openssl-1:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	usb? ( virtual/libusb:1 )
+	xml? ( >=net-libs/neon-0.25.0:= )
+	zeroconf? ( net-dns/avahi )
+"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( app-text/asciidoc )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-nut )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch"
+)
+
+pkg_pretend() {
+	if use i2c; then
+		CONFIG_CHECK="~I2C_CHARDEV"
+		ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+	fi
+	if use usb; then
+		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+		ERROR_HIDRAW="HIDRAW is needed to support USB UPSes"
+		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB UPSes"
+	fi
+	if use serial; then
+		CONFIG_CHECK="~SERIAL_8250"
+		ERROR_SERIAL_8250="SERIAL_8250 is needed to support Serial UPSes"
+	fi
+
+	# Now do the actual checks setup above
+	check_extra_config
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]] ; then
+		./autogen.sh || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--datadir=/usr/share/nut
+		--datarootdir=/usr/share/nut
+		--disable-static
+		--disable-strip
+		--disable-Werror
+		--sysconfdir=/etc/nut
+		--with-dev
+		--with-drvpath="/$(get_libdir)/nut"
+		--with-group=nut
+		--with-htmlpath=/usr/share/nut/html
+		--with-logfacility=LOG_DAEMON
+		--with-statepath=/var/lib/nut
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdtmpfilesdir="/usr/lib/tmpfiles.d"
+		--with-udev-dir="$(get_udevdir)"
+		--with-user=nut
+		--without-powerman
+		--without-python
+		--without-python2
+		--without-python3
+		--with-altpidpath=/run/nut
+		--with-pidpath=/run/nut
+		$(use_enable test cppunit)
+		$(use_with i2c linux_i2c)
+		$(use_with ipmi freeipmi)
+		$(use_with ipmi)
+		$(use_with serial)
+		$(use_with snmp)
+		$(use_with ssl)
+		$(use_with tcpd wrap)
+		$(use_with usb)
+		$(use_with xml neon)
+		$(use_with zeroconf avahi)
+	)
+
+	filter-lto
+	append-flags -fno-lto
+	tc-export CC CXX AR
+
+	use cgi && myeconfargs+=( --with-cgipath=/usr/share/nut/cgi )
+	use man && myeconfargs+=( --with-doc=man )
+
+	export bashcompdir="$(get_bashcompdir)"
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}/etc/hotplug" || die
+
+	find "${ED}" -name '*.la' -delete || die
+
+	dodir /sbin
+	use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
+
+	if use cgi; then
+		elog "CGI monitoring scripts are installed in ${EPREFIX}/usr/share/nut/cgi."
+		elog "copy them to your web server's ScriptPath to activate (this is a"
+		elog "change from the old location)."
+		elog "If you use lighttpd, see lighttpd_nut.conf in the documentation."
+		elog
+		elog "Use script aliases according to the web server you use (apache, nginx, lighttpd, etc...)"
+	fi
+
+	# This must be done after all of the install phases
+	local i
+	for i in "${ED}"/etc/nut/*.sample ; do
+		mv "${i}" "${i/.sample/}" || die
+	done
+
+	local DOCS=( AUTHORS MAINTAINERS NEWS README TODO UPGRADING )
+	einstalldocs
+
+	if use doc; then
+		newdoc lib/README README.lib
+		dodoc docs/*.txt
+		docinto cables
+		dodoc docs/cables/*
+	fi
+
+	newinitd "${FILESDIR}"/nut-2.8.0-init.d-upsd upsd
+	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
+	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
+	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
+	newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
+
+	newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
+	bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
+
+	if use zeroconf; then
+		insinto /etc/avahi/services
+		doins scripts/avahi/nut.service
+	fi
+
+	mv "${ED}"/usr/lib/tmpfiles.d/nut-common.tmpfiles "${ED}"/usr/lib/tmpfiles.d/nut-common-tmpfiles.conf || die
+
+	# Fix double directory
+	sed -i -e 's:/nut/nut:/nut:g' "${ED}"/usr/lib/tmpfiles.d/nut-common-tmpfiles.conf || die
+}
+
+pkg_postinst() {
+	elog "Please note that NUT now runs under the 'nut' user."
+	elog "NUT is in the uucp group for access to RS-232 UPS."
+	elog "However if you use a USB UPS you may need to look at the udev or"
+	elog "hotplug rules that are installed, and alter them suitably."
+	elog
+	elog "You are strongly advised to read the UPGRADING file provided by upstream."
+	elog
+	elog "Please note that upsdrv is NOT automatically started by upsd anymore."
+	elog "If you have multiple UPS units, you can use their NUT names to"
+	elog "have a service per UPS:"
+	elog "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME"
+	elog
+	elog 'If you want apcupsd to power off your UPS when it'
+	elog 'shuts down your system in a power failure, you must'
+	elog 'add nut.powerfail to your shutdown runlevel:'
+	elog
+	elog 'rc-update add nut.powerfail shutdown'
+	elog
+
+	optfeature "all notify events generate a global message (wall) to all users, plus they are logged via the syslog" \
+		sys-apps/util-linux[logger,tty-helpers]
+
+	udev_reload
+
+	tmpfiles_process nut-common-tmpfiles.conf
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-power/nut/nut-9999.ebuild b/sys-power/nut/nut-9999.ebuild
new file mode 100644
index 000000000000..1a18e915356e
--- /dev/null
+++ b/sys-power/nut/nut-9999.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit bash-completion-r1 desktop flag-o-matic linux-info optfeature
+inherit python-single-r1 systemd tmpfiles toolchain-funcs udev wrapper xdg
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Network-UPS Tools"
+HOMEPAGE="https://networkupstools.org/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/networkupstools/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gpio cgi doc ipmi serial i2c +man snmp +usb modbus selinux split-usr ssl tcpd test xml zeroconf python monitor systemd"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	monitor? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	snmp? ( python )
+"
+
+# sys-apps/systemd-253 required for Type=notify-reload
+DEPEND="
+	acct-group/nut
+	acct-user/nut
+	dev-libs/libltdl
+	virtual/udev
+	cgi? ( >=media-libs/gd-2[png] )
+	gpio? ( dev-libs/libgpiod )
+	i2c? ( sys-apps/i2c-tools )
+	ipmi? ( sys-libs/freeipmi )
+	modbus? ( dev-libs/libmodbus )
+	python? ( ${PYTHON_DEPS} )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? ( >=dev-libs/openssl-1:= )
+	systemd? ( >=sys-apps/systemd-253 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	usb? ( virtual/libusb:1 )
+	xml? ( >=net-libs/neon-0.25.0:= )
+	zeroconf? ( net-dns/avahi )
+"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( app-text/asciidoc )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="
+	${DEPEND}
+	monitor? ( $(python_gen_cond_dep '
+			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		')
+	)
+	selinux? ( sec-policy/selinux-nut )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch"
+	"${FILESDIR}/systemd_notify.path"
+)
+
+pkg_pretend() {
+	if use i2c; then
+		CONFIG_CHECK="~I2C_CHARDEV"
+		ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+	fi
+	if use usb; then
+		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+		ERROR_HIDRAW="HIDRAW is needed to support USB UPSes"
+		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB UPSes"
+	fi
+	if use gpio; then
+		CONFIG_CHECK="~GPIO_CDEV_V1"
+		ERROR_GPIO_CDEV_V1="GPIO_CDEV_V1 is needed to support GPIO UPSes"
+	fi
+	if use serial; then
+		CONFIG_CHECK="~SERIAL_8250"
+		ERROR_SERIAL_8250="SERIAL_8250 is needed to support Serial UPSes"
+	fi
+
+	# Now do the actual checks setup above
+	check_extra_config
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]] ; then
+		./autogen.sh || die
+	fi
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myeconfargs=(
+		--datadir=/usr/share/nut
+		--datarootdir=/usr/share/nut
+		--disable-static
+		--disable-strip
+		--disable-Werror
+		--sysconfdir=/etc/nut
+		--with-dev
+		--with-drvpath="/$(get_libdir)/nut"
+		--with-group=nut
+		--with-htmlpath=/usr/share/nut/html
+		--with-logfacility=LOG_DAEMON
+		--with-statepath=/var/lib/nut
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdtmpfilesdir="/usr/lib/tmpfiles.d"
+		--with-udev-dir="$(get_udevdir)"
+		--with-user=nut
+		--without-powerman
+		--without-python
+		--without-python2
+		--with-altpidpath=/run/nut
+		--with-pidpath=/run/nut
+		$(use_with gpio)
+		$(use_with i2c linux_i2c)
+		$(use_with ipmi freeipmi)
+		$(use_with ipmi)
+		$(use_with monitor nut_monitor)
+		$(use_with python pynut)
+		$(use_with serial)
+		$(use_with snmp)
+		$(use_with ssl)
+		$(use_with systemd libsystemd)
+		$(use_with tcpd wrap)
+		$(use_with usb)
+		$(use_with xml neon)
+		$(use_with zeroconf avahi)
+	)
+
+	filter-lto
+	append-flags -fno-lto
+	tc-export CC CXX AR
+
+	use cgi && myeconfargs+=( --with-cgipath=/usr/share/nut/cgi )
+	use man && myeconfargs+=( --with-doc=man )
+	use python && myeconfargs+=( --with-python3="${PYTHON}" ) || myeconfargs+=( --without-python3 )
+
+	export bashcompdir="$(get_bashcompdir)"
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}/etc/hotplug" || die
+
+	find "${ED}" -name '*.la' -delete || die
+
+	dodir /sbin
+	use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
+
+	if use cgi; then
+		elog "CGI monitoring scripts are installed in ${EPREFIX}/usr/share/nut/cgi."
+		elog "copy them to your web server's ScriptPath to activate (this is a"
+		elog "change from the old location)."
+		elog "If you use lighttpd, see lighttpd_nut.conf in the documentation."
+		elog
+		elog "Use script aliases according to the web server you use (apache, nginx, lighttpd, etc...)"
+	fi
+
+	# This must be done after all of the install phases
+	local i
+	for i in "${ED}"/etc/nut/*.sample ; do
+		mv "${i}" "${i/.sample/}" || die
+	done
+
+	local DOCS=( AUTHORS MAINTAINERS NEWS README TODO UPGRADING )
+	einstalldocs
+
+	if use doc; then
+		newdoc lib/README README.lib
+		dodoc docs/*.txt
+		docinto cables
+		dodoc docs/cables/*
+	fi
+
+	newinitd "${FILESDIR}"/nut-2.8.0-init.d-upsd upsd
+	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
+	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
+	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
+	newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
+
+	newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
+	bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
+
+	if use zeroconf; then
+		insinto /etc/avahi/services
+		doins scripts/avahi/nut.service
+	fi
+
+	if use monitor; then
+		make_wrapper NUT-Monitor-py3qt5 /usr/share/nut/nut-monitor/app/NUT-Monitor-py3qt5 /usr/share/nut/nut-monitor/app
+
+		# Install desktop shortcut
+		newmenu scripts/python/app/nut-monitor-py3qt5.desktop nut-monitor.desktop
+
+		# Installing Application icons
+		local res
+		for res in 48 64 256; do
+			doicon -s ${res} scripts/python/app/icons/${res}x${res}/nut-monitor.png
+		done
+		doicon -s scalable scripts/python/app/icons/scalable/nut-monitor.svg
+	fi
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	elog "Please note that NUT now runs under the 'nut' user."
+	elog "NUT is in the uucp group for access to RS-232 UPS."
+	elog "However if you use a USB UPS you may need to look at the udev or"
+	elog "hotplug rules that are installed, and alter them suitably."
+	elog
+	elog "You are strongly advised to read the UPGRADING file provided by upstream."
+	elog
+	elog "Please note that upsdrv is NOT automatically started by upsd anymore."
+	elog "If you have multiple UPS units, you can use their NUT names to"
+	elog "have a service per UPS:"
+	elog "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME"
+	elog
+	elog 'If you want apcupsd to power off your UPS when it'
+	elog 'shuts down your system in a power failure, you must'
+	elog 'add nut.powerfail to your shutdown runlevel:'
+	elog
+	elog 'rc-update add nut.powerfail shutdown'
+	elog
+
+	optfeature "all notify events generate a global message (wall) to all users, plus they are logged via the syslog" \
+		sys-apps/util-linux[logger,tty-helpers]
+
+	udev_reload
+
+	tmpfiles_process nut-common-tmpfiles.conf
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_pkg_postrm
+}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index c053ec805b9c..28d55dcc12f2 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 64c1159d3710..47423eca90cf 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,5 +1,5 @@
 AUX qtile-session-r1 1860 BLAKE2B fb9345d3acc5e0fc5694065f12e2759e02aebc765925cb0ffcb1a776ec82e959503d8a8039238e4e48a5045a3118f2e37201a88d5255fd0a0782d2f8291d8a77 SHA512 41b37ba034b5dd7f3126142d2cfc5cf8986b521fc419d47e420582fc8b516df87249bd8e14c12d77691b93205ec3cd1249bfa040ef0691e0751c669f742570ee
 DIST qtile-0.22.1.tar.gz 488969 BLAKE2B 3b2fce587ae39570997b503cb386314160dbefa39b1ef65dc2ff5bc2f1167251224a0f298ef8e374d0d4c034d1e5012251f96b92ce5cb74d7fd93320e14ff8bf SHA512 944ec27b5d227154624fa2a15a0840b748307a1e79ab52ccf3384763111459b3c4d26b4677f8e2ea51634206dc6d1e32e057e057db917b3705ce583d83a8056d
-EBUILD qtile-0.22.1-r2.ebuild 2803 BLAKE2B c64167d359c91e99354dfe51e1df801523ef0b48350c86e0ec3bcf04369d868bacb0e6b11364b11a31dd77351ca779ff9964f2296a48c318bb34b6242e7abe80 SHA512 7a6bf16ba610595b781dde9c34fa56e3ecf38387bb7a65afdbe902a2e102e5bd7b00471f305d44849cfe404afa22c62fc564f8a90ab37c3ed1ba781e02405d1f
+EBUILD qtile-0.22.1-r2.ebuild 2802 BLAKE2B e9128ba74ce01cc3b4c27e211a73bc7caac33a254732d48c45a0fa9228be1c6ee29a53c327b27c617323f2efda2d94426479fbf609a07841d004dfe2b9e47ed3 SHA512 28180708c14d4834498bc4d61833d1b74f79cadf9e47af206464bb3bdc6ecc7b6f69061373c8a97dac0a111d1ff49cc297dcf02286d295189556907e8684253e
 EBUILD qtile-9999.ebuild 2565 BLAKE2B 22d6ec5cdc17f86496706a2baba1dc4dcc4613833a903156a2978e53d91f2e1bbead238405c00be2adb38a7c875731292be429c5cb124399990104cf8175551d SHA512 be95007e4b6791cc64c5f089df3de25074f216a3cdd8bdc11ef83189a8a52fb96cc456b44c22999ea767b09ede79d3ebceeabb610d0e910edc7c475cc0fc8993
 MISC metadata.xml 520 BLAKE2B c4f950d403af7f6e2f43e9bfb0d8b7ff62ff79f882d082238556bec18178d9a74de4b4d234e8ab7bbeb87b45242f0e2a7aa0a491a8cca701abe5160c30004bad SHA512 1836daaa92c9af266f3b5531203230ccb94a704f6819d14db469adc87e8d36a187e65048ba637d957c63c8e713ea5b89d1938bb75e1425da8aa3153543268924
diff --git a/x11-wm/qtile/qtile-0.22.1-r2.ebuild b/x11-wm/qtile/qtile-0.22.1-r2.ebuild
index 4c48610f2886..6f48d2f1e8b6 100644
--- a/x11-wm/qtile/qtile-0.22.1-r2.ebuild
+++ b/x11-wm/qtile/qtile-0.22.1-r2.ebuild
@@ -27,7 +27,7 @@ IUSE="pulseaudio wayland"
 # pywlroots-0.15 dep.
 # xcffib v1.4.0 breaks its ffi export (https://github.com/qtile/qtile/pull/4289)
 RDEPEND="
-	>=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
+	<dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
 	dev-python/dbus-next[${PYTHON_USEDEP}]
 	dev-python/pygobject[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@koprulu.sector>	2023-06-17 07:43:56 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-06-17 07:43:56 +0100
commit	b978efa000250668b2befa4e2cc96e0afa137611 (patch)
tree	0c561efed9b15c17a9d3ef926443f35c58dfb48c
parent	fa5e8e92d94ea9de5d49a1f5ad19abf7272503d0 (diff)