gentoo auto-resync : 01:06:2023 - 09:25:35

author: V3n3RiX <venerix@koprulu.sector> 2023-06-01 09:25:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-06-01 09:25:36 +0100
commit: 9b9c22874161d13ca8d50c952d549f2390f3f179 (patch)
tree: 008ed76c56f51f6f3c30370c7b6109476f3dd4e4
parent: 51f111b675c30c05f05128be7836616634098bae (diff)
465 files changed, 6552 insertions, 777 deletions
diff --git a/Manifest b/Manifest
index 3d9103dec8ac..d4097411ce9f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29414 BLAKE2B 6e2a91ad3e4964a99f7be1dbf14301e327170947fc231e3b68e31020a18211cd189318334a3e50cfa3142f9b4fecb2884e5d492b767dd21ac889af4d9c776517 SHA512 f994ce0364f268cac596809f139a2176c3de85124a51acb8026dddf913e9e1e9e038c40e3d1effbab752074b7756359eeb7693cd63b7c3831a0460c02a758330
-TIMESTAMP 2023-06-01T01:40:14Z
+MANIFEST Manifest.files.gz 29440 BLAKE2B 9d0beb51fcf9e28ceabd242cbab2f06cef65c7b7507f9c58b093f770a5ce1a1e73400e57fa5c55e8fc28dc34149d53a9a01888e4371cec54d4ade80a863c78fa SHA512 bce14520b17448cb9bd7c96283dd2153493318bce6476b8b94f5055b2d29d0d91ac872b8433c46490b7d58d7875bc8196f2173c0c1789bb04d3215267e6b49a5
+TIMESTAMP 2023-06-01T07:39:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR39v5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR4Sz9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBNjxAAoB6Dja50uLx5rZdtq7z9HJ9xFZPSS/2E4CjUJRB6OSwFqPj35s2+4n3E
-7NuxxWtMQ69kiB9pFIXDX/4aSnXQcKk4nlwJzjSIhvKeMrAnahFaL3ojrWnbl0lk
-bC/Nku6HZuSd4MTeKot07k/92095tHSh3VYAtU8OzNZAoMbZMHSqTSl/Vn1Ezccy
-U9b7cI7gK1+3OpAdvJEDn8PgtpzpWlgX3oSfnC9ZFtZgoSuT4tq6BKIX+QSKddmo
-JHgdFR29J6xBEjvNEzk6/9IstlNE1OR40rzV8n8l26TJo8jtnPwodVnADGrzQCS9
-pWWbHTV6J+L6luODziS4OO8YvqbDcQh57TOLS6i6ngOGImzwp8SYr82PTBbJrQWP
-QmfF+9r4EU8m5Bb8L2rp/lQSLj6a9o57NPAsu5Kvf2Y2BplEw9CeSu3lRocBgHx0
-2w1gE07nMLE6dZf/MOZ5zbKIsuP4ytD2/ckIr1zw/JbgKJY3LjXwajHGIzmDmWEK
-Etrm1s2Gyq/m+OQNtUi47I+Z0M4TMryUIpQ0mHjxC1snUuX4dl0GuX9lA8itU9FE
-tAvGCL4o3H2z8XV61u7e6mAchbS9l6pv24IivAkr4pAUXtUq9LrefL1GxT6GHNCz
-1aihYlI8PVwtjkv9CljyG5mf9jw1oZ+AFaqjLbVnnGeQbDaW0Vs=
-=dBb/
+klBOBw/9EV9tm7X4HFuPHn3IRvo28AvfUb4AVG/ErttNeFPo6wWKUlG1n+RsNGGt
+z8/Y8BcM+sG3mBgknXNyZLw2pv4zlS0gplox8POuKT8NJyyHWuS0/MuOexZPcDIx
+vqHIFIE/U+ssnqne4t8i0gPEJeI78U9RrA55ZTkfWMTTnLBTdpTUHyKENhjqWRHZ
+JCVRV+i8jRhJdOQfA8qv7Vmwajf39F+nMRuf/0YIsGLy80n/bFFLQ/4pbStSS6VK
+QIqVcMt108cykGM9zG/eqODKv8SHY4SXnTUMivUdkCgiYcU4wTnuoKYfETuTZV7p
+dvliKuhCU08iDbmPr12vn/JoU1qEthca1fV2OjlnyafxGQerJL0EWYvlNgWlJo3W
+FWT+KmJCg/qgOpfHXTp31ZrtzdiM2L8u0wkk+KtHnILBkuH8rjfJC9M/rKuP57Ay
+umTphSnVGJP2OFAPhYb2SZSa6iZGmyU63GHXQV+j+xesPupRsx5gOoTbWbLNV/+K
+m7z0L2E1o2dsrQvhSl5e3tW0lPevZeyKe+E3hu3iTNbhijDBZXof4rA0TZlRDPmX
+NjfekX8bYWrhbBwazwH4bvjfWIE+gviUeAvEcWo7/btc7r/V0Iukvh/X51VVf3kb
+gsJ6ztr5qZFPm9NPaxsjPJd92nXwufpxtQRz3y1tvdzPhjy073M=
+=yRms
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ae2e00701d75..2c3a9dbeb3a3 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bb8efc4dac43..39eef405726f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index a6ea1db89da4..6d3c227799eb 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.27.133.gh.tar.gz 2421348 BLAKE2B 0511291bf018bb62616f11231327b47a
 DIST aws-cli-1.27.137.gh.tar.gz 2423020 BLAKE2B 9cdc1cab324eaa2b2bc17418180bf8bec6e34903b427afbd2bceb0c35eb0923b5e7d98e42954f239bf13576b5d10b80c29d15af17e0f230ff79c244b1532a671 SHA512 9d3220b392839334bc077e0ae417b73ae2aaec363a5a3684690eabe790c062f9b428851b02cb2f27b65193c712fc149eb602a33b8f500afc81daed5cd2d3e8db
 DIST aws-cli-1.27.142.gh.tar.gz 2426758 BLAKE2B 587791e0102d51b9681718a71c1225c673f1545f98d2cbd679d266c559ae4252e92ec2c41a640584b5ce1e4aced885489723edb90e0700846e3fd74968be42bd SHA512 cb2ba71dc955ddd5a738f6e703a16216effdbd1232fa4e14c5974bf59c6f871ba80a4a61614dccb0fc110c689ce24f466c4142967be83f48c5de41699450d092
 DIST aws-cli-1.27.143.gh.tar.gz 2428987 BLAKE2B 3cc1d312e2a5cb4187234615d42f69c1296ad810a317adb2ebce05514168aee5b58b9ff0240e84bd31d4000d6f6cc76d476bee739ea6d394a833ee25ec422dce SHA512 f82634435ac67ba1cd2b43913d86c66ebe0dd06d40a708ae63a2bfc150a9733f1c80ff82362b48834ede5bba317c970d88d5e70d133860bb0ef022fd00ac07a1
+DIST aws-cli-1.27.144.gh.tar.gz 2429624 BLAKE2B 63b447244a5e1d110d30d69d02c6f895fcd667870c25e7f85abb0f51c47fe7547494010930bd0167861c187a0cfef3d298e55e83d1aaa77614687ee90b69da35 SHA512 979a38e3b089258d6828d55294ac5ba664df8b1a62180a3ecbdd98e0554676952e785c6ee917ff31eed32ec36cde0e08cf8cf98489eaff6b2242d6923493d2a3
 EBUILD awscli-1.27.133.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.137.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.142.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.143.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.144.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.144.ebuild b/app-admin/awscli/awscli-1.27.144.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.144.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/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index b983aef72175..ac3f93a9451e 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,5 +1,5 @@
 DIST puppet-lint-2.5.2.gem 91136 BLAKE2B cae884b3994c7862f337a214903ecd4d7bb297e9e2bb7495fb94030304f53fa7ae98080b62944d5c96f2af0d208352d00030415a89259e8e188ec53da2a2b643 SHA512 996a5fda970c318a3f58a196c7b9aba7e712aae2b24d936b917f1dd9eb6bf5d706df28f70d88e1e174e175aabb13f1d22c8c90289314d5a1dd4ff9207ebbfe03
 DIST puppet-lint-3.4.0.gem 83456 BLAKE2B fa6b274b3e6e84095fdaff6f024864dc301f0afc605198cc40b4dd8df7a9de66adfb91982195af9a0ad35301409c23e99d8d6ba5d3c43d3ee4dd57235de2b8cc SHA512 47c025ef925618cba3c1f579a3ef62bd5f9fd8ee7f8f9a68ed84daafeb7f9071e558619b24f0a249fcbe85d8c1b27e715938cc352792f9aa91de131820103e9c
 EBUILD puppet-lint-2.5.2.ebuild 531 BLAKE2B c1ac4560155432f3a6a0de1f10eb9d150b259cd98f6054b4ff642172c1201435f42c5eafb066129cd8de56498c56bbf78549019c4af0158db74f29e0f58a7740 SHA512 3d0511ef51f16c31de57b3796fbba9eebd475f32701379cb305851b789912519735458a8c19561291488f998ba0888611e06c9acb6db8266860544b5b379d0f5
-EBUILD puppet-lint-3.4.0.ebuild 758 BLAKE2B 6c022d7ec8416cf6eacb3c130e11193789c134b7627d56e2962568f39cd70a9efafa7127c21b91a602c48ae1f42cc5dcc9dc960def9ebfffc518d78e16edae57 SHA512 2e7996aabed09ebeb85c3fa3a83b7716b1f1cfdf760295171b92b322bf839da17549f83b25b7809994eb48aeb06a3501b59abfcc54e5cfcae852708ab9ee2476
+EBUILD puppet-lint-3.4.0.ebuild 757 BLAKE2B 6c85abe19f11a0a1ae7431be8852c1fd7bc92bfc311083ce6484dcf31c18de6377e0c732b9635fa7dfc4483e44b6948edbdcc8f6c10d3537db454b44747297f8 SHA512 5fa96119ae9086fcdbc2cac3e94f010a64f11cfffe732cb69f66dd87ff6df3f48ee0f15e9889246691efd65d0d715c20e518392f5c7fc53d8493bb4f1ce3d355
 MISC metadata.xml 444 BLAKE2B 42dc45f92fcd9546eaf6dd1408ce3f2407a6d9ceb6fe343719d47d82f4e7034085ac5df7b5e215624db2558a76c6d95f0c73a4cd946c2dd91e09c6beb682c31b SHA512 91a1ce00d98421c057be1d70e74e06bbe84c78a0aeeaa574d20164772084272a910afdd1a95f65aff6b453c0cd4e1c00ca7ba146ddff09ddd3f6f2bb6ae810c1
diff --git a/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild b/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild
index 3925aec549db..eaf594a6a0b4 100644
--- a/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-3.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/puppetlabs/puppet-lint"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec-its:1
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index dfab69f7bcda..6ad86c9b3cc4 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index bd4c4bac02c4..2fd641d3f303 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -10,5 +10,5 @@ EBUILD unrar-6.1.7.ebuild 1798 BLAKE2B 7b318ad6599c97bcac10c0a610786cc1df402c57c
 EBUILD unrar-6.2.1.ebuild 1798 BLAKE2B b77f79dfb772370b71ee1df41256e944d80563942404436e0cf5e2dc84ad92ba3e051636ecb82ea511496cecd53a887cfa9d5fe74257494b049094d3486e5851 SHA512 aa771fa76cf3eeeb00475dcf7364a0d3930d99e2ba84e4f0e7d9a899238d8b4f534a7f036df20b8fca854757b834275d7260b250bf2c0c5f1e170d744a6acec7
 EBUILD unrar-6.2.3.ebuild 1798 BLAKE2B db6f8c35e6ea5268238ae530edec412a9daf2491a8186898207a48825c3e9efc57f187274ca24ddd17f7c28cd99654d7920c0d1cd03d1e821a144afd5d14d7fa SHA512 8d802fccf423342031149d7b49b7cb5d9ccd42b067c634852c6ae3fac5aea2429aad72c50406db99a51703514e8ac9b0d799b76098bce548beadc81e997203bb
 EBUILD unrar-6.2.5.ebuild 1798 BLAKE2B db6f8c35e6ea5268238ae530edec412a9daf2491a8186898207a48825c3e9efc57f187274ca24ddd17f7c28cd99654d7920c0d1cd03d1e821a144afd5d14d7fa SHA512 8d802fccf423342031149d7b49b7cb5d9ccd42b067c634852c6ae3fac5aea2429aad72c50406db99a51703514e8ac9b0d799b76098bce548beadc81e997203bb
-EBUILD unrar-6.2.6.ebuild 1757 BLAKE2B 4cb1ff3589b51d6d8c0ea8550ff53879cf47c968fc9b0a41608c095b19c75fdc4abb4ea402c4465615a74771560ad7bfe938d449e6b5a42d4bf40dad9c4327e7 SHA512 368a0f98447fee7a469d51d735f65a12259597c58742cbcef1efb38d72f024ea08eee539ed1aeaa5303b94be21976dfe2e4cdfb55704fb6ed35ffc2b577cf2b4
+EBUILD unrar-6.2.6.ebuild 1752 BLAKE2B 687ebeaf26e28d9dabf5f8447fb89a6dec661c075682c7348e009ef043a067dd3ee025b829d86a7208a981a7c9b663ddb3d3a42ea8368efd39b92dfa7308dcfe SHA512 4fe18700ce900bf751caf03a22dc7e13a9184838b390f09bce7acf6f7836d9d2b5140d05c6dbb440d827d568427cd90273b7ee91f8ad59ee5e99b72785ad8027
 MISC metadata.xml 409 BLAKE2B a84cfacf4a852caa6f6389b380eeb700e1c44c4af68cb2568a27db21c2b577838d9c57269dcdb5f08dfa989617eca978520082d36153ea503a5033c4cc9446af SHA512 fcdf5a345b3eb2b5093b60def127dd48fed068bf5caa92dc52524b4e398d49c39d8ee686b3f0695c781ab2d0d3ba486baec23f74f80e581b7a2f77e0c5709eaa
diff --git a/app-arch/unrar/unrar-6.2.6.ebuild b/app-arch/unrar/unrar-6.2.6.ebuild
index 50fe099a9502..864848862193 100644
--- a/app-arch/unrar/unrar-6.2.6.ebuild
+++ b/app-arch/unrar/unrar-6.2.6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/unrar"
 
 LICENSE="unRAR"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 PATCHES=( "${FILESDIR}/${P}-honor-flags.patch" )
 
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 596d25f41198..312a95a98b50 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index e5b8498dc52a..b4c89c0a0ef0 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,10 +1,8 @@
-DIST eclass-manpages-20230329.tar.xz 409168 BLAKE2B 5913afcf95174540546d238cc637689fe0c7de2013f4271ac3feee749eb2fede8b741e2409ba09060fd5c36941e36ee504be8a584201d04b368886f50abfd3ea SHA512 ee43c47f26b474acec2f778a5bf05c752198d2f5cce959a337eaa674465c92869e213dd4aea8243671825cea80bbfbec7040cac283354de4e8feeefeace46d32
-DIST eclass-manpages-20230417.tar.xz 409620 BLAKE2B 0e1b3cce23ee9f2a91b87c5de89819eca8fd50101e813ecf56c8a1d4147bf33006505425be95a2f1693ec084fbf9409c2aaf1dccf6d9cbf244e71ee1c0e1498d SHA512 2cef6f30e917979b9f56c11f953c27a8048842b432fc6641ea06daf479bc202d9ea2f8ce26769584f317bf3cde2c2f9736d2605546be1b1a10ea557177639de3
 DIST eclass-manpages-20230512.tar.xz 410888 BLAKE2B a6a26230b7e06a4a62c9e7a6695af3849ed0504ac24da4a2b05ce770a44b69224da6eedae960a7c0a43a9cadbac24b88ef76dd1b2cf9853e91c424e63136989a SHA512 e09513b23268fc5bc84dcea90f5c9901ae0b376379b4235dc599553c3664a29d72cef15787acf4ef3bb2cd9081b95891dc5c100e9f88b6f133b7fbee13c011ad
 DIST eclass-manpages-20230530.tar.xz 422768 BLAKE2B 1e2985175be537300aa31e87ea397eb103d0b5118f792ea46a06a9100ea4d0c15d25bccdd47e855a2d9b21fe3e0af1f22bdcf97997b1ce79a0c2b0a07b497812 SHA512 7471cd52678ae2f7f4e62c7f6acafa2ea7e7df2949db0280d443c9395c25dc45933050a4c8cdda0d69d0d181d7004c927c9366bfaeb3d2c65f60cd2d62f7c8ff
-EBUILD eclass-manpages-20230329.ebuild 760 BLAKE2B 4e30a5b7d8a53d687041068715f77689d581608c5790d5ddbe72ba88d2ac58d903f13d60c4bbad35497945060075c22f0b6ea6f2b4b6c8ec4a59b3e6cd920d2c SHA512 51eb4b98dd2a04c436dc0cdb5343f07d427656ae9cdb2fe36cff5a1abceef2f11ab618beab8000677109e351aa7ccf0ae98b4712f38abcc760e0ce87a6d330e3
-EBUILD eclass-manpages-20230417.ebuild 760 BLAKE2B 4e30a5b7d8a53d687041068715f77689d581608c5790d5ddbe72ba88d2ac58d903f13d60c4bbad35497945060075c22f0b6ea6f2b4b6c8ec4a59b3e6cd920d2c SHA512 51eb4b98dd2a04c436dc0cdb5343f07d427656ae9cdb2fe36cff5a1abceef2f11ab618beab8000677109e351aa7ccf0ae98b4712f38abcc760e0ce87a6d330e3
+DIST eclass-manpages-20230601.tar.xz 423088 BLAKE2B 35ef9f3fad733d6aa363c2808de8e6cc8936f1c965c7181b55cd955c8e3bcc339af7ac070302f220002e77011adf05e9904f38d29f832f7640f3cdc11f4f0a8f SHA512 5ff2dfca210b14a448472d6ea55ae5b321541e09124c74ff43392eea48dab06b22fbad9a7b62b80d5b67f9d07e1055bcca29eb03f77b899be886ada078e2df1f
 EBUILD eclass-manpages-20230512.ebuild 759 BLAKE2B f8374a8491136b96a4a94943efd94c48c378a0dd45bb16af56c675efaa277c16b5fc91e9d59b952d852bc4de2cbbf2005ee32c10ec88015981a632ec582bb098 SHA512 b6167142c15cdf5a603c7ace12028e03846931bbdaf6cf7a269d295796c5cdbcc88ef0e070ed0edb9e094d280e44dc78568a19f43eaa03dd3648ae8feb2ed201
 EBUILD eclass-manpages-20230530.ebuild 759 BLAKE2B f8374a8491136b96a4a94943efd94c48c378a0dd45bb16af56c675efaa277c16b5fc91e9d59b952d852bc4de2cbbf2005ee32c10ec88015981a632ec582bb098 SHA512 b6167142c15cdf5a603c7ace12028e03846931bbdaf6cf7a269d295796c5cdbcc88ef0e070ed0edb9e094d280e44dc78568a19f43eaa03dd3648ae8feb2ed201
+EBUILD eclass-manpages-20230601.ebuild 759 BLAKE2B f8374a8491136b96a4a94943efd94c48c378a0dd45bb16af56c675efaa277c16b5fc91e9d59b952d852bc4de2cbbf2005ee32c10ec88015981a632ec582bb098 SHA512 b6167142c15cdf5a603c7ace12028e03846931bbdaf6cf7a269d295796c5cdbcc88ef0e070ed0edb9e094d280e44dc78568a19f43eaa03dd3648ae8feb2ed201
 EBUILD eclass-manpages-99999999.ebuild 717 BLAKE2B 539cacbb1e30897fcf7217eb7420273a11e342eb19ce270d6ded5f25a7dbab87cb6719cff57d4a63bf78d58dcaec565bdbca41f4689c5ee557adb09f60be6376 SHA512 b1a601332d1b82808a698d463026dc093a1afd93d93ef2845ff71773b79c4f12c6925f8b90101cda725e5b6c479c230aaf0d15fe8767e05648689dd9d1fcb0fb
 MISC metadata.xml 546 BLAKE2B 3fcaa67cd9ba2aebeae79ad37612fda556b7e42ec1692293d26201e82b7101cc8894e3fa8ed9acb4026fa0eb7e9c54ae6919872cd8e61c0f0d63ae3a323206b0 SHA512 6fb2a7db8da921bc6d3b22444ed401ef73c2a2d25ca4e4170234763ec98a108a63d05167660ce4e173d4e9604053269c04a66d617897045b2482b3febbc7e33c
diff --git a/app-doc/eclass-manpages/eclass-manpages-20230417.ebuild b/app-doc/eclass-manpages/eclass-manpages-20230417.ebuild
deleted file mode 100644
index 16414db9870e..000000000000
--- a/app-doc/eclass-manpages/eclass-manpages-20230417.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Instructions to make a dist tarball:
-# git clone https://github.com/projg2/eclass-to-manpage.git
-# cd eclass-to-manpage
-# make dist ECLASSDIR=~/g/eclass/
-
-DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://github.com/projg2/eclass-to-manpage"
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="sys-apps/gawk"
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
-}
diff --git a/app-doc/eclass-manpages/eclass-manpages-20230329.ebuild b/app-doc/eclass-manpages/eclass-manpages-20230601.ebuild
index 16414db9870e..a48746c8b4c9 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20230329.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20230601.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 # Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="sys-apps/gawk"
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c7a18c20d1a7..f2145c2e8224 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index d9f8879cde95..d5d01837baf1 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -28,6 +28,6 @@ EBUILD libvirt-8.8.0-r1.ebuild 8992 BLAKE2B cad2f465f03f0ccc6bf62ae1cd48514a304f
 EBUILD libvirt-8.9.0-r2.ebuild 9136 BLAKE2B 197b18ee1f588691bc0947f7783208adf726b442be95bddb80ed02e541b0d5b4ecec878f7c2a56019ecf55165a19bd7d2e0e0bb2e066887c441dd8ec57ed9eb5 SHA512 df61ed7e908741194f4aabb2eefd0be6c781787fcd0c962fcf34d939d7f72c51a77b7d4799763d86fdba64152e7988191971fc2952c6c1a9e89b7603e8eadfdd
 EBUILD libvirt-8.9.0.ebuild 9113 BLAKE2B c6fb14ed1b96147f70cfcbaace9b5821c3cf955230e0a665b980094cab0ef6a1d31ea24fab0a8aea5c355213cd9669d64e76735ffb141daf59ef3c89ef1a11fe SHA512 d0f4d47a9edf7956a43c7ce74ab0b936edc6c22f420be32349e784a8fef91435ef0a7129f397ccdda91eb5fb5519a6c505422d46e32f26dde2cb354e25d53255
 EBUILD libvirt-9.2.0.ebuild 9067 BLAKE2B edff1ddc3ab7815b5905e88d64fd85a744f313519db5271999972b120d77da1a39f872a524a7c7296e289c976c9d5d51c279e41a818835a655821815a60b7dc2 SHA512 9d4a95519a38fc18e225331bde2e5d736b02d6fb74823082c6e3282ac4fcac4323ef7cbd6c846b5655b7034ce61322a5dd48797d1178bbba5c92df2d5fc927ff
-EBUILD libvirt-9.3.0.ebuild 9129 BLAKE2B 799bce3282b4b20c0c6afb7456fd492b3339045e801c98ec052cbd1f9da5dd45073e41a8c8c0ac925aa4d585528dfa493b5683dfc48871011be8a3f47a5a63a0 SHA512 593b49636446d1d1a69bff637357d22dba66ad9342846f43ec62b27da78a6f5011cc1eeaf070a67aafce7cb1c99edebcd80a6672f925bf8bd366cf460510b236
+EBUILD libvirt-9.3.0.ebuild 9127 BLAKE2B 72e852a61d8af005c295de00ef15b228cdadf6265dccbe9c89546711ca4b1e96d7f662b2438128e8cfdcf4ef1f0f6872e37c151fd0bb9573562f4d40c210b995 SHA512 e3f21a7dbf21854f2d53d84f9c78e28bf2294855b1f13becc65e99209343db3d1dece9c28b696821f4e87ffa3f25c1d897e830729f58788b15eb64a8cbe89d9b
 EBUILD libvirt-9999.ebuild 9169 BLAKE2B bfc7c644b377c455aa3f30318e4295f2c9dd5894ec49caefb07b55fb98c754bf35b57db87186bdde857e28841c4097868ed64b75c3d81207ca4e60e53a325daa SHA512 2ee0021ed6a7295db012bd0318fcb21ce6404368e09a4b50978380d93b535c32bc9fa85f4be91cebba1e81e20b4fd74af51275f27e73ecf60d9169bf8a4b153b
 MISC metadata.xml 3729 BLAKE2B 2e68676afb3820c7b8cd3d76b0a5c42886e246fc6b440ce49c71cbe60c124cdccd4ed8fb97f7153529b758d56dfba98b6a98a31b2fbff7e738f52bce796a3476 SHA512 0dfe519af8b740de9d41b1e2c40133026718a782b654a261c54cbe22b5f694cda8b73036c59411317757b73c40acaea77f70d7ab86ae8325e78d61151e6c64f1
diff --git a/app-emulation/libvirt/libvirt-9.3.0.ebuild b/app-emulation/libvirt/libvirt-9.3.0.ebuild
index 6ca1ae130822..38c62b32f793 100644
--- a/app-emulation/libvirt/libvirt-9.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-9.3.0.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
 		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="C toolkit to manipulate virtual machines"
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 6a34c1c9f7ef..0aa9204d2fdd 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -11,6 +11,8 @@ DIST VirtualBox-6.1.44.tar.bz2 165775421 BLAKE2B e87d7175bc616784c79d02b595d8111
 DIST VirtualBox-7.0.8a.tar.bz2 199387757 BLAKE2B 0ba397825277ecbb851bd4ea94c85448e2966fd96ef8edcaf3102f8515553736d6ceee84c0647fa37443c1875256353fdd029d6c505aa99834079acb957b24a0 SHA512 fcbf907f6f7f2396ebff5a31af6ec00b38f09799380bac4847cc9044455832de058659edaa9f621b0054fa402bfacef1b5444498c9faeb3671d02da1505c952d
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf
+EBUILD virtualbox-guest-additions-6.1.44-r1.ebuild 7413 BLAKE2B 690ad4ee20599463adf2a6f22761013fb99006bccd07bbf6dc5ce30c5ce64b1fc7d4f3eb340563481cc710370f16711446928d42469330e9a5e825e1b0f6e0f0 SHA512 a5207a396b4e589b567533d72321048b5748cc6f0076556bb8c9cc2ec12592caf431596695df57b93c6e3ae0952c87608baaf8d46b46b42a9376abad1bb93e6b
 EBUILD virtualbox-guest-additions-6.1.44.ebuild 8052 BLAKE2B c9016e7cf9d7203d42a6f4f04fb8ae0e148ee1897168af717f540621e9e773a3154193847bf40b9681f7857499ace96a28ead243d81ee2e151dda43ddd2c910e SHA512 aef00dc9471868ebaddb213f3376388ded2c703018fa28aa8ab8a1a06ce8339c4b0580b4a0fa7392016a2aba6ce4d9630a3d249e790b1764bd62c4e6e04ea884
 EBUILD virtualbox-guest-additions-7.0.8-r1.ebuild 8561 BLAKE2B db90a5d48e39708d9e0ace1cd1d71140b1c57bef9d7512d6848404ee5c86d8af3ef004d3bd4617a9a2c43d5fcb994c19d2c48d1f68d2bba5cc0f83ca89d68b96 SHA512 57f48b19df665d1c1a36eff32d7a10dbdbcb76c0eeca710df6341e2b7851cf1f96ded9ca70ebb16d711b9b051e08b0df1ce59ec5485ddc51660b766e2d64b9d6
+EBUILD virtualbox-guest-additions-7.0.8-r2.ebuild 7922 BLAKE2B 14d354f8aa8cf23a28493dddd622fb1973f039475c6b0ef3da9784c287cfb3f381e5a5fc8a36f5a622fc9d07d81c9dbfab1e923c46d1e5dad21c60da037bedb1 SHA512 abbe71189b0e4ff41d034a3d12c0167228c3aefab056d2829ba972e4222a358f510b862e3fea1a31c81f18aa2e79adabdaf6e924628d8fe768dffd42b5f581d4
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild
new file mode 100644
index 000000000000..ea083a8adc9f
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild
@@ -0,0 +1,282 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo linux-mod-r1 systemd toolchain-funcs udev
+
+MY_PN="VirtualBox"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +dbus"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
+	sys-libs/pam
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	X? (
+		x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+"
+DEPEND="
+	${RDEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXau
+		x11-libs/libXdmcp
+	)
+"
+BDEPEND="
+	>=dev-util/kbuild-0.1.9998.3127
+	<=dev-util/kbuild-0.1.9998.3500
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-power/iasl
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+
+DOCS=()	# Don't install the default README file during einstalldocs
+
+VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src"
+CONFIG_CHECK="DRM_TTM"
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
+	eend $? || die
+	popd &>/dev/null || die
+
+	# PaX fixes (see bug #298988)
+	eapply -d "${VBOX_MOD_SRC_DIR}" -- "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	# Respect LDFLAGS (bug #759100)
+	sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk
+
+	eapply "${WORKDIR}/virtualbox-patches-6.1.36/patches"
+	eapply_user
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+
+	# Build the user-space tools, warnings are harmless
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		$(usev !dbus --disable-dbus)
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+
+	# bug #843437
+	# Respect LDFLAGS (bug #759100)
+	# Cannot use LDFLAGS here because they also get passed to $(LD)
+	cat >> LocalConfig.kmk <<-EOF || die
+		CFLAGS=${CFLAGS}
+		CXXFLAGS=${CXXFLAGS}
+		CCLDFLAGS=${LDFLAGS}
+	EOF
+
+	edo ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_ONLY_ADDITIONS=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LD="$(tc-getCC)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_CXX="$(tc-getCXX)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+		TOOL_YASM_AS=yasm
+	)
+
+	MAKE="kmk" emake "${myemakeargs[@]}"
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	# Move this here for bug 836037
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	local modlist=( vboxguest vboxsf )
+	use X && modlist+=( vboxvideo )
+	modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+
+	insinto /etc/modprobe.d # 485996
+	newins - vboxsf.conf <<-EOF
+		# modprobe.d configuration file for VBOXSF
+
+		# Internal Aliases - Do not edit
+		# ------------------------------
+		alias fs-vboxsf vboxsf
+	EOF
+
+	cd out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	if use dbus; then
+		newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
+	else
+		newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN}
+	fi
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+		doins VBoxDRMClient
+		fperms 4755 /usr/bin/VBoxDRMClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	dodoc "${FILESDIR}"/xorg.conf.vbox
+	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+	udev_reload
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild
new file mode 100644
index 000000000000..5657fcc424a6
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild
@@ -0,0 +1,295 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo linux-mod-r1 systemd toolchain-funcs udev
+
+MY_PN="VirtualBox"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}a.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild
+LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus gui"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+# TODO: find out what this is, remove comment if obsolete
+
+RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
+	sys-libs/pam
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+	)
+"
+# some libs here are indirect dependencies, and also needed at compile time.
+# keeping them in DEPEND to avoid warnings from qa-vdb.
+DEPEND="
+	${RDEPEND}
+	gui? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	>=dev-lang/yasm-0.6.2
+	>=dev-util/kbuild-0.1.9998.3127
+	sys-devel/bin86
+	sys-power/iasl
+"
+PDEPEND="
+	gui? ( x11-drivers/xf86-video-vboxvideo )
+"
+
+PATCHES=(
+	"${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch
+	"${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch
+)
+
+DOCS=()	# Don't install the default README file during einstalldocs
+
+VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src"
+CONFIG_CHECK="DRM_TTM"
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
+	eend $? || die
+	popd &>/dev/null || die
+
+	# PaX fixes (see bug #298988)
+	eapply -d "${VBOX_MOD_SRC_DIR}" -- "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	if ! use gui; then
+		echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die
+	fi
+
+	# Remove pointless GCC version check
+	sed -e '/ check_gcc$/d' -i configure || die
+
+	# Respect LDFLAGS (bug #759100)
+	sed -i -e '/TEMPLATE_VBoxR3Exe_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die
+
+	eapply "${WORKDIR}/virtualbox-patches-7.0.8/patches"
+	eapply_user
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+
+	# Build the user-space tools, warnings are harmless
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		$(usev !dbus --disable-dbus)
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+
+	# bug #843437
+	# Respect LDFLAGS (bug #759100)
+	# Cannot use LDFLAGS here because they also get passed to $(LD)
+	cat >> LocalConfig.kmk <<-EOF || die
+		CFLAGS=${CFLAGS}
+		CXXFLAGS=${CXXFLAGS}
+		CCLDFLAGS=${LDFLAGS}
+	EOF
+
+	edo ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_ONLY_ADDITIONS=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LD="$(tc-getCC)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_CXX="$(tc-getCXX)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+		TOOL_YASM_AS=yasm
+	)
+
+	MAKE="kmk" emake "${myemakeargs[@]}"
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	# Move this here for bug 836037
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	local modlist=( vboxguest vboxsf )
+	use gui && modlist+=( vboxvideo )
+	modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+
+	insinto /etc/modprobe.d # 485996
+	newins - vboxsf.conf <<-EOF
+		# modprobe.d configuration file for VBOXSF
+
+		# Internal Aliases - Do not edit
+		# ------------------------------
+		alias fs-vboxsf vboxsf
+	EOF
+
+	cd out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	if use dbus; then
+		newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
+	else
+		newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN}
+	fi
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use gui ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+		doins VBoxDRMClient
+		fperms 4755 /usr/bin/VBoxDRMClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	dodoc "${FILESDIR}"/xorg.conf.vbox
+	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+	udev_reload
+	if ! use gui ; then
+		elog "use flag gui is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index a122af534fa2..7104e7a66d40 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -3,6 +3,8 @@ AUX virtualbox-modules-7.0.6-kernel-6.3.patch 1064 BLAKE2B cfdd3779ec7349c4fe9a1
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
 DIST vbox-kernel-module-src-6.1.44.tar.xz 678920 BLAKE2B d18bd899205b1baa476b6a17b29c8f210238ddcf5949dd5f7b73e06854c85a816422b8f24045d3d0c1adb3cf1fcadbe089e61c2b9764262a14b04b2beaede8be SHA512 a682c94e61ad1c6090223348522123ee7ba87cdd69aaa0bc09a268068bebc2f9d7c8a156c52d82237999f26664790dddb1c8aca72ac4b5ba2133e35086f6516c
 DIST vbox-kernel-module-src-7.0.8.tar.xz 718032 BLAKE2B f8993f6668d12f6bb6a4ab81376e02b11f806012e9ef101ab7d1cbe17004ce34c9214691e1047aa0b5a82b25b91521b9c9ab20a8b7638136cc64e44f1dda89e6 SHA512 5f56a94cdac2490a2dfea3f006f7fb0229e7467d7a71029063c200d42dbf4fbeb65d3d0612f862c5c303f8cd5b60a9ab58dc7a8f593f128e7e6b3f89c53eaefc
+EBUILD virtualbox-modules-6.1.44-r1.ebuild 942 BLAKE2B d001b609287f13ded153dcca7e6188a9389503a7fbf1a0ac014554fba47582acc0e6416b1b58a524cbc33972a8bac3ce052cf3c4d9dfe01d5d296419261f371e SHA512 3ad9fb5df15b2666148204323fd43f72aa5dafbd74a2402258a286ebbb65b27d42f979068f13552d717ac07d24664c8603feaae09b06f17071c8871617aba209
 EBUILD virtualbox-modules-6.1.44.ebuild 2452 BLAKE2B ac3c57ed8b03807848cb1b5d6e1c7e096e75ed6d002086aa4b07fbb33ad45b79efbd5e1d1592880550b8280eb0302272e1835071adf786ff4dd6ee79b60b65b8 SHA512 291bc97f33f713f0ab3136736f390a2bee33458313d7c23b20254dceaa74e5087dfa2c81c43296f6ff237de7ab193318f0282752c46ff403c12ee40919164d00
+EBUILD virtualbox-modules-7.0.8-r1.ebuild 942 BLAKE2B 666835042ed720f08e0e51ab83ee1a4c9328b7abff922c929148ed246a03cc410856e846542ce5d1758b0c094ab9f040c6a8ba29ea2486ca64dddc01d9db05bc SHA512 b3dd20429f4dad94e1c5f270de8de0af095fec9e5980283f9ebbf625047840e238f254ed42c73cc985ab0dfb86bec225e6124f21d990d040f723ba39cfa5c0fe
 EBUILD virtualbox-modules-7.0.8.ebuild 2452 BLAKE2B a6450dbe26b3b841b6e5842f937ec5942c8dad219560c77e9e5fde28e44fadd3a3b60af9b43523148edcb2166eab584d1f2db0dfe0fccff3316f689e8705d211 SHA512 600466e3edf5bddc799b8a0f01b8873acfc855a5468c7c8c95969181db8483a170ced08d071169047fa38cd91452c7ac615c2a30855434750129825bd4e89e5d
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.44-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.44-r1.ebuild
new file mode 100644
index 000000000000..00acad894a77
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.44-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from VirtualBox-*.run
+# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb
+
+EAPI=8
+
+inherit linux-mod-r1
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+CONFIG_CHECK="~!SPINLOCK JUMP_LABEL"
+
+src_compile() {
+	local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc )
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.8-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.8-r1.ebuild
new file mode 100644
index 000000000000..d0c1bf4e4df5
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.8-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from VirtualBox-*.run
+# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb
+
+EAPI=8
+
+inherit linux-mod-r1
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+CONFIG_CHECK="~!SPINLOCK JUMP_LABEL"
+
+src_compile() {
+	local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc )
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 36a8b024fd15..f1cafaf0cb06 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 961d895bf510..fa56335d8d31 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -3,6 +3,6 @@ DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf
 DIST mirrorselect-2.3.0.tar.gz 18039 BLAKE2B eebc4a02257b734c3dfd05cee541369689b92548b5421e977dd451442e8c83e426a03845a46e92eaa01507e0cba2b3679c97db2c00f012619cf9f551cfa1e1af SHA512 fc040bf6a9cc79f781157c7b65c6366c86dd54d583b4286845e3d037a2709c376e9132889e9dbe2cd40846cd7bd138aae7111d1a442a421101db756cc259b535
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
 EBUILD mirrorselect-2.2.6-r2.ebuild 1510 BLAKE2B 3e1b3c8c7c9be8fd28c5c9fd32e164f3a9c6624db9737f948446f619623bfd7137e7f5d64c95f5486e7476205e6e86d80716fcaa6f1a179baa233b3c6920e395 SHA512 0257055c1eb403c54a10741406b336ea668cca0c2f2bf7b579fefbb492ce5cf92f682234d650e3365d7818b326fb4cdb43758461ab605895f307650304480e2f
-EBUILD mirrorselect-2.3.0-r1.ebuild 1173 BLAKE2B ffba6ab1c12c777c09976074553dc87ede64a77219b252d00588b84b51be9dae88379c9d745da75c5a8672d29e30642e99075eeb3a6d5f74a5dfc0fc010fff22 SHA512 65ed82562465de78df9150c621e723af8b038c97cbfd51c85c6aebd42373492ba39521e8e1852265d8f71afffd0bd82a7002fe12014250d3dd874c98ad0f476e
+EBUILD mirrorselect-2.3.0-r1.ebuild 1165 BLAKE2B 626efb68f6e3ea42c911f6c69cdee21cc6852b5425136c44494dbac4ea990ed94fafae8ad4f08c1f72d3345a2efd61404dc44b6318d041e1ad12923626be4884 SHA512 f309b707d851517948d71faebae958d940b9272f747d2809162a4d761d304d67bb9e71553641f1f393d2eaf7cc206c3b605cfe38929e6147a0fb5a1b60a6e4ee
 EBUILD mirrorselect-9999.ebuild 1152 BLAKE2B ac62c333bbe94307b1bee244ce5eeaf0667dfc0b5bcea316f545bd20bf27aad10526256e90686bdfd3eea53b97c38ad468baab11ac4acb62f497a61bb8f7a808 SHA512 8468a11211f1c67dc709875b87866df54d08c7ab2055d4c18ac245c56b9e7e3d208baa0e8eefb4a2cd3e0d2e14d0eb3a44234f2b8455bcdcdfa14bed7db41320
 MISC metadata.xml 495 BLAKE2B ebc7faf279e0a14f107411622bb0855c36c2229ed8357d7abea7cc7ea6e49a7ae7d136d476c33c02da46bb93614adadf87d6b6e19d1698d14c78942f9eace139 SHA512 5e8f9c4e185318f2de112e02c2c15662553ccae75f35a14023eac9e55ade710a45f0f6b78d98c899fa7604043e28f0ec2109889459aca46b3708c97c444d858d
diff --git a/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
index 30d9a214e1e0..008f33b0c3fe 100644
--- a/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
 
 LICENSE="GPL-2"
 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="ipv6"
 
 RDEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f098bd86380a..f4db2232dabc 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 036b6efc63a1..bc8cb792f8ae 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,5 +1,5 @@
 DIST build-docbook-catalog-2.3.tar.bz2 4686 BLAKE2B 3e386d0aec67ed9cada98cacd9bdce4345f8732a1d9653c096744178902036da5cefa2bde1d69279fe2080f660635f5c29380f40f6fb39aa586d80206c5e42b2 SHA512 79649f39f5a432a57e2457f61b73d83c8ccf76144e29b8e44a2c81bb86a00ff711c199fbd126236edfa965518e0cbd023597c97e386211b8c07a6ef66bf232a7
 DIST build-docbook-catalog-2.4.tar.bz2 4693 BLAKE2B 496356008ef31f87169f9f060ba5593e6054447789a8a1c0dbc43fb4f81ebf087d09adec8fe82d2641e3550616bb874c6a1253b7988553948956f1bbb2e241c7 SHA512 5d42a641c8b336e49749b28101f87d4d856d3e5491adca4053212a473b42dcda88ab00fa64f54813a3e1b4ef1e45756e7de3a652808ad7ee113aa3afe7bf99b5
 EBUILD build-docbook-catalog-2.3-r1.ebuild 1120 BLAKE2B a5260cd83160409e509d25137aae21bac9c75db45dccbc235ae693efbcd60d23b7939831f1c18eb9fa58c6ab27f6ad52a486a30b890b955e2e956db9cc04770a SHA512 ccbe7279a099b136b58c5526254c12474b93b2c61eac945623c2eec32ff01f1285f139638dadfdf16e44aea7ce215bccc95c4ad4c17ef487aed56909f07d0411
-EBUILD build-docbook-catalog-2.4.ebuild 1128 BLAKE2B 6c59890f6a8ca449a1b2357cdbc84110236937f23af67609916de9777c0c1da846cdf484a37ed4233f3b29b5e9b6c7543a18760424c2ca6ee7a14c3e79c7d83d SHA512 128864f8090265f834c9c8eaefbad9457456ace572b19153f597926ee3e556305eed372c5a0e0060d407b4d281b200fdbc9e1eb155023cc73463f5475bd36517
+EBUILD build-docbook-catalog-2.4.ebuild 1120 BLAKE2B a5260cd83160409e509d25137aae21bac9c75db45dccbc235ae693efbcd60d23b7939831f1c18eb9fa58c6ab27f6ad52a486a30b890b955e2e956db9cc04770a SHA512 ccbe7279a099b136b58c5526254c12474b93b2c61eac945623c2eec32ff01f1285f139638dadfdf16e44aea7ce215bccc95c4ad4c17ef487aed56909f07d0411
 MISC metadata.xml 283 BLAKE2B 5cc7f34f6d2e2efcea07d91ed23d5f70a834c0d11b92ee45c27bab7296bd480fac2d27652f0ea4388e370014bafe490e8464eff4e3bb27fda67e20f568c1d92b SHA512 97de2993c7828c3585e4e97d62ac2a08146ae5a39051f825b38be1f657836603eb24ea8819bce7bf75cc71a349ad29f6d920876f20c1bb1cc88a78f9e5dfab66
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
index f6fd6caee178..38a0dee4c042 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.
 
 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 ~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"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 111c00f88f0c..d42496b5a76a 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -8,6 +8,6 @@ DIST qpdf-11.4.0-doc.zip 6854262 BLAKE2B 58b55287fbef37beae452803db409e163f3fcf4
 DIST qpdf-11.4.0.tar.gz 18643945 BLAKE2B cde1c4db4c51733fe71a7e46fc271817825b5a56ce81053edf0f886eabdf13bce55308dd36ebf9b5067dcf173f371135bbc651253a7df214b9863c2b62cdde8f SHA512 6f31a37a9a52752c89d319e0d29d8e6c1e4885ca494de47a65f9374cdb5672497ab93f754481300c8e6c68fc2874860997b778dc05386b6f3e6a5a70a3f9f754
 EBUILD qpdf-11.1.1-r1.ebuild 1850 BLAKE2B 5e52d82411d166b3d1959f72a5ba9672473ce50c78f01284cd9d42163ef20d61b29893e554773c61a63d4244da8fea22402591eabeef1c5835200d08b6fde4b3 SHA512 133fcaeae8de4256704cb55c0670d8c664ddbf1f11f28577e2bf73bea961b8755757aadbeda4222e5a2d5c80792cdf6beb2d3918729866270d6b930503622f67
 EBUILD qpdf-11.2.0-r1.ebuild 1850 BLAKE2B 574271ba3fc5b19da071d62a32357a108de174f0c26ea93d91d81b35e6d1928c685cd9da8edc4499d090d2080f96f8ffd12f82eb748f7223c940b3986e66faa3 SHA512 b53654535d13f84095569a40fa36785228a8c2447815ab6a7a3ee3b0ebb480200bafe25a7bccb160a719a45c28ff12c36fceb7a7384af55ec4304a7e817aad28
-EBUILD qpdf-11.3.0.ebuild 1858 BLAKE2B 93f474844536a0e75fec9a5e9d3cd3fc6b8c02cbdf8b6c99165554dd8c6c01de8f0e1abf2e2bb7f0fefc2c4d48fa4db69f7bff27a1d92e2325437e9a9fc6f1d9 SHA512 0a2cb5e0e92357711027e14ffa5791a5d99e7f4a2ed70dbe702e52c180c81259300740fcb947e09867f9e20828781199527a8359dcd4d532ab4ab83aab5888e8
+EBUILD qpdf-11.3.0.ebuild 1851 BLAKE2B f66653a88781d3c15fb4bf4ec61a8c30370670797422b5a671f77636b5825f834bb59537207f58bbde36439a6725e7f429c8e57040b5cc02bebd49bc99788d4a SHA512 16db24282a869fd8e0bf40edeaa331e5e6a5a78029b3146a49f4f75df500d7f786cd3a024f49432e0e9639a3aa3cad9f5366377e77d05f897b0735c5a9e17f5a
 EBUILD qpdf-11.4.0.ebuild 1858 BLAKE2B 93f474844536a0e75fec9a5e9d3cd3fc6b8c02cbdf8b6c99165554dd8c6c01de8f0e1abf2e2bb7f0fefc2c4d48fa4db69f7bff27a1d92e2325437e9a9fc6f1d9 SHA512 0a2cb5e0e92357711027e14ffa5791a5d99e7f4a2ed70dbe702e52c180c81259300740fcb947e09867f9e20828781199527a8359dcd4d532ab4ab83aab5888e8
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-11.3.0.ebuild b/app-text/qpdf/qpdf-11.3.0.ebuild
index 596bff408664..847524b088ad 100644
--- a/app-text/qpdf/qpdf-11.3.0.ebuild
+++ b/app-text/qpdf/qpdf-11.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # Subslot for libqpdf soname version (just represent via major version)
 SLOT="0/$(ver_cut 1)"
-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"
 IUSE="doc examples gnutls ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 63f340c8ca6d..842e4724fc47 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
index edef8f8422e7..6e3caa11f5f5 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -1,6 +1,8 @@
 AUX capnproto-0.10.2-gcc-13.patch 675 BLAKE2B 52dc508a80fd30c243d7f3c98cf908eacc6c0f8c4efff0d4a77999dc9d8dc5ab639a6abb1fe504b5ad461a0e023a9af8b520bc7784e570b03665bf9404967abc SHA512 9229ffa3b8b47b0c1437d63ed5f8967cbbaa07e3cc0ee9e2012c7b5bcf87fc278e7bbf4324d2d76a24a98f6d6219b09640c45ca5d76a1f7338d6938bde70f723
 DIST capnproto-0.10.2.tar.gz 2279393 BLAKE2B d78442bc122bc976fb636dfde694e10414bf3468ead903fac7ba59cbd81a49ce94969954fdc90f92f7f58f0af80f2da1f70de9b461d99fc6ae9a9e7aa9cd0500 SHA512 079ab715ea19ac207f72bb4874ab6362c11dfb9128342ec937e3f4d27e4100530cf9e6a0275eaca1e45a1bb706b65179a526ea8cfceba93bb36cd6c4f1c0cf5b
+DIST capnproto-0.10.4.tar.gz 2280389 BLAKE2B 3a893b766302a96df71763613fa1624f6b7229b8926099d1d9c217f4a1817db16aa24d3bec7950e480da6b027bd9b6b0b5a4083e982e7bda8fc6594794fd379a SHA512 6179a202399f4391014827799c954e0b3ad811ab82ebd0addc01d8c7695b9c1a9c0a0c26b018cd392e3731e12b30cca58545459d1b3a140e86e34b75d7eacbc7
 DIST capnproto-0.9.1.tar.gz 2238849 BLAKE2B f8de56c7f79b0ddad35f3e8fec7740510ca2328e4ddc633a71420901d3fc44df44d807c3965213dfc2535bbe03832c5164242d33cd0bff901d6f288fb62bab21 SHA512 bdc5960f26214139744d768ca4558b085e2d359c375a8849ca532a4c458a2daf0ee1a1f4d00745de5abf353aa1e4084a2d85e5523006f23f591f21fac2d847fd
 EBUILD capnproto-0.10.2.ebuild 1040 BLAKE2B 947227d338687a593c3e5f039ad0f353508aa56e6343ece186fcb574d90c6ffe06391eabc0f07c746c86c6f14c9f6165c8417707d520c6d5fa3effd29d7c6a4e SHA512 28d1362f934eeedeb8a3110ec68426122a085aced8f6fa30e280978e875953452686257d1e5117157ff060ca9b8430398bf6f9912f0148ef894e3855f41cd5a4
+EBUILD capnproto-0.10.4-r1.ebuild 982 BLAKE2B a141d81d301022490d33228d9042ca4ee462fd220e6475e41b0b34b696c2313fd69e3068df1dca9699ac056d224390e28075fc4938308e069a2074cd6e13ee05 SHA512 e4bd279f63555f406a0aee3bb7f20cfe2a2ebc0d77e6b1e9e966d157ad8019b2b51eda7f181721e52049ebf67115316caa9daff410226e30917a82bf98b92163
 EBUILD capnproto-0.9.1.ebuild 982 BLAKE2B 14fecab4dff6be5e7b42222cecd47664a85c45058d810c578c3d093b7c7b6cc61d9ce72ca1aae7995ea7b729f202daa17a46303c4062e06eee81b41029e8c631 SHA512 1db279715ff228a167b8e8f5d87a5f77e0d5d2c1855a72f0c522792ed2e34dec52c11a97e9cdbe58741e87c30faa5954cc0f80b5d2887113aac6260edee22a18
 MISC metadata.xml 347 BLAKE2B 36c92aa137b803a5b0804f7684ecd55e13733f506000bed2fa306267b87922255486124dffe336822554c8644e2b2b34cfa13a5456a0f69f0e5b0e4136a1ce95 SHA512 af4c39c709263a8d5a3849a057475cebd9c7bac0228d599c28d0d9298c1c0d06a744f5999198217ee9248ed0318f95d376fb1802afe766082d18606f4776be57
diff --git a/dev-libs/capnproto/capnproto-0.10.4-r1.ebuild b/dev-libs/capnproto/capnproto-0.10.4-r1.ebuild
new file mode 100644
index 000000000000..30c2d9f10ffc
--- /dev/null
+++ b/dev-libs/capnproto/capnproto-0.10.4-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="RPC/Serialization system with capabilities support"
+HOMEPAGE="https://capnproto.org"
+SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P}/c++
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ssl test zlib"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:= )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+src_configure() {
+	append-atomic-flags
+	if [[ ${LIBS} == *atomic* ]] ; then
+		# append-libs won't work here, cmake doesn't respect it
+		# ... and ldflags gets missed once
+		append-flags -latomic
+	fi
+
+	local mycmakeargs=(
+		-DWITH_OPENSSL=$(usex ssl)
+		-DBUILD_TESTING=$(usex test)
+		$(cmake_use_find_package zlib ZLIB)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build check
+}
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 903f1dabd7be..eda757b2592a 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -3,7 +3,9 @@ AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74c
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
 DIST libdnet-1.16.1.tar.gz 666619 BLAKE2B 74472af1bc97c4771909e926eb9b27193c50d665036672fc89ff21159408daeef090e682c5e76e19f31d04e802fb73edf01d1aa057b543568f534d31f8db375b SHA512 9c6899b42502f3892463f1ec694934cc3b02831222fa15b5a899868229366ed4e9cc728ea2c70ec857ee9d676d763b1e390f6878a597a33f7d1cd5a7bd870586
 DIST libdnet-1.16.2.tar.gz 675191 BLAKE2B 04e4533dbe45700decec4755c7db608d0ca68be05431bf44e6984b2c6a4aec55888fc0f0159916c8ac4a60ec5f743047d2a0a541786cd13fda61739bd7eef0fb SHA512 4b1902553a57eeb56952968e15be032de92d8106dc6e0ebf8e10470605c9c2ed69cb015f4057a5c119d01509c6795fc0dcda85a311d14124dddefdeb6223f848
+DIST libdnet-1.16.4.tar.gz 684358 BLAKE2B 40be891c9004288329aaee0c79a29ebf0f095dfaaca4da98fd5ecfd759e22b8d10dc6b906200db1ac5b0a8cfbbea8fbe509da393e60cddeb5f875ad179cdc67a SHA512 6c5556e365047afcc5da3f76b1c99aa70723c076a7cf75c03d96a661a583dfa6d0ab605076e68efffe5ddca2d69875e4bc4938e0874b8aa24915fcfbfe3f3ff9
 EBUILD libdnet-1.14-r2.ebuild 1556 BLAKE2B c549d9c5e392f2f15df9c2c2bcc474f2c408a3236743a19432b519cb7208574684c7d63947d037d1aba8412ef84497381d52e48edd869268046aa0ac26ad939b SHA512 0e45ffea4a32f5c105882f74c2234642dffbe2401ba4c8ac1d123cd201d7ce26476f4d7fe0024aed7aa97e33d75fed4d919d35460dc5ca8bdb4d05f55f279989
 EBUILD libdnet-1.16.1.ebuild 1569 BLAKE2B 6214911f6448d2fb0fdef86db09e0b106824fa515bc71bd93561afd845eec56aaae62b2083eb6d21c1d50dcff7e6495da85a0be1c0c434f23773f152d226b74b SHA512 f9d0751c2edf0318855a3869a6a1060060d3dfe00b7d8bca45e25d9507eb4deb758753f513dbfdbd11594eb19a98a575e70532dea3c87e2e35416d9e558d5c4e
 EBUILD libdnet-1.16.2.ebuild 1569 BLAKE2B 135c8a4db92b4ae7a03b2336b88ab9a600a0b2e2dbf09713f404ca647b5e3f218eda610ba0a36a2f2f7fd6be8eb2ec99bb5f08325f8dabc296d1ffea4f9b6e81 SHA512 5a6ce103d0f837e551265586105720efb140bafa6c86e870f1722c4836bdc9dbafb690af640b033405af0eddd096e981567d931472aa82555a19ff64cbd974fe
+EBUILD libdnet-1.16.4.ebuild 1592 BLAKE2B 44dd15a83237fc19760c40c6b3739c4ef06c9be3b4091092060ba16860d6c2412caacf7f513eb59706d32e565c08fedc2bcc684aac77dd5891e53b3f7609cd37 SHA512 454db6d5749e5c2287e76df3e93e7ca27d1831206a0b61af6c78185ca1b7ecc7df4fa612a7435117b52b231499e65e434ccbfc21d3573be5ba8960e52ab202d6
 MISC metadata.xml 413 BLAKE2B 91e8ea8dfe7585b6bcce394bc63e466cd7094b8b12ecb4f6b03303b37575387250f81c85a3be03cf8b36cbe10ef724794c86afec5decb5f042d0cde5db2bfdc6 SHA512 af7f752fa0811cb6e57b2398a86f5c57bbc0af1e3392ff3c26af27568ae3ed5232f765558f5e3b01cb6a6e3debfe2b0b893fc2c3598776d94eb6318744ca6fce
diff --git a/dev-libs/libdnet/libdnet-1.16.4.ebuild b/dev-libs/libdnet/libdnet-1.16.4.ebuild
new file mode 100644
index 000000000000..6b8c4bc843ea
--- /dev/null
+++ b/dev-libs/libdnet/libdnet-1.16.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+inherit autotools distutils-r1
+
+DESCRIPTION="Simplified, portable interface to several low-level networking routines"
+HOMEPAGE="https://github.com/ofalk/libdnet"
+SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="dev-libs/libbsd
+	python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+BDEPEND="python? ( dev-python/cython[${PYTHON_USEDEP}] )
+	test? ( dev-libs/check )"
+
+DOCS=( README.md THANKS )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's/libcheck.a/libcheck.so/g' \
+		configure.ac || die
+	sed -i \
+		-e 's|-L$libdir ||g' \
+		dnet-config.in || die
+	sed -i \
+		-e '/^SUBDIRS/s|python||g' \
+		Makefile.am || die
+
+	# Stale e.g. pkg-config macros w/ bashisms
+	rm aclocal.m4 {config,m4}/libtool.m4 || die
+
+	AT_M4DIR="config" eautoreconf
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with python) \
+		$(use_with test check "${ESYSROOT}/usr")
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+
+	if use python; then
+		cd python || die
+		unset DOCS
+		distutils-r1_src_install
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index a3963d111c9a..5b472a9cdda1 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,3 +1,5 @@
 DIST libwacom-2.6.0.tar.xz 110288 BLAKE2B 321bacccab84f287141257b4c7af12822fca976c335027d399765fdbbb2c59eabcc76f40d4fd83c7cf1cdc88e2c57ccd317b1922ea3dddb98cf2a0847e920ff1 SHA512 aacf234e77bd976de2e2a687294c5ab704dca5a70df01fa2485441029e4faa34bec2824c455642115ae79f5cbbac41d064569e4eb2788655c324b37149009d26
+DIST libwacom-2.7.0.tar.xz 111424 BLAKE2B 2cb046a7390c017680a2a67197896b0613fa3b0ca65d388b5d760fba1438c3079786efa77a5b69d26dce7b8813436ca4240500ef00d77e11427fee81df912d64 SHA512 47dd8fc7b82fce88ae9d857bcbecec2e45f2a83e832a5e1f97d5b09f77a2dacd53a470e08e756217fe7c5ef4420fdd8d3e3c37071336f7a3dce522b9fa781583
 EBUILD libwacom-2.6.0.ebuild 1507 BLAKE2B f470234baaf9cc8fc33f07881b172745c7fe475c41c15f272df89ffad41b095adfc706caadbe7e6d2ee0e8452100e5fbd28cb45544b56916b4439e67267858a8 SHA512 f4cfc95491539e33b89675f6e5c3dc135e7c4269321d140c69e9856c68e27bec99eba91844e0dcc7eff39b70b4b739daa1109b3041aee5493eb569a1d91de7e3
+EBUILD libwacom-2.7.0.ebuild 1513 BLAKE2B b96ed1724c6a575ed708b505d0969a650c5d64d77c294a1a451b4a102655422c6c423c95b85168453d33bf8095886b84d7729f99e048626623fcd23406d17f9e SHA512 9172e4f7f4e03fd81da119ba8b7cebffc2ecc5ae75498babe6fa0656b92853b53403c4c36f67110f4baeabe6b8cc793f44bc6b20161e396717fb96f5969050a3
 MISC metadata.xml 313 BLAKE2B bee5263fa9309d84996574f86a17a4292e58a7eefc65159ecd0df578ccab24e39f4c050deaaabbcd33e5a86292af6c57c5b2c9eb2c9b6e3caeab86e5633cf3c7 SHA512 b1575775a9f633ffe2124bd5ebef65ab864ae697ed733f50e3028484d2d60ea827e5ac12305d57beedcdbe58d8699bbc7e67cb0c844041c7a56045cb91eae633
diff --git a/dev-libs/libwacom/libwacom-2.7.0.ebuild b/dev-libs/libwacom/libwacom-2.7.0.ebuild
new file mode 100644
index 000000000000..ebc7fd454b98
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-2.7.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="https://github.com/linuxwacom/libwacom"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/9" # libwacom SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgudev:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-libevdev[${PYTHON_USEDEP}]
+			dev-python/pyudev[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pyudev[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Don't call systemd daemon-reload in the test suite
+	sed -i -e '/daemon-reload/d' test/test_udev_rules.py || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+		-Dudev-dir=$(get_udevdir)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-perl/CGI-Simple/CGI-Simple-1.280.0.ebuild b/dev-perl/CGI-Simple/CGI-Simple-1.280.0.ebuild
index 6d797f120962..3429740d79d1 100644
--- a/dev-perl/CGI-Simple/CGI-Simple-1.280.0.ebuild
+++ b/dev-perl/CGI-Simple/CGI-Simple-1.280.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A Simple totally OO CGI interface that is CGI.pm compliant"
 # Bug: https://bugs.gentoo.org/721422
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/CGI-Simple/Manifest b/dev-perl/CGI-Simple/Manifest
index 5afc2857643f..50ce1de6b71b 100644
--- a/dev-perl/CGI-Simple/Manifest
+++ b/dev-perl/CGI-Simple/Manifest
@@ -1,5 +1,5 @@
 DIST CGI-Simple-1.25.tar.gz 87489 BLAKE2B 18ee59c7d97b042fdccaf93a9aa7a7aeafe6cdca52c675af11913a4cdb67daddf086679777936e3914663521c62a86795778b563478ed633d9b2b860a62fffb7 SHA512 ace262b4ccafe2ee01582aacf52b31aa1202dc5408bb33071330bc7c53f2cfbb39f9e8844c4511c86125dc05f7161b7592a4038c353dddd1bfd52c03dbcfa9dd
 DIST CGI-Simple-1.280.tar.gz 86718 BLAKE2B 28c2587ca1e786767fb726bc879d739b6dd8124ca6de074402fd682d210474570097995a83cc53c94f9d5ece7e0717ec56050f6a76513a0f2afc63177f357ed3 SHA512 437421f94ba75fc665c03139e297ad3a0616d4864e7eedfa2d877f77f4f4eb574009beeaa918c0202f796e84e1ad2036a662261960a7bd77cb8e1582c316b620
 EBUILD CGI-Simple-1.250.0.ebuild 624 BLAKE2B 6b9b529d4e0c3123ae515dc1f4ae904eb4156f456251b8eb3f55985d6f1103cb1dbf0116633f37cde99fca81d0bdd3524c828a3d0d7f532cfc7ddb60f3815b08 SHA512 0a2103f0fae0fab67b203e85c0721075021330923466bb0d78907c21b57475f8744a79801877d801a24f47b628b68a06f5f44a8aa6c234651bb81c2c2db032a7
-EBUILD CGI-Simple-1.280.0.ebuild 630 BLAKE2B 477cb1217955d69e7f8227c1990fae6b6438140654a7b9a06de4fd8e4d84b6b15d6938dbed5c63a2bc4268b7c813d8f31ea96cdbb4e0490ebb4ee13c75c25b27 SHA512 7c578e2889a77874a63a132705699468f5e3792bc6e6c7642d5997942c405513c8cecd262600da624de37aa80f83cd4dacfeb400dfb645a89dcdfeeba0eed96d
+EBUILD CGI-Simple-1.280.0.ebuild 626 BLAKE2B a74cc1d09098cdd0ffdb68b667216f1dbd4c27e0e29805f682bf55657fcf04f9808398e1c5e1f5fc6823e5afcbec238ed3f45c0cf7d200150b6c7e99c1440e51 SHA512 b89fa7877df4f19519a994639d8b867790d2c27ad67da65bb4edaa237d587480cfa1e0c789040094ff130834e513c3fb7c8940f51b6d1a6137c6078f91617086
 MISC metadata.xml 591 BLAKE2B db2a709a80eb487939ded95522b25acb5ba1b3f59e6d3d00eae50ab915fb73e42dc9dba287d0c0c01a825e25e5e4590a1fbfdd97d4debbe78970d0e5a7d482f6 SHA512 b453d0b4f7bea3c3f85899d3bd5b1863eec1a37a3c19b481c4ebe507ae45fa7a46c97c0ac77eea9eb8ddcdc332b1f6eb88a800c3346eb8b5db022e09d5b793bd
diff --git a/dev-perl/Email-Sender/Email-Sender-2.600.0.ebuild b/dev-perl/Email-Sender/Email-Sender-2.600.0.ebuild
index 1a1514549a56..d4ba97a270e0 100644
--- a/dev-perl/Email-Sender/Email-Sender-2.600.0.ebuild
+++ b/dev-perl/Email-Sender/Email-Sender-2.600.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A library for sending email"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-Sender/Manifest b/dev-perl/Email-Sender/Manifest
index 7f0d140ae429..88a6200c94a4 100644
--- a/dev-perl/Email-Sender/Manifest
+++ b/dev-perl/Email-Sender/Manifest
@@ -3,5 +3,5 @@ DIST Email-Sender-2.500.tar.gz 52593 BLAKE2B 16a633f064ed3d1f34dcc8fbbecc9a7be5e
 DIST Email-Sender-2.600.tar.gz 52671 BLAKE2B cabed02545f7d4c068454135f02128237c5342eafe2fb2d121da24d655fa9fe69a1fe675e693bc2f6bc812210bb5cf7d1da5268100674c2ae428dbe168b2f311 SHA512 2c28cc1f5c36488bf573a6e806ec4fbbe5fe3560fbb24c237375586a3f4e87df4c539e494910950a66e235296733fc9d186c49d9c7c5c016b17f2eacb62b17c6
 EBUILD Email-Sender-1.300.35.ebuild 1003 BLAKE2B f6dcd9383bad700d69041068b7ce52a38ad5cdebe3ed42e911bd808eeacbb44578840f409d63106a414ff8e248547d71e6f3e1a137546323951e8a4053fd3613 SHA512 33ed116604c30f582164819b1e3c7f304682d6416924824d455fc4f63ac432173d2f0333eb9e9542c524d425e5d3f47b7a18a8bc12fed9d74b555c6b9dd38b2a
 EBUILD Email-Sender-2.500.0.ebuild 1006 BLAKE2B 9321038e618c1494d1fca2a5ba5dece32888e82a66d5600839fd5fe9df5b4515736c9331724c633c4f136fce28904bf222f858bbe04a3e899c997f1dadc4ac67 SHA512 e3f34dcc2c24133df384c390da1f3ead2b8e04c7ac85f38b8fdd4deb7bdc0fec47efc53feaf3664deccca64b3fc458d65e44707dd4d252da22f980f9347d7681
-EBUILD Email-Sender-2.600.0.ebuild 1016 BLAKE2B aa40f8c27392dd0f9b5da965009f49788e7f6c3a08f3077f47ed8ecc342746984c32e24375bce04c6dce4767757c7b932c2992c3865f1ba10e3103f142c83933 SHA512 629e214354ed9e3dd82e490be14b7824a873309171b9dffe901f99c6e3dba620624ca7ae4eec84ac5ffedf65336fa7feaf8b204e8aac5f2d99c9e3af36ea1164
+EBUILD Email-Sender-2.600.0.ebuild 1010 BLAKE2B 2416a9aa93895685fea843df28468c3893c1795edbb2ec03b567237e9912e81ddc884e8ffc6501d41729519e862fa7c37ea7aa8feafba69022e5ab10ff913002 SHA512 d14ecbb292842c79bf586bf072fb414f66bde5d7ba3c7ec21591466a9a340fd5481e75613eed3502765763f9fdb80185eb5637bffa9036b584ebf7d9f0018df6
 MISC metadata.xml 2220 BLAKE2B 2910bcc8319062aa08b3621d8dc139774bf02fd5ece1b5f8251d79be459443c32f5edf8a6e692fcc81a81ad8c6b9b2beb8e90d101156827858ce10d94dc116d3 SHA512 2ad3d62fdb7a79b1cb582cdaa036c02f316f6210c8e6c98bef483c0347a94e41b2f91a01eccd0a76cb0a42eace09eeec49465241c132e35a74b17e8dc517b7b1
diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.550.0.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.550.0.ebuild
index b1d755b8c520..b34465cd294d 100644
--- a/dev-perl/Finance-Quote/Finance-Quote-1.550.0.ebuild
+++ b/dev-perl/Finance-Quote/Finance-Quote-1.550.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Get stock and mutual fund quotes from various exchanges"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-perl/CGI
diff --git a/dev-perl/Finance-Quote/Manifest b/dev-perl/Finance-Quote/Manifest
index 9d6f042e91a7..51476e35c00e 100644
--- a/dev-perl/Finance-Quote/Manifest
+++ b/dev-perl/Finance-Quote/Manifest
@@ -3,5 +3,5 @@ DIST Finance-Quote-1.51.tar.gz 231156 BLAKE2B 5472e19863a752fd9c610fccf0b6a383f4
 DIST Finance-Quote-1.55.tar.gz 247929 BLAKE2B 4220b9376c033c93934f36c170c4b2180acaf34859ef82a55bef7debc1bc70648266c160ef5819ca6df071fa3b2afec6a5df2c9553fdc4419ab869e914fff03d SHA512 311f103d8922c7dc4fcbf35dabcc2eabb59d235bb4087917c3bd9e1585562e4e0e54ba76ffd1fa17a93a56b0934a3ba6697164ab2770fb37b8aced6aced77a05
 EBUILD Finance-Quote-1.490.0.ebuild 1481 BLAKE2B 331334dd3799729198d18c98d0c55a58dd18372bce3b4982ecc38eb1c2401a016105e04d402381a15df2ed69c9d466b3430bcbade6f8d658fd117cc52b72e059 SHA512 d63365e2142073abdaf8c9da53f03e9e75d04ff28951d947491f663d9b3463957d5e154f2d0cbb447d8241259bfb2a7546e86fc58d32b715c3833cbe42869d4d
 EBUILD Finance-Quote-1.510.0.ebuild 1693 BLAKE2B 0c6268bb8fa1bee94e3e9ab7f0bf37324a6ac4557b7212e73539d0116933c191e88bf8cb62a33082f77eb39ff723b3870c44122268a8f6e84ef2a9b53c72ebfc SHA512 7b1bc741c211e367b0ddd12e86634397ec4b93af967b750ca5da9ce343cf0483a6a8cf91aafce999b663ea741af18389e87f448cf0ae8113101e77ca60d944ef
-EBUILD Finance-Quote-1.550.0.ebuild 1754 BLAKE2B 9c67a4ca17384d5cd1f525626a5a299f6311a434ce067ca1dbd09d7a8dcd3031d65d9fe5c6415e2e2fa39e02ec8b3b6ab3ee1362bda7fe170285cc05306d6b05 SHA512 79b0335da1fe43b7818a14b8653af8c05c2373b7f615a58c626181c25781763269acee7a52b0d92ee27f1b85a21f080774ead97fbd100944143006bf835c8155
+EBUILD Finance-Quote-1.550.0.ebuild 1751 BLAKE2B fad95adbadaea679b347e34ca6599fda8848e8d01680247581290aca8414e7f5f44770ff753f418fd5a68788bf82063dc229fecd95cacdd5e88f340633952b03 SHA512 aed1b3970177ae0d788eb030036a0498cefe5a4df7fc20f7b98ce85b00188742e39ece3add7612eaca5a23e1ef982432cc471e5ee9ee6b96c94082a9691c13ab
 MISC metadata.xml 4378 BLAKE2B 9e58d3411c53ec5dee267eed278f7bfe1cc19c4fe4a6d49138db09108efb98388b9d93f8aa4d2826a83812eed055b744360abbb4040a793acc9d63b07d815db1 SHA512 f58365ec28214486376ef74fc379f7cbfdf3ba8f186975ab8c5714b445174b573545bf23a5c4423dec40ead2a7a7bb1aac5fe4fa6d2a94d83bed3199e071ad0d
diff --git a/dev-perl/MIME-tools/MIME-tools-5.510.0.ebuild b/dev-perl/MIME-tools/MIME-tools-5.510.0.ebuild
index 99f09777194e..dbc8c519e526 100644
--- a/dev-perl/MIME-tools/MIME-tools-5.510.0.ebuild
+++ b/dev-perl/MIME-tools/MIME-tools-5.510.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 
 DESCRIPTION="A Perl module for parsing and creating MIME entities"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	>=virtual/perl-File-Path-1
diff --git a/dev-perl/MIME-tools/Manifest b/dev-perl/MIME-tools/Manifest
index b124f3cbdd02..802d1d28b53f 100644
--- a/dev-perl/MIME-tools/Manifest
+++ b/dev-perl/MIME-tools/Manifest
@@ -1,5 +1,5 @@
 DIST MIME-tools-5.509.tar.gz 423714 BLAKE2B 7e11da6f97468521d2e95b9ed71941d91559844a1775597c27f60288c04daf55607a8d962afd6bdf8521187930908c97815fa5664a448d1ab902e3740197cc69 SHA512 0407b09916144eafbee0c75758306e0f44c27db0e8aabf033267f9903f676f0415de99927dcfdb69f9e9d4123d63c280f526dff92e0d97744761c888df90667a
 DIST MIME-tools-5.510.tar.gz 417208 BLAKE2B d819b7e243a5edc72204c78467f0603c6be576ef5e7285b2c500ce8498ef631bbd2cc921d5d32ec7c1243da8dc20ff5c209a6682215404358f9d1e1c69c81884 SHA512 86d110cc3ed3e9744a07a7b671df713708ab70f57aea858a9570bd021102b4cea91a869239f6c40611f1b1fae190e1b6d1bd65b54914ffc3a41fdf9160977328
 EBUILD MIME-tools-5.509.0-r1.ebuild 875 BLAKE2B 443d6534b747d4609cb59e8bda39f5e0f0f589e7bcad3520f01fe8de53e231f2de40aa0e7f112dfbb87807a87629ac6895f0c1a0b55a74408bc5a50cb1794409 SHA512 464746bea1332eafe4bf806616fa9504146c54180afcc6fefb8c6511d46949350caa49e4c744567fdefa505797a8d9ef88498fc1e7cfbbcf70916a05a7b8969f
-EBUILD MIME-tools-5.510.0.ebuild 881 BLAKE2B d21a2205309d19bc801eb7969a6128101cb38e6d937f05857f034ad64843d0df1e7309613ec07d149e43f631b85acef6bed2fe191270b6e32cf99795f112d997 SHA512 8e1085188504f8917e172a978c196bec19cf9a6a8da1c7af0b6fcff2e5e85fa2621b11d86d67b1772ab8ff0f20152799e729e621bfecd6da292e4d65cd8f03c6
+EBUILD MIME-tools-5.510.0.ebuild 876 BLAKE2B d135f94b0027b03d55b79da375a9c9bd9bf6f725c6b10c74e19035683c53428fd51368c62592b4434dc88a65b38f46070372da801f6e913c0a2c7a6bdff18976 SHA512 5d600acc8e9c25e3c0b4672f5bfd4240d722d57cd8e4b6a3250541d2b09472b10e879cc583b705390c05d2976d4d7c44470f86a4cb556ca81e8fcce48be2bcd9
 MISC metadata.xml 2237 BLAKE2B 6a241d96bd9176070625612af4db82e1fe8d14da33911016252be14f7eef4326f7ea1097b93e10d384efeaa6aaf5296cda823ba7ae2feda6741676c31dfb8408 SHA512 51ff52bda7c059d66c174cacc74b7dff2fc5cbce77cc04b42a37a76728f86bec2ad0dace849e7e44a0f8f5621be6e10911343f1710bef485d9b04f686b994ec5
diff --git a/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.301.120.ebuild b/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.301.120.ebuild
index af57db6b0ad3..216f53a04e96 100644
--- a/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.301.120.ebuild
+++ b/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.301.120.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Object Oriented Authentication-Results Headers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Mail-AuthenticationResults/Manifest b/dev-perl/Mail-AuthenticationResults/Manifest
index 275c6af2b6a8..7166023e1e11 100644
--- a/dev-perl/Mail-AuthenticationResults/Manifest
+++ b/dev-perl/Mail-AuthenticationResults/Manifest
@@ -3,5 +3,5 @@ DIST Mail-AuthenticationResults-2.20210915.tar.gz 31535 BLAKE2B 9f459fc7a9b16ece
 DIST Mail-AuthenticationResults-2.20230112.tar.gz 32438 BLAKE2B 7acc982ecb5e1486a7b6905acd220bd849c180fc7b8d6cddb75df89dc6fbbd47da122621739c6c783925a59b117783cf6aa0e6789d2520dc40a22b435e2b69dd SHA512 78ea5067e2386ccbbe5bb9c86150c8255e6f735319968180a59c992fac35a918704792b2f18bf10c0568a41690044fbdb14b9d23e7829c178a42eb64126725fb
 EBUILD Mail-AuthenticationResults-2.202.101.120.ebuild 493 BLAKE2B 944bffedce029d8efc2325c287fbcf45f0b431ca5e2bbfe212774e21a2a15e3677d42ac224cfe05c45084c6d24ea0593610dc525fe2a164dd7c9e3a0af6a165b SHA512 6021732b881635c862fb4e5b1218bf644c86f8ae77c79ff8bb41e08218e420c2f4f7a54aac691d3f0108989b7a75fd1e2b0aa69e4e563aa834c838c7cf72b2c0
 EBUILD Mail-AuthenticationResults-2.202.109.150-r1.ebuild 515 BLAKE2B cbb37acb17309fb066f2673e463e81011a096ec075d245aa08bdf7d2d906e8bf78f57671105d79fbbcc5d6c2ff0118388e3dcd06a9fc0d5c3ff3f68daa6155b9 SHA512 b63f4ba4f29df7e08264093edbe20df1a92362992ade0091ab746884a4b6d7866141251e1b3b604d4eeec73761e68c67356af8462863566562c325c3292e4c75
-EBUILD Mail-AuthenticationResults-2.202.301.120.ebuild 522 BLAKE2B a3402bd90a34340851c0a8571df42b1c92898950c52d28c95f566c44ba046b313e622123fa0ff9e2a56c9ed14e82ead53018b4630ab32fd078dca852ed866590 SHA512 397609092670fa800693c2b8b0f1ed2ff7cf61865e72893d5884f5ed17e9ef0b3b39f7d188f2936f002ac0322cd793c3eebc1a7857898126e2fd257432c7ad84
+EBUILD Mail-AuthenticationResults-2.202.301.120.ebuild 518 BLAKE2B 8301d3607ffbdbf6098411f3de8b84fe261cf10994fe08e6ed6e4b5db643d05e169776a8078b824ec06e29043f6e6769898f62a1fb0e87afc7babffc5a885b5f SHA512 67b11359b384e82a2add34eccd14cabaed6a66e2c8b9c9fc827223323bd13ca401ea8afd5728136a83c90ea622d2014cee76feb59621db5fbe52f4959e9da034
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/Mail-DKIM/Mail-DKIM-1.202.302.120.ebuild b/dev-perl/Mail-DKIM/Mail-DKIM-1.202.302.120.ebuild
index d413c224bf92..c0af19960346 100644
--- a/dev-perl/Mail-DKIM/Mail-DKIM-1.202.302.120.ebuild
+++ b/dev-perl/Mail-DKIM/Mail-DKIM-1.202.302.120.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Signs/verifies Internet mail using DKIM message signatures"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Mail-DKIM/Manifest b/dev-perl/Mail-DKIM/Manifest
index 6d1c022746b9..5a0726708e55 100644
--- a/dev-perl/Mail-DKIM/Manifest
+++ b/dev-perl/Mail-DKIM/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-DKIM-1.20200907.tar.gz 177877 BLAKE2B a71da80038e9abc8056fb248f7c6da76fdd98427bc18fc1d3c4bdba73dde4a683db10a1b1b61bedf03adbcf349c4be9e82e29b13adaa02007db5b7422ffc27f1 SHA512 1bfdd97ca49abfd3ae6f13bc8ede8706531801e078351ac41a3a6172b9e65249d247e38a95c53eb60781b5f38b971a5acf9c8b98948e9c4d7a427a525ee231cb
 DIST Mail-DKIM-1.20230212.tar.gz 179183 BLAKE2B 51613469d5369525a5c51859cabbf2ac0dc04e5406ede338dcb16471182d3d3e789821b5cc52fe85cdb07f67a20b33abf4fff1e647e3aa25c2a69c1037b0f753 SHA512 b34ee931f121104c93973f5cacf551f7583947c82fd272197b970852ac37d910f69d2fd44a4d4614162ee38b54205bb93e0138fdf48cc2c43ab2606040f18d3b
-EBUILD Mail-DKIM-1.202.302.120.ebuild 1060 BLAKE2B 6adf4955bce5639ae28d6879219c755792e3ec6082359446096453332aaa564417301e99dd0576cb6b95ed5293bb961a4189c033f2c89fe222abfee8d7e45923 SHA512 497df1325d144801be8e2e7a78b82f1becefd70ca0b6bea8dfc8c5004f6b4a011a2e56b02c5c3270d7c995166975f2a22a6d8dfe81e885576234b96ded82c706
+EBUILD Mail-DKIM-1.202.302.120.ebuild 1055 BLAKE2B 2cb48a44501a9ed424177828c0a22d1b0effcbedc06b2eb180ffe554cd93b0cd805cece3a346d2c051ad3571478740ee6b30a9920213cc2a770f0a21904bf60b SHA512 1677758a875d701f76377e95f185290ade2ae9a3e9cbbe67b3579b296889682bf8ffaeebac454ac5c52efe934ebdd5062d990aff4cc05bc92821a12e3e41e26c
 EBUILD Mail-DKIM-1.202.9.70.ebuild 1053 BLAKE2B 99403d245cc10fe5f07cec0e1ec03cc8593cca3b6ba9f2f8194b3ef3cd9b3fc50b85d788e6261ea7ef95bcbe879a9e14bdcaed80267ad6272582950bcf454940 SHA512 7faf79908b47c2d6751b4674f9454623c51d93d9e121a222842deb07236b80895992f39a59d7e61b6e571782ec47555a53c22da44bbe3fc7d3e16a3177f109b9
 MISC metadata.xml 2903 BLAKE2B 00068bb3935dcc5fadec99b748367ec58136406681b15a917fb33d5a3824d5cfb68c72ba2ce7c71ce32ae0a88481d97bbaad6e5ca1219ab3288d54330b4452c7 SHA512 9bc389bb1b36f46bf1e3ff7f2523b87ac3998b0c76e83270bae2550f64629288680a13746c4a4bbf699f920f533c944bfb4c95ace006bc32dfd48e7dc5c4d5dd
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index fd68ac3da415..f296d30a1d73 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Math-NumSeq/Manifest b/dev-perl/Math-NumSeq/Manifest
index 4b34cffb08f5..6affcea46600 100644
--- a/dev-perl/Math-NumSeq/Manifest
+++ b/dev-perl/Math-NumSeq/Manifest
@@ -1,5 +1,5 @@
 DIST Math-NumSeq-74.tar.gz 839603 BLAKE2B 6d52670375a529050c768fad08e471025dcaa3f9e641f4c8d448b58cdc58d459d096a76ae4a94ed94b244b6b7d11f71a1fa11f1c0fc6c42be7dfd6210a86422b SHA512 2312b7dd5fcdc3e7be4a5575d999bdeff33eaa0e4742ee188298d0c362256c0f02b32d391f734d58c4f101b6590e3bf21c17eb789066d5cf057f1074195e77b7
 DIST Math-NumSeq-75.tar.gz 867355 BLAKE2B 95466cee81621baed7b4f70f512227ef225fdfc558c13023e71bccf13e9c955b662e22a8d1868f07c908ff7674104991c8469e951d5ca5de2839a10221f7cc5d SHA512 4992e3a1f6507581bdd8a0623bc5891dde55a1e39262059805e7158b74b0ec5f5b29ef450d5b90613b21684e3e067efbe895765bc133dd32abaf2971be88c78b
 EBUILD Math-NumSeq-74.0.0.ebuild 738 BLAKE2B d3e22d4c828d6784446ec2f082dc7ab1f15c8d4a59026d3455ef4a0780f691a0b5becb8c475b92ef61ab81c5271bc5aef6c2e3546ad9e9b72f83bb30a1039a2d SHA512 8f580be7bf52e03d6e674a79147070faf64995049a727cb0d7833fcf2e01f54df3cdb1bc7338bc31e80c954221c991d86819863e962174900463f9c6cb264179
-EBUILD Math-NumSeq-75.0.0.ebuild 739 BLAKE2B ba8a4c0abe00a458ec086274ea34240edde262c65db27c5994d11562b313aa5a8cfa93b708b6fcc20ac95bda5f6f27ed153cd69ff629f88226f963ba2a8d4c0b SHA512 9a3eb5bfc52bdcaf93ed8065ed136fc9b0ab4dd8e8d984d0e628b939b2098994be9bae3465573757694c1c80109aa49d5b71cc3995ab139ced0f1beb001911fc
+EBUILD Math-NumSeq-75.0.0.ebuild 738 BLAKE2B c94ef0a2d149e7dcc1803da73694e680c3291055165905f92dc77d2adf682819a63fc3e5eeb2c168999a805fed868151d75afe3a7bd623420b18da937ef9a753 SHA512 0f36e7340b78b9d40fe5fbda32a67167c2e5a414f766e32c9ba3dffa747abdd75c31de91c2442907fe32965da5eaff2d68aa013ba2c68775d09290bb78443a0b
 MISC metadata.xml 9716 BLAKE2B dc2550fcf78c4e0ac7a159a129331c695534948d4df6e07ca07c305f285304d6ef23a6a2b7e2c9e7f4e8fedb0a028770e8c57402c80e1774fec10773425488f3 SHA512 2ac7776a086291ccfc49b63f5f0f43eea79f59afb6dfc521d1cb4637b3cfb44c41e359b3dbf0dd2805c14416b9cd21988625728b63b21b6fc32f7e8c84509ad6
diff --git a/dev-perl/Math-NumSeq/Math-NumSeq-75.0.0.ebuild b/dev-perl/Math-NumSeq/Math-NumSeq-75.0.0.ebuild
index 7a8abed32021..a5433a053c65 100644
--- a/dev-perl/Math-NumSeq/Math-NumSeq-75.0.0.ebuild
+++ b/dev-perl/Math-NumSeq/Math-NumSeq-75.0.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Number sequences (for example from OEIS)"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-perl/Net-HTTP/Manifest b/dev-perl/Net-HTTP/Manifest
index 953f9bb12112..7b977f6c4fe4 100644
--- a/dev-perl/Net-HTTP/Manifest
+++ b/dev-perl/Net-HTTP/Manifest
@@ -1,5 +1,5 @@
 DIST Net-HTTP-6.21.tar.gz 38914 BLAKE2B 7d0351912f279a60acf30c5867ba54023e29b7208fa3605bd493271f9b59b3c8ca4e26c093b80b24a8f9a98e57bef54304b70c98896d270f9580a7e88794db1d SHA512 ca50e54a893e38456dc107c216c6b119cce9c30b2d1ca47607e0fed426a79d2ed660818a5d5a6ef240cae28844c2d7ca613ce81f53e890e7f15b22e4d0e2887b
 DIST Net-HTTP-6.22.tar.gz 39087 BLAKE2B 07bb50d172a01b56839b6e5f26584451a3713cd645791e294dedb0c28bedbcd2e1c89fe16dafbb2f89544c0a5e7eab3d591c1d3b874f4f617b02ed508863de1c SHA512 8d0af85baee8a3b257995c6dd277c2eb578d1feeec89f3e4be0548959d2cf07934764d9d16a542a50f72a4611e3f4b6335ff7e969a28cd74fbb0ec3961588131
 EBUILD Net-HTTP-6.210.0.ebuild 843 BLAKE2B 9c4a20759630983c6ed938fb7099c607c6fad23a5ea896ef76928614aefe587cc8f3c2708ed001b3ce97e342d1371f465f32b19a3c107aab8431320851c780c4 SHA512 0bf006ebec8b6056d17fe6e173272b7a16ba92772cd5e7ff46e637cdd4691e84ddfd9bf3db089b8eaeb3b79fbf9de3a4fe128fc192b6a36d1c8709623be321e5
-EBUILD Net-HTTP-6.220.0.ebuild 851 BLAKE2B 9f9ab8674f8dcf81361a038c98790a2b62137e5b0e76272c4781957d6307759c45c362090b22297f00e56efdca5d72e6797047047e0398fee967ff917367193d SHA512 07e09b5891cd007fd626bcbb8b0eb5199502f5b4bc2ae35e54c89803e40595c026b27146cc6058ec0164d915585b79df61c8f4573fb0b9dd871a501e7bcffd84
+EBUILD Net-HTTP-6.220.0.ebuild 845 BLAKE2B 26524d2afd08be12068f621b7331cbd7e64964d8f662e19dc21eec249670b5e56d117c7e11b27514860fd34a3a93af321a3157cd28b4c5ce57c69840e7f4eb08 SHA512 955ccb9d2bde02c365eaa52491f77c1ddc3b7568f2dcce1e40c2ff1d168193aa5048a14143b098c610f14e26d39f65ef3cd89730c788e68c5f91813a8919f9a4
 MISC metadata.xml 553 BLAKE2B f6b1a86e8ee72d4fbf04ca30b0dadae64219f155190d20e5d8ac5bd0dfb48e9c0adf9d6bb313d9626ba07d4a3f5efc96d614800ac0556e114ba826680c3b105b SHA512 3420d4b3800f5645cbee4b21ccfe4745941a01e225690771a639ee5e198fa795f1d36f27e8218e0ee47b3844b6c2548d6472b8ebe4dbd2699ea36021dfc196a9
diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.220.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.220.0.ebuild
index 24939515ebc3..43c690bf3994 100644
--- a/dev-perl/Net-HTTP/Net-HTTP-6.220.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Low-level HTTP connection (client)"
 
 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"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest b/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
index dc97df8e7c3e..43e53031c645 100644
--- a/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
+++ b/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
@@ -2,6 +2,6 @@ DIST Net-SSH-AuthorizedKeysFile-0.18.tar.gz 16413 BLAKE2B ee22c2b456a5b8ad98fb96
 DIST Net-SSH-AuthorizedKeysFile-0.180.0-r2-extra-keys.patch 35614 BLAKE2B bca23e3265897c3935f3976aaabd4fb084c5fe328d90db6e5fac3c6dfe416815d83ea92dd33f4268359f3d6f2563d4decfe0279ae23ad45b0036777c09e5183a SHA512 b11e706c1b49cc9d0f42758d4815a420ddbf17ff1b5df61def65c9b21e7b3ba3cbbe1f6d2fa868e2cd64bf14ac2670ecabc5f2ab9c7bb02980e640b3aac98694
 DIST Net-SSH-AuthorizedKeysFile-0.180.0-r3-extra-keys-v2.patch 41851 BLAKE2B 0d3679ffbb48c84141ef80f541bf965ab5b007b7c9ddff1d5518458e2fe781114f7269928a00e5f8e7aa40794cf2ef4a4852b11ba374b167366d7ab1b27cf04e SHA512 7b941d2c58c1cee1684742e7d2fff09f3d934679c070894d769261e176f0cc9989915f4cc3f4af535c50afe5dd7aff17bad1418cf4c89496a238a95f88040cf5
 EBUILD Net-SSH-AuthorizedKeysFile-0.180.0-r1.ebuild 504 BLAKE2B 2d3c2357948a8f914a1557a352f831cf2e83412853183937ae92a4accf986898fdeb7c9ec881c8f2282734d4debeb45492e0d78144da95ab872a72417e63b3bd SHA512 bd5068e5b255688331d05e96eb1fbeba98b2ce2f50e0480b0f3612c95b5819727e91a45af96ef3ed7c342ea253a2cf826ed6a520fdc868e7d365ae8c1bbe0bf9
-EBUILD Net-SSH-AuthorizedKeysFile-0.180.0-r2.ebuild 668 BLAKE2B d62a30d7eee047ba90fada5f5bf1679a97781e22cd7621df7683a72470ca9ee95b6327f0d353b218f6773b69c25c3e1dc00a67c8e0232dcdf72cd455b80984e5 SHA512 3606bc6f0dcffac4da382b6082603d67985f8392fc4f9dbeac006c09c8ec7c8d4e73a6bc460ded08ca32ea6ba59803a236f516993298115b26463c8d12656371
+EBUILD Net-SSH-AuthorizedKeysFile-0.180.0-r2.ebuild 667 BLAKE2B dd19cf787b8679e753f790c03a0d3cd7b7b2cdcc78a62a2acf63c389a9a588eb82f90a6ed5f1808564acaeeb7067474cfd5b0a16ec55b43f407c2980bd2c019c SHA512 c9a61255c4d645688bdf29170a8bcc97e40643f04446837123ce529ca186ffd477386a848f278d55f8f4d0bfd9ceb10a634caf562c84cf6e0f7117ef3de8df12
 EBUILD Net-SSH-AuthorizedKeysFile-0.180.0-r3.ebuild 674 BLAKE2B 10159dbe3aa077ca378f6a5716491ca927c974b261c56bd3ee6e7bbef958eeae5f3a135b47f5a14b3bc017f0c06fd9d42d69dce5d19d4b5226bdd0d75a668c02 SHA512 57f8dc4867c19c9504dbb9b4bd3d98060fd0d94dd3bc6ca7e8abffb7c5a5e03a852e27769df771ac08946086ec2a84792c9c0cf942bc010ff7fe23cb7a23a5b6
 MISC metadata.xml 724 BLAKE2B 4acd576af0a24191b388b30d41d5a14caad2972239711dd564de7e7c4fd1e6f9676fdc5ba62ffb7f86cbecd8fc17946a6479f50506045ebe12a26f5d263f1070 SHA512 d28736842f36c4c6ff6816bd1a155c177036756ccfe8656e1aa7e63ba77dfb17b11e9226bb6392e032ea850308f3abf37aca97fa7e4dc5e3a7108cc861028b90
diff --git a/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r2.ebuild b/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r2.ebuild
index 58b42837a3ff..9d4110b442bd 100644
--- a/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r2.ebuild
+++ b/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read and modify ssh's authorized_keys files"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 SRC_URI+=" https://github.com/mschilli/net-ssh-authorizedkeysfile-perl/pull/3.patch -> ${PF}-extra-keys.patch "
 PATCHES=(
diff --git a/dev-perl/Net-Server/Manifest b/dev-perl/Net-Server/Manifest
index b58130bdf137..291c6bde85ee 100644
--- a/dev-perl/Net-Server/Manifest
+++ b/dev-perl/Net-Server/Manifest
@@ -1,5 +1,5 @@
 DIST Net-Server-2.010.tar.gz 145901 BLAKE2B 2b2339064e1e2a6d3296a19a497635fb4fafb7884e15cc04f3328df349086cbea561247c9d53a140e3c43a25be366fec566133a0e51dec1a4bec0d83f0950665 SHA512 b4c1a85263e81c4ad6f32e28acb5176002ad591a1140dca060b706901758f48d3c63c4077606d772540e18fc6fa6772e71d213d0a4940e903c597b0e0f844365
 DIST Net-Server-2.014.tar.gz 154783 BLAKE2B d461224e49f95d006d072d8e9e81f9e0dc6dc79663326bdb9eb97fd9dd1b10f6657dd770b0324b0f944a13d28c93fd5a13b9d107c9e98cf49f65fd7eb7a92887 SHA512 6b1bbfeed13af5f9dba76873899e162497234b5cc8fc08bf749fd86e0377bd9184a9807df61f27645634d0ff8d8e6c8c14b700b3d283fbbb7d1d844e6608c9c2
 EBUILD Net-Server-2.10.0.ebuild 601 BLAKE2B d383e0d68af2b5a2d801255b62d3e74291221e3063bb7a837ff373df30b282c944ebda265808ab8d7ce9dfa509572fce5c738d7bdf42fcc04529eb9fa189ccc7 SHA512 bc4740f0e4a2cca35525f31669849aa1dbd1e1f8c8a8b2a996bcda01b6248a52007e7c93ef34c15edfb906a032f11e231ed03d3806f0085cfe09c50e6db8ec0a
-EBUILD Net-Server-2.14.0.ebuild 607 BLAKE2B 70448d2cedd3c9798736e9809fbc6d2b9a85eb123c81a3179663cb4dc03679e43e3b5aa18a1212704bd638c991ddac1c8ca6756a6e6abfbc77eb8ce50949e7be SHA512 d6164ad0059759e564172a9f1fed4ebcb85af79a459af70cb6b0ca87ffed3bc1a3fbf974eff96f2c158c1945fce814e599229850976e130c385a82d73bb0eed4
+EBUILD Net-Server-2.14.0.ebuild 601 BLAKE2B 0030eec151df684b786b7a3c05d166ba790f3b030f69e08b4b2f3c0effae2647f42e5fc089d0d09b004b7ac2e4c5a03eb20c6dcb34c52142c62b5614596659a6 SHA512 6bd2bc13e82f8e85476f5f9a0092d79c7b7e5e034116265c50607d73fa49a6c3aee48d9a0e512a1f8c877b7abd647f9fe64fb968bd73f489673768bd9a95e75d
 MISC metadata.xml 1990 BLAKE2B 7cf4859883e0922ee5ad6b110d383fa6387424933d97d50c1b4d62ba9dd3c35381d51c661c2e94c77ba6cbf6a864528904acee63539fbe2387111b594db67101 SHA512 6685fa6751bf1b3c6f937021b6997d099edf5fc6ef4ab360b460418f8a6f023e283738470cf04d994fa4959df5f700fd2a7cd9cef56945d1886aea13d568150d
diff --git a/dev-perl/Net-Server/Net-Server-2.14.0.ebuild b/dev-perl/Net-Server/Net-Server-2.14.0.ebuild
index 0391167e6369..2118f0cd31f6 100644
--- a/dev-perl/Net-Server/Net-Server-2.14.0.ebuild
+++ b/dev-perl/Net-Server/Net-Server-2.14.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Extensible, general Perl server engine"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/dev-perl/Test-File/Manifest b/dev-perl/Test-File/Manifest
index 3000fb6e1e6c..beaafb7c5665 100644
--- a/dev-perl/Test-File/Manifest
+++ b/dev-perl/Test-File/Manifest
@@ -1,5 +1,5 @@
 DIST Test-File-1.448.tar.gz 29914 BLAKE2B 566a4c2047d94c48e9b89fa9fdcdec84de5fbe15ad0f25eaf9f11b2a658b06cd61ef025caaed5f18d805a81f318fd4a995d01756e21ed5a96956b5e84b3da5b6 SHA512 fea5082cedb03de62dd9b4ee1db891439a14367f746f1fdec4056ac251a607cc281d22708517de4e3e64484b47fb6cc5898c30983a6af9db03412c469b4e9009
 DIST Test-File-1.993.tar.gz 34406 BLAKE2B 3726d1ff14547d810238750584668f9a7467c24b6a9262db0b1940a83053a25264a6d9cc584e2adb86850ef732ab4a7f433c82abd424bb9537886ed38e4a091e SHA512 0e14580a11afc2f3115d5594be226237803ad8e462c314a2b775ca96bf491cfeea84bd90ae92a70c58d3d8fc7c0f21d38b54a58d29dd01a2c082c0cbfecb0aaf
 EBUILD Test-File-1.448.0.ebuild 667 BLAKE2B fefaf045773cc1ff88cb962838236fd542251fab57585f47d8db6e1e71c5e68ffa1e7d63eb58e3bd000c0c90151f73240d16b853048d306ab748b0c58f8b16b5 SHA512 a9a786fa49a834c231c2935d327f43fccc5de0481c470cd0873f93b8a8ab866cd8f016e535f6e65194dfca7d24fdfd5d297257b8e1528ce494937280ec180d9d
-EBUILD Test-File-1.993.0.ebuild 653 BLAKE2B c2bfbee6827015d0c2aed8c1668aa9262231e55f004fc81b3b676ff95be6986ec434a981f8a97ab39717bc94989f45a92fc330e8340817c2f4fb9fb9ad3a18ac SHA512 5b5a059f79c98f4a54703264e7fd4c34d9389dbae5b7737d880b5161a54797c00d8a7d1c4a4cb61af405eada5c405e887bcce8b5235227704d883a980007b6a7
+EBUILD Test-File-1.993.0.ebuild 647 BLAKE2B b06e88f84f76de6b59aa14a650d418fcb9c83f420782b4aa214173c50a330e0800c8fbdc95bffa0ad616e8ca4a50f78bfcdce2df38fc5ae8b8d68afec3fab959 SHA512 4a0c981e93c4fb6b612335de2987c57bd6fbb0cbf7fec184c8d3d245561950c55886ebcd0d6fec6e5df17cc3de856ede9d35501ddce7d8a769be48f396477ffd
 MISC metadata.xml 391 BLAKE2B 1f334c17528acb52ae757b454672a3c8b01b99c374b1363f69db2b46de7ebd715f1d2d8a7c5a062b019e395dca0f42fb37b6a0069e91b1313ade056c34aa7e05 SHA512 83f823533546b42976d35a3f8b6680ce17c54932e38b9da80ae70ab491ddbe1b23df454e8c72df6f7b8eb02145e4b7b92207d6cd56653da9edf55eb4b6235680
diff --git a/dev-perl/Test-File/Test-File-1.993.0.ebuild b/dev-perl/Test-File/Test-File-1.993.0.ebuild
index 92dd5966de98..21d0c9b375ae 100644
--- a/dev-perl/Test-File/Test-File-1.993.0.ebuild
+++ b/dev-perl/Test-File/Test-File-1.993.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test file attributes"
 
 SLOT="0"
-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"
 
 RDEPEND="
 "
diff --git a/dev-perl/User-Identity/Manifest b/dev-perl/User-Identity/Manifest
index a17c097fcf72..51c3d0bf9870 100644
--- a/dev-perl/User-Identity/Manifest
+++ b/dev-perl/User-Identity/Manifest
@@ -1,5 +1,5 @@
 DIST User-Identity-1.00.tar.gz 28871 BLAKE2B fda44088fcb156352c79a7092bd41a4c0a86fb00486a9feeda4e7f74d398ac4d3000859b0e9fe4d5b758b60047c29f4b425337896ca6343fc81268e85dc1d31e SHA512 b39315050aed9064f606d6fb167e42fb55bd411f1573215b544c9f2833c0d39f12700a4fec701317e31d614c55825f250b0b5ce7b3355fb63bc953d07d8fc744
 DIST User-Identity-1.01.tar.gz 28933 BLAKE2B d0cab040f4d68e10e6314b88d65831cc7129f18092b4c025db54294a6644daf28c0f59eb99d7de7a4bc7482303d49783e78c6ab4739afa9c5c5f030a475aa516 SHA512 541492a3a43dace6fddc5cdc237e64447e5b3871f4609c9a8b1304f250e57dac3c7cf2b17f6a11c8a9030ca40f72971e6439d275e6f9390680bb56013d5635a9
 EBUILD User-Identity-1.0.0.ebuild 480 BLAKE2B afa0479d20105faf35af0b24c8da64cdefc0e8b6465d785e47ea9b2a51eb2a88edb65f86483d66ec82363edebe0bf6f934ca5e0cd9b8e9ab936190390666bb65 SHA512 2577a6b0e312fae6e2c4f6ca1527bcd04d455b823fb0a71e25b4c9e916f38bc56427cfe8d453cb8a9424fbc582aa3c7fe7edc293a39f718f72552a5d2fdfe177
-EBUILD User-Identity-1.10.0.ebuild 485 BLAKE2B b472e85dcbba6caa142aeb3714f4b47d333ab9cbef6e6046f8a640f6b8dc73e9371d1a5a8474f69323c58f8e55572e503b0da543d44764258112f86ddba2f1d3 SHA512 de142d40b4d63e5d3ecdc4e3e9d868bb4789894cb03d3208f4c132797b5e6e1e910089b96702dbf28da40170b6a7df4a4535bd1430809525455e9be9becda427
+EBUILD User-Identity-1.10.0.ebuild 481 BLAKE2B d2d9c8ea7aca77b6a6a71bb78ee3adb79c0942918a3d430c6bca5a0e34ae3fd36be569be5f72eb82e7fa230391b2d3b602da9bb72f23bd26d14b109fa46981a4 SHA512 dfbf87616b2eddbad1fd12e0e3abeffe1a7f08b6d3ddb131e4e8b5505cadb5470cc65e00785394c6f73072790db4c28c55e36d4a43b0ccd053f634af5ba83b03
 MISC metadata.xml 1283 BLAKE2B c92c3d22c53ed01ff4682de1f1c8ca8e4dd1e66321b9d51640cc7365befb9397ed3c78237dfa8e132ae5b892452963045b336166976c3c5345501540bbdd43f8 SHA512 c5a13c89779967959fd9870c62f72652194192d0940efab02a8a32458de759bbb2c3436e8ef79c18619a98fdb5f3336a416ce63bde9426b2aa063088f8ed1a56
diff --git a/dev-perl/User-Identity/User-Identity-1.10.0.ebuild b/dev-perl/User-Identity/User-Identity-1.10.0.ebuild
index ada78f5a8608..e8cea177a672 100644
--- a/dev-perl/User-Identity/User-Identity-1.10.0.ebuild
+++ b/dev-perl/User-Identity/User-Identity-1.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Maintains info about a physical person"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ppc64 ~riscv x86"
 
 RDEPEND="
 	!<dev-perl/Geography-Countries-1.400.0
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a77bc9c848cb..332cb5623cf5 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index bac86badbcb6..631d1a0be1e4 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,9 +2,11 @@ DIST boto3-1.26.133.gh.tar.gz 648114 BLAKE2B 97c71216d92baffb9e07f9c112590a1fc78
 DIST boto3-1.26.137.gh.tar.gz 650777 BLAKE2B e4a7d02ccefbda53b33558dc107457eaa1df0871bb2fc548b348246192cfdd6760bc43a6e6861622de6376244b80a94a387bbb827be2f5b749bccf6b8ff5af58 SHA512 de5d29a4139650f0527e93a9e223b7d41b285b6c263a5bc7ec9ebad1eee19373b1f2093c03414f7b575f8a7402734b4076cfaf0fa5be34ff54b55d8960e9c836
 DIST boto3-1.26.142.gh.tar.gz 655602 BLAKE2B e9d5671308e71bb43a97953407f4aba5b78594ed39b26c3c992af9db8864e3c363ab874a66b5b015083c4a18fe7415bb1761137367783a70ff22564ada8a8842 SHA512 c2eabdb47898aa26fc8ba8a8ebfa43a86153188af1f1600bfa741bd3af1ce68a8692e461aecb5a29df94885e1c977b06c3cd009f1cec52a2e7a9dc853a2c3942
 DIST boto3-1.26.143.gh.tar.gz 656551 BLAKE2B 67ed6469df9ac6f8911d0d59d1f256db424e1302315163fac71b1da94be4b9bd25dfb99c97009523cba56af48eaf32276fba3088b703daf38a40724d8e715183 SHA512 ea982542cf7138368a9223049418859a176065b03ee3919895245c35667773206ce7587b101f7af72d30893c38d05afec28ca72a7d0968bcc209d24c118709d2
+DIST boto3-1.26.144.gh.tar.gz 657264 BLAKE2B 47d9d5fe5d1b134ae2ca0992b8bb2771f85b0bbbafe595ceeaa68d7d7805596e1a7abc9617a02b70da2119cf2d5091d0981ad049b1d38fc8bcbd2be8bff8ef78 SHA512 2622ec60e3b682c09c82905ff52a3b8bc91b6f69085b18b842482597d7defc6f6740dc0969ca1bd69f2e585e35558e33e69fd63401ba0063b414d90c5434688b
 EBUILD boto3-1.26.133.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
 EBUILD boto3-1.26.137.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.142.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.143.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.144.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.144.ebuild b/dev-python/boto3/boto3-1.26.144.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.144.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 ce12288c9369..1f2a4e2bdcb9 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,9 +2,11 @@ DIST botocore-1.29.133.gh.tar.gz 11484789 BLAKE2B ce1acc51ffada796e594090e7b4d73
 DIST botocore-1.29.137.gh.tar.gz 11508178 BLAKE2B 2f74fd2f3923672a4fcd501f1c5ba48cd09965ea0f70689bd6559a4c4a6fe8921f783ef86f28ac57893c8b1366d8fca2fc79f0216747e04142ed33880f07fe39 SHA512 b800a1b73170b5fcbbf1b17477bb8f04b19f5f250a68bbb3b993b0e058d8df870eddf932f79d94eaa3255b976ce136adbdd5b359757cd79f2cfe2a16b3cfa2f4
 DIST botocore-1.29.142.gh.tar.gz 11528069 BLAKE2B 860a5ab68d26424702006b221e62e29cfe21ba93593be61e4ef7e89ab50c6afb4b305f2ef3b2d80fd428cf7791933e43b20e1d4934d330653290a7b2aa16f6c4 SHA512 f408175054095bdd3094dd789de333e4e669cee72fdbc5b03551fc006cbcda5cf69eaa6daa2eb3bf09b30524f50d4b7b334d7b18051e55eca12caa16529b41bf
 DIST botocore-1.29.143.gh.tar.gz 11539133 BLAKE2B f1845154fe406cbc06fdbaa1bf8f48a98b40f267a59b86b9574955da9ad9d01c8eb573327ff1f1e68c06682ab2068328dc3bf8cf3cfe0df277a13afe51c70a50 SHA512 647301c2570f214493a934e0deb516a3b08b1bca34b71dff1a068c67427eaaeb371894f651cfb7152e23a31f91a63af3f25f47c198b5c6b65113eb648ee0b3d6
+DIST botocore-1.29.144.gh.tar.gz 11545575 BLAKE2B cda5a1c91b44218d43a4f06f6f68ae44cad4d1ba0ff4b88a168642bf7f8be7f2a627acba2375c9d8dbc1b5648d71dba4e37a2da5dd9ce8845dd0ee716504ecbf SHA512 ddd3e8dbe334d663012e92c2839f91387751aa7a69b3bdf1331ae25f145700c26e1c62e4b3a8bb913afb38f11d02b5c0da34fdd5d45a97898bcd0b468163a4be
 EBUILD botocore-1.29.133.ebuild 1827 BLAKE2B d9e353ffebf3b77bdb5b034da339f9f3cf95937e288fa522fcc40f88a4752c58ae085406bfefa595c3738ec118712cdb4ee0509c1dee7a00e2c76cd2a657009c SHA512 f0d3e81726bd65bf4c097b63e8673881949970e29d976de53c1facbccf8cd1d214fea9153f4820a5889f1892979342a0255e110b243ba613d4e803a940d46602
 EBUILD botocore-1.29.137.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.142.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-1.29.143.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
+EBUILD botocore-1.29.144.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.144.ebuild b/dev-python/botocore/botocore-1.29.144.ebuild
new file mode 100644
index 000000000000..3ced99abe4ff
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.144.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/breathe/Manifest b/dev-python/breathe/Manifest
index 0c49ec83544e..93f08577e554 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,3 @@
 DIST breathe-4.35.0.gh.tar.gz 212932 BLAKE2B 9423cc99cd1dc45fa1c93f1e2adfe59be4f3398842d3c6f98ee7a17285e108de4eb88e149c4ee179fa1008e30b69c8fa4f3934506aa53892c2eb612fa7652ba3 SHA512 76e36fceb89c21e2c62471a37b856f8e7077f946ca8ebffdd068297d7d447ba4f42f8f9d91e231f7a181d7dba2cb8650479f35f8bef342184e5ccbd3dd951f91
-EBUILD breathe-4.35.0.ebuild 893 BLAKE2B 22f6ec314c2a57d2b0145ed972b1024b0da4333e3e11ac50e806a26dd57967a408823fe8e9b535c28e294a1f479db06a535c6cbbf80234453abe80739079faec SHA512 6b71e9fc75362493226792bd05dc7e837836ad73c4a14e38cfc89eb8ee9b35c9d1b695c4cef5398edef7b007ef22e6a09501950628ae503f088facbd55d93486
+EBUILD breathe-4.35.0.ebuild 894 BLAKE2B 70bf2f8592d2100940adcb3b2210d8d9ea1d20a58e52c49f7fbc250bb9df59bc7cc8cd102072b7a9309d6739eba18c47a78d3296b3bc2ce72a52b035b532fd85 SHA512 4c842bf96ca45b9fbbfdcf1e258b4098648d4d5cbdff15ec8a3619b95ef86802fcf12b44aec5a1bca19b3bcde720537d69a2a71b9dc25042fa4b637612f15dfe
 MISC metadata.xml 821 BLAKE2B 4df48e03f2ad66f9a802bb6c238ee2459435e58153ce5cb8556b7b9feda45dd86017266bdf259faaa3e49963976bd61fbff5eccf18f2d9d95d61319995974fa1 SHA512 a14c0334a7029f762133252fcf7b8ae313be23059326876cd64d81fedaac4c37023288779450ff99524b6c3c99f62e7809befeb60476a9e838e6fa2f3169deb7
diff --git a/dev-python/breathe/breathe-4.35.0.ebuild b/dev-python/breathe/breathe-4.35.0.ebuild
index e5117107d3fe..b8d31307ded3 100644
--- a/dev-python/breathe/breathe-4.35.0.ebuild
+++ b/dev-python/breathe/breathe-4.35.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cachecontrol/Manifest b/dev-python/cachecontrol/Manifest
index 45789489f700..25382883481e 100644
--- a/dev-python/cachecontrol/Manifest
+++ b/dev-python/cachecontrol/Manifest
@@ -1,3 +1,5 @@
 DIST cachecontrol-0.12.11.gh.tar.gz 41338 BLAKE2B 09ce2336216b69dbe9796d658db9f5b0d378259484cba3a78ecd789843e19683adc2b1b90d579cea8700d07ed55a93ecc3a56e5da2c8ab025e5084d2847d4dbf SHA512 be1c91f58edda36192f1267a8fdfdc50685ff57da5d84f5348b608982327993333f18f5c318a20cf258b16d2bc83272ba58317e8c4c44a84d5d1f93b522dfc8b
+DIST cachecontrol-0.13.0.gh.tar.gz 43740 BLAKE2B b544d8a662a5850c629f76969fce32651c259fbdf59970c138db6418a2aa3104fe180377cfcee2613abd6d239d75d2878d95090615ff59f590c8a0080e711821 SHA512 271abe40ef66f8227fb604422de215ab99cac283c8464f3fe8eb015ecda6975034c53932565d2f2eab3bdeda94cacd3317798e9e3d1c03a16a11c52a9a0fa451
 EBUILD cachecontrol-0.12.11.ebuild 825 BLAKE2B afa1164ee70db11ab2e06d639ce944e993121cc16bd56f7bf312e27cda48e062d821d5b863f18a4da1e3ac4f6c89b359d132d9f1c208022358c049e3d2051974 SHA512 7e35e1fa8deb847071d408f24eac5549c13ca22c82b371c80d267cbe17f65fe8902862d708fa0b1252dee9c79a8513654e4d8ef12b12a28685101197dab1b66e
-MISC metadata.xml 400 BLAKE2B 0a4de3dff77966722a153ca7d1b4e6531932fc2ae1c99bf4c7482fa83a35ccdc1bf647e3c7a9097ff2844e2127af90709a47ed4f6b47e38c1ca0f240896b270e SHA512 992efa678056928cfaeb04df9a6a7c5523bef32ea0665d86e06faf7b61decaf424cb1c8f813fe19bab74ab25427b5a70f3e106e61cfaab1cc3fa3a359f052e8c
+EBUILD cachecontrol-0.13.0.ebuild 803 BLAKE2B a265025225d02852e7b05788943e64b59b22e2cc1f5fdede437af04fa9431dbc86d6bb66a0d5980a0b683dd3848f54465922b1bf88c31b6c3f1e301668784f7f SHA512 759569a62153121c918693356d30675db2f307f530a6d9c64b1b0d972dd2f06f50dc7457d9c914041889c68fe1e4d5e434fe772000fe3ea410a6ce0a8d693453
+MISC metadata.xml 396 BLAKE2B dd4511e8517b46997276e85152d25ca60bb94cc899fd9b56de594d18814578741a8b040e99e59fa1471a8396adbcdba6f8068dc5535918ff8ae7007595362851 SHA512 aa2346d2fca689f6b2c793bbd570585d93aa412719054e2daedf9378459237649fc32df9482407b55e94d2046df15a8d85a077db2369c9f4c8d5146d89d783d5
diff --git a/dev-python/cachecontrol/cachecontrol-0.13.0.ebuild b/dev-python/cachecontrol/cachecontrol-0.13.0.ebuild
new file mode 100644
index 000000000000..d81617083597
--- /dev/null
+++ b/dev-python/cachecontrol/cachecontrol-0.13.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="httplib2 caching for requests"
+HOMEPAGE="
+	https://pypi.org/project/CacheControl/
+	https://github.com/psf/cachecontrol/
+"
+SRC_URI="
+	https://github.com/psf/cachecontrol/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.16.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		>=dev-python/filelock-3.8.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cachecontrol/metadata.xml b/dev-python/cachecontrol/metadata.xml
index a98e88cd3529..fe6101713290 100644
--- a/dev-python/cachecontrol/metadata.xml
+++ b/dev-python/cachecontrol/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">ionrock/cachecontrol</remote-id>
+		<remote-id type="github">psf/cachecontrol</remote-id>
 		<remote-id type="pypi">CacheControl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 53c1a2c9f88a..c727b58cd4aa 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r3.ebuild 851 BLAKE2B 177a30161b1f81fb5eb0d0fc27bae5bde9bf8387c4f1d653f52c3d5b0042ac766cbd93bf125d6fbc9fc986854a536450f1cf3547f1f1b13aa673d787ffbebba6 SHA512 9e9c1a58544d7b0c031d101d05711960154f4bd400e7b456d45db5d4e7f7215b921b996a76070c529c7e78d6092d811108e7e42f9334750ef7ff84e85f701239
+EBUILD fields-5.0.0-r3.ebuild 852 BLAKE2B 52889e73b89c190b91cd503ec9a8808ade983b5a215b0cb9b2328b0d46bf204a1876687a8037bcf098547c960141f4de75c09bce2f17ad0179ff6924844364be SHA512 bd5081192995837515e203aeb26b98a7927b7acf787a291f42127d8d85ddd00ef1f5ad08c41f48ef9679d80c6343a5221e9516feeede5f9b10f157b65ca8b685
 MISC metadata.xml 395 BLAKE2B 8c4172bfb3d5f625120ba446c998d4641bc8e6177c4fa91c6efd141facdc9a6f5519ebb991eb571946f51156b7095333a8262fcf12b2401108c8ef3e1f0aac9b SHA512 388901683dda3121cdbcabac4370d7b45d50ae5b8c64bd282855953c111e1f10aa8099a95007bf7e6f0a3d03ff26dbc20e1233b8741863f23057d62f8853fd36
diff --git a/dev-python/fields/fields-5.0.0-r3.ebuild b/dev-python/fields/fields-5.0.0-r3.ebuild
index a68540135ff6..663e02348ff1 100644
--- a/dev-python/fields/fields-5.0.0-r3.ebuild
+++ b/dev-python/fields/fields-5.0.0-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index c2e775e0783e..eecb3b8f8768 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,3 +1,3 @@
 DIST guessit-3.7.1.tar.gz 161488 BLAKE2B 66851898aad5386692bd3535e01e74918b31c59d56c2b2a4ead3d126f0ce30c4f7388bcaa0acd06652f3b72bba99aacf29bd7d9d8abbc38d38f2d259a77bbe17 SHA512 4932407ca3a283a756291a69ef4cd4dcd96ea9c37b6d30331f134b2285960afb1f6adecdb299474ef7dfdea4b6e2e029ddab0789998efe7aea13d0e5bb8c54d6
-EBUILD guessit-3.7.1.ebuild 837 BLAKE2B 86b622a311e975aa5d69c5c716c517dd752126f6cb7793dd1457e9986bd77c8b58d3cfe65f12c67e327899cd7cd899e1c566d7d8e3a3057f4ba582453d32768e SHA512 0c31534199cacd6f7d846a32ff09bd7abd036a1375bdb077d266fb2261d4dd36ff28e1cf552034b8d927e0d100fa2f2cec89cbeba1c590650d3b8867f41fa71b
+EBUILD guessit-3.7.1.ebuild 838 BLAKE2B 822d243fadbddd54ccbcdc7d9d3d5ed080386f051458f79ab47957c8918aa815728bde7bca5cde23c53b22337a376b37a78e7d2435b6aa0629b214a06ef2d413 SHA512 f399440741d95f5dcb4b85c7902473a63159a598fc82e10e338cb64654c79c8028ea8cc665a35d292f8484e1da2f0acacaea99f71cc2b24d95e8f510045cc572
 MISC metadata.xml 393 BLAKE2B 6aaa0bb7a7cac0915e2aa2d65bbc311144f5ac04ace0abbf5591f94d7e4b50c80754d9ac5d92039fb0494ebaf4051fcd9d0de60f208fcad3fb4fec521503a7d5 SHA512 02502c60dec90c160d8bdb29223cf27bf0ea6e23d01b3feb336f747e13c0c830f788e1b42fede862706d7b45927f08f3c8bc124dd8bac7c94264a0659a9df9c9
diff --git a/dev-python/guessit/guessit-3.7.1.ebuild b/dev-python/guessit/guessit-3.7.1.ebuild
index 078315374d88..7df93c5ac51e 100644
--- a/dev-python/guessit/guessit-3.7.1.ebuild
+++ b/dev-python/guessit/guessit-3.7.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/httpauth/Manifest b/dev-python/httpauth/Manifest
index daf7c71e556f..a194c4a613ef 100644
--- a/dev-python/httpauth/Manifest
+++ b/dev-python/httpauth/Manifest
@@ -1,4 +1,4 @@
 AUX httpauth-0.3-remove-nose-dependency.patch 1239 BLAKE2B e4d40f37e88b7bc0e95d012837b3a256d75f8a67c41dbf66b6bd2d11f769f584771de3a5b83707ae32f8b4d5175d8814f57bc89450ba7f049b4afe3a91474b47 SHA512 a0cc7ce2db92e9bc89b4f5ef5be393e3c8a444729f0000aead02701e7128ed0a489f08f366f3ae327e476f10b29c4d81d1e1a743ab4c5bec032ab8c1204c9564
 DIST httpauth-0.3.tar.gz 4440 BLAKE2B 41c9ba9ee50b7fcc4ed409f4b34897b5243df4065fd081cd5c0951ebe2719a34a424e59c21adbcd9be133c8fe4fa4ad9dc7bec561285b873987f982f684b3682 SHA512 aa35148322a1c5ffc22a132d3062d300118aa23181a0008018d0aacfd473758d86d50ff1236d88126858a53e2f45aeea938988b2d1a8f62f80a97d8c2cc69822
-EBUILD httpauth-0.3-r1.ebuild 525 BLAKE2B 832ca4187992b7fb20367814549f67f616057b1b34a6d9d0fc799428cc68845a26c0db8da5084218c7733da063b40eada7ac960b905784cd871a2a5bbad9dddf SHA512 daf3c6f523a7ba570dd6118ba4ff33c272c7981ffff30d1ad2bb377863c736f150356e4dae280ff8042aa7e98b5d39ad845c7a98e361ab7c558e002ca2847112
+EBUILD httpauth-0.3-r1.ebuild 565 BLAKE2B e1cea46317398929a833fae6c8f298642e12acc29a0df9c2518fabdf3518f9694bb0a1fa2fc03fd4ec9c07260ebbccdcb2e5fe2846763907286402f2c535a581 SHA512 ff9cccd90fb8cb510789287485ba81fbd489037ca20f6cca72ef6feb8df29635ef98d13e9aab4afdd5dc90e146663b24db8211bdb251d6ce31ec351115e67cce
 MISC metadata.xml 441 BLAKE2B 2c3d0480d416c2d12e0e5a4d511a5a2c04d2e26d1ddf4a52528371f16c36059276ac7f4b2c9b0d2d40a7d93aa5d3323e1763ada535ccc37a2c5b74ee28449dc5 SHA512 17202ae2f283611ae3a31f9519c7d11b32c904e729efbf878c928d5920481d1c4279127763a4d11f89b5354c677a213909cd4db39bbef56539bf4474ad61af1c
diff --git a/dev-python/httpauth/httpauth-0.3-r1.ebuild b/dev-python/httpauth/httpauth-0.3-r1.ebuild
index 826b032ffd94..cba95c2a12f2 100644
--- a/dev-python/httpauth/httpauth-0.3-r1.ebuild
+++ b/dev-python/httpauth/httpauth-0.3-r1.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
 
 inherit distutils-r1 pypi
 
 DESCRIPTION="A WSGI middleware that secures routes using HTTP Digest Authentication"
-HOMEPAGE="https://github.com/jonashaag/httpauth/"
+HOMEPAGE="
+	https://github.com/jonashaag/httpauth/
+	https://pypi.org/project/httpauth/
+"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7de536825a08..d27d395d19f2 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,10 @@ DIST hypothesis-6.75.3.gh.tar.gz 9369491 BLAKE2B bae51e4f280a0773d4101b5b136ad99
 DIST hypothesis-6.75.5.gh.tar.gz 9370565 BLAKE2B e9ef05cfc24a0e5ada5ba863b4ce4c2d4884020cc8f3692c35f3f3d25b0a416e4a2c1b2061ea9bbd105a0f30264ca5d91264e99d6e65e79c909e577756803d78 SHA512 c94b5d40fda5e66a216aee5d8b40ca4df2ebf1549674ee81ad84f2456eb6f67348f468293b693708bb61b2999bc2c31d81b0fec277d39dfe256230320a4de0cb
 DIST hypothesis-6.75.6.gh.tar.gz 9370713 BLAKE2B 93996d6ff0c109c11123ad9b653502c44d51277760338c2575840d6257081bb19b0eedbf2d0feb15e9ebc9e6feacdbe79e070bfd31d35bb9c825bb4a2d44b7f5 SHA512 12396799a7f3fe661f5cb72ccf1a7299919d9f4b05a4075810803350380d217e30312d853ba72e49c28c4f1a08143cb76adc87465ba9cef7400e2dad9cc52001
 DIST hypothesis-6.75.7.gh.tar.gz 9371718 BLAKE2B 9b0c9f4589be2c81fdb79a1157fcf3815dd7f9c11e3c68e14319c10fdb7a534e90e3c1ae042889057bfdb97ae3ffcf9f0360d7fb1b17419309f31b190aa03d9e SHA512 ac4da9e837606f0d98361386e51496f21d9f53ceb0fdd9b3d14eb85456eaa3b4f7cbc7b29754b6b400093fd38b3d3c89ef74be6662f113e0eed87afbf0382ce1
+DIST hypothesis-6.75.9.gh.tar.gz 9372102 BLAKE2B 9588536fade56f4f87f54a0dfd7c911934f08aad71f31785210d99dfb8060bf9719a3bc3e9a0dcd647261a4a1927d5b7cb1cab8135dd9b97ebb321d79a23946e SHA512 29dfd1e9ff1087080a8dcd9c0c25c5e01c79839ac736d20f3eb31b1173b702e31c6b7d777c03f8f5674ec13e9bdc51aab6be8b1d20d067a30508914bcf61e8f1
 EBUILD hypothesis-6.75.3.ebuild 3332 BLAKE2B f8f40533ab1e341d563093f901fb42bbe290927d1579c201389e5c210d58dd883f5a9cd5819829b76c9cde8c6e0031a8a0234c99d0465855dd699e59b72d6a02 SHA512 f9fb85e22f3d7df7e5eeb0d6e09b5b4f294e281e222e7ddc80b0b92b92b7a6cd80a3eb4e6ee3eaa6b5ef1a2bd7248291e160c584b3d11b5b0a5649f01baca079
 EBUILD hypothesis-6.75.5.ebuild 3392 BLAKE2B fb6424f2cc03ef7ae8806ba24f845896c3af5dbb55a52ff60e423f97bf9811a2cf1aca9568260ff75901595a8a8423cae319205c4c6a750510f4751e5019d178 SHA512 3d3ca613a80fb92cec796a1dbcfa3c7d3b1974d9efb7dd268f09a67de4835a6962e82ab88840da75025cea10123ae31807a4497a7523612b6483b78086538e4d
 EBUILD hypothesis-6.75.6.ebuild 2729 BLAKE2B 3d6ec95c344df3c3cdec79154e841feda590af529b846eebc27004200f79dc6a3ef8bf4fa6536f4db23253dd85acd9447fd720f8f25e2afdb940ddc375e2a3da SHA512 da23784648e0b2d3e99f015b1812c8da6085dcc9f74132f0cc2beca59cacaf4466ef97327571bbe5f17133e890c4919499fba402e73bf9a4fb71afa2e1afc09d
 EBUILD hypothesis-6.75.7.ebuild 2729 BLAKE2B 3d6ec95c344df3c3cdec79154e841feda590af529b846eebc27004200f79dc6a3ef8bf4fa6536f4db23253dd85acd9447fd720f8f25e2afdb940ddc375e2a3da SHA512 da23784648e0b2d3e99f015b1812c8da6085dcc9f74132f0cc2beca59cacaf4466ef97327571bbe5f17133e890c4919499fba402e73bf9a4fb71afa2e1afc09d
+EBUILD hypothesis-6.75.9.ebuild 2919 BLAKE2B a2ac6f16eead88aef808d3dcfc8f0c81f8b5fc3d9fa86784cf1764850c0cd6ba607af0317d53f89c00512e5b230725f44afbd944942be3f8c0dd2812805d5b14 SHA512 4d102afff3bc933949a2479068ec59290b7f9d37f60b6a1aa81434ddd2b922120cf09266c000d1d10a9afedca2525ba47978b1c5c2f62f562d556dd10f113e14
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.75.9.ebuild b/dev-python/hypothesis/hypothesis-6.75.9.ebuild
new file mode 100644
index 000000000000..ccd9764a0bcd
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.75.9.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_12 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=() EPYTEST_IGNORE=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+				# TODO
+				hypothesis-python/tests/cover/test_lookup.py::test_resolving_mutually_recursive_types
+				hypothesis-python/tests/cover/test_lookup.py::test_resolving_mutually_recursive_types_with_defaults
+			)
+			;;
+		python3.12)
+			EPYTEST_DESELECT+=(
+				hypothesis-python/tests/cover/test_lookup.py
+				hypothesis-python/tests/cover/test_type_lookup.py
+				hypothesis-python/tests/cover/test_type_lookup_forward_ref.py
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
+		tests/cover tests/pytest tests/quality
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imageio-ffmpeg/Manifest b/dev-python/imageio-ffmpeg/Manifest
index 8ae360efa608..0929525dfc6c 100644
--- a/dev-python/imageio-ffmpeg/Manifest
+++ b/dev-python/imageio-ffmpeg/Manifest
@@ -1,3 +1,3 @@
 DIST imageio-ffmpeg-0.4.8.gh.tar.gz 27124 BLAKE2B 84ba7cbb46feae7e95b9d6f61e9b3289a753da7d78ad2848b593969c7f2a6f9e36307ca07a4b03f672fe8f61c697dcbf2dc236a2545b9ca9547fa6f174c96220 SHA512 aa6179d8c8cdbb49a60bea5ad570c6343d5e6b5a2678e88bacc484916ff806311c121143342f039ba9d41c8ac46ffbfe0adefe298e5eba0052d72c6e1707c4a6
-EBUILD imageio-ffmpeg-0.4.8.ebuild 744 BLAKE2B 235a4f7515b3161111b44bc1ef7c014cc9c0eb0047b7cf6b3fac23fa79eb5b9792c694b51d8cf7598dbc67bc2541e01d19765559cede72ded1e7980541b95ec7 SHA512 b5461574917f84de6262a7d297b6b7d98604f39c6df737e79d8eb950343a56b4e5ff72089ccf976a30dcde0674e399073abe6d2f531efbd59bba9c54e948b637
+EBUILD imageio-ffmpeg-0.4.8.ebuild 745 BLAKE2B 75385e204fc3ca555f837fcf21676c6a858cb5913059d8ac2a032ada963d83a9b77c2f8fc7495f90049c01830bc1150a8041d3f03d10b8b2f2171540ebc119fc SHA512 4b83a0efd5ca51b5735a600343d78bd76aa297dba20fa203adc7719f9a2d74f0c4844daeb0061426fd521f1034391df0fcae30af2b0be81bf8057b87b2d6b6aa
 MISC metadata.xml 404 BLAKE2B 6edf3706d02cda22fe3f62df4c773035b0296721571683672ffe287059b3d5b12812538bd8deb4b26008bb28bef65de97feab3aad32b397f55a9d6c62fb95b52 SHA512 3b6ffbd42a85df5f03cb429aa8dd0b5dbe5585b4fd57af4739aa49a96408329bb77c8017eeca078ca2212bfc390099d06670bc70f968f8024a3d5621d1016ed3
diff --git a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.8.ebuild b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.8.ebuild
index 8f1c10e146b8..5270c885eb44 100644
--- a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.8.ebuild
+++ b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/leechcorepyc/Manifest b/dev-python/leechcorepyc/Manifest
index bf4979be57ac..bba6a256ea87 100644
--- a/dev-python/leechcorepyc/Manifest
+++ b/dev-python/leechcorepyc/Manifest
@@ -3,5 +3,5 @@ AUX leechcorepyc-2.14.0-respect-CC.patch 1518 BLAKE2B 67446ded63f4a9b7e0f267cb0f
 DIST leechcorepyc-2.14.0.tar.gz 124463 BLAKE2B 26b7581da76ab3f8981e956ab2f64de2094cc906788455e38784fb50dbad31b8b14de2f510cb49b9c1e842e2a66effd44a2db94cb6ef9e7ec9f11c3af0d9434c SHA512 c7d1d50727023f6b34bbc9682dba9bc70ae69962dcd5c326612a0dcd48a2a90ecfe674391559271d65d7720d755edde02342fb999e53ad54f8095c589060b901
 DIST leechcorepyc-2.14.3.tar.gz 126511 BLAKE2B a15b593144685d1f44dc1b580c8146f57d6c784e39d2a4aad8b4221ea718ee79dffe24877ac74198a2f8baeaca30a37d3fe1e6680265b94bcc30dc7117002706 SHA512 06c4c66cc92c2c55e2dd2e57e5488a1864dc21a1667b4b39237372e95fcd6b99b569754a44eea7afdae32207245016b096939c0edf11a4133fc24a343c892ba8
 EBUILD leechcorepyc-2.14.0.ebuild 813 BLAKE2B 78175e203aa801eb7f553acf8027e0d60e4845f89a76fcf7179e2166649f297ceac7a4415081bdcf2463e47be4f5e3ef46dc0bab619049b28d62de501ad0360d SHA512 0b526cce6ab640849a6e20b1e46f2d30bf35c815381bb1d6584ee0c223bb26c4039eb227a73a78b4af89497d2ad14eb73870ba36641142824a2f7d997fd89b3d
-EBUILD leechcorepyc-2.14.3.ebuild 814 BLAKE2B b087972e97e54c719a9366eba3d50ae16f3ae98967eacddc4b4872abca39c4215ed162a1e7668bc2f751380bdf74a5c8816ef46929aee8a06a97e24f73c2821a SHA512 b243440f72e161c1f1a8c45663406be0ac0e48e4d98e38c4b64df4e25aa0a70d9f9bec834ecde9a37e10198987a78531ef7c1d01205760a68e931c01a9c42607
+EBUILD leechcorepyc-2.14.3.ebuild 813 BLAKE2B 78175e203aa801eb7f553acf8027e0d60e4845f89a76fcf7179e2166649f297ceac7a4415081bdcf2463e47be4f5e3ef46dc0bab619049b28d62de501ad0360d SHA512 0b526cce6ab640849a6e20b1e46f2d30bf35c815381bb1d6584ee0c223bb26c4039eb227a73a78b4af89497d2ad14eb73870ba36641142824a2f7d997fd89b3d
 MISC metadata.xml 683 BLAKE2B e85f13b83acf28fc6d59876fad2576afe741065c754680650adcb7acd1068410469de969ab4ee28ef5d9e7ff448c615293cf3f4713b4211c22dbb1b13d7f5947 SHA512 cff010f9f6dafcb3379a0de5ae0c98b974e605cf4e3a0131657832da2f0609e62cf07d3da84327b8c1272eb4cad64218e6c3f0231ec2402b3801e2453a10e76c
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild
index ed0c33db2819..e79613f7df0d 100644
--- a/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild
+++ b/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ufrisk/LeechCore"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # leechcorepyc ships with a bundled version of the LeechCore library. So we
 # don't depend on the library here. But we must be aware this module doesn't
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 51a338d21b3a..288c9f386dce 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,4 +1,6 @@
 AUX nbformat-5.7.1-no-node.patch 719 BLAKE2B d9a30c5cc917f6056e73a90f2300d15aa57d666f79d7185fed2ba092438c00f0bda307b1f0e4d2ca1429bf17a8a44475847aa98292c94fa5bcb911d868fcadab SHA512 2b52e2bf94155460f7963037119078301ed96d6b838d0f639f4775d6b10ee73ab05ebdc381eb020fdab01517f9b92d32dd2f45d7d614e783c221da937e4cb3dc
 DIST nbformat-5.8.0.tar.gz 140655 BLAKE2B e45b6fcc45fa01ceed49fba0b3a3fd749df6692e355156845cf69fd9d2e176332c61c89b5474ffa89d96da4d4453b668150e96ac266cddd254efdcb1a3b742a1 SHA512 f000db59701eec2fed8adba6c1b521bdfaf942bcd0dba2d8d6d79a7d28b078f4a29df05ca3f393c1651f3ddc6b3690f536928d6fff5937982cc52dd013bc6498
+DIST nbformat-5.9.0.tar.gz 140980 BLAKE2B e967ac0972dd2a5749694900002f9ada4171b5219249c3b6aa600fba97121aae0334516838c86b175064b0975a298fa9a1614dd2a458dd5d66ba832187731bd4 SHA512 c409feb3b6ae9b89b86d1c5e77a23a368776ccf9e62d606e2bb689927eca4d73c79a22e3f5e9e2beda78c201dc7485114e762872b305278c23c8129c7c65449b
 EBUILD nbformat-5.8.0.ebuild 1072 BLAKE2B 66edd69158d6524217cc6b242fbe5dec4587939dc6ae1feffabd8477731fdad8c29d091a89783eac4c122d8e54154177490a9b8437e2b4a9e5103ec976f88c99 SHA512 8b72f7976b8c620474d6e34bd654fd2e164ad0a09eaadb5335aeb6f2aec9f623af9ee19d790e1165d43e87429b92151d64c71412862dbe978d11bae6307bfb5a
+EBUILD nbformat-5.9.0.ebuild 1081 BLAKE2B 4547b6936f9cfc6001753bc3b36ba711e2a2524d7ffac36173566420fe7673dd1b13910f292b3faa1f962980c22f90785003a3a4b0dbadddccb675e571cf48e1 SHA512 e45bdad4952cbb18ce6a3db997ae5dd9d326803cb1bd56fd7ffca4e8c4962bfd9f007c22562c144f689ff483292549ea296b5f9d24225f0c93f77eae6fa6608b
 MISC metadata.xml 780 BLAKE2B d44b94d8d10d01e2b8f465b6a0351308e7c219295f34713ea2f26f0cc1c9ee4c156bae3a33977a8adc0bd2cef177d468a5221d0d7a5bce946bcd3aa1a1ff0623 SHA512 0d15f8e0ef1d3f675cfabd0a9d4db7a8844be4ae1c9ff06825bc9a0771ef7e2430d1ff66a3ded9ee64df42ab4277c3eba65ed256d6a672cad20154272a0a2c96
diff --git a/dev-python/nbformat/nbformat-5.9.0.ebuild b/dev-python/nbformat/nbformat-5.9.0.ebuild
new file mode 100644
index 000000000000..d4cb983ceb55
--- /dev/null
+++ b/dev-python/nbformat/nbformat-5.9.0.ebuild
@@ -0,0 +1,48 @@
+# 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} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/nbformat/
+	https://pypi.org/project/nbformat/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/fastjsonschema[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/numpydoc \
+	dev-python/myst-parser \
+	dev-python/pydata-sphinx-theme
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/nbformat-5.7.1-no-node.patch"
+)
+
+EPYTEST_IGNORE=(
+	# requires pep440 package, which is not really relevant for us
+	tests/test_api.py
+)
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 430b347ea901..c8eb6b1cfc07 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,4 +1,4 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
 DIST netifaces-0.11.0.tar.gz 30106 BLAKE2B d531cec80142d005548ad30f4d13b23d0a7aa85f6907998bdc6d6081567234b169774b25d2e274d14e68564b16e96ff016c429c0a7aefabd6abae6994f1e7c5c SHA512 a53110efb78c89c4d72d002104866253a4c085dd27ff9f41d4cfe3811cc5619e7585ceda4e91e83cdd0645c40c745c61d205708ee9a34427b35f437a48f148e5
-EBUILD netifaces-0.11.0-r1.ebuild 652 BLAKE2B 36e78276abe854261dae65adbdf31f62866f0b1cdb8d66fbbe40c6ee92e72034b81b935634b38cd965105e17f66aa2f47896cab902a704d6c1732ca7523ee537 SHA512 a448bd5c3829fffd931f525b34733b4e1af98f807bcada20adee71019afd5e72145edaaba944cae0c18bfe8b9135c26bfbf8a78e95724498f044696d4140320e
+EBUILD netifaces-0.11.0-r1.ebuild 653 BLAKE2B f6a337b89c9243013b69b923e21565c9da22b09b2e6e9fd892f7c9aa7208c6035ac2c990de49c43c690888636591c4aca2ff69a961b81951495f9841fdcf2897 SHA512 4e25ae1ca047d8f82e98c4d8104b580cf620d2aabf8607936296c99164edacbc53849f368897580479d13b6814b20d2d3370cfc158572f1700a97afd197b003a
 MISC metadata.xml 451 BLAKE2B 4d43f77c5e911cad7a8bdfa7cee80c553a645abfce7c551f1d819a62193e1263bf28d70c47d14f05ccbe9155ab08dae49c18cfdafdbd6c5705eab28e5c717258 SHA512 abf26a0026b93acfb3d81979694c13b2298bf09d410fa85994c9406a4e0219c1ee8d83b4814323cde287d27fab2526682df48238fe5db35ef93c4c3e0c0e068f
diff --git a/dev-python/netifaces/netifaces-0.11.0-r1.ebuild b/dev-python/netifaces/netifaces-0.11.0-r1.ebuild
index 3629c99a436b..46e323797705 100644
--- a/dev-python/netifaces/netifaces-0.11.0-r1.ebuild
+++ b/dev-python/netifaces/netifaces-0.11.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/node-semver/Manifest b/dev-python/node-semver/Manifest
index f0158ac36ee6..b2a335a3abde 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1,3 +1,3 @@
 DIST python-node-semver-0.9.0.gh.tar.gz 19547 BLAKE2B 6558468a38aa11943429919c29d00e5512fd74587a5e9b53a9f7704acb60877919331329cb42b53812918eb3264f2bcd08838d566cbf9476b8aa9a47f745cd74 SHA512 1ac32e271cf2b574ffbdf3c37aa5a13493ab03dbaa539b50614e9f91adea1078e0bee0451ae400b456e83de0493942ea209d7dd9aec4ab90a3e9753ba1c80082
-EBUILD node-semver-0.9.0.ebuild 730 BLAKE2B a2086f6a79429b4a05fdebaa825ded61e634d9ee4f17cb2f2dc625ffce52d53553eee83f417b975073b5c52918f64feab5b7e7d6181729c1dd7440da94764ef3 SHA512 19ce900d4e4e14d730502eeef108c3c2f0cbc36984c345d6fb872de671c4b15203ed36ed9353492c756aebb17e63c881f5fdfdee152eaf2b3563c0bbfafaeee8
+EBUILD node-semver-0.9.0.ebuild 731 BLAKE2B 6408b1b1f6d75a91cfa58a8a3ef68f7f80ac55d80184d397259ebdc1b78982902384e40ac2b37b37fa3750410e9116199104f09a2c6351fb2863b0f08690d907 SHA512 33e547c9141dc1760cc43fc85f7a6fc415d467e11cc87294db109243379ef5cca5581e96f0df0f8f9abf495547660a9099c1ee4de9c1c46f1734727fa4fb09d1
 MISC metadata.xml 643 BLAKE2B efe8878eb7a0603425c025505175af4559d00025b5cba44eef12b04eb27abf2dc7222056e886866c138f4993f7e9ae4913d70d0b49a4a605351e1a6a25c8c92c SHA512 2b34dc85f8a453bd6c15fcb72c3a1ca124cdb38c64fb5999cf57669a73d8ef64df3dc8eecde3d6532b38f1e0ebf4b35b8866ef8a842cfdd6db4738586bd1e3ec
diff --git a/dev-python/node-semver/node-semver-0.9.0.ebuild b/dev-python/node-semver/node-semver-0.9.0.ebuild
index eae865fa5850..856d197a5729 100644
--- a/dev-python/node-semver/node-semver-0.9.0.ebuild
+++ b/dev-python/node-semver/node-semver-0.9.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pastel/Manifest b/dev-python/pastel/Manifest
index 0641f1625033..a62a709584d4 100644
--- a/dev-python/pastel/Manifest
+++ b/dev-python/pastel/Manifest
@@ -1,3 +1,3 @@
 DIST pastel-0.2.1.gh.tar.gz 125760 BLAKE2B f9b3c29444bb6bd0e710cd80d4e48cdc9099ad6512cd99b0224559b87504f5b61cfcb90165f97b101b8ff5e9f8b7e230878c5cf50ae2b0555447f5be28977cb0 SHA512 585834d035fe208313a77e0c824f6b67630a85697d4aef802800911cb1da72bfd6c9ba47fe5502359bdf244a98b8f6dea300a788ff1cfd56a8bc19eb7b7dcc16
-EBUILD pastel-0.2.1-r1.ebuild 513 BLAKE2B 6aa74d1826f92c4c5138748935653044068bf8a43d25e4d72adc98cffd0016b41b54dcfb3de987c03628d3c46b0bfd31c5f8e6fc93d9212a5e49331e72ca8108 SHA512 4633611c3f2cb23c099d3561217876a01c08f09c61dc2427cd3cb1d1162bdf9f190fcf93c714eb623ac64e9d37a7f1483c06045758c1d01b9ad2869b48305a8b
+EBUILD pastel-0.2.1-r1.ebuild 514 BLAKE2B 3e632124e7165488de629fd649f832d882e5879b9ee3885ebe4cb936a1d574749fe480697effcac8210999da8cf8beb9f081f289bb097607dbdaaaea7660b492 SHA512 3606cc1759fcee26bb5d3af3fbfb6df90117583875cf2f7cc8873b781ed74806d34f06dd4454a11b21037bcafa91e1ff6e733ddec4480d05b97b2c60ff99c1c2
 MISC metadata.xml 517 BLAKE2B cff05c299e222c92da8a7ff7be168491210668e8d225f431725d843dcd872b952a25161f1b6c049f86e7deeafe59ee7d4da9cfb1d77f12ad493bbb415f2dc7fb SHA512 6111b23b11aedcde16500e361abd806e3158031fa4e429865338fb9b028e41d239fc6cc178b1d18eeefa45d2d8b93639991811b2f0bb37d7e48d90f7259d1b10
diff --git a/dev-python/pastel/pastel-0.2.1-r1.ebuild b/dev-python/pastel/pastel-0.2.1-r1.ebuild
index 82aed98e1228..70df926b888f 100644
--- a/dev-python/pastel/pastel-0.2.1-r1.ebuild
+++ b/dev-python/pastel/pastel-0.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 723420d6c607..d8445ae08bcb 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,3 +1,3 @@
 DIST pkginfo-1.9.6.tar.gz 379307 BLAKE2B a063e3461aecabac5bf35a9eb6b9f59a24865f3eeb903f69538a6e625893f506a897df7199d647539405bdd383b10722f5b0048380cc8ce8b6a8b4e7b2016c54 SHA512 07d9b8ce9965572b84ddced107aa1fcd2ed20a485580f87d667bd53508b0a8fc3aef2ca900bf8bb7fc075b95a81512920c4eef513c9ee6582d61b09968efee08
-EBUILD pkginfo-1.9.6.ebuild 628 BLAKE2B 807c236fb13d5beb9e50423763695e0d58d21a4efc712cb0940f07143b94daa0d50950b706e392b29b0d94c95dc0bd40820f20abaabe2e0c991d424957ec4c07 SHA512 1f3875d783c4b255cc3039f623d92edc4cce2f0b5081d1e89214f4815113748882f865375bba45065bd8ab342b02f5b772b6c5a210cd120f0966c2c6e31a5045
+EBUILD pkginfo-1.9.6.ebuild 629 BLAKE2B 47022b4988e503191387b7522d28793357d982c42bb143720c879127f0ae9ed0ba81db26b3db97556a6dc898a0e80d2e45b13e5bce32b10cc60ff7cbb3fe8901 SHA512 9b938a22bfed2d1efa64467d20f66f298fd09d962f2f29d0fa9218ab8686acb320d9358fa731f2e741e27d71e447dd2d567e9857fac368e3c8650e57d6d146e6
 MISC metadata.xml 385 BLAKE2B da3779a71a7d23a535599d8854c970725b3e6c121642cfabbabccc0e97cc1dab0cf77452da565c9efbd8044cb02cb2fbe00687a0b312948298902e4eb1f4e498 SHA512 fcd65e87146d573c1bc33dc560ed419ae5d4e46e6ba423da1a6dd46ce96683d3ffeef75b640ee671f16865e34293695b48a5fef89ee754a8b6bb797a03c13b08
diff --git a/dev-python/pkginfo/pkginfo-1.9.6.ebuild b/dev-python/pkginfo/pkginfo-1.9.6.ebuild
index 6a8dd225795a..67d2f0af364c 100644
--- a/dev-python/pkginfo/pkginfo-1.9.6.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.9.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
index a24f0cb4a9fe..e16aa6849db3 100644
--- a/dev-python/pockets/Manifest
+++ b/dev-python/pockets/Manifest
@@ -1,3 +1,3 @@
 DIST pockets-0.9.1.gh.tar.gz 42077 BLAKE2B 0cdc5a63389b7c01df9a2e63fc1e18edfb8471da8084832b3381141459932146fd46e2e1cf8f87fbf33fea8204a46596566be62ca6c5780985f0d7bd18d5d3e3 SHA512 a24418759bc133a0c62cf0a606a851d00cf1bd280c731065b92fb96a5274a45bc2266a4e1fec3db929aacec5baab774667052e7b732a53c4c4a217663c02ec7b
-EBUILD pockets-0.9.1-r3.ebuild 872 BLAKE2B 42f3a54ffd5f1f705e20569249e42ea4ab7331c188708102252a9bb3439740897a321fb30b8268db83e3dc3119b802772794235827d8ce702e96010ee92b6610 SHA512 43896d20e7c8425b316fbd560c673d9ced08b2520713f642e5fe239d715eecd60c0f0988006116863435dc29888877a322175241019dc58ec71e6cf499d3f136
+EBUILD pockets-0.9.1-r3.ebuild 921 BLAKE2B c25826dfaa4e872df2253137086b6e933719791b130a31b4e8e834fb8ca4a9c5675cecd1b4216c2c06a745748e3af42b98e32d937759e953836f45f1183acc81 SHA512 879373d1781726e6a740bb68eafcb203a417890f1dcaa5081b448e96224b1194489805907172c7e8acd3deaac0bf0895699898598047693e27b06e2649b6ed6c
 MISC metadata.xml 404 BLAKE2B 7ddaa084bbdfd7f2971751532fcdcaa3596bf864b4df477785ca1f80ede6e509a2e8fbda25b2b951058f4b06dcd413db29512a89956843d84d566e857a82dd74 SHA512 5d09eeba8a0e4f8ecb4826e058806283a818696c13c99158efd77a3d334053dd2882cdf7b512da20a8c70ad4a3a29c8efec7e7a0227212607cd5c048e69c1746
diff --git a/dev-python/pockets/pockets-0.9.1-r3.ebuild b/dev-python/pockets/pockets-0.9.1-r3.ebuild
index f39fc6248076..39add067ef57 100644
--- a/dev-python/pockets/pockets-0.9.1-r3.ebuild
+++ b/dev-python/pockets/pockets-0.9.1-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -12,7 +12,11 @@ inherit distutils-r1
 COMMIT="777724c8eabaf76f6d0c5e4837c982d110509b2e"
 
 DESCRIPTION="Collection of helpful Python tools"
-HOMEPAGE="https://pockets.readthedocs.io/ https://pypi.org/project/pockets/"
+HOMEPAGE="
+	https://pockets.readthedocs.io/
+	https://github.com/RobRuana/pockets/
+	https://pypi.org/project/pockets/
+"
 SRC_URI="
 	https://github.com/RobRuana/pockets/archive/${COMMIT}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -23,9 +27,13 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
 BDEPEND="
-	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/podcastparser/Manifest b/dev-python/podcastparser/Manifest
index 22f2e8c603c1..69327a050c10 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1,3 +1,3 @@
 DIST podcastparser-0.6.10.tar.gz 31717 BLAKE2B 19ea422b78c7631fd2622f935e292d5bb14a31ab749db36a9a19e356a5a331246e7d853412bf913522588ce6446be2070f2ad4e6c1b50d245058eae49739519e SHA512 55b822a80f8fed56feb41d5f9a39c04371e4e11dead45b8ca6aaf666ecc26dc3c94673331da59e2ed6665f2a9ca367b6daccb24f987b1763b6b3ad8b302ee783
-EBUILD podcastparser-0.6.10.ebuild 432 BLAKE2B 0426235c4b05881f79037b7d58166cbe512bb71f2d3ed2a30c480af7e02079662f7e9a257dc5e222040ae95968e419cb9b9ceebe150212a3f28e627ce9f34a6a SHA512 3f93f50bf221de257c5be2f0a941b9e97d4a44f966a42c3f1cdcf4ca4141f64d0961c3c6c825814e76c1d79e6438d2bf30a68a9647f01d45e4fbb946ed02b992
+EBUILD podcastparser-0.6.10.ebuild 433 BLAKE2B 97492ccce31b051118612ae7d0e378a25b835405898f51183d4d8f7625fbf058181908089e311f815a5b7c50f2861c2b9b331df62771485eac64cd000ebee4eb SHA512 27c939543ffa2ad4392a90e136ef5b532a0749f73e905a802a1d1d1088029ea799b662b9a3e5e21bf3eff9a63e0c4e85acb0d918be2729b24cfe9b365620cbcc
 MISC metadata.xml 516 BLAKE2B 2cf902a3f89e91ef879ae5a9ece9dc5a3991ed06c2fe4542a330e5e52f24f850728a8d1588d02481109974c6cb400e6e53952356075c42cc4b0079f383fc4119 SHA512 947c15724f072eddd93600a0c47555c5a191a0c6bb28d1fad0149f6ac510b932678c494faa36a959d4639213c4133b2a9c28037177a6fddecc171b728f561d23
diff --git a/dev-python/podcastparser/podcastparser-0.6.10.ebuild b/dev-python/podcastparser/podcastparser-0.6.10.ebuild
index efd0a5d7400d..7f910d9ba95b 100644
--- a/dev-python/podcastparser/podcastparser-0.6.10.ebuild
+++ b/dev-python/podcastparser/podcastparser-0.6.10.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index c5e9246f3001..201288ade2ed 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,4 +1,4 @@
 AUX polib-1.0.7-BE-test.patch 545 BLAKE2B 800372796d19d98f47dff73ed593dcbe8a60d55b654258ea5063b702fc3761906754096bc2f4703621378a56ef9589ff5a4c1d7aa6bcef368e293bad9e8b869f SHA512 0b62dadaa7983657901463770a5e7abc41361094c7dba41618881d7328378b989c10b3458c667f15134ad92d0bfebd785f475e1ba040ea11da70352bd8a2cc2c
 DIST polib-1.2.0.tar.gz 161658 BLAKE2B 8f53d829ac7a2e59676fa7b548645eed26fbd5a2c6e966093145b43bc492ba05ef715e4ddb95f35f8c965890e24c80b7e19d58c6d75d26c4cef141fb15a7d79e SHA512 b325730cd4df6c881ffcab72da1796eb2949243f6060c650209e1c6584e5344ecaede870f22ece00f5c74bcd289fa5d2aa5223b88cb78de0dff5f9e41759096e
-EBUILD polib-1.2.0.ebuild 680 BLAKE2B 4793ad090f9a0f0a2d7557494916ee24b39785a9975f409eda764426a1ca000cfd3dc801dfcb153adfeae273f4d763de743cc034002ccd89c61cc2c34a007694 SHA512 fc3316f7ccf643c78344142bad9372c8041395eaf3babb2e5ad71d6fc84477a6bb901ba368edcb2352cb5ef795c0c4277860cc12a1f266bfee8215d4d42743ea
+EBUILD polib-1.2.0.ebuild 681 BLAKE2B 246ca8b62af148d024bd1744338e735bf9d00d576d47427f9e5ec9345fbacdcc467d43fcae33b35f52ae8b8e3519d8d6bea3ecec005d07d958519897b4a0a2b8 SHA512 e09bcc98bd0dba756076e22cf31a844b6fd0a99dafc173a6af98e612274535317972c1d0a278d050bf519c2a9926ae22d508cb60334db2868ef751ef64cfce64
 MISC metadata.xml 387 BLAKE2B 52efaa4e504721043d48bbec1b86dcefd99b96351222a90c8f91288c177980e0ce451cc7e4b48345bce69f92c34edf2487a3324f307263d9da1603ccf49da846 SHA512 e19b1b268bea67dc6882b698ce03a3a3c9795e361ab94a77d774bb026793df6cb2868a465de79ab3491c2aa7b7b162b169d695ec9859f19d1fea58a8a5e5f478
diff --git a/dev-python/polib/polib-1.2.0.ebuild b/dev-python/polib/polib-1.2.0.ebuild
index 961cf321813e..627a252a2d0a 100644
--- a/dev-python/polib/polib-1.2.0.ebuild
+++ b/dev-python/polib/polib-1.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 01e2e74002d5..0e1880a738ef 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,6 +1,7 @@
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
+AUX pycryptodome-3.18.0-python3.12-unittest.patch 974 BLAKE2B ceffed2878cbaa96ffeb500ecf2a855ef0e1f22b5e2f762241b3fe920b3e9117f1e4c7b7179bccdbcfd65ea12ec17a21cd697f5842610e368fc2e7b5275a40a4 SHA512 9db569a809048007eb4ef6e34426f70535a23e64e7037871eef1a65af8809022155ca31efb2eefac83f4221f03d82328645ff87b313714711d53b661c160eebf
 DIST pycryptodome-3.17.0.gh.tar.gz 16714317 BLAKE2B a7a96ba4d10078ba4d9bc02b384c982ad7307065fd6c9118def43bebc073eccdfc11a766742e5d0207e9cce32aca2fe3da51f8a59964de8c15db6808cc2aae03 SHA512 c0a0754c0dd1d8138e8dd27c034e3f3469237eb5f205d86d0c5e2377fd7672c6ed0df9717292a73d380daaabe88c3be80b575ca1149f4c70f08d82aed0d4b39c
 DIST pycryptodome-3.18.0.gh.tar.gz 16720227 BLAKE2B dfdc3a7cc0b1aea1e7b7d8f6e8bcf651ca92f0020e2c51849512d00e716283537feb884cacdc655d99a6b992305db9b899172d022bc9ff65d6349ee40b40c4d5 SHA512 a30a6b406bfd1d4288169924924636246c36999ca1e14c5cb70bd2f71ce25739dae04726ca97bdaebf7a8b36927cc6f617fbe2599fad48512a2c5e016a528247
 EBUILD pycryptodome-3.17.0.ebuild 1298 BLAKE2B 3969878516e9ebba466b8a8ac09dddc6509a237aef7d376af1d39bbd2fd1c100af478044abccb767050a146918f0a6046dfc5141d4d22b2596bc98e01285a874 SHA512 743aba8f0fd868f7878619ada0b963e4a2993f472d25bf1d0b5a8e28b0945f87df2194a96ff7c5ae2fa4afa3bef1c79fb2070c627a719878ee0af9cd59056448
-EBUILD pycryptodome-3.18.0.ebuild 1347 BLAKE2B 8716f8c33ba88452b88b8b1ab683fe2fa54c5de31ca5b8a5126b99560427cd0909f41c6ec316fc3897b51b4b5656ff6f098380ea7958c23e6d5d2f69ca532316 SHA512 31bf19489e584adffdb4e6f6e394ec83ef00a0311629040ced753b348926072b8a94853275a08aec20eb72a219bbb0cc978eb86592fc76994ba80046512bcf07
+EBUILD pycryptodome-3.18.0.ebuild 1438 BLAKE2B ea841338e7b5fbbc2d2ce739c66b0b14a7e46bd2e08271028fda52a25aaafe695e64a731ba758d25c102fe68689a326801689bb0c5ec27fb864fa834cf659a9a SHA512 03ffba2eb3270a776f989ae12e970c20e5d126c92de9ed1012c894f42e1138c46c09b5fcc18a3655dc734db06d397b37d4d461bf294f827a302b9da39d8f97c6
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.18.0-python3.12-unittest.patch b/dev-python/pycryptodome/files/pycryptodome-3.18.0-python3.12-unittest.patch
new file mode 100644
index 000000000000..6e49a784af16
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.18.0-python3.12-unittest.patch
@@ -0,0 +1,22 @@
+https://github.com/Legrandin/pycryptodome/pull/746
+
+From 9d70fbca927516b31ef61fd7cc3ed3e0ebc95fa6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 1 Jun 2023 08:03:18 +0100
+Subject: [PATCH] Replace deprecated unittest aliases for Python 3.12
+
+See https://docs.python.org/3.12/whatsnew/3.12.html#removed.
+--- a/lib/Crypto/SelfTest/PublicKey/test_import_ECC.py
++++ b/lib/Crypto/SelfTest/PublicKey/test_import_ECC.py
+@@ -2269,9 +2269,9 @@ def test_import_x509_pem(self):
+     def test_import_openssh_public(self):
+         key_file = load_file("ecc_ed25519_public_openssh.txt")
+         key = ECC._import_openssh_public(key_file)
+-        self.failIf(key.has_private())
++        self.assertFalse(key.has_private())
+         key = ECC.import_key(key_file)
+-        self.failIf(key.has_private())
++        self.assertFalse(key.has_private())
+ 
+     def test_import_openssh_private_clear(self):
+         key_file = load_file("ecc_ed25519_private_openssh.pem")
diff --git a/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild
index 71faf0d17415..cb0b4894d406 100644
--- a/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.18.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -26,11 +26,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
-	dev-libs/gmp:0=
+	dev-libs/gmp:=
 	>=dev-libs/libtomcrypt-1.18.2-r1:=
 "
 BDEPEND="
-	virtual/python-cffi[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
 "
 RDEPEND="
 	${DEPEND}
@@ -40,6 +40,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
+	"${FILESDIR}/pycryptodome-3.18.0-python3.12-unittest.patch"
 )
 
 python_prepare_all() {
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index b9f56bfd08e7..447f7d6b6b4a 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -2,5 +2,5 @@ DIST pypdf-3.8.1.gh.tar.gz 7516880 BLAKE2B 87d8cd66c7efcf9624205da904290fe82f51e
 DIST pypdf-3.9.0.gh.tar.gz 7516907 BLAKE2B 12c0a13ee1ca897966bcd2f6a93b50ef1ead8d471ac9543544988a9c03c26a135a91c07b443d3a7b89fd38c302f5c2323994407fdadc23638832ca07eb7571fb SHA512 da9489bfd7c91c497852ce71050548d99fbca8118575c5eec85d55611fdafbe471c1cf7c4c8ef0e46165a89771e557c868f133af325d4672ba897fffffd43c02
 DIST pypdf-sample-files-69b31cff6b183a42f9081709ef9bee4047976f56.gh.tar.gz 9044391 BLAKE2B 9a9bcfbacabf3c80073a440f54736728cba4ea92d1a817ce98bcaf9375340d95e453f45207f53ac878ef5c13bc4ca7d0d4488b79f205f396e960ed042680ca01 SHA512 32b4572d60a0aadba02485f11c84712c1f5f0a75f7acd6fb27f1df00cb2a8ae338a1001e6519f66c248efbd129aba1a2ad568e930ce90bd542c8dc58f383386a
 EBUILD pypdf-3.8.1.ebuild 1244 BLAKE2B b464a7c321f5a4f233bbb11b73e91c3e512236ee4799c628ad649770e29ceeec8a7dc390436172b47f70197828973a72d79cedf7b07e7de1e4a164da17094d9f SHA512 e22731975a0a437905e378d683f94c2c82044512712c25e7fa138c671e1c376bfb26eedab371996f38578542d77fa247870d329d5534edc3d11895945c9828ba
-EBUILD pypdf-3.9.0.ebuild 1124 BLAKE2B fccd0718b71a7f371e4396b4810c837825da6f52990eebb0064e1681f69ed7cbb69f175e0722c68cc9362097078ca00cf250079044b36d6e939dbfff8606d607 SHA512 a72655620654cc51059c3fd15ba390b963fb835fb5d3fd46a0453e28e0223a5955006edfa9251c135af17bcb9f93aab9e5bb3072b053b21c0d3e9c8fe1bf85d1
+EBUILD pypdf-3.9.0.ebuild 1124 BLAKE2B c44f7ece585165911c7965a583d25414e0b911ae07bfc3548f7084df7102fcd481bd4c9b4a55f0ae414a74c1e9a113f28e301dfc6ad96f89d03665094b1e5628 SHA512 fd4ffd74c1ecbea51954af7a8dc09aa4d16cd7ea14490622e48fd440259793c76cabbabd1c17529019c98090aff411973e876eaf6c69f527492b8b3b57eefe56
 MISC metadata.xml 373 BLAKE2B a829b7048eb3a95caeb1be83b6172603df6a031d40995294f2687bf3c3cb70e66fafb9ba8339d9979fc85f5936b9552963a8fcd072a20661fa78f3aa3c4b89c0 SHA512 775ac2de487f11fba1ea8d283b42b9ef56e42cd95ea11f50a06b099420e69c0567f65c506b14891ac641da90ea05ca70da4f8a3e4a028cf41bdbc823021dccfe
diff --git a/dev-python/pypdf/pypdf-3.9.0.ebuild b/dev-python/pypdf/pypdf-3.9.0.ebuild
index c3e628bb375b..8c79bcacda8e 100644
--- a/dev-python/pypdf/pypdf-3.9.0.ebuild
+++ b/dev-python/pypdf/pypdf-3.9.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index a3f194724103..8369d6e89ed4 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,3 +1,5 @@
 DIST rich-13.3.4.gh.tar.gz 15059899 BLAKE2B f0ca78bf4cdec19136f9372e541ea90713e55acf4dc6f709b8edba9c8dc56da9ac534c6f32b05b634a970e4c02b1f08bfcb5ff949889d6f7bfaa104a1ca6b1cd SHA512 ab3b2ef30ede12f0959671baeff299621303e09750c245b3b3d7b8f1dbd3b7465410400b39668791de57d6027fe24a0a17d5b7284eea162d819c4cb6b9535f81
+DIST rich-13.4.1.gh.tar.gz 15062357 BLAKE2B b5e0067f378910b6a93f0ec40ff47a4ce26298055fba694441962ec2443f9bb76a8ba34ffe43a05abdc077ea8b1d26bbf6294c9d2370baf724045be043c29544 SHA512 655252e9f34da17df6bc7ce74560667f4472da4df6ed699d4302a02301857543ba8756153f48ea8d5a2df5e627ed3c4c8ab732b2b2b27baf66a10c798795a885
 EBUILD rich-13.3.4.ebuild 1790 BLAKE2B b448ad02d1e41999de4a1a928a223df97f6c035752b8d8dbbb4931e306816743809fb895c15c6bf2b271bdfbdfdaa01cc7e8500d7e1ccc14f55aa8e7a5657e82 SHA512 d5770a6ef16151d6e937903a12795db31b1f929cf65e5415266408e888bfad950d2882c5460788a0a616cbd5bcda1b064b2c3649c2bdb0f3a3ae4a165eff84d1
+EBUILD rich-13.4.1.ebuild 1874 BLAKE2B c37bb3da347b8b81cc02c5ccbf8bf61ae1a25108f577c2645bfe429bd78d6212bc23c488c538f0a98ba3b165496c5cd05b7acb31363173842e75a498a9b7b3dc SHA512 d3d15f317b83d0a8468767611ebb039edcdf28cf524bc687da5596f66c3f93adb446dfecf57306bb6e2ccf69646c7a926f354fba948953bd756db99a5ec39042
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-13.4.1.ebuild b/dev-python/rich/rich-13.4.1.ebuild
new file mode 100644
index 000000000000..d8840241d2eb
--- /dev/null
+++ b/dev-python/rich/rich-13.4.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
+HOMEPAGE="
+	https://github.com/Textualize/rich/
+	https://pypi.org/project/rich/
+"
+SRC_URI="
+	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	<dev-python/markdown-it-py-3[${PYTHON_USEDEP}]
+	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
+		# pygments?
+		tests/test_syntax.py::test_python_render_simple_indent_guides
+		tests/test_syntax.py::test_python_render_line_range_indent_guides
+	)
+	# version-specific output -- the usual deal
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# pypy3.10, to be more precise
+				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
+			)
+			;;
+		python3.12)
+			EPYTEST_DESELECT+=(
+				tests/test_inspect.py::test_inspect_builtin_function_except_python311
+				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
+				tests/test_inspect.py::test_inspect_integer_with_methods_python311_and_above
+				tests/test_pretty.py::test_attrs_broken
+			)
+			;;
+	esac
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index b2d91fb327bf..82f03dca51dc 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -5,6 +5,7 @@ DIST ruamel.yaml-0.17.24.tar.xz 186504 BLAKE2B d5bd5240c3ad68309ad9382dd076111f5
 DIST ruamel.yaml-0.17.26.tar.xz 186752 BLAKE2B ce3d914ac27df2d038a882535f3559b47051a1fb1206a3ab6cab7c2ee0ee9fcfb5fc0babfb3a3488e7d074798bcbdb24d67d2a37a00c9d9210e96f13bb5bcdbb SHA512 40a91002f904621632acaa73b5bd3095f933369d354a8e7579a5afe4c171ceefadb76d5ecbdd3ef6202833874ba19ed518ce5ac5c7dbf15b698dd07b95260d33
 DIST ruamel.yaml-0.17.28.tar.xz 187800 BLAKE2B 24dbf1c3fc76ec2f6255a7771dfa3bae24bf97c7014bd3205dd4968d73bdd9c4fc9e3adf721dba89c50554d13dbdd528f5f67c99692ef15b361119330b35005e SHA512 313bd7e4cfa559f90e150cf5a522b5c690b680b38df24ea3b4320484012b6e4c841f94fd21ca33283dfc0a1d04c465d38d4b5d48f95d2f1f9b876dc371a74f35
 DIST ruamel.yaml-0.17.30.tar.xz 189936 BLAKE2B 9e662551527372b3a1654d8e5da8c1e0a22f432d6564a807fe89bee7f93e2878d47e6a97f50475643575e89eb03564beb86daa7295d14513ff09615d38441f3b SHA512 0e460fa05e69d99591ff4dd1b35ae3be4ba40f21bcf514f16256a56a346b570c7c41a56e1ccf7c1d3ff14beb53800a4f0752243aa20fc37df345509c293d351a
+DIST ruamel.yaml-0.17.31.tar.xz 190068 BLAKE2B cb5682ca184d86f8acb2516f0ce515deb81f3eb1bd9ea0b340c588e738f657076d589424e71492cf8fe37f5a2f62e0c9881644770c23ef1cb8a6d42cae48a86c SHA512 5a453a31babe1b9ad3b782ae06598f5f65d5e6aee167beaf7b898a2b624578245915ef0579bb7f9eefbecee28a472d6f3e04cc721b0c7b320e79f5986225986c
 EBUILD ruamel-yaml-0.17.21-r2.ebuild 1416 BLAKE2B 7c5fec37a294037618a2f9d21788154fb806d6fc1575d622b7b8140f994395c4eb92be635f9f8ac11df318e37e72623ec68ecc6ac273e1961fcf99bfa88c95ba SHA512 2c2f983c303a954b217667a3c0034d14d422cb5e2473b79fe9ece4dc9e43a4f032dbeb74a6d78ef3c6d463f31f69e4ea63fd0679bfdecaf4a0c8e08267686ca2
 EBUILD ruamel-yaml-0.17.22.ebuild 1423 BLAKE2B 5e168553d3cae61fe84f729c50a299633d9a56e476676c2c762f5776c95b5173743e2a554209c3309c6baefae8abf882197f71c4e6efaa4cc5a5970c5f462b91 SHA512 999fbcc45460816f74fa1aef11b09a52221ee49b5a661381dbbdf01e067da037060e5df91a2ca62415480754c57a3f13bd75f8019bd947e4bf69b90dc7d43943
 EBUILD ruamel-yaml-0.17.23.ebuild 1423 BLAKE2B 5e168553d3cae61fe84f729c50a299633d9a56e476676c2c762f5776c95b5173743e2a554209c3309c6baefae8abf882197f71c4e6efaa4cc5a5970c5f462b91 SHA512 999fbcc45460816f74fa1aef11b09a52221ee49b5a661381dbbdf01e067da037060e5df91a2ca62415480754c57a3f13bd75f8019bd947e4bf69b90dc7d43943
@@ -12,4 +13,5 @@ EBUILD ruamel-yaml-0.17.24.ebuild 1424 BLAKE2B 2eb712c34d3de058093abab29e683061e
 EBUILD ruamel-yaml-0.17.26.ebuild 1424 BLAKE2B 2eb712c34d3de058093abab29e683061e0d8c2fbd3e42e7b99acf2ff3d169bd5eb5fb8c579535f109c69f75d7b64f4f369859d01da85df7b3fb893d515977eac SHA512 ee4b07d307ca7fa0d0c984c0c26862529ef5a846b81ac01a143e40266df025b96faa64731470c93ccf1921e3b5e2c1faec7fb7c876a0580ada2af6ac7c07ae0c
 EBUILD ruamel-yaml-0.17.28.ebuild 1424 BLAKE2B 6582ff97f1e9f98e7d9e606132418bd6c4dab4549e374fd86957cae8f3639eded3696b1715323d4f4fc2ae15578426fa1f27c216d54fa51dd77e5d65fca70eac SHA512 9eb853351400ff0357adf8887ada641fdacf7dfc31052862997f18c133d70570ee4ed83183ae0b9aed7cf34fa0e3575b1da4a95d3b1c2ec4ec44eb74085d806a
 EBUILD ruamel-yaml-0.17.30.ebuild 1424 BLAKE2B 6582ff97f1e9f98e7d9e606132418bd6c4dab4549e374fd86957cae8f3639eded3696b1715323d4f4fc2ae15578426fa1f27c216d54fa51dd77e5d65fca70eac SHA512 9eb853351400ff0357adf8887ada641fdacf7dfc31052862997f18c133d70570ee4ed83183ae0b9aed7cf34fa0e3575b1da4a95d3b1c2ec4ec44eb74085d806a
+EBUILD ruamel-yaml-0.17.31.ebuild 1424 BLAKE2B 6582ff97f1e9f98e7d9e606132418bd6c4dab4549e374fd86957cae8f3639eded3696b1715323d4f4fc2ae15578426fa1f27c216d54fa51dd77e5d65fca70eac SHA512 9eb853351400ff0357adf8887ada641fdacf7dfc31052862997f18c133d70570ee4ed83183ae0b9aed7cf34fa0e3575b1da4a95d3b1c2ec4ec44eb74085d806a
 MISC metadata.xml 759 BLAKE2B ce5ec2429c5fe84587d1b5e7744055e1e8e91eae8dec780a4654cab405df46350d1c8175827351948364255b8fcd62ea234239260c01b8ce23b8db182e6514e6 SHA512 faa587083ffa9af40108e2ca9cfb7a4e2c3e19a731b39241a7ec62d6fca051ace92bcff3fa9896a343fdc196a04fe1d132bcbb7bfa3fd96401ac996b76bba4ee
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.31.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.31.ebuild
new file mode 100644
index 000000000000..171e0b89375a
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.31.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/projects/ruamel-yaml/
+"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
+	!dev-python/namespace-ruamel
+"
+BDEPEND="
+	test? (
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+	local EPYTEST_IGNORE=(
+		# Old PyYAML tests from lib/ require special set-up and are
+		# invoked indirectly via test_z_olddata, tell pytest itself
+		# to leave the subdir alone.
+		_test/lib/
+	)
+
+	# this is needed to keep the tests working while
+	# dev-python/namespace-ruamel is still installed
+	distutils_write_namespace ruamel
+	epytest
+}
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 133244e07cbd..63ece49f82aa 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,7 +1,9 @@
 DIST scikit-build-0.16.4.tar.gz 271037 BLAKE2B 6cca8a3c4f4b37228b77ac098650a5eca4ad0f525ca7dcba178f4cffabb7e60e9a7bbba244e64c1a598ab5916f2f47788198eb2a19803d8d0cf7b9792f4e06e2 SHA512 90315ceac4c372e4d7248b4b56b6092362c2c43fbdc180d1a234e057209c508a05d2c6e0a3d0c2587c3adb8957e4c66d5c171a2a2bc3dbf9874a0de58d97d976
 DIST scikit-build-0.16.7.tar.gz 274287 BLAKE2B 8a5064c021d904312ccf89a396ab794b89b73ad1b6238767ca74eeb394f0f1514eedd3c746353ee3e9e7b825988b3c52c563e1f19d0acfbe69213c5a306f1dcc SHA512 5bba94214c249f891b2972301b0e37b5f10938151e37a04b845dfc9e11ae85edc7e3880984f9fbbd1c037257fc8baa3ba7b006b1f1b7abb941d1a54e049f3cbc
 DIST scikit_build-0.17.5.tar.gz 269848 BLAKE2B df1ec6ff3791efeea0ea7b672b7c5d2ad946c9c8d1e8b7035f4036315701ad1b7d61b0917e75ca8c9aff10fe8f25e53b8d1221fa6c3b554225ff8d8f5dec5fd4 SHA512 f0c9a861f9931db36df137d96a9a53d2bfa4a696efc2c1307ff50a00f7df828042d933ef1f670d14d0a339ccf5b94ce99fca7ffbab9169b6e70c47440f4eef06
+DIST scikit_build-0.17.6.tar.gz 272208 BLAKE2B 9e3f908041eca89182f798c54a1a248934dc026816f7cd041a8debc97be27096942dda42a0ae63e87b9337304a478d6f520edcd5ea7a45aae6a195d1f769eed2 SHA512 92b97146f40d8222bd8415ef8439497d5075b72e5bafc40aba0a3e2911d269a118f2f7d41f468f7add8949f550b1fd7d5a9113d249e42dfac431108182ca9198
 EBUILD scikit-build-0.16.4.ebuild 1993 BLAKE2B cc3de0bc11e45c9d4ca8ced7d2239d18b71a62ed089fa73d36da0298d9fc66319f7743d809c8a001b57a3b3c5fc596835bcfc560e4e1bd9eaf03b7d10901ddf0 SHA512 9b5961baf199665bd9d854006d02ab2e5f3cb0a6601e6d39f05df8db4b2c551c5f215028d51ee0b588a09b04951c206a26bccf4f6f854bcf3f931379e61dcaf5
 EBUILD scikit-build-0.16.7.ebuild 2087 BLAKE2B 4514f714a41c571c431d2d9fff4abb426ddf9a7abc4d6476f2ffce28b8c7c0ca5418b1416f2969a0cc14af96aeaabab20c2b0f6a0befe323e963b07444c4a19d SHA512 c13083c11b93fbe3a11011c764f13547c5cf804739f5aabcf9c28258e3f18c0e98a4825648a5e70f311e65ee5a77a62ed54c2cb917ffe9cdff2446e70a661403
 EBUILD scikit-build-0.17.5.ebuild 1559 BLAKE2B 6d7370d0358d5a930156a7025fce99173b033da54da4cabe84ea94f5cec11722b06c740760b0b3dd3c24290f55bcbcf3bb88453b4995da05886173986ebb3bd9 SHA512 ccea1eb1ac6eb6dc3a7f01940b223bd5088c56d280706f43fbf3684948ddf905242f094a69980667d8300264b90a759d4a34ca1758e15b17c8f3a25ee18a78a6
+EBUILD scikit-build-0.17.6.ebuild 1502 BLAKE2B 69a907c8b7041f6e0ef8d1823bb593ab189209ac069dede23be4ba47cbc687f6cf30b04fa9892ab72c330f1d00ef0ce6cc9401910359153d30638bd2f7539c4d SHA512 f7e25f7fbe2a38a76aa053db00d66db369f61649f71b71435582523e11cc28ddbb63a23f555faf4f78ecafd5a985bae1bae33e972b5e7d6a66032dffd36cc8d3
 MISC metadata.xml 473 BLAKE2B 9d02a79439618fa413f74e4a617b8af042879be7a44c8f1c33e254e985d4f24057321fb2ec0b73074be1f6b67af3984190e48669e19985d6297411c0c5b61a79 SHA512 afc398c6287ce67eb85402832684fd006385e70d28a738ca8c5f1e2d008526621121cd9107a7fbc217a1a5857b54fa1dce3de69c47db58fc76990764b814a36d
diff --git a/dev-python/scikit-build/scikit-build-0.17.6.ebuild b/dev-python/scikit-build/scikit-build-0.17.6.ebuild
new file mode 100644
index 000000000000..24b2bbb94ac3
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.17.6.ebuild
@@ -0,0 +1,57 @@
+# 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="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build/
+	https://pypi.org/project/scikit-build/
+"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-42.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{9..10})
+	>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/build-0.7[${PYTHON_USEDEP}]
+		>=dev-python/cython-0.25.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.10.4[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+src_prepare() {
+	# not packaged
+	sed -i -e '/cmakedomain/d' docs/conf.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -m "not isolated and not nosetuptoolsscm"
+	rm -r "${BUILD_DIR}/install$(python_get_sitedir)"/{easy-install.pth,*.egg,*.egg-link} || die
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 986e794059e5..aa4a0756622b 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index 28b70a2f720a..d7e9f6543b76 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -3,5 +3,5 @@ DIST connection_pool-2.3.0.tar.gz 10656 BLAKE2B 235ddcf6956c53bff276c27b47f3dd21
 DIST connection_pool-2.4.0.tar.gz 11243 BLAKE2B b8fcb164473863dfa4d4cd0a2f511f006ab0369a3890639115b42755eb6a50f1e8e37e1b2bdba0a4ac203ef05e5fde84cc95b0f10f547b56effbaa19df0ee64e SHA512 7b3d732da657ecdd1ebe2fa1600c0d723496be9c89397db3da06d854daba07aa959750527ec2c08bdf5a41e30df2ee04407fe76260440848db9b426c508a3544
 EBUILD connection_pool-2.2.5.ebuild 771 BLAKE2B 9a1cbea11bea0f33cb19d07ea2f83adf0b190be605b4837783562b5959ddae606d36dab38897846c5662dce51564efdf6783154fda5b6a0f3d2c40ac58e8b68b SHA512 20c2f5366a0ef29f49949b1321e6cb8889e230a8cf0ae3656c28b371da43b446ba93a2c182e7da78825e1e785bc8aae612a64f846dba492148a7a7352248ff8e
 EBUILD connection_pool-2.3.0.ebuild 904 BLAKE2B 74cec4c276c65575d8b3f4c48901bfc91d9bc11d00bb336cfa795bd0a981de57176450b21a4eb1933c59c748372679c07cea72177a3caac71f34375d977e69bc SHA512 9531ebb72331153355d600323b7245a596dd4c237b569e63f7eb3ae83247e4b7ae6b7223ff8e1181685e98dd3202abce8708879856f43b4749012dc5fb825367
-EBUILD connection_pool-2.4.0.ebuild 910 BLAKE2B ec95cb63c7c5a976d769e75681a944acdb5401470f00ae65cbdb1a8060fd106ac6aa81cd0eb7da888df3274f451be532cc9ce957629c63a39b5a4492385924a5 SHA512 7e0aea27b9e571c35c60b5e96fae43a7ee9756266350d216c26f7066a5cd486fd5e1264b8dcda278b23efde1665316b8887b559b5d0e462efbf5ad977bba2fa0
+EBUILD connection_pool-2.4.0.ebuild 904 BLAKE2B 74cec4c276c65575d8b3f4c48901bfc91d9bc11d00bb336cfa795bd0a981de57176450b21a4eb1933c59c748372679c07cea72177a3caac71f34375d977e69bc SHA512 9531ebb72331153355d600323b7245a596dd4c237b569e63f7eb3ae83247e4b7ae6b7223ff8e1181685e98dd3202abce8708879856f43b4749012dc5fb825367
 MISC metadata.xml 350 BLAKE2B 9a703bda88725974dbaaf272241eed5ac6da6789fd05221852d904b53b506861c85b93f7a8a0c43c6ae4f75864ad1a9e8686f1edd44231f55671b2be80745dd7 SHA512 7cf078db32bc0d8f6f5b02516027dd0231b2276cfae19b7ede7adca0342e96a994233c78decf9ba83ec7bf4cda66525192cd6fff0f27fd4e3689e557b97d90b1
diff --git a/dev-ruby/connection_pool/connection_pool-2.4.0.ebuild b/dev-ruby/connection_pool/connection_pool-2.4.0.ebuild
index dbb4aafbffa5..93e7f57f0e54 100644
--- a/dev-ruby/connection_pool/connection_pool-2.4.0.ebuild
+++ b/dev-ruby/connection_pool/connection_pool-2.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/mperham/connection_pool/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
diff --git a/dev-ruby/execjs/Manifest b/dev-ruby/execjs/Manifest
index 1282059a4e6e..577c58e30e98 100644
--- a/dev-ruby/execjs/Manifest
+++ b/dev-ruby/execjs/Manifest
@@ -1,4 +1,4 @@
 DIST execjs-2.8.1.tar.gz 425838 BLAKE2B e81c2cfb803e3ffcfb9fbde3ce907147e577f81563500dd74a6a6aa560f13a0318246530a4e54c7139f86c8fe76fe79c9a2961c3b0d685e65c5e7d9d395ba82d SHA512 ec808d3feccf1cfa2500f4ce17a497a31e5886cdd7482c56fdc0cc952aa8967ca50f09c33eb83545713e04aa73fbb8a201459cdb72647e8f8c291f8846f3f230
-EBUILD execjs-2.8.1-r1.ebuild 1043 BLAKE2B 83d1fab723e31a3124aadbed9b39b4146c86238f83adb4ec5f2f4e86086eb0e5f6359d734ab7d98d84aed8d716b0397bf9502123158b5f8e415befcf7a0051f1 SHA512 9a8cb826295b8dd5d2a1ec452e4c90fa7934e2d09af588b8815585f9a6eaf054097764089948991c206006e2f5e23ef3274f23ed5db94650f622832594a35805
+EBUILD execjs-2.8.1-r1.ebuild 1037 BLAKE2B 9e367d398eda92c2db78bcdd08eda02446002707f7867e4c126d9a18e6196971fdbdcb80e248662ba0207f880ccd87866e003de5d1505614c31908ca0030715b SHA512 1be4e069f71eb6599fcd4e1d79413440e660a317082b3ecba8c419b6b944dea0ab9633f6475dff1bdf6ec65c1ea5a82a671f17ed2e45884098b13a0760916eb5
 EBUILD execjs-2.8.1.ebuild 1030 BLAKE2B cfeacff2f4d86050e82b112f150968276f77d0c932e3a895939381cbc73a248f9ec6aecca902795d319710775aab8107639e22ff0456b2c22160289518f5fd73 SHA512 6f4581f5672735a52e2c717a0604a7064cae45b6726245d3854bc62202ad6d1b921570b3ab815b0ed59f49c0c4174d9b0192b9b2d4acd7025194dd9695c4fbbc
 MISC metadata.xml 339 BLAKE2B c570f6191f5de8c4aabc788863f8543fa3cc298d6a86653c3be02ad26c7648232ca2f6d53fbcad6efcb2b7443626885c76b4755a36d1d7835dc164388f3db0bb SHA512 b9032df75adc4978d11fbc0d62dec6a9c26c86369c0debe38b0c9e1656b9a6d7c166398ba3e4628ae4eb4d4a3e75307e2e5780cec81db0e3b05183b1037080e4
diff --git a/dev-ruby/execjs/execjs-2.8.1-r1.ebuild b/dev-ruby/execjs/execjs-2.8.1-r1.ebuild
index 8e68b34fc881..3e08241f7eb5 100644
--- a/dev-ruby/execjs/execjs-2.8.1-r1.ebuild
+++ b/dev-ruby/execjs/execjs-2.8.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
 
 IUSE="test"
 
diff --git a/dev-ruby/histogram/Manifest b/dev-ruby/histogram/Manifest
index e1f5ecbe643a..d3d5c4978e6e 100644
--- a/dev-ruby/histogram/Manifest
+++ b/dev-ruby/histogram/Manifest
@@ -1,4 +1,4 @@
 DIST histogram-0.2.4.1.gem 15872 BLAKE2B 4c416b32e348564e9a938138ac22697acc480dd88e4a879cde6485acab481690cca5d8f61c1c026635a000ee45386e78169143ebca282ae3577e83da66c3e88c SHA512 b2358c648f528e42419b52155273613e6da560ee839458a888d47588a442effec3ee78ad18c33de2b2eed8c6a9f84fbc5b97f7d23ff3675871e9e58770dae36b
-EBUILD histogram-0.2.4.1-r1.ebuild 549 BLAKE2B f9761bffcb8ef8dc131c56f5caecca098fc63e59e467dbcead38b873f779d281fae9270ee13a3c8ec40e21930117b88ed125ceeb74424a6d6ca6c80f588b9778 SHA512 98f8d2169811e44e0f7ed8cc52049f492c812e046771da44f199a5767207d934479b500167b3a4b4640e12e0e53f29f28dd1252c6a411ee2871d63d2b871e846
+EBUILD histogram-0.2.4.1-r1.ebuild 547 BLAKE2B 38cf6b7df32974dd90a11939684c98a6c8e4b28e7ada8295e79424870f609d8d941f6376b06db8dd651d7927680fc5528ec7edeb5cfe3c2122f78044a56c395b SHA512 8208d70c75bc761f8d9d37666b129a94d3820e16810e8c8ee32d89cba4a30926c6306ceb77200704dca0228278d4f82149b7d66ec35c2ff0ed163aaf8a9788e0
 EBUILD histogram-0.2.4.1.ebuild 554 BLAKE2B 42f551c400f36fc2b85982ca5fa28f200496f20b63fea78290e2a588623a95efa857e00cc08a5cc4c6a142f1d3631fa76c450edcdfd2a89882d8402c92d82cc3 SHA512 2f115100135012327bd78ed4fac82ef20f2972a6bd0bf70c4421ed09ab32f2fde5e7a6d6833b496f14bb1a769d05c717770246c58f98a4a1361eebb4e9da0d3c
 MISC metadata.xml 345 BLAKE2B 3975ba83a6035f96b6d32dccf43af94094a9e03482d0fa6f5ab1a701ae34eb3a5950c89c55d3ed2b0d8de46effac5aa85215e12f6b972aa786abe4f685bba612 SHA512 7b3ca22baa6bc62e8ae8698ad2ec362d884babe3579a5de4723202ad8f019bbd8f2f7801ea659f13c3eaea82c139a95a4586bf9812a0e2e833f81f7def60847f
diff --git a/dev-ruby/histogram/histogram-0.2.4.1-r1.ebuild b/dev-ruby/histogram/histogram-0.2.4.1-r1.ebuild
index b36c73cbd6ec..9d699a45de6d 100644
--- a/dev-ruby/histogram/histogram-0.2.4.1-r1.ebuild
+++ b/dev-ruby/histogram/histogram-0.2.4.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/jtprince/histogram"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/narray )"
diff --git a/dev-ruby/hocon/Manifest b/dev-ruby/hocon/Manifest
index dd2503bd87c7..6ecd84bb6f29 100644
--- a/dev-ruby/hocon/Manifest
+++ b/dev-ruby/hocon/Manifest
@@ -1,5 +1,5 @@
 DIST hocon-1.3.1.tar.gz 146330 BLAKE2B 4eaa791f148347cf30cea04c79ed63fbc804a0ef7f4bdf1640da706f857a46a99342d338a8444b2df316ef972e11d5a3e10aae8d82f464b2964aa30c2086274c SHA512 c73cfd8d6c77751d1d2a35d85cad2f2eef700a01e8b8de9449c0c9dfefe8d4a80c4a79dd3db8ee4a6d2c3649f26d6780cbe05fe9b067de05ee3711b00faf4255
 DIST hocon-1.4.0.tar.gz 147184 BLAKE2B 7a072b2c4e5bc0dda80b836a6b905888e2a8cf6da87403c738f62ffebc9bae6dfa71125c68f90c4b2608a36f1491f17ceb55b4628e54b44b8acb3933c2a748a9 SHA512 735cd6344d96e5e5e42a94da875476483c6cb993c9d2f6c144b74713e1eb5cbdadcd8a2c73414d456ff9fa565a6dcc575507ee1a6df339ffe1c1944ed6d15e33
 EBUILD hocon-1.3.1-r1.ebuild 648 BLAKE2B cdfa3585471642e91ab1509d99502874fcf1f327414461c775c786ed12687b0c5f7ee813745eb5210817ef7992f62e2c4820e519ed307ba60706e2cf8e7e00d0 SHA512 a943d98dff437d55df338186db00715cfdf75ab076ebcb1827bd1c76a546ad538307e9b931a75ea9b6018cba92a76f8479c8343de6ee814736c1622d71528bff
-EBUILD hocon-1.4.0.ebuild 650 BLAKE2B 70ecf45067908ced25aa51da1db0087c3d722592dc6e40503f0c3adcdac1351f08af3e8ce9ad0c92a81a6aa8a75b524669ff8a0132f8dcb205b7134aa70e2fac SHA512 9bee1e47a5c2a3a6166d5ba90ebb4527e2c42e62fb538882aeb9b3a67c52e41176b4611d4865e46f9f4378611d9f59bc5d3c25f1e95342d218df952400b474e7
-MISC metadata.xml 515 BLAKE2B b9365c4720afbf0e7391467b79850bd1925b0e074b9799b9a7b8686244cb9d5b16a2740950f921bbecea176eaf925a8a9deaeed5db8e3a3ef057f55c3f41fb44 SHA512 cd21280aef08d17c83c6069c1fad07ad58f442a04136d37d6cd626cfc1528b7f44d4ac22135a405d1291e0305d9b3fb92cd26945698258581c609f487b7ecff4
+EBUILD hocon-1.4.0.ebuild 648 BLAKE2B 2bd4cc53b3217e24a16abcfbf7ed852885b0be75f0bf7da43b31e3d18e9f3abb066e600b2e88cc116659c7c6b9819e4c2fc1e04b8ae5785adbf41d484b589c07 SHA512 704bd6049c12a4382898d38d1a6c0fe95d343f0864978bbafa2b5a78d599587b04bcc6aeed9a817c87c161dae7a03598876b940a45439e4f86e0dcb2a64a9213
+MISC metadata.xml 601 BLAKE2B 0000d77fb95eed788705c212f7180818c2718d1e40e8d88591c470daaac5a5c33089c6c41fc0bdf9d2b406802a28fd1461f061d902d36295e8551f5dfd3d5323 SHA512 2ef7c6a825854db256727eb164f9c649cb7876b1c038eac239e0d65692a5f4b91c5bad01aebd6f43f9d884d093f68565f4d3709ffc760e27d4b80e1cc3d3d72c
diff --git a/dev-ruby/hocon/hocon-1.4.0.ebuild b/dev-ruby/hocon/hocon-1.4.0.ebuild
index 993b80b25b9d..d49990d7fd15 100644
--- a/dev-ruby/hocon/hocon-1.4.0.ebuild
+++ b/dev-ruby/hocon/hocon-1.4.0.ebuild
@@ -21,4 +21,4 @@ RUBY_S="ruby-hocon-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
diff --git a/dev-ruby/hocon/metadata.xml b/dev-ruby/hocon/metadata.xml
index 83e021557455..27d02209b463 100644
--- a/dev-ruby/hocon/metadata.xml
+++ b/dev-ruby/hocon/metadata.xml
@@ -12,4 +12,7 @@
 		This is a port of the Typesafe Config library to Ruby.
 		The library provides Ruby support for the HOCON configuration file format.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">puppetlabs/ruby-hocon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/http-cookie/Manifest b/dev-ruby/http-cookie/Manifest
index 0a58e48403f8..39ed62e80d2b 100644
--- a/dev-ruby/http-cookie/Manifest
+++ b/dev-ruby/http-cookie/Manifest
@@ -1,4 +1,4 @@
 DIST http-cookie-1.0.5.gem 39424 BLAKE2B 569a0d18c962be378f3974b400ddf2289c72490b2b93619fcd83ed6c00bbf5def76239c52163dc6231060792abf3a19988285a6cd28f158ff7339252da912e61 SHA512 d530d64b5c2fc3757a6de03384fe768317e24a523d4a4215f5bcc6b5bca9e7b94eeaad1e52fbb67548396b7b2ca7c9d8b68ea7b99109e24770fcf34c950469ef
-EBUILD http-cookie-1.0.5-r1.ebuild 780 BLAKE2B 07eb850cb68e240e14e9098bc5c8657e62e193fd627f7de05c0965d7d3858e349190c34177d7ba5c934e1eb03226df3443ea0cfb2cb00ad7f49e519f368404b2 SHA512 c81fffa880a6c3e086ea92ef85031436da002cb80c9e36d7e9bbf8a2b6002185dfb15638cb33620371a4af18b80170dbee383ceb161315a37ee3db61949f5761
+EBUILD http-cookie-1.0.5-r1.ebuild 774 BLAKE2B b1226e28c0a8abdabce86855caf12d681667d6c0fe00947a90c74ad046a81dd31de890ff4290d16e37128fc99436fe9dcd6d68e2482b95acee40714122cc5e46 SHA512 a940cd238f570a1e6d3fa4e9dee8e8cfad7905698cce8638fa58c12ad684e7a2551b47f67eeb4c5b6cd3890859f083101e0efbfe4dc86beff7629559c3aa7842
 EBUILD http-cookie-1.0.5.ebuild 772 BLAKE2B eec39d07e71a27e263e427472ee4f721af3a62d97bbe63aa5d6031c6e52e548b7f33ac2fbef978257db3a290e95b1d96590bdc21c746e77db070b5d32c4205d4 SHA512 f2bdfc6f52a9e37fa401c1b3ceea05c668586b431f3c48a6cc2f8302b289b83045505702716881d0add107845c78d34088514f15dcd2c10b8e0cd3af4adaceb6
 MISC metadata.xml 352 BLAKE2B 0e1cc1e4cc97d4d773c64a068d2f7246c863fae1c17504f83275d1ab15e59a9bc6535c22fdf0c02d89d778079d100b74e29170b0fbe6fc1ad5464e221751a56d SHA512 821e08b75914f51a4a341149db588c8e3b17fc401a14de9abd44918b9f6bf88bc1d9c76b460a10c1b312669db478759aab90d0bb08bc04129bc8c964e7b3a314
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.5-r1.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.5-r1.ebuild
index 6e8ed8373fb5..f23617e13ee1 100644
--- a/dev-ruby/http-cookie/http-cookie-1.0.5-r1.ebuild
+++ b/dev-ruby/http-cookie/http-cookie-1.0.5-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/sparklemotion/http-cookie"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 # See https://github.com/sparklemotion/http-cookie/issues/16 for dropping domain_name
diff --git a/dev-ruby/mini_portile2/Manifest b/dev-ruby/mini_portile2/Manifest
index 1774fdff71bd..b4bbedf4c36b 100644
--- a/dev-ruby/mini_portile2/Manifest
+++ b/dev-ruby/mini_portile2/Manifest
@@ -1,5 +1,5 @@
 DIST mini_portile2-2.8.1.gem 28672 BLAKE2B b0ee9b2326260d9f0dab630da104443d23a696f1c2083d5f26acb0950991c0697ae4a62e4dae33fe5fd1cc0244b1094d002e8fff8ced037677be9a64f74699ef SHA512 600c25aa092993709842024006ba013308ca471c070134cc727184456871a4d8d3363448803cc513835b57de89e97fe536b6974ece50ff866b6d5e00b7edc308
 DIST mini_portile2-2.8.2.gem 28672 BLAKE2B f2c914e708d4e6a535cf821d52f7094627ab2d2e9f02f41a3d38b932d6cc97c452a597237d475014cf541c932f884292184aef85b853a6116326e1cc04460487 SHA512 a24131400bda6460dcd21cc9e6700eb9d79c6174ac2074b4b7c253ea7180d9f1c636342e1b9390c2ff4e35625079c988aed081ddf78ddd54a429eab4a892b1d7
 EBUILD mini_portile2-2.8.1.ebuild 624 BLAKE2B 9ed53905d337cfc22bb10b65b232f829a5af3b23fba0c33a4a0ba978dfaf821558b7bf3cd7e486a9a3df77b2d6636b08c4d155211d7f17d3ab4a77f3656084d4 SHA512 4e66280bda0ee310272193fe96ff9c90819fa0d661baa5e2be8c87ded4b09a5824a88f53d2f93882dfc27b72274d9044449aae7f8e958bd41c20a98482b657d8
-EBUILD mini_portile2-2.8.2.ebuild 624 BLAKE2B 2f54d59e427604ad478b8a38a1de369a88b7bfe2fb717906b02dab37d55fa796313a1bc60ca5305016bf219a703e63f652f7e3ea5f662ea037996cfff275f2d2 SHA512 4ea7636691996d10ca862bb83a78cf8fa6c2182f2fc78ce7c7b44d5abc7418f6e36c417cf26df80f62d9b49c8f36fefd9cca59006bd6edf2f1d2b6a0f0148dfb
+EBUILD mini_portile2-2.8.2.ebuild 619 BLAKE2B 90ad6ab61cc28145820a1b6c61210bedaab5f86513266117bd9fee0d2a6f03bf20c7f44e5416baddf086b5866f49f0213138abf67fe44ecb95723e09ee46d29a SHA512 4158fbaf2081de71714e9410ce691b86af88ff1196cd0351214d0a1de793e43ac314eb9f2fa618c8c358edd3330603a228f43484a5b07c0c8fbebfaf0fd898ad
 MISC metadata.xml 351 BLAKE2B 1089816679cc238435b30f4a2365c7d1fe7a15837602f266924604629bf4300462b1ded28a537b9337c9fe13e4b397fcb1e97672bcf901eb65162090a514751d SHA512 80f58025f07a49376e4fab08a8396ccbc5e09ea76eea09263c3388666b14cea9dae84bfadff887aca2468c8651666d5e907911782968b76b7c1f3289036586e0
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.2.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.2.ebuild
index e2cc32be3890..5a530e8225f5 100644
--- a/dev-ruby/mini_portile2/mini_portile2-2.8.2.ebuild
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/flavorjones/mini_portile"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index c9e57453325a..e51e72b81f11 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -3,5 +3,5 @@ DIST net-ssh-git-7.0.1.tgz 227016 BLAKE2B 98cdbad0c8c52d44f3d4e288de7de0389680c3
 DIST net-ssh-git-7.1.0.tgz 229217 BLAKE2B ab3c46d3d8831335495ae72dc60f2659109b66566f04117a16e4fd41085203b6a2d333e65ffcda4e390c96a2b808c68baeb168be1a2e23d4c797ad63b5af93f9 SHA512 723f487e77526a7acba8a9c8f09dd85c8c0bb21577d148f6c4280c79d603d3d364e29fb55b2b282064b5c108465efb2b1da061a2ba5872d575b0be264f493745
 EBUILD net-ssh-6.1.0-r2.ebuild 1265 BLAKE2B 48bdcdb585462a553fa5b71b65c5e1ebd55bdbc5dc769e35ee9d9040a7c073458ab48ec12705f1a472913f6ee7cc022c2f00992d02c5d200b2eb5ccc795cfb19 SHA512 5c9be21772ba9a7c24bb7f394cb7f6a08548dbc07812dce94970f9c970a519fbd02e73098b2fa260056785923090518c78f0af57caf1d256584ab5758be04139
 EBUILD net-ssh-7.0.1.ebuild 1265 BLAKE2B 48bdcdb585462a553fa5b71b65c5e1ebd55bdbc5dc769e35ee9d9040a7c073458ab48ec12705f1a472913f6ee7cc022c2f00992d02c5d200b2eb5ccc795cfb19 SHA512 5c9be21772ba9a7c24bb7f394cb7f6a08548dbc07812dce94970f9c970a519fbd02e73098b2fa260056785923090518c78f0af57caf1d256584ab5758be04139
-EBUILD net-ssh-7.1.0.ebuild 1269 BLAKE2B 4a3ddc35f26bb089ac6893794d67adc3ad1812bc292fa136da6590f3a587ec41d9f5897eaf7e4ceac4c75ea1719961358d835fa7ace1a20cf65882d12dcd8038 SHA512 64cc9e17b20a2d6fb1bafdc3fe5faba22719a56a49da7c945c27c738ca95ae0ad9c0bd105490507b70426e4e34d9e68653efcab3a917fd390e2cb64eb3832b62
+EBUILD net-ssh-7.1.0.ebuild 1266 BLAKE2B 388ea7ea0b76ff5142f648d9287f581fb22b26b3de1ecfc462ce4b50fd17b0dc3dbf9f818cdd466f6acefda473ba8074b3c3ff2d121236c6c6404dbfd406bd80 SHA512 32e72b2f5656a62fbbf2135905628f9e0becc4ef0b833d9624c92362084f8ac53d7ac2ded7eb3ff2ca5c51de88a9da6716131d078114e21c799b7288c3f089c7
 MISC metadata.xml 429 BLAKE2B 12f25e38fdd426b0814611f3036ef401703666e1ac651d807e587187f641736627a35ba117f8707208f07716f31d4df8b471f38dd221fce79109eb2aaa749dc3 SHA512 4c760e2d9799444907f4b05c26ae95b6c18eb108786ce90a5b51c58cc903f4ec90da060556cab72fb80741c3786613589a4d403c64f9b411631d6c4b4ea982de
diff --git a/dev-ruby/net-ssh/net-ssh-7.1.0.ebuild b/dev-ruby/net-ssh/net-ssh-7.1.0.ebuild
index 989d3c0cbb5a..cce9aefea2d2 100644
--- a/dev-ruby/net-ssh/net-ssh-7.1.0.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-7.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="ed25519 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ruby/netrc/Manifest b/dev-ruby/netrc/Manifest
index c56985ea4ef1..e241fc7c30f4 100644
--- a/dev-ruby/netrc/Manifest
+++ b/dev-ruby/netrc/Manifest
@@ -1,4 +1,4 @@
 DIST netrc-0.11.0.gem 10752 BLAKE2B 40f78989c7b58b726c1f83ea7032eace74c11776b006a2f5fc9459134224cad6129b370d6da4bcdef540d75504da6d5ca5a1d6bab9c1ab8a2620b22c3933be20 SHA512 7f0df3f79d92b891d40a49e9b893ca7131077195cf15453b155e37e68e29f8cd3810ba791a06338058262c8cb8fed56c87c295e450c133b428b3398eb99e683a
 EBUILD netrc-0.11.0-r1.ebuild 738 BLAKE2B 747f585435c2978b6dbf00d7bb7ea0fcdba6f98b855fdc0322aeefdde29ca22e754b4318d604ba83d42c69f704a9c14211abe2019e8dab59b2aed9e89d38514f SHA512 9772028ef421f0a5ee3acd665b2b7e622d27c437108ec98adb67befe516c8c605d38f85e914c1b9291585266b752e2821285d417c95e8790b00864f98064bbbf
-EBUILD netrc-0.11.0-r2.ebuild 740 BLAKE2B cca793d64e6cac7f61f63478aadcf505b61b2f54682346f899ced022bc6cf581ea20ea2a14acb1d5ae57ba9dafcea54acdbb411e41ee17218ddf6d8e2d584f38 SHA512 4ef640580bb2ae3c0004e1f54b5ced9c91a0325cd5d4c1d91455b4e243071a9fc3ea1229a32da18c2478f2501b46944076fe90f70e33515aa2a8a87500fa5b78
+EBUILD netrc-0.11.0-r2.ebuild 738 BLAKE2B 4bfdfda73d7dfc19356b825ca6c3573f5e9bfe417502a57071ebfcaf3ce646e6efb642fd2adf394244f5b6f797046916fb0b1ff8353cd931ab7952ec1031cf1c SHA512 03b1c7ae6a242945fa04d40abf5d627d2d134b4cd053e75432c3ed040f25e790a9df8eb55566ff9706d9f4339fb09753faf214f9c76f6313aff01e1ec6e2a8d2
 MISC metadata.xml 388 BLAKE2B a02bd97fc07f286ee3932834aefbeec734ed356b3b76a436ceb96d79068cebe681bb9811629ab7d61f2cfc81894b1ec2cbaa40bd0d3c1de02fb7ab48fc5da327 SHA512 170ddf5b8f74de9e0d3d715bdbc44bec7c3e6ea301beec5f286a38fcad2619cc21e1538712f96724fbb42c2aacc301ee54617ad5fbde02c3aa9634217a29abb9
diff --git a/dev-ruby/netrc/netrc-0.11.0-r2.ebuild b/dev-ruby/netrc/netrc-0.11.0-r2.ebuild
index a57f2be410c9..d33251cd1390 100644
--- a/dev-ruby/netrc/netrc-0.11.0-r2.ebuild
+++ b/dev-ruby/netrc/netrc-0.11.0-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="This library reads and writes .netrc files"
 HOMEPAGE="https://github.com/heroku/netrc"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 6d3d4e67896d..8393b9f09565 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -4,8 +4,8 @@ DIST rack-3.0.4.2.tar.gz 788276 BLAKE2B 9934c4e448ee09c9a910ef8259957737e4d213d7
 DIST rack-3.0.6.1.tar.gz 789191 BLAKE2B 1431e6e97afa503a03dbf3deed67e438b00ad0b74d93df91d248235bd135c7bc6f45da3d488f531b9f00a62f9c193bfec0e301507250543abc1f66db6fe69b8e SHA512 afcc93723c797bbf7a231e70ef8336053443dc8028bbb26bb58d4e1c17ed6a53d178d56fc9b2d33be5bde88ab634fbb233ac133b8a991258469c564afdd5758f
 DIST rack-3.0.7.tar.gz 788611 BLAKE2B 99f4b7394c7b7d78ca3c7888369355437383ed5e3f3bea1bae7117019df5588a2c778270308309908223f5c509c97e6792b2edfeac6b3e3d6815e147bcdab375 SHA512 7ed94b59a4c8886ad94898eb1a7dd3e363fd1b2cecb79713ab744853e7c3da7a1d10034235a1aa5da4cb50c1a5d7c86c4d524ba2a328bbbb6289e9f1f7e37edd
 EBUILD rack-2.2.6.3.ebuild 1672 BLAKE2B 441836edc1a44c888fcecbcf6b462913e4734ecace1155ee3a4d63d865257d81e060c3a72f6d2dcad0559ee6270f6eccb6702174d76ad44e646bfdd52e12ea8f SHA512 d37cc4af348ca5faaa1d7267d0816b7e930f501bb82d3d6637d89cf37fd5485485bcb818977e143e799c67c3122b6b84eb0f5f6c4bd395a2329a54c24ce159a6
-EBUILD rack-2.2.6.4.ebuild 1555 BLAKE2B 5e446143227bff5322d935cc1d3ee36d25584532e3152f0ef848b46850680e63073af86d50a56e4a7c3968a71f4be3ad08a3a0d42f39eede59ab14a55e02174c SHA512 456a52ae46898d656f498877913565cec18866d8faf0f39b5b356393a62d49007f7253b158166fc0506b35b1d95ac241ec277439b2e1dd35d1097eaa42f1c986
+EBUILD rack-2.2.6.4.ebuild 1549 BLAKE2B dfb730ab7a4eedcd26b3853d1880abc48d968756ca20a645b0757578b7a8008912b2d0543429fa64b5c5df2ac041843346ebbeb9e58b692220acbf841dff7861 SHA512 d8ea0ce497e3122bb2ad3e67863bce4e170df4b8945dbebb5874c01e066b93d06709d7b59e396a422de09826038d5a5f6f54d0ce69c35c54e25d50829212d03c
 EBUILD rack-3.0.4.2.ebuild 1293 BLAKE2B 228f3d3c46693522823fc3df3e52caff783caa6c7eadaa19be9c34a38a3341b8a591116463b428d32dd9993c2ddfc0dda705a19fcd57882fd10c4171cacee0a2 SHA512 47f89a8b637974dbb56575fd196c393eba89697d2cffad2eda5ed91be40c0cc03810acff86f3eaeb0fe9d0bf6a9946a338cabce78baa3d24b10f5948cc006864
 EBUILD rack-3.0.6.1.ebuild 1300 BLAKE2B 77d4266dd5fe42759f88a0380718334b034918514bd8a9825816045113280fd37a7370ddac9ebcc262bb743eac6215032a9adcf78746feb1a1022f69734877cb SHA512 1b5711d7d327a21fa8539f27ef29761e88f633126372675398e3f6d83a7140f97139b4c5cb96edc6ec36978456881c68c2f8041e7ee6a502cfe41b86c66d7c49
-EBUILD rack-3.0.7.ebuild 1300 BLAKE2B 77d4266dd5fe42759f88a0380718334b034918514bd8a9825816045113280fd37a7370ddac9ebcc262bb743eac6215032a9adcf78746feb1a1022f69734877cb SHA512 1b5711d7d327a21fa8539f27ef29761e88f633126372675398e3f6d83a7140f97139b4c5cb96edc6ec36978456881c68c2f8041e7ee6a502cfe41b86c66d7c49
+EBUILD rack-3.0.7.ebuild 1295 BLAKE2B 3fb60f88840335ca74537c1047a0efe426e3dbc34fa5db924d00dc62b6e0bf8dba74f58bf009e0c6bc6b3ac99e34a6cd83bf27967606ce53d0ee688b81dbd406 SHA512 372f9b82d577d4241c133ee338fecd996d259a9e78193db760477ac8246f17f2b060db5d7a21d26052058bd93367db2403660cc71a91305d8af77bf2c7d50a25
 MISC metadata.xml 537 BLAKE2B 998152d25abdb228da5fc7b39719693fd0811ce6dc0d831cf90a5ecbb88e540d76dfb6cfddb3584748f46f6d66aa2d1bc73d492c9e810db1c0e44895108d5e17 SHA512 4670ef4b5b33270c48d212fa995b965305f558c5f670e7eccbe2e44f9ba8d1628c112de5a9305c2ad90adb6e2996cab6da385e5f473d850b287e92f7594e0d21
diff --git a/dev-ruby/rack/rack-2.2.6.4.ebuild b/dev-ruby/rack/rack-2.2.6.4.ebuild
index 605f3f5f3edc..bbcd5a8d3148 100644
--- a/dev-ruby/rack/rack-2.2.6.4.ebuild
+++ b/dev-ruby/rack/rack-2.2.6.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-3.0.7.ebuild b/dev-ruby/rack/rack-3.0.7.ebuild
index e01ec370183d..6263ba6c5375 100644
--- a/dev-ruby/rack/rack-3.0.7.ebuild
+++ b/dev-ruby/rack/rack-3.0.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
index fd0b9b09c68e..ce2233b4677f 100644
--- a/dev-ruby/rbnacl/Manifest
+++ b/dev-ruby/rbnacl/Manifest
@@ -1,4 +1,4 @@
 DIST rbnacl-7.1.1.gem 226304 BLAKE2B 4c7c356cc3414c1b49302ff16af701bffbeaaa18b49bcdb4c9d0c10fe2e1f693e7917f8031c90d5c4362d95ffe5a8d471a48476788f64f97092adbcdce0d9f72 SHA512 da7e406bd2b5112e51d2c15cab35d955b65091ed745fbd027750eaca8ff1d11d982c82f497fc15b9ee9aa6536dbd21ff9ac285bb2a2d1fb39c3374fd0f3dca5a
-EBUILD rbnacl-7.1.1-r1.ebuild 713 BLAKE2B fac219a836a18edabc723ad98d9eca91ae83f8c062e0c51077d585ce27f8ae3a51f05b9520647c7d882aef4351f2bc9e98795baeaa30a2f9909db87b043c35ef SHA512 9ca29c55a358be775aa33f86be18661bf528e13c88ee562b4cba02bd150ec3aecf131e1d14acf98362e30768edd2cac5e9f53de64c6d2daebfb893e33889e128
+EBUILD rbnacl-7.1.1-r1.ebuild 711 BLAKE2B dbd3e7030a5f197036ace35abdbe534f4f4fbe3b70e5bb2c1eafbc0e4bbdc7bdd9d8ea11f859c8faf93a16046a71b451c4618249b1d11a4b13ec897e62fc6da7 SHA512 2c6659d1646417f6609153f6921509f3291c082f41541ea80637b179ef5765ef3b865cdf94d5029c49173aca87b1dabb44e19af97eb8a7c4bf36bc8d49fd1661
 EBUILD rbnacl-7.1.1.ebuild 711 BLAKE2B 264d048edc86f455ef7f3f0437f36db968530a7704fcf95205b08205fcde28d2814a11cfbb8ddd63cca56afe88d54c8e3fd6457fa0219ec9b1080eb5fedb29d0 SHA512 4a236842bbd144a4cb6beb770c6d155a194cd94e4045204f3c2432684151f01e502f0ce11ba046b6dab7a30db65dd4f328a1e89a41c2dfb7ac502b51b603422c
 MISC metadata.xml 344 BLAKE2B 56ac8f1ae1e1cf2cef2d8f7920557552a2941070b581ddee21e63c7f5192ebadc05e2150bdedba282c9b3f4e4f0398e57b59c522b35656e2d5ab17ff5f0feeee SHA512 590ae6a645898f3d78add701dc98a40fd54a571b837d23f257ed206e73bfa3859eb089f7d3560d7c7fb3aec00eecbda24cc4ca6b7a1e0804b3b4ba75911f3b34
diff --git a/dev-ruby/rbnacl/rbnacl-7.1.1-r1.ebuild b/dev-ruby/rbnacl/rbnacl-7.1.1-r1.ebuild
index a991bed06b6d..58bb374c3788 100644
--- a/dev-ruby/rbnacl/rbnacl-7.1.1-r1.ebuild
+++ b/dev-ruby/rbnacl/rbnacl-7.1.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/RubyCrypto/rbnacl"
 
 LICENSE="MIT"
 SLOT="6"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ppc ppc64 ~x86"
 IUSE=""
 
 RDEPEND+=" dev-libs/libsodium"
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index cc0e6625b7ba..d8d94798569e 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -4,7 +4,7 @@ DIST rouge-4.0.0.tar.gz 1036030 BLAKE2B 7f446bd6a84d8eed28faf5b873ede459aff5c7a7
 DIST rouge-4.0.1.tar.gz 1041393 BLAKE2B f2c26a918b0365a1b65d938e8835fbe96cdedaeaad5d06e24972f79b0dd8b27bd301ec7ccc7de603f64fbdda5ddd06fdca870a06e0365eeb6adf7f0e7a4cfb2c SHA512 1a7f564d27c2c12c060eeb29f1fdb38e01c1c4c22424b78cfb7b0b19e61e50e9266f21aa6972694a654111cdf6205e2326650ac3e5ef4d0fa182732bd3609494
 DIST rouge-4.1.0.tar.gz 1045005 BLAKE2B 4cbff8d855d36e2d4ab79bc7c125eb2e757f11dabfc5501f59687d7203d3ca1ac503a44caa938de05a99676b4fbe885dd7c012139dbbbfe110d5409e7d3ffc1a SHA512 02bcdcf57d3eb896a006513439930791e4a7486c83e1124fff8d8d2abe211d151b238b52dac1a14019dfed061a44ab249ce7979b94602df730c5684522320252
 EBUILD rouge-3.29.0.ebuild 996 BLAKE2B 8e158583c47d3be31c4f5b1af2dc3b585da5fa26c97bc1d6a58c20f658fe3df10356a093a5d86bafa6fab32970858cc87055ea5944fd6fb2d88322e7a225e603 SHA512 2f928af0f85af7e7b09fa4d0cffdb1a63d8a900a822663cd98b25b478a88d089246536c6c3313b4b0bbd3746918154bdea5ced9991eda83a509511dc7e8cce57
-EBUILD rouge-3.30.0-r1.ebuild 1025 BLAKE2B 04edbb92744037b8281a351096c8d6ebaf9236989730e1b102208217f94382f93c43155f08a485735fb0af661f6f854461c860e247706eb4d67f8d75e4dcbd57 SHA512 5903cc11f8252db6befbeb1e9e2252bbbb442f68fec1e2fa5e4b5d3d38110a55de0da9a3127a9709dc5ffa2fe39e04d47d044727b6f8da71a62529183366d810
+EBUILD rouge-3.30.0-r1.ebuild 1020 BLAKE2B 6e5636979751a231579c66194626c3b6b13c694ad5bb0239a7abdb6b226daa2fcca413b68f212f665d062d2b7b917944a65702d02d466caf6a1ffea8bfa83d79 SHA512 84c47af0604a09b20596c918612af126a677dd71d30b41c1ad4dbb720b294e41d3b993e026f3b9befc5bfa9e94c640f503389904369053d2b432e6fe75c779b9
 EBUILD rouge-3.30.0.ebuild 994 BLAKE2B 77391fc2ed5031cc149cad80a186421bf6c11e1a699123f4d04253e45deb7c3acd38965e6138923a1783fd509ab3f9ca53b43381d67559e03a3e1bdf995756df SHA512 aa95c26a6692b601816b56332247575c564bbeebba82dbfee56e5cc3b7371c112cb47e4407b7a15c14f08d6ba5084446b591ef3542f9f58d9e2ffeda39cce08a
 EBUILD rouge-4.0.0.ebuild 1032 BLAKE2B 97a7e01d220cf2168865a89b96c2a5cb48ce769810070b2f15e7c38c78f0808cca2fe80d3f504a3dfa0e4f1d0d9b2bfb66a70b626c4a0e39e565347aacccd19b SHA512 7fd8ace7bb1575ddac7fcbc839295d3bda7c7527c290daf73303a590f22a0a5dff6b9211730bc5089bb90988a54a8b1610913cbc9994da12ce8b5745ba38b400
 EBUILD rouge-4.0.1.ebuild 1032 BLAKE2B 97a7e01d220cf2168865a89b96c2a5cb48ce769810070b2f15e7c38c78f0808cca2fe80d3f504a3dfa0e4f1d0d9b2bfb66a70b626c4a0e39e565347aacccd19b SHA512 7fd8ace7bb1575ddac7fcbc839295d3bda7c7527c290daf73303a590f22a0a5dff6b9211730bc5089bb90988a54a8b1610913cbc9994da12ce8b5745ba38b400
diff --git a/dev-ruby/rouge/rouge-3.30.0-r1.ebuild b/dev-ruby/rouge/rouge-3.30.0-r1.ebuild
index 38fe6658eae0..c95f8861afbd 100644
--- a/dev-ruby/rouge/rouge-3.30.0-r1.ebuild
+++ b/dev-ruby/rouge/rouge-3.30.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index b6d2029d9fc9..c25be2335ddd 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -2,5 +2,5 @@ AUX ruby-glib2-3.5.1-glib-2.76.patch 730 BLAKE2B d5097174b6a6852f81f882cff5783d3
 DIST ruby-gnome2-3.5.1.tar.gz 2613400 BLAKE2B ab9b7e3b6322b5b89a6bf4d529d5b5abdfbe50b1e099cfba67f089bab3abd39c2a96b57305b13311e9c34957c57107e31708cc76ffa4c20d84af2294f7bf7bb4 SHA512 9423c18587c11b6c317a58ec817e886c99ab37b29271b1684d7c793655a121c8b20c9630347d5f248e687843fd888e2137dca5d3d232121d87565ee2707f2f21
 DIST ruby-gnome2-4.1.2.tar.gz 2708791 BLAKE2B ef24788d8c65f96c76b43d8adc38af21dfb3bfe2f8ae2157f6978993fe65e9735030e9912e8eb1ff5ff90ab1c67701ae61ac3b0790cb285646f26b6193d74be5 SHA512 898ae5bcd7a6347d7392b7888c19493905f6e660afb61f17a60b1f22e4069329ef6ccc9277375a2c40b4d998a309b61de6797f50c4633c0f5de22d2e85252537
 EBUILD ruby-glib2-3.5.1-r1.ebuild 577 BLAKE2B 2d4bd6fa4029a38e547eacc2471956daebf625191ca2825d75179e0a7510be7a5fbfb80bc9e92436ab2fe22a453e3c9dc54ce39d6730cbfd61960156aefc4f4d SHA512 b6840113d9af1fae00ba40443af17df4db1e3595674487b63cc9aaf9e1da0c2e3dffea67105ac8fe0ed7cd1e6cdb506edaeea0a4404495aa3deb6b43c1f58d4a
-EBUILD ruby-glib2-4.1.2.ebuild 523 BLAKE2B 0ab94fb223f5e56e08ff6a42660a45d8b6af5da80ad6b4da216cfbd6431cc1fa2a637f5b8bae7af140f07d2a818a6a5bde8331850eb139af84e6d75e8bb8f432 SHA512 8bfe2f81ecf267307cb693300bc934a6eb95a5075e5d6be201cec6c24252799b9ab4f1e492c79ace92d596ddffdb63dac4d383dd0fe1bdc769d4ba4bbf32d115
+EBUILD ruby-glib2-4.1.2.ebuild 521 BLAKE2B cee2e028cd9dd9f9ca3ce1998ee27e7750ca2bcbd45e4e9ae30a5906b21fdc4da99db9bb59030abfe0823186d1785d4f9843c08f56ad0d57febca73cc782d8c8 SHA512 c8ae78d17613f13b90925b8430d82c2232b523cfa37f333b5dca5fb473be2e8c792d23b3d6cd2518643cc1268124dff4d50d91ec47197f6e2c93df970cbe6c6c
 MISC metadata.xml 338 BLAKE2B 28afb4e4601ddbd918344e8ea4668d18b43122fd5db29849d806919be9da2889d21fa047bfc43cbad6c95ff0e0f1bcdba2c2ba0c5e0b8b27ac7a235f534cd163 SHA512 72c7dbc3d22142137d4017e7514cafc7c900b673a571b44b7c649dc8776550d504052cce7f48164594939f1cd01e0fa5034a1e8c3b9c4a5f7176f7760ba692da
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-4.1.2.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-4.1.2.ebuild
index 0de91c6941c6..02744b8ff412 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-4.1.2.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-4.1.2.ebuild
@@ -7,7 +7,7 @@ USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Glib2 bindings"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
 IUSE=""
 RDEPEND+=" >=dev-libs/glib-2"
 DEPEND+=" >=dev-libs/glib-2"
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index af242341cb81..ef49d742c097 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-termios-1.1.0.gem 17408 BLAKE2B df85f46693c17ca05736fecb2dcbddafc3831ae04cdb56e13782242e4161d04e6c095d04927eebe1959843d6f6da95f0433309018a7cee2bd42407560c2c99f9 SHA512 dc98e6d7e304fa76b4139dd88f8c6955e6f4e09ca48d5611813fac941564c93165945c24dc0d7f7f84d7cd959512d006d73f042b57fcb1dde2743ffbb3cc9b41
 EBUILD ruby-termios-1.1.0-r1.ebuild 585 BLAKE2B 8c5d5145580652d0384c9809ecc9996711108f094738a39821fd2b497c5c1676cf29801b302211525504dc866a67a0eddd5c006d654b46c5cc2ee68af202971e SHA512 9037a2c828afda40b2e7654143553644411523d2bd8aae41fd60f769095f3b96ce60f43cff9fdd0f063884e227b1618c519f761599cb0669805633a10fc48443
-EBUILD ruby-termios-1.1.0-r2.ebuild 578 BLAKE2B 55b0d044573f11c06d81623db044050366289139e18c761ea4b8d53f63722015645ba1f10f3de572c6e0d80e18c0b4ede80bb9bb00525dc40f9e512296376762 SHA512 38757e9f2cbd177dc175b9b86d9a34a611e77aec8fdc41d30b4d3f07cda9f55aa632d97b4237a8868e3ffdbcc0da375b90194555dc78671a654bcfdda8daf2b1
+EBUILD ruby-termios-1.1.0-r2.ebuild 577 BLAKE2B 3e0f616a36f677775d400fe6f7a01260e562079bf3fbc8b9f182fc7d29cb28a59c0068664b33dad932789dc92c9db77729cf6f8ecba20693ee198d8218bbc987 SHA512 78dd9cee11e1f91814d2389c6f07de108220b768b03b80aa66d5250199db35a3e4d47f4f4f38438884750cbeee643324a0408fb3dc0d3b35583370b35dffcfb1
 MISC metadata.xml 345 BLAKE2B 7548870113aba058a32107f58f042d6a1616855032a5e32a95b684c5142375037c6d5ed79fd7f3788cd0ebbe8db48b47a6578b7707d34d158faca579449bddc8 SHA512 a71981c265c8ef7f6845370efd733510a1f0a120794d6cf4b9af226287a5b72843602dd0c5e7925ede219a503669e76f300e4a199acb57a909f2662480f15787
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r2.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r2.ebuild
index 1bd05430dafa..1a15118fbdd4 100644
--- a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r2.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r2.ebuild
@@ -20,5 +20,5 @@ DESCRIPTION="A Ruby interface to termios"
 HOMEPAGE="http://arika.org/ruby/termios"
 LICENSE="Ruby-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc x86"
 IUSE=""
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index 1cee73b4ca68..b6038022a475 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -7,5 +7,5 @@ EBUILD shoulda-matchers-3.1.3-r2.ebuild 553 BLAKE2B 4018b0649c13383d4910d292b0bd
 EBUILD shoulda-matchers-4.5.1-r1.ebuild 827 BLAKE2B c9550fb724c931bbd22aea68b7768410d0050f2bdad8f9d6b9b7580ca69d4dc64c9803961b6987c34ecab7005ccfbe75952b3d83ef5a379905792ac6bb9ae9d0 SHA512 361984de3c4ef339fa20f9004788621aa018fcaed209c5eeabeb3044a44a223c5de693677cca3fb82f33c5aa58194ce16a335fbe43176ae32e595e58e0d5746a
 EBUILD shoulda-matchers-5.0.0.ebuild 834 BLAKE2B aa8a0ccb8d7a2ff207c1e82a06c5921cb09c54b64d6c26c8bbf7bb492423609387403578bdaa2ebb496495cd1bdc37603e7460a377d61cb0cf77fb8aa8f365a0 SHA512 e885a4573d6267515c3da4a336aa7ae491684a3e636ecbe5a7751c5bf9ae4928caa3d4e161123629f30347f215e786fcd5293478f0b836897542e0a5119de263
 EBUILD shoulda-matchers-5.1.0.ebuild 835 BLAKE2B 19e1d321fa1051e17bc1d13b23fb5401f07e80779f6fbdc6d1741e959be0f704d78c591d8d0552439581e3495f6feabd35173d7f686897d68c47397f6a11395b SHA512 dae2fd3667d6dbc6f79e2a55983f3c221498e74b992ad375e9dcf6c12d7878338d930a71bbb9842e80074c5377dc680052fa646481508cb3f01b2d7590f729dd
-EBUILD shoulda-matchers-5.3.0.ebuild 1623 BLAKE2B aeda432eb0948bd778123bd8e0eb98a512e8bf1c1efc62c6b828b1967bda8a0f5491bbb07c3b1c0522e332fc3cff568ba52542659bbc3936dc70ee8cb0ebf5bc SHA512 4d18b1bcbaf3284afeca1f3ee98e01b8a70f405225b974c598d67e5fdee0ecd57e75c6448736096ac7deb3f5c41e0102ad93d7acf42f80b9f9f35c01dc04e30d
+EBUILD shoulda-matchers-5.3.0.ebuild 1619 BLAKE2B 6d4bcd489e370cc6dbf328d2fadf1963eeaefb79ab8cbae5ea8c1711c8e7bebebd38f111fafabd780df87b10fb51b17725d4a386bdf8660930f12860b29d85e3 SHA512 89ac1c42256192226c255d1ae804625fa8e7552239ec5ff6951f4d63e75cbed1d5c0fcc319d0c122f7898eda27b53e665cdc0f0d93ad9c55972b8edcea7b1385
 MISC metadata.xml 468 BLAKE2B deac17b1815c5381c7220dfd64c5b07dfcbb40ab1e9a3d60c69113e28d4132b0347e825a7c2ed836a541f3f97a898e794f4f0a9712045959c490962c757f95fe SHA512 b6dd01f25c76a89d822835ef56d8968eb53138ccd44507d7863e45834674eaac84092b825b5ef107be02109f82c5dc5d4ce60d21729da071b375f52f8fda4c4c
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-5.3.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-5.3.0.ebuild
index 0e847b4ec193..88b452c2175c 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-5.3.0.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-5.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # Fedora manage to run the tests, but it's still pretty tricky.
 # https://src.fedoraproject.org/rpms/rubygem-shoulda-matchers/blob/rawhide/f/rubygem-shoulda-matchers.spec
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 02d7fe6a8e40..52681a8ba253 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -2,5 +2,5 @@ AUX slim-4.1.0-temple.patch 1651 BLAKE2B b979b550ad138ddac448f974b3a96ca5c7b32f1
 DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
 DIST slim-5.1.0.gem 100352 BLAKE2B 19d0bea76a932d18a39fab30d0b1f2cd4f8f2eba108d79d2992112b568461cbc854a99d70b6ea97622e1928db7f33434221a054d77c5d3fa989da639fae176e5 SHA512 2cc39659a5c36cf37e3eea240f5326552fac0be8a42ff6bfe62837467bb77f8841b34d838d5a6945ff7195eb1e59842c64e04944d6882d132819f1ffbf609f50
 EBUILD slim-4.1.0-r4.ebuild 2132 BLAKE2B f3cf006a609dec8388a77b578f6c5af6e7ae268eb374f51cc9aeb288040dddfa1ad634782655e74718d3f79d2dd60663ca2938f4fba80f3798d48d848afbf1fc SHA512 5753cb009fe5461f5750742e01a8f340aa9ba64a027d6979d3aebe68f0feda595bebf7aa7ad93bf47fe10082d5f17e113b125f43ed90cf9d6b308efb738fbc50
-EBUILD slim-5.1.0-r1.ebuild 2242 BLAKE2B 07fa7187699fea63f409cc0d68a8652539f72164a9ea01bf2434ed74591db776068165d2e47706852d3d20cb0e3ee67a7e03cf04ccfc5c2ae733fa2f91752aa0 SHA512 54c4eb5ea0d8de2c9c86dfcf19175986503d0eb793a740b101644e4e50661a7624578a51ff7c4183cf2fe4b3e7b0b519a256a90fe1160c714b193439cb42e0b5
+EBUILD slim-5.1.0-r1.ebuild 2237 BLAKE2B ab9ba32bc001af959c12675f29c2a943a2eb751d49e94349ab68688f35dcd5bc9eaffdb20d164387d2fedb14365dfd2a987e22085d72a75d119f254e106851a5 SHA512 ab40d98fec84795acd97e86e15bf59c942cb7d83ef642b6ac92b95fb49df7f1afebdaf9e040b4eb246fe87d3205c8dfe924d6413f9cf24a1799eebe013089e17
 MISC metadata.xml 328 BLAKE2B 278b8ae81f02f38eb7a70fe1f6649cfcaa5a256ecdeaafdd1231b18050fb9b1a7e36d332ba6165867565ecc7d19ea425966d35a739950c170f151ad927ab57ed SHA512 21ea066ca55a1422879792472cc5b07a87332e5eb204b1311a5a63cbe9f33296a9ef48cba2491a50064baa3760a18285cec51882c3ca885a7cce2453a4e2234a
diff --git a/dev-ruby/slim/slim-5.1.0-r1.ebuild b/dev-ruby/slim/slim-5.1.0-r1.ebuild
index bce5075fc469..dcf46c00bc2d 100644
--- a/dev-ruby/slim/slim-5.1.0-r1.ebuild
+++ b/dev-ruby/slim/slim-5.1.0-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://slim-template.github.io/"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="doc"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/sparklines/Manifest b/dev-ruby/sparklines/Manifest
index cb82b9bc96c6..ccc45e8cda46 100644
--- a/dev-ruby/sparklines/Manifest
+++ b/dev-ruby/sparklines/Manifest
@@ -1,5 +1,5 @@
 AUX sparklines-0.5.2-rmagick4-deprecation.patch 833 BLAKE2B 7fa54975f2aaa75f6bc1492aae5206ae7d806c152f0e1de674daa75d1c21d12006e018f0429988ea7d4900aa3fbab25625a64c66fffe93ccb9e18d1b1e41e07a SHA512 a261dac62970e15e2492e6f7acc13708315e09a1390fa7261a7d414b3f8095eb260d1a83d113fca84d6afaa6ad708131353205358bb870600ce350f6876ad359
 DIST sparklines-0.5.2.gem 150016 BLAKE2B 408a8a5348e0bb3a331087066dfccbb42a58f68b839b7ba24b7577e50d5ad8f9c33c8befc60ae4577d2f8b5b809e52d13c5e11f61021a1d3eafff4d5c1fb2a32 SHA512 2666db1c2f4dd97cad10fd6b9b2fc938ab6b2e619b968f93b86090db4a77cc356cb97bd5ec01582804412c214226ed99cc0f65196e2a26ea1a395b29288cc715
 EBUILD sparklines-0.5.2-r7.ebuild 801 BLAKE2B 5a24067c6abe6ef8626c3aca69e5769ac7b615242d60ad6d8e1a597e43c343afa14dc8e9913b2c864b95d3dc9dc4a77820fc32c93872b90975f134c7ce36667f SHA512 9fc9c7a18a286749b548bd80051ad65a6218ef7ed0e32a3acb8e8fd92f0a4bee0e06b208e78c93b68752f63ac7b1352fd36dae879e954e518a0164f1aeca416d
-EBUILD sparklines-0.5.2-r8.ebuild 849 BLAKE2B ed17d2e25ffd6d53e6a6cc7f7352e70b4c7cc9c783564ae66c543accc000510146a68d500c03d1a3c873e25e8d8dbf2378a0d0e07d080ebacb1e3b8d6c3b7ab0 SHA512 f4836d11e9e80c63608def557015b118edcabbf948f5fc59275c0b79d2401144d122a26817bb60e082a2ecc1a641b040520e4dcd9878309dacdb356db5d0a615
+EBUILD sparklines-0.5.2-r8.ebuild 848 BLAKE2B 5c703aec665afec1e1ac5a8667a882ae0b009f7bd4eb49e8a7e4fb087b58c3a8fab69e321b60c40a589323376f787835bec6f1bddac9c12a646e491a307f60a2 SHA512 5dcdcd0d2903b38aee4b1c5eba11091b3d62f42e03270355ec1efac0a24f463a06a774e865d154511343936be8622404b38b7938a8a3643dcd8a7494a7c038f8
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r8.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r8.ebuild
index bb8943773706..27c933bff38c 100644
--- a/dev-ruby/sparklines/sparklines-0.5.2-r8.ebuild
+++ b/dev-ruby/sparklines/sparklines-0.5.2-r8.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://sparklines.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND+="test? ( media-gfx/imagemagick[png] )"
diff --git a/dev-ruby/stringex/Manifest b/dev-ruby/stringex/Manifest
index b784d822940e..9054035538e8 100644
--- a/dev-ruby/stringex/Manifest
+++ b/dev-ruby/stringex/Manifest
@@ -1,4 +1,4 @@
 DIST stringex-2.8.5.gem 130048 BLAKE2B c07eaaee07bf348690166b41b0846bc49eb49c5ba9e39c7eaeea2a3a60d6089edd7c7d1d75fd9a5208c9883c4bff8840ccf56c6f186daeabcf79e7f4fb6b4d25 SHA512 53f9908f176f465d2e884e92dffb26abcdf75593c94ee8250253da0eb29eddf489cf5b3f539135659ad4c0e2dd738d2affff6a946c50abd5f36517148d8338ce
 EBUILD stringex-2.8.5-r2.ebuild 844 BLAKE2B 75936c5fbb8d1f776fb143a947d5337a354bda0c60d6320f314b40ee061355c944d9c61d20e533c47fbe3c02faaae88bbaf38f2ce66bdfa27723b72f307a5329 SHA512 ab10bb7d1ffa7e156348ef9e9306ff42a4e6601555e47506fe17bafa273ed04272c5b6ec27a066e0a5831a0f1bf04261931becbaf7cac7f8150f600725a3a34d
-EBUILD stringex-2.8.5-r3.ebuild 881 BLAKE2B 651756ef5560be043dea8c6e061dcff8ab9a453f21453d72084900b6fd45fdc13b576d805d61b653789154f6ffc54607ed0dbd8d36eab94a9e21653ba4611fcc SHA512 b45ca6c682db0d0344b7b43a93dc685453f3eb476763705ab2d3f4eab12529575370a13adbaaf3f0f742654e9f58c729413bba1093169ff734da246bd18e0229
+EBUILD stringex-2.8.5-r3.ebuild 880 BLAKE2B e09bd3e405499cd9c8411228c698621339d96a5bd05ff27637e7a437ef30a812eab7602c5dd3eb99e8b516094fb3fa7a86120347de1d1e29bda0164ff0f21da4 SHA512 ea9d0090c513b9418c0f009921661106ba95407b73de605fa165667eedf70081bc2951189f7ed2180f430bbfad82d33b8f56aa7356d475ed5da554805bca29dc
 MISC metadata.xml 339 BLAKE2B f73c3a0f80358652d11426529ad603b32ea4ef3b882be5d1862ffa94d35fc49a154406d66eff59d61544d6c35a8aaf841f553f689e4fdedffd88337d2be3ce4c SHA512 87d2f65efec8bab706894e788d2c6ac548221684034bc93cf43efc104fd2340188ad8aaf1e9e484ab40475aee38a7bd9227b55f73e8ae31c39548c297bb18d32
diff --git a/dev-ruby/stringex/stringex-2.8.5-r3.ebuild b/dev-ruby/stringex/stringex-2.8.5-r3.ebuild
index f05feaccc48d..355b5d8fa4f2 100644
--- a/dev-ruby/stringex/stringex-2.8.5-r3.ebuild
+++ b/dev-ruby/stringex/stringex-2.8.5-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/rsl/stringex"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/sys-uname/Manifest b/dev-ruby/sys-uname/Manifest
index 568d15481c58..a0df14e9d9f5 100644
--- a/dev-ruby/sys-uname/Manifest
+++ b/dev-ruby/sys-uname/Manifest
@@ -1,5 +1,5 @@
 DIST sys-uname-1.2.2.gem 29184 BLAKE2B abfc9172cde35f946d420f8737a9b60b6810e551c2c361027614cd812a50c86bf8e92446c9a113d0e7e2f6dd09c6f40ceeb5a024defc7cacbb45c53f4b761809 SHA512 97a7a8cdbbc80e9d886be92d104aca389d82a1eac61b7a0172ce8fa27dbe751b0653dc8a027610d69051a79ed1fb2c855e2ee802308a74300dcc709c9e56b9fe
 DIST sys-uname-1.2.3.gem 29696 BLAKE2B 0ba1882a370f506de79dc533355cf808acf3f1369a76515192d900a5aa41be6255810ab68454a82bb3939248f61baf83d7c46bc1f12c8aada4a96618a4e19bb9 SHA512 86964d1bb4036711673988da96219683b6520dbc5cee81dce43b8b109a878a5d04c479d6844d75c8cf5bc36c14bb005279ca7d8c7c03809786ed9d269779a210
 EBUILD sys-uname-1.2.2.ebuild 584 BLAKE2B e194eb51eafa6168dc6228a5f5697b958ef926ed5f0023e2741d1ba7699656e058935f848519ed2be85097f0fdb22ea4ca0edd2c8049144ec0507aaab257e34c SHA512 aafee0bb61f86e39a770d7f567b92a6559a31e5ad96b701bc9a74697565230751f495e690e7ddb037effbce938c87f739423852f9eaf1a71178f461aa74fe165
-EBUILD sys-uname-1.2.3.ebuild 591 BLAKE2B af18a25dd77537d06fa4244296c73cc5e14ba321af290c23d73571189e9e0493b1fffd07b265456c98408ef12df79436cf77b3844f5573c149457c88567ae2b6 SHA512 e9036d21c2d511fb5949325a203bcdadd223119413a8ffaeffd0b80d4ce461c1b81e639993223673b573a8a9e7e37c466a6c2cc8cb99ecab369fb27b301f298d
+EBUILD sys-uname-1.2.3.ebuild 585 BLAKE2B 94381217c1ec36b7de099398e607a1b25e82830d80b35aade618a2110f28b2ac4a880dfc082291f39799dbb627eed582e82dddcc7f0056f67e118e219d61e93c SHA512 48de112ba5bd6792f958a912bb5b5a2c1883564e77b602f9a1ea3eb81262b42ef48c5e8f595f7ee1e84ff5209333e7184e69aa7d02ea1d4c5ba6776a1604e4a8
 MISC metadata.xml 328 BLAKE2B a81ab6b616b202ff48f8dbedea434f3b43c585e9670ad7a1642268fdbc2628e28c662f007c62aef9bec3f85f6a39f1ffd3544c0ce8270484f90b12938b6a29e1 SHA512 b8ca27c20819d74a043fe89b7305d534cf32fad99150dfaf204555d53d48e43aab73ac381f640c74d96f3b9ccfdc6253379f762e9d0a2220c686fa8908d959a3
diff --git a/dev-ruby/sys-uname/sys-uname-1.2.3.ebuild b/dev-ruby/sys-uname/sys-uname-1.2.3.ebuild
index 66325db983da..b3081810e411 100644
--- a/dev-ruby/sys-uname/sys-uname-1.2.3.ebuild
+++ b/dev-ruby/sys-uname/sys-uname-1.2.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/djberg96/sys-uname"
 
 LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.1"
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 442bf574d81d..7084b32a92a4 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,5 +1,5 @@
 DIST zeitwerk-2.6.6.tar.gz 121370 BLAKE2B af3d8d02e3547ae35e6efdda82c50676dcfbb60ddc07710116e6da8e56c63dadec4ec0526fd9e0da4ebcde91de1be6faf0308ef10fcae01b4d9362768fd1dc7c SHA512 1e3cf2961f06d9409cb9992126da298c2f183b73660357301a60dc9b3d1c649701b5d886185b38a233a94a1757d13e684e012d569af1bd5935ccca413bdbc745
 DIST zeitwerk-2.6.7.tar.gz 122658 BLAKE2B 7435f8fb117be8186d56262c0aa8832132105d065cfdd470ed293e9530aa282edd824593f28199b908476a47f90507158beb216b803d39fdaa956d32ffa072ea SHA512 666f527771bc10d34b05a8f27996a9a7adf89466c54fd30a174a1e2e6df2500a2a658e08505964644d25ebd11ed13bf3f741724bfc9fd2a189c3e7b3ce24ffc0
 EBUILD zeitwerk-2.6.6.ebuild 908 BLAKE2B df2ad75d252cfbd3234570b9c9c6bff9fdad6e5138cf899340f96537d059a335a1c6574e2b46a85fb399201db2d010df3062257c697a614dce40f41925141523 SHA512 08c9160d7a3b74d1bab2af1adae004ada6abaefda5fdb0d6bbad8a2101f86335855f1d676bad0df3a03c7dac9ae25aa56dd906f5b022429288defa17c2a1e9b6
-EBUILD zeitwerk-2.6.7.ebuild 1088 BLAKE2B 30f8ea7ef31f1da7a30390bee5e975f2f18c912b3cdca6d196c2292f5cd0ec6d810b4b9241685715e16191075051367dd2ec216bc177a73d4fcb2708253671c8 SHA512 badb2f6ba8cdd6332a773d139c50507c3fe77cd7c6af35407c93752a000f471e70c784be33b752e01d808087456217a4b8b585340e7a432d17556c433f14f0f4
+EBUILD zeitwerk-2.6.7.ebuild 1083 BLAKE2B 4fe4b3fb2071bbe9d6e427ad1721b9c53d8dd3f90d7b162e0386de8ef176471e3548dddbf403c35238b52fef26c67483a69fff585f87ee40998b37e06b5d93f0 SHA512 3c0977854b9509da7ac407604e937bc156da9ba4b0b67a81cff1198049314725f205eb7ba5177c266bc61a6147e1bb0bdddb3058b58a2ff07a40878ee1010105
 MISC metadata.xml 641 BLAKE2B 27f5d9950eee9945425ab5606b78e7c745345e49dcfc201b55bf52693b3882d44206a82af09134696e694e524202d9c43f642c0854bdcf640356db8f8c84972a SHA512 b744fa895c31a93a5566151b3b3d73308ad41a7b43638ccd9aa00c9fceda495279d32f56e9c68cf44adea06f0e6842e38324c2f20b412e46f05b78c35288869c
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.7.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.7.ebuild
index 3a5ac84d4c6a..334de1dc6e8a 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.6.7.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 83aa76897d6a..c2accd96f631 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 4d884ac9236d..96c9ab9f8552 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -3,8 +3,8 @@ DIST cppcheck-2.8.1.tar.gz 3921391 BLAKE2B d61c4a8a3e88441f0a65090eddacaa34bda91
 DIST cppcheck-2.8.2.tar.gz 3921806 BLAKE2B b48a3f4163fec491d8a7f9eb4957a140cd33b852d1778974c383ca5148aa252cee412b4616cbf49b622ee5b4ccddcb1aa60b217284f2c01c020df606a1e4fe5b SHA512 595645cede2d1b801127747cf19c66ebc73a97c4c3f5c9af1fbf865a995f9b7ab4027a16d73cf2aa638e51569be275a26b92909d548ddb40e185978a247fb5cd
 DIST cppcheck-2.9.tar.gz 3916529 BLAKE2B 5d75328e1fcd389376630502ad7427d3473392a9467e8731e6cd7c2c6349efccc05eddd7eca4cb361930661d2383a8d316e33bd3609b9333a710153d199e326d SHA512 69204a7ceac087470201482894e6422b99d0849f08641e80b2e341c9d164a1d2095e3a08a1fba2e9fa681783d07fe7277b30ea0cc0bf582431b5d13ab2f58c1f
 EBUILD cppcheck-2.6.3.ebuild 2003 BLAKE2B a940be98b6802b4d64005761171cee58db12a2f1c1074b062d464173cc7b4cbb59127467a5e820a01ace465f158a266f2494da3f58f9581f787917b881e7b15e SHA512 3d1d04c1a8de9653efd10c0b325503e0081f067d94052b491d8581a0e12446076d17f9b0df7038d6acbe542dff60ab1a859ed934282aec101b90b881429d765b
-EBUILD cppcheck-2.8.1-r1.ebuild 2331 BLAKE2B 54a7a1b8ca5c34f6527333f1d94c5041924fe0fd4142967ae49a27ade6352cb0f9ef9a28be39a6f7d9cd3433823fdb5c0e18504ef144248af5dcb0d45910fbad SHA512 8036a96194d1f529e67590e641886f05c6d4f3763412163982c1e814442b1bf31d216a3875e5a3b358e2a6e48971e763fc1f781def15db36ae87b567b4abd51c
+EBUILD cppcheck-2.8.1-r1.ebuild 2342 BLAKE2B fc7065f490523219cc406b8b737096dfd972b6b2cfeb98d404bf6fd418f21be88cb73ae80f4acbce25fef1e85db4107f4f8f0a40d55f28fb4df4e1e8a5c0b0fa SHA512 ba4f1876357e65bdc779ec9b80bf77eba28ee151d98fb5d1c365bb069d355fa9d05244fc38b63c2040532f5c65416db26dd180c8eb9ed9c50bd95187fda65977
 EBUILD cppcheck-2.8.1.ebuild 1949 BLAKE2B 4e084cf5e45fd53d78bc9741ceea3fc83b201254702fa65abceabac0a1d4d4d720d5538f5b127cc9012fab14806f60d572f0651ef0ff2d34114d38a1c76ae497 SHA512 64af20af83b7c2ca4bc87af5a29253628eefe56d208ed3a1923eddd2ca60acf176aa69b96769bac8262eb0c45a2547c9ec2deed63ef6929ad37339090dff675d
-EBUILD cppcheck-2.8.2.ebuild 2331 BLAKE2B 54a7a1b8ca5c34f6527333f1d94c5041924fe0fd4142967ae49a27ade6352cb0f9ef9a28be39a6f7d9cd3433823fdb5c0e18504ef144248af5dcb0d45910fbad SHA512 8036a96194d1f529e67590e641886f05c6d4f3763412163982c1e814442b1bf31d216a3875e5a3b358e2a6e48971e763fc1f781def15db36ae87b567b4abd51c
-EBUILD cppcheck-2.9.ebuild 2364 BLAKE2B 7ddc54c238e6f9db652d15090a21d639c06cc6f804da8db3d2c98d8066168e4d967962230b95405eb63547f2c069e9fdfdea05adef31b8e6ee7e49c08d041d1f SHA512 67344c96b62ef2434c3b5f5f75d8f72499104fe48530ae71016a89553fde5199da3e730e0e632f18afa706ee86b2021c95ccb8a23e595f81d952c70d07c16ddf
+EBUILD cppcheck-2.8.2.ebuild 2342 BLAKE2B fc7065f490523219cc406b8b737096dfd972b6b2cfeb98d404bf6fd418f21be88cb73ae80f4acbce25fef1e85db4107f4f8f0a40d55f28fb4df4e1e8a5c0b0fa SHA512 ba4f1876357e65bdc779ec9b80bf77eba28ee151d98fb5d1c365bb069d355fa9d05244fc38b63c2040532f5c65416db26dd180c8eb9ed9c50bd95187fda65977
+EBUILD cppcheck-2.9.ebuild 2381 BLAKE2B 9c9bb8285c57d9ba95ecc474795f707608b56b68944666a2995fd73093905fb9ca3775c3d4bd230bd89d0b95fa9138fa402178a306897caeeca1d2c255e6a0ef SHA512 18d8f5a03658cf6a9bb8d7feef333b0bd4fb86059780cc6c0e7838bf73a0f2826719a3bd223f291b819bfe496b1d3b1927531c3d069f094dba51edc01a631aa4
 MISC metadata.xml 546 BLAKE2B d42258e8aad43867bf7b8d86f4688d76a70cfe285e203eb1938adb2b5167f2cb51e110ba5eb51954ebaf50a05d5d01605d577ff7b9528a1220f3ce0d69790984 SHA512 df3a8b62b1a8f1fcd8e4e78d3e44f20dc71fdf985251a5b1d7fbcc7fc2cdbc12428e3a7fe191640678cab7a046010578149f4176285ec1ca1538839cdf5a2070
diff --git a/dev-util/cppcheck/cppcheck-2.8.1-r1.ebuild b/dev-util/cppcheck/cppcheck-2.8.1-r1.ebuild
index 1359462471f0..69a3b72075ec 100644
--- a/dev-util/cppcheck/cppcheck-2.8.1-r1.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.8.1-r1.ebuild
@@ -48,7 +48,7 @@ BDEPEND="
 	qt5? ( dev-qt/linguist-tools:5 )
 	test? (
 		htmlreport? (
-			$(python_gen_cond_dep 'dev-python/unittest-or-fail[${PYTHON_USEDEP}]')
+			$(python_gen_cond_dep 'dev-python/unittest-or-fail[${PYTHON_USEDEP}]' python3_10)
 		)
 	)
 "
diff --git a/dev-util/cppcheck/cppcheck-2.8.2.ebuild b/dev-util/cppcheck/cppcheck-2.8.2.ebuild
index 1359462471f0..69a3b72075ec 100644
--- a/dev-util/cppcheck/cppcheck-2.8.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.8.2.ebuild
@@ -48,7 +48,7 @@ BDEPEND="
 	qt5? ( dev-qt/linguist-tools:5 )
 	test? (
 		htmlreport? (
-			$(python_gen_cond_dep 'dev-python/unittest-or-fail[${PYTHON_USEDEP}]')
+			$(python_gen_cond_dep 'dev-python/unittest-or-fail[${PYTHON_USEDEP}]' python3_10)
 		)
 	)
 "
diff --git a/dev-util/cppcheck/cppcheck-2.9.ebuild b/dev-util/cppcheck/cppcheck-2.9.ebuild
index d600a652833a..b53dc7717c0c 100644
--- a/dev-util/cppcheck/cppcheck-2.9.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.9.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
 	qt5? ( dev-qt/linguist-tools:5 )
 	test? (
 		htmlreport? (
-			$(python_gen_cond_dep 'dev-python/unittest-or-fail[${PYTHON_USEDEP}]')
+			$(python_gen_cond_dep 'dev-python/unittest-or-fail[${PYTHON_USEDEP}]' python3_{10..11})
 		)
 	)
 "
diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index 9134271f848b..f60b4dcda5ad 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -6,5 +6,5 @@ AUX elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch 3246 BLAKE2B d8e476486df9ca8178a
 DIST ELFkickers-3.1a.tar.gz 101709 BLAKE2B f4e32be84bb05d0f5823fb09d60596086d70f726312285ce847b79ed7f08eed936cf72a9eff92123c4fecee9e4748a83363a05075a29d04490bd02701d53bc59 SHA512 a3ec3c1d5062c67e0108a04ea9a7e9d88d1e5090af887544be756f3269a28950d1211908b74da287d82975dada4a6ea30686b5a3cffa203b9ebf835a5c13d408
 DIST ELFkickers-3.2.tar.gz 108555 BLAKE2B d9ed0c6a2a782e7178480436d526674661af1f625788a28c8e41b97cabb1412f083b492fd36778de17ded7d123003dde878a45af9a63cf7c1e7bff860dc3a0d1 SHA512 ea8b274030880579a44149a1c093e0dce2d9889729f5b4bf1a998d97a78f9bb3cf3fdec807eafda964060fd464a44d4992b35a397737724f7f95732186b8b3ea
 EBUILD elfkickers-3.1a.ebuild 913 BLAKE2B b7f61c9e063fbb00036c562a95fb37a7b66277771f9e3c3f75bf26430fc3e6d2dd938f8abc28957877cefd4a6022a18fa360bc258792d8a2f76012e11b78177c SHA512 1f81e2a5dbf70b0df0a6d33bbda4fee861793e775c55f98aad917ac0bc2c61e2f0b41be0b9ef11e2afd55a1cee688c8688855f80b2a3f529159675edab643786
-EBUILD elfkickers-3.2.ebuild 874 BLAKE2B b4eba0df24576c0eeba6245db67a48669996b79f983e695a49110d0483bfb316f41c41187c0077cadec9e2d4abf17e37bbae11187d96c094b778421d4e8d6f13 SHA512 4be5d4174f8bc7f49a226bdcbb384bfd3e10b8a4e0be8d66c84d53c339064c420cb3a871b537302c4f2f2e5b307f4d1204c5938601e0a8276343bfbe76b7ce59
+EBUILD elfkickers-3.2.ebuild 872 BLAKE2B 40998d1ea11ce43bb53e130d4d3f0984e1cc6b545fadb02ee50e5cd28cef1e058bf69b1a8905166180056aa7820baf7e881a11ff5cbc707c80fae8064f89d375 SHA512 0f4ec7a92e4e5f9a9192c587b79e2ec49aa9156e3881683509050b2ea14ff64ac2b79b23050e2329aadbd2e25ea1284e2b096515c27e3649f01c012efc06cfca
 MISC metadata.xml 626 BLAKE2B e9ba48876a5f58de1a1c91e33cd9764e61d46017e7c67d2c401b438245b979cfe777c8d56039c70ec28c12694587359a088b24b8ff24eda25c53d2bbaf1a6a23 SHA512 a3d43426466ec8e88727ea5e0492fbde39b22fd9c1bbc265b4d547ff31032869058587bec16336980d157891241b8ec1dc0e361cededab09688c45392bcb2901
diff --git a/dev-util/elfkickers/elfkickers-3.2.ebuild b/dev-util/elfkickers/elfkickers-3.2.ebuild
index eabb5ab6febf..cb3cd5090303 100644
--- a/dev-util/elfkickers/elfkickers-3.2.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~amd64 arm ~hppa ~mips ~sparc x86"
 IUSE="doc"
 
 DEPEND="app-misc/pax-utils"
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 3dc242300959..564b8ba1b0fa 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -11,7 +11,7 @@ EBUILD strace-5.18.ebuild 2344 BLAKE2B 2c55a36cfa70076014cbf0ae1c80768193367c71d
 EBUILD strace-5.19.ebuild 2447 BLAKE2B 88535b5906a24d4b2ccf26777e4a9fddc382187721598b44a6092e6ca7087601e2895575ba0046bd78c1caeeeface1dc52883b7fb30e266129b40bb5ea19b8df SHA512 c29e74848ff20d686ff02acbec5e08a9ad55d5f1970bc30779fde8e609ba88688fee69d6a63e6607c1da32b53676995f29adea9e81498e3feeaeaa0bb7fe6b16
 EBUILD strace-6.0.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 EBUILD strace-6.1.ebuild 2434 BLAKE2B fccc5a75dda51852abdbcc18d010f14bb1e52e3f0f92f78db4791e8af014c6c9816caea6bb5a2792390865abca8c217a414c24e78ac7ed743aa004f23d588d26 SHA512 c0efdfb974253fccfcfa1d68aebdeff45ad8b15f206d1140c26e44e98331d69350d8cb844d73b048ffb5bf6415e41f264826af6a73bebf2d61d5de151540245e
-EBUILD strace-6.2.ebuild 2442 BLAKE2B a83bce1936924f68b7d5edc81440b7cb2101016f0902cc0c02c3e235c2a9a74069c4e8616821a0597638bfa1e24ec0e859870af1886a5f5314196918d73bcfee SHA512 9b9d1b2a23c9ef98d706c4862b189b28647348b9987d111102223d237b70b42cdd40a803cdbff00cc8103e8c221418ef0e2bc40f3a214b7c08b78f93cb246f13
+EBUILD strace-6.2.ebuild 2436 BLAKE2B 6cf94e4db1d91c48825ed62cf8b2065f3428af7ee627b2734d804ceaa2107282f4d9e826f6ca480ac2db37284966f2f8d6e1daec8493d9d02ac70ce70cfcd8df SHA512 e4a0611d91cbf2258844876b4fb3f8f81174a007f2ea753da20483e03544957a763586fd08c17f806607c2aeb17d81a09b4b094adacde7cd9bf63875b48f17b1
 EBUILD strace-6.3.ebuild 2442 BLAKE2B a83bce1936924f68b7d5edc81440b7cb2101016f0902cc0c02c3e235c2a9a74069c4e8616821a0597638bfa1e24ec0e859870af1886a5f5314196918d73bcfee SHA512 9b9d1b2a23c9ef98d706c4862b189b28647348b9987d111102223d237b70b42cdd40a803cdbff00cc8103e8c221418ef0e2bc40f3a214b7c08b78f93cb246f13
 EBUILD strace-9999.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 MISC metadata.xml 779 BLAKE2B 89b4360e876fbb34a7a766a57ba9ca088a5e03e9ef66fdbe0a2b15df4cfb625daba11dc76920dec405b97cb87df49fd3c9edc0e184e73262b14b616af36fa4dd SHA512 88b2d94fd6efebaa617c8344bff3997f31c6262b9376cbce014bf7f6225f02bd8ee7bcaf98df4477435319bbb92addcdb6756e5d37a137a863f0bef1ecc5fced
diff --git a/dev-util/strace/strace-6.2.ebuild b/dev-util/strace/strace-6.2.ebuild
index 24526a0eb263..9e5e5dc4ba0f 100644
--- a/dev-util/strace/strace-6.2.ebuild
+++ b/dev-util/strace/strace-6.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 41c7fb3c2ea5..6f575d17e5da 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/sil-doulos/Manifest b/media-fonts/sil-doulos/Manifest
index 88ff5eac2da1..54dc19fc1e87 100644
--- a/media-fonts/sil-doulos/Manifest
+++ b/media-fonts/sil-doulos/Manifest
@@ -3,5 +3,5 @@ DIST sil-doulos-6.101.zip 1532281 BLAKE2B 845ec45eb338a0afc3bd0bbb953adfe87c3784
 DIST sil-doulos-6.200.zip 1513687 BLAKE2B 0bd626f376e6231507a6a484e8d1fd2e1215a68f0b80f9e30ed182530e813cb91d1a5f9539f459efa9f81784d34a00f592dcfbcc932b85a34ede3609eb4a3ce0 SHA512 8f8c330f858f620b1db8278615c3b79464d019e68ba9bb166ba581ce91b942d8060657b3e7a412f963c53fd0bc97aa2a9534dce078113b1c3fc09c7f8a1ce8f5
 EBUILD sil-doulos-5.000-r1.ebuild 584 BLAKE2B e3dc43726f7b3d3d2795b2febae360d2e9a6f08cb52f032e5fa05611a9cdea0f3c482e6e9f956a530e0589ae3422d0a9a27d89af5c0cb34983d607437ba42206 SHA512 2b869841eed14c288c01eade7b70ea00dff4d692c07e0e17c227f8f3d617311077c97d666e4c53b4eed6253cd73f0a7b86b86b21cde9854ad0f32df230965e80
 EBUILD sil-doulos-6.101.ebuild 570 BLAKE2B 3a205c1b4fbff923751910748473a35d9c0b4ee9ec256dea48ef2ed7eeb946b61831e9ef106a5555eadd927eba65b113f03c2d91d772da742696628ec95509bc SHA512 f37d3c9922a2fb58e770944f7b39a7d0de3281606d70e52807ec11a7c98b88d84db94c25cfb2efbf2fcfe0fec03f0857a1afd86bd0e81626e68b6d50935fcadf
-EBUILD sil-doulos-6.200.ebuild 576 BLAKE2B 8352648a54f6029dda5bf1b624ce64ac6381bcc43a7efbf4925a33ad4ca9755718be17681696acfa72ae7f155013999efbca21af6e6f56d34c270600d39d5844 SHA512 7071f425d7d1d5c51afaa55748147dc91efc4a0403f6ced51a8a657abe77d6881ec8738c907158296e33310af6361e7919b9a9dbc802b3fc8443c73f61d138cd
+EBUILD sil-doulos-6.200.ebuild 573 BLAKE2B fb17dcfddc8df2ddf8fc2a23cffb8fe329f8c84d276968d4a616f924fdb4af29c4a74b7a1aa0b6580f7b74c8496410f1ce46bf9b2e64dc0ab0af63ee57852d4c SHA512 ffa451fd088cc05d27c55c4c37688e2d1629d7dbdae3404361b315df9a2f4de7e1cf0a5e3faf5c275bb66e64b9088a6a4a86cb66d822c9e5d61afbe8020468d4
 MISC metadata.xml 1108 BLAKE2B ff47c845d378a1b8d9f7a36262cb1c1150c48e914a768ad34b5e9016a23384aba60026834761efcccd2508548ac62ba16f2bb58d6eaefdbe7c65a11a1739cae0 SHA512 70f703bacf933399de27a543ff276d87762f88615685f629bf0c569a384009e4fbca8b268343cdd6bbcf75afbb9aefdbc39d56ae34bd661f2f9e7db6e49a15af
diff --git a/media-fonts/sil-doulos/sil-doulos-6.200.ebuild b/media-fonts/sil-doulos/sil-doulos-6.200.ebuild
index 3b3840863dc0..2329b6c6a9de 100644
--- a/media-fonts/sil-doulos/sil-doulos-6.200.ebuild
+++ b/media-fonts/sil-doulos/sil-doulos-6.200.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~loong ~ppc ppc64 ~s390 ~sparc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 8b2c5a15eca8..2ac5067a67d7 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index f1ea1062e9ca..af1dba0be05e 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,10 +3,14 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.12-84.tar.xz 9264140 BLAKE2B 5d26cc4921d5fcf8b98a126816c3f03ba8c925fef02aab49b50b54cc9275f412a35797a0a5200e6de41b7fcec1c3936aaa6139227568adb80070141cd19bb805 SHA512 5b1294e171fe627d8197b771417b9939516175a36b6f33bc82f62558fbf6af7bd26dc357a17da44d73429e4dc56f79f8c8770e2ffa040b0fac31663d31fb4ef3
 DIST ImageMagick-6.9.12-86.tar.xz 9259744 BLAKE2B dd87e8b7e4826ba0da239315b4acf0b92b05f08f88eb2f10b2b044d779eb317118d63f2a892b75a02e392e2eeadbb516289da1e3ccd3ad88e3feead3d3c2b239 SHA512 c391d40c0c0e3b34e3df28a0509bf7535cc18453b432e7dd0427b41298fb5f72a3b5d6ecc9edb37d8e298a7254abc7ac2a09e033dcfa4bcf722ce5cb188a8c71
+DIST ImageMagick-6.9.12-89.tar.xz 9262956 BLAKE2B 5f4eb74e6a57cc16503e1bc803472f1bbfaf1b737a4bb9f1257e8100c791bb12fdf8904c8eea4d27d9a26da70839894eb157133a1ad1de7a0a9d700f62747147 SHA512 d109cce5dbe239f0e20e871575e5093938cc0c45053e99f675a40a4d5a24f0e67814abc9aac72c2fc0b3216249ff46ff82fa299877d4488bdbf3f28766b50cde
+DIST ImageMagick-7.1.1-11.tar.xz 10196156 BLAKE2B 328ffe6dbf30b597ec56f94ab5e74cca553cb47eca244c76b91273c278c097990fb8ed7eeaa22311d4408022808e752cbb4c8775c56b3d64d3a4216487093e9e SHA512 b3c839457b62a6b83d3ab9cf12bda2f41030eed75ae5ff898331ffdfe202a93ea8284c8f8608f4ecd013c7eb0c4cbef6527caff62bcf382d62e8531389628fc3
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d SHA512 52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48
 DIST ImageMagick-7.1.1-8.tar.xz 10402336 BLAKE2B dd2f2b1fb1a42ae2da4d02cbb7d0d4c4afa6877f5b98a3b7d6cc2d3ce74fea5a2a30bf1680cdbf44fd3b37d40cb1957aebb12cf5f2dcc88b4ea90539218ed4e3 SHA512 99e786fe72465e414766cbef4f26fe48d89d6ea7a996197f9cc6b96492eacc8a9873b5440a7cd96bf097fafef6ff4765674d2295f4743b3c32eb2ff2dc9348ea
 EBUILD imagemagick-6.9.12.84.ebuild 7398 BLAKE2B 8d008c24c598beeb0310fc20fb15191e46ae6f9201fc1377ef42aed6c982f38a498faac5dffcad016d924c352bdba1113aaccb65a16e7f636e1b1a8bc58bdaf3 SHA512 44437431485556b35d046dde691d723aac9d79ea023e4f4dae2eb59c94c382f619f4d3c086bb4e3dae41ab9cf217c9a6ab289e6e3ebcc7b7c983176f384f5b93
 EBUILD imagemagick-6.9.12.86.ebuild 7406 BLAKE2B 8ec5b53905aea991534d854fe060ed4112885fa49928da5eb94bcbf06e3a84faca7748a811f5a9381721848563b0fe0a1d41d0d6abee004a252246497d56fd1e SHA512 a96b9ac902a34e507361342c4a17469e681da09bd8cead4c254b4a5a5ce3909d5aeeb6b5fbd296b43c23cfa86d95c9a2a168daed410b5405a0cb378a44ef6d37
+EBUILD imagemagick-6.9.12.89.ebuild 7406 BLAKE2B 8ec5b53905aea991534d854fe060ed4112885fa49928da5eb94bcbf06e3a84faca7748a811f5a9381721848563b0fe0a1d41d0d6abee004a252246497d56fd1e SHA512 a96b9ac902a34e507361342c4a17469e681da09bd8cead4c254b4a5a5ce3909d5aeeb6b5fbd296b43c23cfa86d95c9a2a168daed410b5405a0cb378a44ef6d37
+EBUILD imagemagick-7.1.1.11.ebuild 7752 BLAKE2B 1c7099ff24e7881478887242c49b42217a9a3c9014af15c96ab0525b468bdb2182ce4032eac1b61a8b6a2b6f36b810ef5332264b14e6812e3296257584e49f2c SHA512 b16e3254e9d7bd3083f5198b3719c9a4ca0982eed25f60a1c559a04f765d6d73a352b02ea35ea8d391e18f5df12f5b87937f7062b3a21b0a4ddf53a29aa6bc0f
 EBUILD imagemagick-7.1.1.6.ebuild 7744 BLAKE2B 1111c6eb68ebd7dfa390ffd6141735edef84fe0f1f8c911d288d6296986838d4c67535472724ba7ffe4fae5bfe22135a2c3fb1e6f21f7b8b9709d90a3a490d71 SHA512 ffc5d1b0a73c24480937522945281f316841cd800bc5086f4aa53a282d970092278b89d03badabd570dc71cec23240b1d370739e5f4f59952b943e988daa4c13
 EBUILD imagemagick-7.1.1.8.ebuild 7752 BLAKE2B 1c7099ff24e7881478887242c49b42217a9a3c9014af15c96ab0525b468bdb2182ce4032eac1b61a8b6a2b6f36b810ef5332264b14e6812e3296257584e49f2c SHA512 b16e3254e9d7bd3083f5198b3719c9a4ca0982eed25f60a1c559a04f765d6d73a352b02ea35ea8d391e18f5df12f5b87937f7062b3a21b0a4ddf53a29aa6bc0f
 EBUILD imagemagick-9999.ebuild 7752 BLAKE2B 1c7099ff24e7881478887242c49b42217a9a3c9014af15c96ab0525b468bdb2182ce4032eac1b61a8b6a2b6f36b810ef5332264b14e6812e3296257584e49f2c SHA512 b16e3254e9d7bd3083f5198b3719c9a4ca0982eed25f60a1c559a04f765d6d73a352b02ea35ea8d391e18f5df12f5b87937f7062b3a21b0a4ddf53a29aa6bc0f
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
new file mode 100644
index 000000000000..e16f7e82db15
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.89.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-58"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!media-gfx/graphicsmagick[imagemagick]
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+	)
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	# Apply hardening, bug #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	# for Darwin modules
+	elibtoolize
+
+	# For testsuite, see bug #500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--with-gcc-arch=no-automagic
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in ${HOME} for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		# bug #472766
+		doins "${T}"/99${PN}
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
new file mode 100644
index 000000000000..bb71c03ea1cb
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-43"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!media-gfx/graphicsmagick[imagemagick]
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	jpegxl? ( >=media-libs/libjxl-0.6 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+	)
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-nocputuning.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	#elibtoolize # for Darwin modules
+	eautoreconf
+
+	# Apply hardening, bug #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zip)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with jpegxl jxl)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == 9999 ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 137a1b361f27..dd7ce304442c 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 7bdde1c587d9..5d3ad812f1af 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -4,6 +4,6 @@ DIST Image-ExifTool-12.61.tar.gz 5207863 BLAKE2B 814cc48ef7d89ea64f22e480964ba7b
 DIST Image-ExifTool-12.62.tar.gz 5216215 BLAKE2B 72c30368ad12036af628210f210f06f5fabfb63c6e2fc3136ae611f305dd654381c7fbd0c84ed8e0fbc3d765a9c5a4814f6380078c7ce9042c52c05d5b433338 SHA512 41d8c9dd9bd3bc784a648a4656133709d3c5b29f1251a2b6122be39cff946d16ef53f6199c858bed96e3661edaab1f14bdd892b213b0be95772f843e0aa8cb23
 EBUILD exiftool-12.50.ebuild 716 BLAKE2B 7c3f88253c2330a0fd30b7c182fe19bdcb34e84309eecf68d6e425aa85f5e13febbcd4e9f6b01cedf31d6843a966a5d0f7caf79e74881bec18d02138816103d4 SHA512 cf91cc008c15fb296acaa05cffbdb49a6cee6e43619d9fcfe61a1067630d8093756a2768b33128fa42cda0b79468ec9a7385ba6b1a4d28d85c0538c618b4428d
 EBUILD exiftool-12.60.ebuild 721 BLAKE2B e0522fce416d270a07e4a14e6c3565f96461e4d08adeb8dadd75fa3865ed548d6beb7416fef966f7f0739defe9af1458ed73b404dcab4f0cb103b0bf0382c2ea SHA512 f538a282a50640e46b6b4a26b635be565302bb1ed10211f99cc0d3874c9f293f7a6e4734793be79a089aa215b05eafd395c518a9e6315286d4c2d47a8d6b1b26
-EBUILD exiftool-12.61.ebuild 721 BLAKE2B e0522fce416d270a07e4a14e6c3565f96461e4d08adeb8dadd75fa3865ed548d6beb7416fef966f7f0739defe9af1458ed73b404dcab4f0cb103b0bf0382c2ea SHA512 f538a282a50640e46b6b4a26b635be565302bb1ed10211f99cc0d3874c9f293f7a6e4734793be79a089aa215b05eafd395c518a9e6315286d4c2d47a8d6b1b26
+EBUILD exiftool-12.61.ebuild 716 BLAKE2B 7c3f88253c2330a0fd30b7c182fe19bdcb34e84309eecf68d6e425aa85f5e13febbcd4e9f6b01cedf31d6843a966a5d0f7caf79e74881bec18d02138816103d4 SHA512 cf91cc008c15fb296acaa05cffbdb49a6cee6e43619d9fcfe61a1067630d8093756a2768b33128fa42cda0b79468ec9a7385ba6b1a4d28d85c0538c618b4428d
 EBUILD exiftool-12.62.ebuild 721 BLAKE2B e0522fce416d270a07e4a14e6c3565f96461e4d08adeb8dadd75fa3865ed548d6beb7416fef966f7f0739defe9af1458ed73b404dcab4f0cb103b0bf0382c2ea SHA512 f538a282a50640e46b6b4a26b635be565302bb1ed10211f99cc0d3874c9f293f7a6e4734793be79a089aa215b05eafd395c518a9e6315286d4c2d47a8d6b1b26
 MISC metadata.xml 10040 BLAKE2B 8bcecde1df2dd3e79c3bcfbd38dcd9d3db9564a7abd5a684e0204779bcb685946f2eeb83a62efaa03efc841f0414b82f1087a3da3c6bd5f43e85561e43d7fb3e SHA512 af79302b57833d1368eff738b2326dd9cd47de47baf42426bfb00f61c1c6f52fcdc41d74bf95d8f65b2b0b00578ce07c3471b8cf4923e2f47c2c0b9d58dea35f
diff --git a/media-libs/exiftool/exiftool-12.61.ebuild b/media-libs/exiftool/exiftool-12.61.ebuild
index 4602af41803e..53cf9e62c664 100644
--- a/media-libs/exiftool/exiftool-12.61.ebuild
+++ b/media-libs/exiftool/exiftool-12.61.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://exiftool.org/ http://exiftool.sourceforge.net"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 src_install() {
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 109adbd8f256..ec5954991a63 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -9,7 +9,7 @@ DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 4bee654f4196922fb07673f588b4bf8a65
 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d SHA512 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
 EBUILD fontconfig-2.14.0-r1.ebuild 6658 BLAKE2B 789ca6fe8b523d117859b571ac5ddc93454d3ec1b470abfea8a158bcb7de0f8ff747036dc60cea3ca9da52968a8a8a53acbcd66ccc8eb20d4eeb16677ffecb3a SHA512 a63db14fa658d93c404ea462bc5b37f537d4169d21a7820f394e7be475b9d4e4fb03146c2f1e85c95763b214bdd5dd17d9047f0e2304f23a78d59d8c437f6c65
 EBUILD fontconfig-2.14.1-r1.ebuild 6585 BLAKE2B 9b9289946672a0f581dcaec83347bd150650576fa8386a2eb48129c704ef50e87bf550ee6e34ece86169df4a72829062ff8c8ad3505d5048984bb5fcd3b28c59 SHA512 9c5b0f3ee44eb5f46ca701f938a4fff341152d4175989a3f914bced0958ce1bcd61d8bb0d26b5378beaa8b1c5ad96551e0d3cdc0077e6e07c834535eb5e9ad6b
-EBUILD fontconfig-2.14.2-r2.ebuild 7101 BLAKE2B 1fcba14a5de5c24375d4f70ea41ed19a5d65f5b75731491e303431d040c9715477f2691104cfc5aa5aa9a0fa3449e25e716aacaef6d03b1d3cb8b861c2e69294 SHA512 2fd6d774118ecc162cd097a1a5349a1b09d3303ab2c9843fe05c0e7663680010e396dbb94beb434b4a389394559ddede55b925d6c0913782b22655df271e5c83
+EBUILD fontconfig-2.14.2-r2.ebuild 7096 BLAKE2B b5f1a75f3e2807402b93658b92b89a5d8908cd13bca62b7af6bd3ad3c2eb8f516fbb0c1e373fd86bb9420cdcab93301a9f3d6d6aaabbc52ce1e47fe6fb5a23d7 SHA512 815932a04eab66488865879df5d703979a4efb475eab6f979578e2d0b97ca9ca94e49246427c8ae75f04a9d863c8ae057d97ee8d888f3c345de5a4127554392e
 EBUILD fontconfig-2.14.2-r3.ebuild 7149 BLAKE2B 85e77326f916ad3982d60d56861b3d1db1791d2ab48293d5f47820cb597d203a1a0158469a657c0b359be63415798f784f6d1bbd5286112a009bd8d0d89620be SHA512 d9b8f60ca8d4040e0edca8b1388b36ff95f6d61ea5537f6a76bc418e0cf330ac84e9811ab5d39ae687a9cbe00d751819507411a05d22088dfb4c7ee8cb09440c
 EBUILD fontconfig-2.14.2.ebuild 6491 BLAKE2B 0b29f10921cb1a49083b95e0a0184ca8b5fd062c89b3d3de537633c8ff5178b68653b516dd2b3bc006840447a9d74e843f4d44069d4ccbf73f31ce8e14a15977 SHA512 e1be93bfecbd156295e6ab41475083e4355f76618c077766ac45563f842c534849ea6c7c61cdd6816e95d09f680c76cf354c3ffeb136880ae8c21f6d71f373dd
 MISC metadata.xml 672 BLAKE2B d23112b5d408aed97ad68bc9a141a570c22fd6bbf0022e979b7006817ae27bcba21be43558cb42df06f3c280cbed5570c62805bb69be8a64b1f41bd90b200bc0 SHA512 1ff9c1f22b9766127692eec4824ce966f7a7305ddfae0dd1d8b0e5b432926508dd7a898eada6c182e02c985e11c2f9a22f13eac195333ed32952af0e89015e9a
diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
index 4b02ba185bd0..326fe29eb6a0 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 578470ac45c1..636b8e8bebe6 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,3 +1,5 @@
+AUX 0001-meson-Fix-libdrm-and-vaapi-configure-checks.patch 2566 BLAKE2B cb772530813a994cb791c68d75edfadd5b5531707bc97f286455f7d2ff51f5a29ebca75ab4ddb0f6480a7386fd52fbae4286a0dc3c5a835aee19dfd855936f06 SHA512 2ce08a24c396013e6e6c24f7536fd761f19fbcb5b75be49b4ef49e48ed6932d9cfc6d4ffcb868ca3148a02c4fda072e66db847836206db66121eed40a2c8ff05
+AUX 0002-meson-Add-feature-options-for-optional-va-deps-libdr.patch 3019 BLAKE2B 068c89169a28603ab22d28d9fcd70bdd59f3dc9d78343b13ab54f4fab7f4ea22f8024823b1e4640d75c7a645f5cf47701ded89cf314d4934bafc06fb3da2dd57 SHA512 e2556bfd7a6ab9c9ccf31b99e88f768efad287a33b0fe603d060d1df89d63ed6fe4fa695335da31f911c84c5b20ac6c1d8a80408c1dcbe5b8b1fb732e1196667
 DIST gst-plugins-bad-1.20.3.tar.xz 6222824 BLAKE2B 01aae59adbe76b8e50a49fb8bb8037e6f3aa93cbc2b658aab05ebbf30f8d1aef98c1981712caa39e3c9d08f1e0c9d76f2f874f7d2fdd994b3a0735b2809eafdf SHA512 cfcf126eabff550455decd7054a269b73489708c10a6b6090dddb5fde29bfba07ed330c339927ff170e025fa3a08d2ffb822322dc3798679366207a54132c71b
 DIST gst-plugins-bad-1.20.4.tar.xz 6229992 BLAKE2B 2cd276cec9991e2ca7367a43024d7aee43adaa185a4a06ec08d1e736e72333f7f38cb54257120b9a313feb1fdc285a50d456b4c1fb33627d83acfcd3ece20687 SHA512 31b28d4a1bbecf021a90f2aa49dd344ccea12533b65f3bf3a8426ca2175469fff7b7f8e08af7d3d22c18db2fe48b9d5fbea2b325d296aee04b019cebef1eaec4
 DIST gst-plugins-bad-1.20.5.tar.xz 6237720 BLAKE2B bf379da420d1f7f148cf51373f6f2d0800685487c8bdb7a768e79e0a2e4f1721053922be9321958b4ce318de12ea390de4cd89c345329ac41dd0425815e0e7f6 SHA512 4b4603d755d17a0fa072d771521bdcbf554fc9abdc8105b9d9189062e5725ae2989f430e1de77363a69d8c969ecbf15e73e9c478fabe8efac83b2d9b1b0a4a0a
@@ -7,5 +9,6 @@ EBUILD gst-plugins-bad-1.20.3.ebuild 2430 BLAKE2B 006eae0daba269614a14ec162d322c
 EBUILD gst-plugins-bad-1.20.4-r1.ebuild 2672 BLAKE2B d3011a7758be33f43a3d91570f2448a9e0c2b71cf1b6ed45eecbbd98dbd9f784b7d89d1d97426290bf09704fcfc7403be365c14ebead6f2f0a53ff3f9e23537c SHA512 96eb63a43caaa8d58f747959568db9d54c67e08885ac6cd73693e4367d29ca873472f924daba0405e8d84aae1029eb65c59d23fdcfdce2f784fd36d29b84733f
 EBUILD gst-plugins-bad-1.20.5-r1.ebuild 2632 BLAKE2B 062319f500bbe90a592c31994d0eb0b8f88a51bf9c7c2c9dcecce9f105ce9930768a59b4954a5326936fc7ccf380d243975c80b7fc038aef6a136a45bb5d653e SHA512 bd36f2e05e26c9f110f45846e30f8a2ebba5655358ecfba232adf48d8edb771cf2be0ec8357760e25d7e497b0ab16b1947c75ff37c0c4266d496a08e645f26b4
 EBUILD gst-plugins-bad-1.20.6.ebuild 2632 BLAKE2B 062319f500bbe90a592c31994d0eb0b8f88a51bf9c7c2c9dcecce9f105ce9930768a59b4954a5326936fc7ccf380d243975c80b7fc038aef6a136a45bb5d653e SHA512 bd36f2e05e26c9f110f45846e30f8a2ebba5655358ecfba232adf48d8edb771cf2be0ec8357760e25d7e497b0ab16b1947c75ff37c0c4266d496a08e645f26b4
+EBUILD gst-plugins-bad-1.22.3-r1.ebuild 2726 BLAKE2B 460bbf05fb384c31ddf6939d2f04cf46a1f1bea8e016368b8b08a94223af63905dcf5b4e3301ff0ee2a1224ee2993f80ab2d3c4a63ed83776740bec3bbc756c1 SHA512 beb10fd3342466cff3fda2dc8bdd01fd3fa71741babadd497e7ce5b4b893f1670955c0221223cc7c0fb3c627f897f38c0619f6d69b4214ff54ab712d899c0d88
 EBUILD gst-plugins-bad-1.22.3.ebuild 2632 BLAKE2B 76b70496c6f8e18ff3a14c2eaa190c15746fc8b06e638d88b96c92c3d42547c8107e97c1e4e19c573053b0c186d7926e87e3733428821247dae95f9796f86e87 SHA512 b175ef63f5a56b7b23cd5888b955de2e9c0acef82b98f035ef5f8d021052e88925d3d11f65c0da68c68d28ea9f0697c45101749638fc25941a5fd77959fc05e2
 MISC metadata.xml 546 BLAKE2B 423dd10a0ced2de218d8d97cf63adec1cfbabc238c10fdbab763e21255884e869104abf8c4e8e6500fad9190c0ca2b855af69525558a0e51ff57df45bf4da393 SHA512 42e02ef93d4d168d37250df7e5d8b07b6b2b2db7127b371082ce4910ef1b3b8c96ed979f06d83e90f7030a9d1ce0aef4c82591d862a90b1ffc2aa78d6a7fd5e3
diff --git a/media-libs/gst-plugins-bad/files/0001-meson-Fix-libdrm-and-vaapi-configure-checks.patch b/media-libs/gst-plugins-bad/files/0001-meson-Fix-libdrm-and-vaapi-configure-checks.patch
new file mode 100644
index 000000000000..ef944db920c2
--- /dev/null
+++ b/media-libs/gst-plugins-bad/files/0001-meson-Fix-libdrm-and-vaapi-configure-checks.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/907479
+https://bugs.gentoo.org/907481
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/55ee0635d3f63c408067dd904f8e8b718983ba0e
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/479f0175b51ea74b07084c8a508b7a7224445a02
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4428
+
+From 864a329f7946460f9bb9dac171d0d80b2ff09a07 Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@centricular.com>
+Date: Fri, 14 Apr 2023 13:18:52 +0530
+Subject: [PATCH 1/2] meson: Fix libdrm and vaapi configure checks
+
+We do not need fallback: for libdrm checks because the wrap file
+already has a [provide] section.
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4428>
+--- a/gst-libs/gst/va/meson.build
++++ b/gst-libs/gst/va/meson.build
+@@ -31,17 +31,26 @@ if host_system != 'linux'
+   subdir_done()
+ endif
+ 
++va_opt = get_option('va')
++msdk_opt = get_option('msdk')
++qsv_opt = get_option('qsv')
++if va_opt.disabled() and msdk_opt.disabled() and qsv_opt.disabled()
++  subdir_done()
++endif
++
++va_required = va_opt.enabled() or msdk_opt.enabled() or qsv_opt.enabled()
++
+ libva_req = ['>= 1.6']
+-libva_dep = dependency('libva', version: libva_req, required: false,
++libva_dep = dependency('libva', version: libva_req, required: va_required,
+     fallback: ['libva', 'libva_dep'])
+-libva_drm_dep = dependency('libva-drm', version: libva_req, required: false,
++libva_drm_dep = dependency('libva-drm', version: libva_req, required: va_required,
+     fallback: ['libva', 'libva_drm_dep'])
+ 
+ if not (libva_dep.found() and libva_drm_dep.found())
+   subdir_done()
+ endif
+ 
+-libdrm_dep = dependency('libdrm', required: false, fallback: ['libdrm', 'ext_libdrm'])
++libdrm_dep = dependency('libdrm', version: '>=2.4', required: false)
+ cdata.set10('HAVE_LIBDRM', libdrm_dep.found())
+ 
+ va_enums = gnome.mkenums_simple('va-enumtypes',
+--- a/sys/kms/meson.build
++++ b/sys/kms/meson.build
+@@ -11,11 +11,9 @@ if host_system != 'linux'
+ endif
+ 
+ libdrm_dep = dependency('libdrm', version : '>= 2.4.98',
+-                        required : get_option('kms'),
+-                        fallback: ['libdrm', 'ext_libdrm'])
++                        required : get_option('kms'))
+ libdrm_hdr_dep = dependency('libdrm', version : '>= 2.4.104',
+-                            required : false,
+-                            fallback: ['libdrm', 'ext_libdrm'])
++                            required : false)
+ mathlib = cc.find_library('m', required : false)
+ 
+ if libdrm_hdr_dep.found() and mathlib.found()
+-- 
+2.40.1
diff --git a/media-libs/gst-plugins-bad/files/0002-meson-Add-feature-options-for-optional-va-deps-libdr.patch b/media-libs/gst-plugins-bad/files/0002-meson-Add-feature-options-for-optional-va-deps-libdr.patch
new file mode 100644
index 000000000000..55ea57fa8128
--- /dev/null
+++ b/media-libs/gst-plugins-bad/files/0002-meson-Add-feature-options-for-optional-va-deps-libdr.patch
@@ -0,0 +1,76 @@
+https://bugs.gentoo.org/907479
+https://bugs.gentoo.org/907481
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/55ee0635d3f63c408067dd904f8e8b718983ba0e
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/479f0175b51ea74b07084c8a508b7a7224445a02
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4428
+
+From ffecb5f1a02174c2d6ab6ca472c6c0cab10179b3 Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@centricular.com>
+Date: Fri, 14 Apr 2023 16:11:55 +0530
+Subject: [PATCH 2/2] meson: Add feature options for optional va deps libdrm
+ and gudev
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4428>
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/gst-libs/gst/va/meson.build
++++ b/gst-libs/gst/va/meson.build
+@@ -32,14 +32,20 @@ if host_system != 'linux'
+ endif
+ 
+ va_opt = get_option('va')
+-msdk_opt = get_option('msdk')
+-qsv_opt = get_option('qsv')
+-if va_opt.disabled() and msdk_opt.disabled() and qsv_opt.disabled()
+-  subdir_done()
++if host_system == 'linux'
++  msdk_opt = get_option('msdk')
++  qsv_opt = get_option('qsv')
++  if va_opt.disabled() and msdk_opt.disabled() and qsv_opt.disabled()
++    subdir_done()
++  endif
++  va_required = va_opt.enabled() or msdk_opt.enabled() or qsv_opt.enabled()
++else
++  if va_opt.disabled()
++    subdir_done()
++  endif
++  va_required = va_opt
+ endif
+ 
+-va_required = va_opt.enabled() or msdk_opt.enabled() or qsv_opt.enabled()
+-
+ libva_req = ['>= 1.6']
+ libva_dep = dependency('libva', version: libva_req, required: va_required,
+     fallback: ['libva', 'libva_dep'])
+@@ -50,7 +56,7 @@ if not (libva_dep.found() and libva_drm_dep.found())
+   subdir_done()
+ endif
+ 
+-libdrm_dep = dependency('libdrm', version: '>=2.4', required: false)
++libdrm_dep = dependency('libdrm', version: '>=2.4', required: get_option('drm'))
+ cdata.set10('HAVE_LIBDRM', libdrm_dep.found())
+ 
+ va_enums = gnome.mkenums_simple('va-enumtypes',
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -73,6 +73,8 @@ option('y4m', type : 'feature', value : 'auto')
+ option('opencv', type : 'feature', value : 'auto', description : 'OpenCV computer vision library support')
+ 
+ # Feature options for optional deps in plugins
++option('drm', type : 'feature', value : 'auto', description: 'libdrm support in the GstVA library')
++option('udev', type : 'feature', value : 'auto', description: 'gudev support in the new VA-API plugin')
+ option('wayland', type : 'feature', value : 'auto', description : 'Wayland plugin/library, support in the Vulkan plugin')
+ option('x11', type : 'feature', value : 'auto', description : 'X11 support in Vulkan, GL and rfb plugins')
+ 
+--- a/sys/va/meson.build
++++ b/sys/va/meson.build
+@@ -33,7 +33,7 @@ if va_option.disabled()
+   subdir_done()
+ endif
+ 
+-libgudev_dep = dependency('gudev-1.0', required: false)
++libgudev_dep = dependency('gudev-1.0', required: get_option('udev'), allow_fallback: true)
+ cdata.set10('HAVE_GUDEV', libgudev_dep.found())
+ 
+ if libva_dep.version().version_compare('>= 1.8')
+-- 
+2.40.1
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r1.ebuild
new file mode 100644
index 000000000000..86417a3c6347
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.22.3-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE="gst-plugins-bad"
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+inherit gstreamer-meson python-any-r1
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# TODO: egl and gtk IUSE only for transition
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland qsv" # Keep default IUSE mirrored with gst-plugins-base where relevant
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
+# FIXME	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
+RDEPEND="
+	!media-plugins/gst-transcoder
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+	wayland? (
+		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.15
+	)
+
+	orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] )
+
+	qsv? ( media-libs/oneVPL[wayland?,X?,${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
+
+# FIXME: gstharness.c:889:gst_harness_new_with_padnames: assertion failed: (element != NULL)
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/0001-meson-Fix-libdrm-and-vaapi-configure-checks.patch
+	"${FILESDIR}"/0002-meson-Add-feature-options-for-optional-va-deps-libdr.patch
+)
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_NOAUTO="shm ipcpipeline librfb msdk hls"
+
+	local emesonargs=(
+		-Dshm=enabled
+		-Dipcpipeline=enabled
+		-Dhls=disabled
+		$(meson_feature vnc librfb)
+
+		$(meson_feature wayland)
+	)
+
+	if use qsv; then
+		emesonargs+=(
+			-Dmsdk=enabled
+			-Dmfx_api=oneVPL
+		)
+	else
+		emesonargs+=( -Dmsdk=disabled )
+	fi
+
+	if use opengl || use gles2; then
+		myconf+=( -Dgl=enabled )
+	else
+		myconf+=( -Dgl=disabled )
+	fi
+
+	gstreamer_multilib_src_configure
+}
+
+multilib_src_test() {
+	# Tests are slower than upstream expects
+	CK_DEFAULT_TIMEOUT=300 gstreamer_multilib_src_test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 4e212a5ead0a..3f70734220ff 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-good-1.20.3.ebuild 1157 BLAKE2B daed9f4515c5ffea3aadaccebd4cc
 EBUILD gst-plugins-good-1.20.4.ebuild 1157 BLAKE2B daed9f4515c5ffea3aadaccebd4ccd0dc5fc876cc618aa15734064c25e949cfcb2e10980635376681b97dcbff504847a999468ad1daf33c589081d7e64d68f0a SHA512 abcb6a9cee9929b211b868a9e188b1d11b9caed3e47f80edb6a13f13c91eb77602bfad594560c9b35b145b0d822f14815b9139ac5eeb2ffdc79b96e61c3a108f
 EBUILD gst-plugins-good-1.20.5.ebuild 1163 BLAKE2B cc12f96d8844aec5fd7a0d09da5ab84da6d6f20cb7b37c4b1a0c6be3cab23597a19e61fb87b52c1fd52c56646880f4fbbbbfd6a776ffc5f4f0de746d93b82eb6 SHA512 05f9b5b9ef9ef76f6d767e71ef33542218109a77ed90449cf2e90529b81140e6facdeebebb5ac1f7629c29f522fdf4d9f4a814a8d0d183421c79bb84777b6b99
 EBUILD gst-plugins-good-1.20.6.ebuild 1163 BLAKE2B cc12f96d8844aec5fd7a0d09da5ab84da6d6f20cb7b37c4b1a0c6be3cab23597a19e61fb87b52c1fd52c56646880f4fbbbbfd6a776ffc5f4f0de746d93b82eb6 SHA512 05f9b5b9ef9ef76f6d767e71ef33542218109a77ed90449cf2e90529b81140e6facdeebebb5ac1f7629c29f522fdf4d9f4a814a8d0d183421c79bb84777b6b99
-EBUILD gst-plugins-good-1.22.3-r1.ebuild 1278 BLAKE2B 55a00eccf7e8805e1a7fad34a0fff7265b53bb7d348e5356471195290cfb615dc4d66dc3c202767d44d16606a308e65bf93d99be57691a6be6fc213da219f3a9 SHA512 8bab699ffc65ef01778406dba9442a66faeed022907ab76daa1dba4897016919a80f73a89858878db31c7069f517c03e31108f9a07f518afd2ef5b468a3ffba7
+EBUILD gst-plugins-good-1.22.3-r2.ebuild 1409 BLAKE2B 8074b5141dbb8c249f0c511810f09873a5fce45097008cbe3e413bd0ded4c66fb94cbc2e03339326a38239f46d1a1853df81ec54c711bae6ec509b06e3b6e8cc SHA512 ec4bf499b699b4c40f1fecf0b2916eb6ee10cc00851e2996062ff232220752317eedd42fc35eaa79cf517f3c8fcd89ae3a79164713c259019db4935cb825e576
 MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.22.3-r1.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.22.3-r2.ebuild
index bdedddb6669c..aedf63adee75 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.22.3-r1.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.22.3-r2.ebuild
@@ -44,6 +44,11 @@ multilib_src_configure() {
 
 		# gst-plugins-v4l2
 		-Dv4l2=disabled
+
+		# TODO: These two almost certainly need to be their own
+		# gst-plugins-qt5 & qt-plugins-qt6.
+		-Dqt5=disabled
+		-Dqt6=disabled
 	)
 
 	gstreamer_multilib_src_configure
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index e3b8d9cc90f5..bfdc8a10de06 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -3,7 +3,7 @@ DIST SVT-AV1-v1.4.1.tar.bz2 9440077 BLAKE2B ed79d566afaa22fdfb1925bf6a75e8e55abd
 DIST SVT-AV1-v1.5.0.tar.bz2 9490521 BLAKE2B 6f54c1706ed65b8248bc434411cfdea5869765c42682100f5aa6b72d08626bd896f6a9a8067ac8af3c89c72bd324e74942b0f424ff33cc2f6ff54d9204ef7581 SHA512 d5aa7679aeaa1e19f21906a36a7214c72cdaee77e1b5c1946ded43f8381ec2d705e671130589207b65b920a4fcaa9ca1d0037f88ef8d2303125d7f7aa54e3a2e
 DIST svt-av1-1.1.0.tar.gz 9882945 BLAKE2B 2673fdbe17b36607e581cc540ca181672d16b3fbc0dd9c1a8b100ebea6b7a6872d6fa55976cb19c1c8afd50c5c09b67fbec1bcc892007ccd41e7f7ad68027d83 SHA512 87d661183de33554d228c2fa72deb9a945f2550083eb25688b4dc0676be384373a6a52af235066d85ce963ffbc7751c8afb46a2bc1c09e00f81ea0db5a232522
 EBUILD svt-av1-1.1.0.ebuild 1230 BLAKE2B c052068cc58e86e6f8147b5fdadf06633dcfe6fcb4dd020783e151be6dec1f59a8e1f0fce7ce7164cf0980973dcd579b0aadbd5a063dd1b26d4db5cd427a54d6 SHA512 3be02f20fe8ad0b4990d669bea9a9e266f65c529a41dfbf833e5477fcd6534f7a515ced45612862fe8213acd577eea30699e0c84bb9e5ba60e78c743785a4bef
-EBUILD svt-av1-1.4.1.ebuild 1358 BLAKE2B b58b73d7d99c12584a3bcfcff93a9101d27f61636f774d62762c4185224fe423feb4bf847387eab3098d1fe13a7d6bdbe4fd3b89ccdd0b5020248f67f8513f59 SHA512 bd643b174db7d05379c582cf02d8ce4b80194960a00fcbb85a13638f28663f7edb36caab31d0937962d006f57e5394b3dc9a373efe8c970095899a425d025155
+EBUILD svt-av1-1.4.1.ebuild 1353 BLAKE2B 0db29bbdde843c42ae90a2b662a794240ca6e97723f2cf4aa3f277a96649c9704201eb2a531fd11d3acb12a139d7db0cd2e3ddece4d3e15d477d5283b6e4f090 SHA512 2e722015d7f4e69a6c7869e4cae87dc51c7b83af22fd5bef493dfd5bb530e8d3d9414c57dbc015760b4bef35fea151fb1e2a2026cd12d445c605edc3e64bcdf4
 EBUILD svt-av1-1.5.0.ebuild 1424 BLAKE2B 0dbc82ef36f8de6d4a1c37dce1a1a2580e3ae1cea759b17a72ae9b2b5bb0be017e2b06b11e4a370e64d0871fb6cb57aad4a88e00de0fc2e5e7a1b9eb324e089a SHA512 f1f66fc5989b29226ff251cb8ea42b773429e697d42972a31a13ddcc33cae295220fab9966a6113dc2d7017e0f74a3d5c4d4a96428cf50a392f2c734e90ec7fb
 EBUILD svt-av1-9999.ebuild 1424 BLAKE2B 0dbc82ef36f8de6d4a1c37dce1a1a2580e3ae1cea759b17a72ae9b2b5bb0be017e2b06b11e4a370e64d0871fb6cb57aad4a88e00de0fc2e5e7a1b9eb324e089a SHA512 f1f66fc5989b29226ff251cb8ea42b773429e697d42972a31a13ddcc33cae295220fab9966a6113dc2d7017e0f74a3d5c4d4a96428cf50a392f2c734e90ec7fb
 MISC metadata.xml 561 BLAKE2B 1effb05644507ea39fe071f9de1fe4c1a4feb30f9bc429985cf464aea9f9bc1f525e0c6f5e75da47d373f0acd60394a2bcec3b71e68bc3ab031334f95717d3b8 SHA512 1042fb94a9c0b93c007843585e0ea075d187cdd6b77bb8eb94d5fcfaa7d083a98916aedcbfccd1fa3da3307ef8bbe7d623efa7e39ccc9714d23973497bec7a89
diff --git a/media-libs/svt-av1/svt-av1-1.4.1.ebuild b/media-libs/svt-av1/svt-av1-1.4.1.ebuild
index 03e68027a60a..843e5820c86c 100644
--- a/media-libs/svt-av1/svt-av1-1.4.1.ebuild
+++ b/media-libs/svt-av1/svt-av1-1.4.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 	S="${WORKDIR}/SVT-AV1-v${PV}"
 fi
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 50dc1c8ec8e2..73fd098baaca 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -4,6 +4,6 @@ AUX xine-lib-1.2.13-configure-clang16.patch 4979 BLAKE2B 2b22560cb1aac2df82922d7
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
 DIST xine-lib-1.2.13.tar.xz 5007364 BLAKE2B 8c39328b4135035e7b4070c670591e61a92443bb389af3b7da053fd68101fcb2f18cd258840e96a5f3e02d4cf979b028947a10fddd1bfc3b92ed7f18d3f58942 SHA512 269275f0e324acc559695d268fb93e0e0ca4b17d22c4a57d482365ac058ae2aed125b9e1b522c1fc501cf4b2c186ac05d921d7c82a98e094cb0c70489e61c924
 EBUILD xine-lib-1.2.12-r4.ebuild 5489 BLAKE2B 21151c6f8f4d714a770b1add99a02e30ad258abbce0b34148dd81e1a193bdfb4f59addbbd01423dfe0c53935fd085a0246b79ffdf558cba128b1c3a5fcaeafa1 SHA512 bd34e9a9a9b894d3ff7529a53c4ed2e2adbc3190e9572ec02e7ef5048cbd5edf83bd4ed536cf88a33ccc993d6094e0965e38283dbe48e8724f99dc48eb9eba94
-EBUILD xine-lib-1.2.13-r2.ebuild 5533 BLAKE2B 36357725cdab97ad7f6d3758aba058bc02144dbe6fe71c496b70cf6cb5ac01e90096bc0be652cd5878362b66616985e446eab397c2d1e61cf6aaf34c3a415df6 SHA512 3cb4d495229d9b8fb929fc4ea7bddd95c0306a056cab5f8d2b40d4ea33cdeb075241ad315051294d9143667d956c151b5bb8faa6d6d31c0ed0fd4a3663e6f2b7
+EBUILD xine-lib-1.2.13-r2.ebuild 5529 BLAKE2B 9912063e64746098dedf9fc139fa63660b1496bd64c334865706ef7f81bc848f907f6da97d362437bf0abec1964e24e986796a047e8b1e98058ca158dd7cadd0 SHA512 0a306f7147f04c155bb53e25483b0d680f01c1389dc5cd3bcecfe4af2906fccfcd78552d7a41668b16427c131aeb1a8ac6274a2cd218d30ad72803bc3d0a13fc
 EBUILD xine-lib-1.2.9999.ebuild 5468 BLAKE2B f7bd1560c88d8334146bc06cc985587474ce202641bdf653525e261e559b29e86524089e71bc3f1c42187b1964f3f4f7ccca94b29582a080d6d62be13bd1552f SHA512 adf9b79ae4a361c50d81f36422c9dfaaec6a9f6d82e0746bd77c2af79b9d198b22f3d83903b4616f94b510bb6bc820328266be10aca2ff08f8378fcd4d33aab2
 MISC metadata.xml 2784 BLAKE2B 636cdb7ad93aa8941a36a23b9bc70cde66878f7628cab7e697582733b8ce85d58c09a5c63fcfbc009f098001399407055c449412dabd52178548c0c41d572c5a SHA512 5b644f501953bbc34020f0955991363d558a23a9610eb37f46499bd2d5415849a10a3306625e50d5cfdf094e67a38da5175bb981387841bae63c33ae74e17757
diff --git a/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
index 6ee408c8c782..9639f9b46329 100644
--- a/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_RDEPEND="virtual/libintl"
 else
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
 	NLS_IUSE="nls"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index a82b77625e6f..19475a41bf80 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index ba9ba296d7b9..dd7159de4051 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,5 +1,3 @@
 DIST audacious-plugins-4.3.1.tar.bz2 1786114 BLAKE2B 7d0a88411dc389e9f250ac126c02eff217ab4feb581527789cfe190f0fd997671fe06664d574d531296d884b2ae4f85f31a25f79ef09bd9db39640f17a0a97cf SHA512 ca065b4558406702e4f2aa2ac085ea02d3215e689e09e9c0b6a740970a469297910df52cd222997e8a4206a68d3a064ac3f6d94c6412830ce8bd34a5b42c30da
-DIST audacious-plugins-4.3.tar.bz2 1932184 BLAKE2B a62e7e3600b21a8af9248cd1b244dd736693e29f3d5374d68417bd46eb37263109b926beb9aa587ebb98bcea8d444403c6d8fdd96f0dcb7e6665199b0b34c9fe SHA512 51ffb38917bc9cf13d433c39843b37cbad6ef2a0db8b5da65ba18f8e547c94cfb979f0c8f4413080c56bc33d4f2ae47f92679ee5c11225aa47d85abfd27c0810
-EBUILD audacious-plugins-4.3-r1.ebuild 4095 BLAKE2B 1cba5bbe8b716d2a428ef030fbabc50f4c1e1c14b1a988bccb896da0b5421adb147c27d33a3f24bbfeb3882d31fdd72c1bf7d78c38d1badb2627dbe811fb621c SHA512 42f6e870a01ef6e857898bdc25ec8f84b51eb6a71ceb69349c689c5e0c0a776846b7b2f203e3e9e0042a2f18b3ac2d59613583b7c5e892d199fe0322ca1e3471
 EBUILD audacious-plugins-4.3.1-r2.ebuild 4084 BLAKE2B 0fe099976811e24612c0c53f11f5dacc8dccc9469f796bc5402f9163e06e3711ad04783364c0a76a695dd126850ee946660bd541f1d21a2266bd2e4c1e3e5c2d SHA512 572e284607bb20d2c4ec9e969b9a1f36fec2ec49415b6f7823bf1afaba4ec8c04d4f6b48302297d9f4c9ecee0862e98d7e3ee5f37616d5355e9dce87ddd68544
 MISC metadata.xml 1155 BLAKE2B fbd2f8cb2bae9dedf92c13907010dda578bc963e32807259be40b656d0360857b7e71e0102ad5aaf0121d4f7488fa138b3fc61be15fdfda630d6ca963ad3f8e1 SHA512 20ac2780a6ff28629dd478a0cca8a4dc9d09a0883c9ceef401639da84c0a01821077e0412e0c6a414548df0ffe13d33dae893229bc797c9507f13a8e8c222d33
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.3-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.3-r1.ebuild
deleted file mode 100644
index 32c24d60ff71..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-4.3-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
-	aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
-	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl openmpt
-	opus pipewire pulseaudio scrobbler sdl sid sndfile soxr speedpitch
-	streamtuner vorbis wavpack
-"
-
-REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
-
-# The following plugins REQUIRE a GUI build of audacious, because non-GUI
-# builds do NOT install the libaudgui library & headers.
-# Plugins without a configure option:
-#   alarm
-#   albumart
-#   delete-files
-#   ladspa
-#   playlist-manager
-#   search-tool
-#   skins
-#   vtx
-# Plugins with a configure option:
-#   glspectrum
-#   gtkui
-#   hotkey
-#   notify
-#   statusicon
-BDEPEND="
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	app-arch/unzip
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtwidgets:5
-	~media-sound/audacious-${PV}
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	aac? ( >=media-libs/faad2-2.7 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	ampache? ( =media-libs/ampache_browser-1*:= )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia:=
-		>=media-libs/libcddb-1.2.1
-	)
-	cue? ( media-libs/libcue:= )
-	ffmpeg? ( >=media-video/ffmpeg-0.7.3:= )
-	flac? (
-		>=media-libs/flac-1.2.1-r1:=
-		>=media-libs/libvorbis-1.0
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	http? ( >=net-libs/neon-0.26.4 )
-	jack? (
-		>=media-libs/bio2jack-0.4
-		virtual/jack
-	)
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate:= )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	opengl? ( dev-qt/qtopengl:5 )
-	openmpt? ( media-libs/libopenmpt )
-	opus? ( media-libs/opusfile )
-	pipewire? ( media-video/pipewire:= )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl2[sound] )
-	sid? ( >=media-libs/libsidplayfp-1.0.0 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	soxr? ( media-libs/soxr )
-	speedpitch? ( media-libs/libsamplerate:= )
-	streamtuner? ( dev-qt/qtnetwork:5 )
-	vorbis? (
-		>=media-libs/libogg-1.1.3
-		>=media-libs/libvorbis-1.2.0
-	)
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-}
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "Failed to sed" # bug #512698
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-mpris2
-		--enable-qt
-		--enable-qtaudio
-		--enable-songchange
-		--disable-adplug # not packaged
-		--disable-gtk
-		--disable-oss4
-		--disable-coreaudio
-		--disable-sndio
-		$(use_enable aac)
-		$(use_enable alsa)
-		$(use_enable ampache)
-		$(use_enable bs2b)
-		$(use_enable cdda cdaudio)
-		$(use_enable cue)
-		$(use_enable ffmpeg ffaudio)
-		$(use_enable flac)
-		$(use_enable flac filewriter)
-		$(use_enable fluidsynth amidiplug)
-		$(use_enable gme console)
-		$(use_enable http neon)
-		$(use_enable jack)
-		$(use_enable lame filewriter_mp3)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate resample)
-		$(use_enable lirc)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable mp3 mpg123)
-		$(use_enable nls)
-		$(use_enable opengl qtglspectrum)
-		$(use_enable openmpt)
-		$(use_enable opus)
-		$(use_enable pipewire)
-		$(use_enable pulseaudio pulse)
-		$(use_enable scrobbler scrobbler2)
-		$(use_enable sdl sdlout)
-		$(use_enable sid)
-		$(use_enable sndfile)
-		$(use_enable soxr)
-		$(use_enable speedpitch)
-		$(use_enable streamtuner)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index aaa2c18c5c80..40b385bf07ca 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -9,5 +9,5 @@ EBUILD gst-plugins-opencv-1.20.3.ebuild 720 BLAKE2B 9a678748ad38136b07b0d300def0
 EBUILD gst-plugins-opencv-1.20.4.ebuild 723 BLAKE2B eaa32051977543a70f4d043d23fd5cd10178e625f2e499bb897213a6f8de2d32335f068afc078661d17903577d150808b40af8d2f742dd2ba89d7e1276f548c9 SHA512 94fcd8f2dfb90c13ec7e4fbee6032ed268344e5aded5cc8597012d758bfb5a79200992241c5764a0544cf00743f176f2323c601e68de9a3f3399aead9c0fc26a
 EBUILD gst-plugins-opencv-1.20.5.ebuild 725 BLAKE2B 9876f5334e548e4a1e9c26559270d9a5ddc831d70a7e5c491bfa4e26ee5642ce29d5c50064d4a7cbb2d7bd8ad7d2fbf3bb221502e4849adca7a550de0d2212af SHA512 46341cf450595504fa56f230d768e882998373e00959a998efab3eec8c140ee12e27723690112b340367e2d45ccb470b49e8c01aa27e44734b72ec339f8a5d39
 EBUILD gst-plugins-opencv-1.20.6.ebuild 725 BLAKE2B 9876f5334e548e4a1e9c26559270d9a5ddc831d70a7e5c491bfa4e26ee5642ce29d5c50064d4a7cbb2d7bd8ad7d2fbf3bb221502e4849adca7a550de0d2212af SHA512 46341cf450595504fa56f230d768e882998373e00959a998efab3eec8c140ee12e27723690112b340367e2d45ccb470b49e8c01aa27e44734b72ec339f8a5d39
-EBUILD gst-plugins-opencv-1.22.3-r1.ebuild 696 BLAKE2B 3996404e3eb653f6cfefc148e3463a9e1a8f88bca78615e4b62dd633c4acb86aa827777fbede0935b76c031a94df0e495c92c63347626579ad5d3270d0f0ca5b SHA512 173907c0def07fd939710c63d5f23b6d7865c7e8235b137d4d0179d74b9e01834fcde21b97272d7c7299e7d59bc5d89d02c559f793ff3fb2f400a29f93385df9
+EBUILD gst-plugins-opencv-1.22.3-r2.ebuild 991 BLAKE2B dd47c38af9a2d70dc324ac97c3448210ec35c3792fe16067327a9cfdaae7c0d57b351065b0af0ae676ebeb80ce176b013a49460fe06334087679024632765e9c SHA512 9e96838d185b7a79dfa6aac32a3d1895f8b285046b0b516244b3584c026d4b31f314f956c3117b1e77200cfab94c0f30977b54bdfb8bffaeb83cd5ff7b6271b5
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r2.ebuild
index dd4e9c41a067..979c21297c73 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r2.ebuild
@@ -25,6 +25,17 @@ src_prepare() {
 	gstreamer_system_package video_dep:gstreamer-video
 }
 
+multilib_src_configure() {
+	local emesonargs=(
+		# We need to disable here to avoid colliding w/ gst-plugins-bad
+		# on translations, because we currently do a "full" install in
+		# multilib_src_install in this package. See bug #907480.
+		-Dnls=disabled
+	)
+
+	gstreamer_multilib_src_configure
+}
+
 multilib_src_install() {
 	DESTDIR="${D}" eninja install
 }
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b1112f43ef9b..50a39cac08c1 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 2bdc0f1202ce..74b43c961270 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,3 +1,5 @@
 DIST abcMIDI-2023.03.24.zip 623602 BLAKE2B 69c5bfa58fbded0cddb01dc405dcb0cc682182a42f40ae8acb8e5bc90ef6b0b9b5ffb13cb77dbe4634007d478e08b34839d62e5fae4deda73137720c5af794c4 SHA512 c552b4e515a9d2110adb3f4c460b2dbefb04cd16ebc2aa96ca452328988e502dcaa5cb933b3471f207a03a7ffb99b0a8f33118a347928aac8c8aca741582a513
+DIST abcMIDI-2023.05.30.zip 623737 BLAKE2B e8e9b36f7385f4de6e292ef7ba1f55c9e19e3fea6d4de811a049e66f0d4e452cf4ad29fe62795767eb70847d75e8ea299b457c54b9aef7dd9ac1fd24f15a8548 SHA512 aded10ae9f7f09f4424a6faf01588ccb2224f5371f0e481417c1e0cb4dd5273c65ee7478c2e099fc91f721def1cd31ff9b332548c849cc22494cc579b22be783
 EBUILD abcmidi-2023.03.24.ebuild 676 BLAKE2B 31477b1343585fb2359f83e9bd3073bf381e7c3c58f72255acc221eccb88f56cb8b1312a50a11ebb1d7d922b237743f144178f524cc1bd02d421cefc6afedbcd SHA512 a0a9665494091ae1f38cd72327ab1b6544af3a9368b3c42ca57d23f9370af0f5469db1cc46d2ac0aefd0dc44a91e807249d7ea8b62ad98ba7c339bb75470eaf0
+EBUILD abcmidi-2023.05.30.ebuild 678 BLAKE2B e80a5b9b4ab2b6b2f3a9100a759875547a3971d443d876db558a5abf5a323eb29f03cf318bd6ac2abb429648955d67cfee9bcdbaa43f13bacd2654ec6d1eef72 SHA512 3a687ee6c926bda64ab5b99d072505c88b949dab46b44fa7b34a002eceb8c9394eedd64def057d5ed99fc06b26776d519a88f77821dcd0ab4ca7f97dbafbc2d7
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2023.05.30.ebuild b/media-sound/abcmidi/abcmidi-2023.05.30.ebuild
new file mode 100644
index 000000000000..636c9619449a
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2023.05.30.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	sed -i "s:-O2::" configure.ac || die
+	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 0e71c4df37dd..1cb83333ff28 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,6 +1,4 @@
 DIST audacious-4.3.1.tar.bz2 630820 BLAKE2B e8885d25cce4a480ac58c5ee1874a530f4b169f264eaafb13830be17ce7e25933a2fb491ed0b86220fdb2e916ea5d7b13bca8a5ac00695ffd06e1ad8b2a6ff67 SHA512 7662a1b136c6ced346ce160a3a6b71ea5941644860466e23248a44168179118202006e8892a5bbd1f6d77730846a4644b6cb4e008af38e1117588b9f4d1521f5
-DIST audacious-4.3.tar.bz2 623855 BLAKE2B a00d5f4fafff6eec5aba0374ba41b0521e60814421845d4cad284bb12bc67623d27d2101f5ba3c72bf7ab68d7f53f3c5473fd173bd929c35de51c4d2ff3ccde0 SHA512 7e92739ffd6adb62c6efe11b3107fc6d2d45ba5bbb6375dddd227f4c51387e0bbca2a5c1020b25a97933b9f02d3e726b22a21f7566ffac8b08ddfad609c3dc0e
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
 EBUILD audacious-4.3.1.ebuild 1463 BLAKE2B e93837cf90dda9a6d6c9410271b6c53144bf6b7a3a298debec30774fa8f7db5de9da98b4c97b2cd7cdd9a3ac563ebd529bf441af2f9568e26f6c6523af195599 SHA512 4d1ad0d2b421a1d84db6f0eb949ff35b5a88f02173218dd8e3cfdfd8ae7f4cb9235752d8bb6a15efdddff62cb6ac7ce1cedc5d070ad2d607e42a5b9fd76d8ebc
-EBUILD audacious-4.3.ebuild 1463 BLAKE2B e93837cf90dda9a6d6c9410271b6c53144bf6b7a3a298debec30774fa8f7db5de9da98b4c97b2cd7cdd9a3ac563ebd529bf441af2f9568e26f6c6523af195599 SHA512 4d1ad0d2b421a1d84db6f0eb949ff35b5a88f02173218dd8e3cfdfd8ae7f4cb9235752d8bb6a15efdddff62cb6ac7ce1cedc5d070ad2d607e42a5b9fd76d8ebc
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/audacious/audacious-4.3.ebuild b/media-sound/audacious/audacious-4.3.ebuild
deleted file mode 100644
index ee999ce83200..000000000000
--- a/media-sound/audacious/audacious-4.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${P/_/-}"
-
-inherit xdg
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}"
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "failed to sed" # bug #512698
-	fi
-}
-
-src_configure() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	local myeconfargs=(
-		--disable-valgrind
-		--disable-gtk
-		--enable-dbus
-		--enable-qt
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins -r "${WORKDIR}"/gentoo_ice/.
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 6685b62489e2..638cc11ec8a8 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1,5 @@
 DIST yoshimi-2.2.3.tar.gz 8067566 BLAKE2B 6aadaa08dafc83e7b5eaec88d53ba27fa923012b4ceaa0acd49dc82bd6aa9b255a17477c950fc9ab97ca0c08e8bf1a2f655f24aca28e1d762ea85fc92da0ca42 SHA512 d10829bcc81999c359912c76a1cbdeba4dbc5a31dbca3c54bd31323495c6ae889d50342d8024929076976b7b6deb1dc7829fbd19f9f3618caf2517a014aeccbe
+DIST yoshimi-2.3.0.tar.gz 8765797 BLAKE2B 3c415c4e0460a5a625eda3cd50324cd234f8c1b3c69fe46e01af6a5c3c7b896caba1f4950148bff35433a616163722913db213b2c40b84eba6956213e8ec86fb SHA512 a5ff3234a1cfa6fefe93eb1088b61e939fb2d89636dacb6ee7f5082532cc0bc04a701d6326b61a3d7d7ba3f4bd58acbf4cc806e9a693f4b89a6db1a8192d872c
 EBUILD yoshimi-2.2.3.ebuild 1193 BLAKE2B 3068dd47f972f25c3bd1b9d3ae5dae8384e8894927f2fe3572713e65a20c230e393995bfb68e9c3740ed224078cc58a9d9e07f9aa3f40ae86b441665c8032cc8 SHA512 bcf582f391ec088047c4a65fa7cb553ee1a946fb959e54c79d45730dd1d85630d08686d24ed9d7cb09f2a4422dcf5acbcb7a0e1f8f1f65cbe140b107c357933e
+EBUILD yoshimi-2.3.0.ebuild 1195 BLAKE2B 5880b4a42e2f93f155396d9c355c160587d594d1a4c762b294866c07e58a753bcbc37816864d153bc4a305294d12a819c307e170fd68c8a42acd0f262da94ec5 SHA512 228171fad7a9adc9e09ce6002936447276a06b6af7b67c30f423f10f4ce9a5b2725a15abdfe96c2691af8ef5953eedb7c877f2a479b8daed9611106e718b54aa
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.3.0.ebuild b/media-sound/yoshimi/yoshimi-2.3.0.ebuild
new file mode 100644
index 000000000000..a7c79e44fa3d
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-2.3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Software synthesizer based on ZynAddSubFX"
+HOMEPAGE="https://yoshimi.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lv2"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/mxml
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/libsndfile
+	sci-libs/fftw:3.0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/jack
+	x11-libs/cairo[X]
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+DOCS=( ../Changelog ../README.txt )
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
+	append-cxxflags -lpthread
+	append-cppflags -lpthread
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLV2Plugin=$(usex lv2)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# unpack Histories.tar.bz2 to avoid QA issues
+	pushd "${ED}/usr/share/doc/${PF}" || die
+	tar xvf Histories.tar.bz2 || die
+	rm Histories.tar.bz2
+	popd
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e1be5659d56d..44a52c9521db 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 8ddf9b9b8ce5..fe6a7e3febde 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -26,7 +26,7 @@ DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012
 EBUILD ffmpeg-4.2.8.ebuild 17865 BLAKE2B c4f22c413e13b0227b47d6e9fa8629326b0a7f6e74a3cf6acf4c3ff0b1ad163f33a7b1aa6dffe16c4e27e88c697d7bf986aa6edb7b84d3e9473b9190bf76e50a SHA512 34a7b84989e2e0da04239c610ddba60ff6c044e16dbc3fb2a9d48580ae9096ae47820f4c6a0448ec8f1c4a1dd47b49d85180fa979f83abb70036fd50ba3b8c00
 EBUILD ffmpeg-4.2.9.ebuild 17872 BLAKE2B 7bf7017456080b73f81d804171733d4dcb5810eab903e51699f1f67831925913553bb255bcd23ab0f3f1f6362cef7a8643151550a07b205145e2e610f62ce83f SHA512 527ec108d2771d3514a165fe7dfe715658d8a19bbdea0a14fd7b9ca2f8e5fed89c1948dd126d6d4192fe5604f02adc5dc8e5954a5d17b045c5a99f5ca74d67fa
 EBUILD ffmpeg-4.4.3.ebuild 19574 BLAKE2B d634d4329c0b9889502ed7f2116ae430751d14cce647b2d5c7da169c26bace4cdfbf7f7bff19c66a947cbef294d81b5ae14ea52b478cbe8cdb5b4f9d1561e1fb SHA512 4d7a8f81b696b630694093a410467cf4457790d5129046549f48846992303a6acfdf271114cdb6389ba806e9a820d7f4d5f07aee6cc038f3e7a7636db35bc410
-EBUILD ffmpeg-4.4.4-r2.ebuild 19761 BLAKE2B 496221abbecb8f491957dd9f32c92a665fbb0e8c2130a6e91f06e1a84b1eff42f9198d5d020a101ca6f131484406073fb3eaa76513a046133cbc5b23080b3741 SHA512 509924bb410a7851ad1b14d77c1004ce79abd9c6c467870406570a39a81095e643b4537b6b44cd3bd5634d1d0547a04bb8f19b6e3cb1a5425017ce4987cf5660
+EBUILD ffmpeg-4.4.4-r2.ebuild 19760 BLAKE2B dcd6b2b9564012c71e0f1df825eb4b1233881d8528b2fcc5666b6aed599cd953cd006c70b92e60a602903061ea619cfe2a700147041ea6cb0690f1e45ba50a0f SHA512 c6944c5e9dedb3c86e200c9d49320e9677a37e4a9164c6752fa1168ad43e4733b22aee34536926211491e3a6d2652ae2d0144937b63344aafecc54a4483f4a76
 EBUILD ffmpeg-5.1.3.ebuild 19769 BLAKE2B 92d421eef7367d4f6bbda319bd16e3ed2e1c26a9d9e9276066c27c96c25dab5f2955a50f73746472a7067ec70db6dd4d9870cf3e1a6f68b344481f711259fa05 SHA512 87230373afc50f062a09be8964e78f2ee1f34414759d3bb94e0ff3cb8033c41dc40f990af5c754b226e8a70c0910b1c50dec5a9f320aa8b93eebfd7eb309b427
 EBUILD ffmpeg-6.0-r1.ebuild 19753 BLAKE2B 91d52d2dcb3e2c3e0ec0c1aef1a4004ba851531061b487e6c2c0f950baf0deb5f3c89e48a6c4cd037235dd76313309995ce80ccaf3726eb32d1f6b195f7d7441 SHA512 93c519c33cc5e69b232edec1a3a1cfbea0230f198273192e49ec30997622c664810544897d75d9a39bca64f50f41421f2f6aa05bfc98ec55e2d797a4e8fe96bc
 EBUILD ffmpeg-9999.ebuild 19638 BLAKE2B 69e583dbaeaf965ee875d272bb25c5655e66f59e31da561e1fd55af2beda1540889e4ffe14edc660607b632cddf7a802e65e00fc874b68d7d26c1c95a47da2c8 SHA512 8ca60e001ee13bef5f7c550e75f1eb11a5f2d57fdd767f187f4cf627cdec0667590b88a59054fd2c5c062af546842d0700ccd3ba3860ebb3ddd1b565f993e201
diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild
index 9acb849c9349..6be7885d8b00 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r2.ebuild
@@ -64,7 +64,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 1b8deaaa9549..37619d28b1fd 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -6,6 +6,6 @@ AUX gpac-2.2.0-ffmpeg6.patch 1162 BLAKE2B bed72ce7db91a5c25f74ae33561fa47c2951db
 DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086 SHA512 e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f
 DIST gpac-2.2.0.tar.gz 11376708 BLAKE2B f50c131912787c274a5b2d37e242e37ddd07f2c6eab3a932ec243f0fc36aeb06d4f16fd861eb3534f93534c291c55fddc2bcd1f573d2ed186e17464512a1f089 SHA512 4ac63a79a5d1057aadb59429af84ca9e4e0c0b863b19beafb60bd1c30425357dec45b5d6d48d452eb94002b059c9eb0c7bb0cc14222194f641604f964b3207c2
 EBUILD gpac-2.0.0.ebuild 3259 BLAKE2B 6abca7a4e0f0ef384e5b81fc24a511effc6925610ddf079f8934e20ea4b227831aad72b11deb5cf547d87eca5c57c4cea84dac2403ed4e0d9394d5298bd6b3a1 SHA512 930f88012e50dba329040c7ccce94eadeb4e63b7ae9dd6c6797c894c052d0f28944b7d65f7fea42bd1889f46bfa3c0b061eecfc59019155d674ccdb958aece3e
-EBUILD gpac-2.2.0.ebuild 3202 BLAKE2B a9fe35ab16ee97853c5f9b7d6641983a73faad717219318ace5b8edd653b304c05cb0ab081a52d929c4a04d25993a6cc0b2d85cc765c3afe76c7504d8f43ebfd SHA512 1e37f715e1c9f9d37e82346dcd53552c6dec795f5130a0dc881b7b8fa54f66cd0be6bd131351f354720904d6765e047d445dc50a7b1d631707b0d8ea4da35899
+EBUILD gpac-2.2.0.ebuild 3200 BLAKE2B d9497e83745c33b0ea850533d6de69e9ed1ede037f7ed628cfacd89ab78bbfe3f322803a09190758ea5a8da469ffe762485aaeb95102a10b18e6aecbed1beddd SHA512 1a460b7a4c0d19b81a98d0190299cac6f30d0f52eefe54e2b6791476ac9ef47e11f3818fb26de664855288e5f6186c1f76fbd83a36fd1e6c12a9479637954d31
 EBUILD gpac-9999.ebuild 3153 BLAKE2B b252f7f92aeb3ac1eb6cedb40ff2b03ea1eb723658b9ea8c09bc11ef24c44b6b0c4562b7ef1fec981ccf6087f028fb19b4da52dad1ae9766e557d9e02b00e1ef SHA512 7f0a85c80d7a0e9a0eaf19ca4f1d8c0efb273249a2ace297d89b7aff1b91b0b3577140235b83ba666461dc12b76c2e5e2f17c7e19f8cb12cb33114f7da734043
 MISC metadata.xml 357 BLAKE2B d08714f001a00d250eaffef3818ed1cf0ea1dfd907799ac7f87c13d32f34106a3dc3982c24729d09c9eaec20143b68b2e966db97a061ee8a4592a8a5d20b8ab2 SHA512 7417738d0c891a1544fa25a9fe4785025e83ed7e5d498335215f70e61b3b599b17cbd9114e660fc5db4315dfeddee99a351b76ff0b801657f990827187f416c5
diff --git a/media-video/gpac/gpac-2.2.0.ebuild b/media-video/gpac/gpac-2.2.0.ebuild
index d6a91321cd56..3c3e56e2a419 100644
--- a/media-video/gpac/gpac-2.2.0.ebuild
+++ b/media-video/gpac/gpac-2.2.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/gpac/gpac"
 else
 	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~ppc ppc64 ~sparc ~x86"
 fi
 
 inherit toolchain-funcs ${SCM} xdg
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index ae96a553b909..f65285a3a76e 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -8,6 +8,6 @@ AUX handbrake-9999-system-tools.patch 1489 BLAKE2B 2a3286dc1cd37d85e1edb1312688a
 DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 966b54d35dd5544800208edc9045eaf26f3253aa470686b9ea29cdf69393af140829b21072133684661fd881eee7f97b90f9c7edfa87f187058dd1b14d1a748b SHA512 ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e
 DIST handbrake-1.5.1.tar.bz2 16137974 BLAKE2B 9ce1f1ae7b2fe514ba1fb6ed30a345d18144829272a6298f2af0831e5ea7533ef2f8b201fd98389269b0ea12bbba15d0b76f09afeff6ed1d9ed313f20cf8f3a1 SHA512 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568
 EBUILD handbrake-1.4.2-r2.ebuild 4072 BLAKE2B e8d02d4ba17fdea73fe53b242c9860ab450ec1221069aa3dd36b1b7e37c398aef66dca8e6ad6b2c410459b01dd3495f3793e3d5e6654000dd9520676efe21020 SHA512 06d292b5e1a455f9fdbc07bfded936653e892ea7bf1e05e8455a8c76a8b3e66dfa320d6fcd6d85cfaa22a987b1f243421681f947ce5b39c8a2eda2e994875c0d
-EBUILD handbrake-1.5.1-r1.ebuild 4206 BLAKE2B d6b377b552584534b658a18bafb11c61f149c130e7493218f968f42094343f42204a6f1b8a872cc497cd479c434352a5e0e68dde95178e27c77a0aecc4b87cc6 SHA512 30bc495ce662649f43344bf085ac90ba5b946f2b48de5bb88b6044d9527d3283e05e39b5b1bc567fafbda9cab34441cb6f505acd97c2bf90fd270e4e2cd00e47
+EBUILD handbrake-1.5.1-r1.ebuild 4237 BLAKE2B 3874bae1bc39b33bce31437c1b41684999d1b0a333e4dd8da09a322bfbc2ccc91cf5cfaadcc60f2071ea3964ad85bf1f15af04b6e2ac6287e1c525f6d0d7991f SHA512 f8ab542064c8ea770eb9ba9c33f7400fa5658a3bac2561c24f74bb1675cf2eec32eb48415437a9454d8aac1ddf0182b920e0b3eb89f3b1c8a4ba42eac0f5da5d
 EBUILD handbrake-9999.ebuild 4073 BLAKE2B 210fd09ec36d17d2a0246964c9eb4061973580a5d54f79dd40c4f5dfade5d6a4e7855a33cbdc6acd18f2512185bf897fc4287d683e82f5a412deed631d1e84c0 SHA512 0da10512ec8c1e41cd056a04d3f31c85dfb46686b3102778ebbc4e621a7273025a8c29fe791983ed6bdf5bbe098418e7164963cd77f3f06d8d5acd9caee19fe8
 MISC metadata.xml 988 BLAKE2B 2c2543998aaf038e587c97734225e42d3ffcfdb3700756c6c4933fec290c5925f1ea622689a6af6d3ffe56740a713d59034786853aa59617cbb43543438f1970 SHA512 013be7227a93e05f90c45411b46d35e26c14ba1d25d1e801b259bc641d643f81489611bfc1aa0b17d6df1689e9f2878454301ff33e8ffa417839b8e2ab486383
diff --git a/media-video/handbrake/handbrake-1.5.1-r1.ebuild b/media-video/handbrake/handbrake-1.5.1-r1.ebuild
index ca4053318273..c4a8cd2ca5dc 100644
--- a/media-video/handbrake/handbrake-1.5.1-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1-r1.ebuild
@@ -26,6 +26,7 @@ IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
+# < ffmpeg-5.1 dep for bug #907406
 RDEPEND="
 	app-arch/xz-utils
 	dev-libs/jansson:=
@@ -46,7 +47,7 @@ RDEPEND="
 	media-libs/x264:=
 	media-libs/zimg
 	media-sound/lame
-	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+	<media-video/ffmpeg-5.1:=[postproc,fdk?]
 	sys-libs/zlib
 	fdk? ( media-libs/fdk-aac:= )
 	gstreamer? (
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index c002872f94b5..354b8ff37536 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -6,6 +6,6 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de68
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
 DIST mplayer-1.5_p20230215.tar.xz 15454028 BLAKE2B 08012f9b955921d832ab268a6e52e22e018b669787ff5e1c1ac734bd85083138551ad1065d5e4f5f9c977b804f8135ee89d2fd0590fb7228d4916b458cc58efa SHA512 f93d222817ff59ac7708956d6e8d5e9ee2084b4e724f66ea9fe4ffd477b864c2d0546d8df97511d499495ee446239645216a1e027d70eed434a3c64331f5ac73
 EBUILD mplayer-1.5.ebuild 17073 BLAKE2B 2c0f9851af9f297da34cfc1ed9e8aac631d8c370c0a7645dcd856617fcea640b80781c1c1791a2676447f00fb45ba0acfde37628066a6e2dde4eecea120a6bcc SHA512 1c508343584789db2399c189bd74757739c2ad1c4b04ad3f630c7e8d69666a68e56ee4a7ce7d7204315a0e5945a61b5d53fca05e569019ed19fce6f43488d50e
-EBUILD mplayer-1.5_p20230215.ebuild 17326 BLAKE2B 00da50538429b182a08a35d8f12ece7924d92157bbd1475cfd630a3b769f86f73fa85bedb34335301d1d5c654956888f523c2e83885f7b9a3d129423b4ea9524 SHA512 8daecf5658187b0500c53dff68a4c34a604f778a327cb7e8e85cc23b8596392bbc1bdfbe8856571f3e76851d2642a69210916e183a8234930b7e6bcce327b824
+EBUILD mplayer-1.5_p20230215.ebuild 17324 BLAKE2B b4be9b1899168095cd6a1f5d4216b1e1a08d640f813cd73e24a712aca365184b056ea71d549046a544b4be3da8d0f1a56a379494d42769d7fbde38357c140035 SHA512 62109697f65a0cc34c5cbf94ebf424f0d1a2f0c10e84d90f6007d08a75d571bf1eea5fbe5fab3877de04097c3b6e52eb203d9c811ca0f402c90a4aa82bce3104
 EBUILD mplayer-9999.ebuild 17323 BLAKE2B 9167d9f1deea8ab2507a43567a9ba3b8eeff5ab8c75618d82122159266fa55b3554e00698fd631ac33978fbd466c4d69dfe53368e330d2f30a20397a665be2ee SHA512 ad2f1aaa9ef7c3ed6593e580aa2830c7323217c8dcf8616e4af1f1c0e42ed96787ac478cf11797e49ac7afd3c3472e66d41fb754c247e0f23e414939193b3783
 MISC metadata.xml 2475 BLAKE2B 5a083ce5b8ed729245ec9eaf544be95f6cbdb9fcb5b80d3a21195557c3aede46d09bd93a0d1acd3830fc796f90dd5f15a17a3d3c69ba2a1a54a0676264dd02de SHA512 f04082ffd63adf9102dd82eb5b4c628fbf912701c7dae69f0b00bbad4e0957355e43369912e9422acc087200de982920c212efb60ba9c26675f74fd5f37fd739
diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
index 31de25e10b42..d6bc5e5f9ad6 100644
--- a/media-video/mplayer/mplayer-1.5_p20230215.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
@@ -166,7 +166,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
 LICENSE="GPL-2"
 SLOT="0"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 # faac codecs are nonfree
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b41231d87647..311ef4dd62b3 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 5bf3544613fd..5bd9824337e8 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Jun 2023 01:40:09 +0000
+Thu, 01 Jun 2023 07:39:39 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 14ebb0dc9a05..05bc282b772a 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-01T01:40:13Z
+TIMESTAMP 2023-06-01T07:39:42Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR39v1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR4Sz5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA87BAAojJa5CzzFwXoI5HA0I4BPUXWWO6VlSla0/h6KD53Hoazv5Fl190qlSAX
-lwEEHnIPvtwoOtNkV5L1A6k+Bw2YbxWIAFK+f1WV25fKLqHog4I0eBGvuPw5feVW
-U3V+edqtXQi6Pc336jp+SUGqvbMAHmq1MZ04vbRhTMhZ93nTFx0Vb9VS9pIkI4Z0
-10j9UIz8nIUQc1N9YSXpRO4LBVAov2qPmKvF3Zg6deqVcNx3MxHXyyZVx4W/Sp/j
-LXkpkNjgCo3k+UXzJJJtg2ar//XsJa9Ht6/lh4CsKQzVvnn4ET9tGfYSry9XUSmF
-hNldISBXECL3xU/4LJ61zGNAWKDKgOg46wp40Os7F8U+s7WTh9ibHSGaNL26cwKx
-vYsmrsukY8SQQgXiRgzBWa1ds08/Z6rLIrWnWWFSf5gvd6w5GpHmQAsR+Qsrt0JP
-cf1EMIv91rW6YdQZli76MWKVVVKC+KOy01VL+HVCfJHf8D7U0Hx8+bfwA3CmuUmZ
-bye8CRQvMMneutF0EFV+k3yh4oa7dZoakfPM2YyiRMxn2ahSfAtd1yu+ktv0tDRO
-xDImduOkLvmtree/Bg7orIxMwOXyN0gg9cgg46kefNhiWLXZ3GPDp4GgmNAJhMq2
-0il3Nt6ABNYLjXqxDEYj9KW2nAKbIQfbeKzsyJ3+HnsPx81/GH8=
-=HAu+
+klCfqA/+P+Fmg6P6dP5ZNsyXXKOOSPKkZHguZtHvkTkNwL0UDMmP25IcVtTy0wZc
+kCnXxL0Wza6Udc/X6izmXkxPEjBY+JDRHqUDbf/oeczoQmgKna8qaYTrcGL7PDuw
+iqdxGYSIT0BkuvHHjRIqyuZjyUzO6yGWgrN/I3HFa6B2LKBv24k3iXKVFNwjkaNt
+sgWDrtCuWrrNMZeEv28bOUqdpC8VzGRduYDjS3yIJWFbxdCr/z1Dc4sGeXfrS0E/
+qIuXH000CIzurQ172ELSrdlR6g9jD1XLdap0X7taBuR/MjTaFxCbrqvczD15sOjj
+3088HG4s8+DhTbDqqfZAt1OtV5+jZUAaalI6QJzNGKxkJHfm+irxnqva9YkWFnJO
+QepuTHLPZHAXnHWMf235016pHWbFiXhNbT43lvLBabnyGphSgTZLuZM2/ZX0gczr
+yICdZxXdvXYTdWmvieHT4mL7mgtbN+vgrbM6jVAuwqCqJt7xD8dXiOm26npHLFqO
+h9UqoyuxxSV4ez/GN8Yg3dd4/N9sqK0NCjFaNCfSNaFUySNFnR4QQ7XYrtkcD5S/
+koDL4XwxZN9bxJlHg44cxw29SNJ2zh3uWEVgf90CtVH8wQOXC+LGYdb/aHJ7senj
+Or3wf+/HCNh6b8mLss11isDsACbqXYe2TYywzamo1D65r0F8AUo=
+=PHw1
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 5bf3544613fd..5bd9824337e8 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Jun 2023 01:40:09 +0000
+Thu, 01 Jun 2023 07:39:39 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 40e615de5ecb..0877c68912ac 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 05ccd8bf6c95..92b65c889578 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.144 b/metadata/md5-cache/app-admin/awscli-1.27.144
new file mode 100644
index 000000000000..40c94992ee45
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.144
@@ -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.144[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.144[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.144.tar.gz -> aws-cli-1.27.144.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/puppet-lint-3.4.0 b/metadata/md5-cache/app-admin/puppet-lint-3.4.0
index 91fb665023ff..b2eedfc27652 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-3.4.0
+++ b/metadata/md5-cache/app-admin/puppet-lint-3.4.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/puppetlabs/puppet-lint
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/puppet-lint-3.4.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d960060d3e71a7d754d7b98041d1e60a
+_md5_=2475f44275cfcf2a5836a82894ffe4bc
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 34679aad445e..e4307640a61b 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/unrar-6.2.6 b/metadata/md5-cache/app-arch/unrar-6.2.6
index c056c1573a91..cb26892b6a69 100644
--- a/metadata/md5-cache/app-arch/unrar-6.2.6
+++ b/metadata/md5-cache/app-arch/unrar-6.2.6
@@ -3,9 +3,9 @@ DESCRIPTION=Uncompress rar files
 EAPI=8
 HOMEPAGE=https://www.rarlab.com/rar_add.htm
 INHERIT=multilib toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=unRAR
 SLOT=0/6
 SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.2.6.tar.gz -> unrar-6.2.6.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2b6369f72c411065186703e36cf5033e
+_md5_=7fc4c0bf0ce0596849739c2e3904f58d
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 43d661ef2bb9..6b064e74324b 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/eclass-manpages-20230417 b/metadata/md5-cache/app-doc/eclass-manpages-20230417
deleted file mode 100644
index 34c1090ac8f9..000000000000
--- a/metadata/md5-cache/app-doc/eclass-manpages-20230417
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=sys-apps/gawk
-DEFINED_PHASES=install
-DESCRIPTION=Collection of Gentoo eclass manpages
-EAPI=8
-HOMEPAGE=https://github.com/projg2/eclass-to-manpage
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-doc/eclass-manpages/eclass-manpages-20230417.tar.xz
-_md5_=df50d4824c4bc4acd122f870a53e3945
diff --git a/metadata/md5-cache/app-doc/eclass-manpages-20230329 b/metadata/md5-cache/app-doc/eclass-manpages-20230601
index d2498debd757..af382e904747 100644
--- a/metadata/md5-cache/app-doc/eclass-manpages-20230329
+++ b/metadata/md5-cache/app-doc/eclass-manpages-20230601
@@ -3,8 +3,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Collection of Gentoo eclass manpages
 EAPI=8
 HOMEPAGE=https://github.com/projg2/eclass-to-manpage
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-doc/eclass-manpages/eclass-manpages-20230329.tar.xz
-_md5_=df50d4824c4bc4acd122f870a53e3945
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-doc/eclass-manpages/eclass-manpages-20230601.tar.xz
+_md5_=cb3b9d0e260ddff47dac940223edf491
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 84cd6df3b407..86fb2f6c9f69 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/libvirt-9.3.0 b/metadata/md5-cache/app-emulation/libvirt-9.3.0
index 91d40eb94eca..2bce64d9311d 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9.3.0
+++ b/metadata/md5-cache/app-emulation/libvirt-9.3.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
 INHERIT=meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
 IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux test +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 PDEPEND=qemu? ( dev-python/libvirt-python )
 RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/9.3.0
 SRC_URI=https://libvirt.org/sources/libvirt-9.3.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-9.3.0.tar.xz.asc )
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	915ec7c25e08d7886558215e6809ca1e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=e3a4656990168386d4d0696b33d8d87e
+_md5_=18519251b2933ecb7d5f7126e97a895a
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.44-r1 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.44-r1
new file mode 100644
index 000000000000..2de19f628672
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.44-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/kbuild-0.1.9998.3127 <=dev-util/kbuild-0.1.9998.3500 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-power/iasl sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) X? ( x11-base/xorg-proto x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp ) virtual/linux-sources
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=edo linux-mod-r1 systemd toolchain-funcs udev
+IUSE=X +dbus dist-kernel modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.44/VirtualBox-6.1.44.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	e4bed03b66db7089d7e83f3542673a7d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=783e5a854d236a68433dc36d9fb09f34
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.8-r2 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.8-r2
new file mode 100644
index 000000000000..b924a97c0639
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.8-r2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/yasm-0.6.2 >=dev-util/kbuild-0.1.9998.3127 sys-devel/bin86 sys-power/iasl sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) gui? ( x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-base/xorg-proto ) virtual/linux-sources
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=edo linux-mod-r1 systemd toolchain-funcs udev
+IUSE=+dbus gui dist-kernel modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )
+PDEPEND=gui? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.8/VirtualBox-7.0.8a.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	e4bed03b66db7089d7e83f3542673a7d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=b03199507a4af6347afb75f52cdbaa47
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.44-r1 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.44-r1
new file mode 100644
index 000000000000..0807556cabf5
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.44-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=dist-kernel modules-sign +strip
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0/6.1
+SRC_URI=https://dev.gentoo.org/~ceamac/app-emulation/virtualbox-modules/vbox-kernel-module-src-6.1.44.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	e4bed03b66db7089d7e83f3542673a7d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=97b26a0ce28937561a97265d764826c4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.8-r1 b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.8-r1
new file mode 100644
index 000000000000..9739424aee04
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=dist-kernel modules-sign +strip
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0/7.0
+SRC_URI=https://dev.gentoo.org/~ceamac/app-emulation/virtualbox-modules/vbox-kernel-module-src-7.0.8.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	e4bed03b66db7089d7e83f3542673a7d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0fb79576a03c8892507f721f2178ce6f
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index e0e65b8a0356..7b478a578412 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.3.0-r1 b/metadata/md5-cache/app-portage/mirrorselect-2.3.0-r1
index 08233d9e3d76..8563d1531244 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.3.0-r1
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.3.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
 INHERIT=distutils-r1 prefix
 IUSE=ipv6 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] >=dev-python/ssl-fetch-0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.3.0.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bf01634e4d53718ecef5269facaa08b6
+_md5_=9d1d7a5c58cfbbc49aa63c46cea6f292
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index f946d4585754..687436071838 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/build-docbook-catalog-2.4 b/metadata/md5-cache/app-text/build-docbook-catalog-2.4
index 400077e9b6ca..fa14e6d452c6 100644
--- a/metadata/md5-cache/app-text/build-docbook-catalog-2.4
+++ b/metadata/md5-cache/app-text/build-docbook-catalog-2.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure postinst prepare
 DESCRIPTION=DocBook XML catalog auto-updater
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/build-docbook-catalog.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
 RDEPEND=dev-libs/libxml2 || ( sys-apps/util-linux app-misc/getopt )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/build-docbook-catalog-2.4.tar.bz2
-_md5_=1b86f71d98adedd03b0d4409488c15f0
+_md5_=2a35c77a53e70bc56d7caf41ff3f784c
diff --git a/metadata/md5-cache/app-text/qpdf-11.3.0 b/metadata/md5-cache/app-text/qpdf-11.3.0
index b1b966f99659..55b9437f7a70 100644
--- a/metadata/md5-cache/app-text/qpdf-11.3.0
+++ b/metadata/md5-cache/app-text/qpdf-11.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://qpdf.sourceforge.net/
 INHERIT=cmake bash-completion-r1
 IUSE=doc examples gnutls ssl test
-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=|| ( Apache-2.0 Artistic-2 )
 RDEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) )
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://github.com/qpdf/qpdf/releases/download/v11.3.0/qpdf-11.3.0.tar.gz doc? ( https://github.com/qpdf/qpdf/releases/download/v11.3.0/qpdf-11.3.0-doc.zip )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4dabba7a4b51d714dbb461d07729917a
+_md5_=341fc7e17d37c6d97016c65a0ffbe86e
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index e75a90dc0bbb..326afbc6259f 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/capnproto-0.10.4-r1 b/metadata/md5-cache/dev-libs/capnproto-0.10.4-r1
new file mode 100644
index 000000000000..220d9f29c361
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/capnproto-0.10.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ssl? ( dev-libs/openssl:= ) zlib? ( sys-libs/zlib:= ) test? ( dev-cpp/gtest )
+DESCRIPTION=RPC/Serialization system with capabilities support
+EAPI=8
+HOMEPAGE=https://capnproto.org
+INHERIT=cmake flag-o-matic
+IUSE=+ssl test zlib
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=ssl? ( dev-libs/openssl:= ) zlib? ( sys-libs/zlib:= )
+RESTRICT=!test? ( test )
+SLOT=0/0.10.4
+SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.10.4.tar.gz -> capnproto-0.10.4.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f935344527aead35bd01db07e96c1fa6
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.16.4 b/metadata/md5-cache/dev-libs/libdnet-1.16.4
new file mode 100644
index 000000000000..dbe9ea0803e5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libdnet-1.16.4
@@ -0,0 +1,17 @@
+BDEPEND=python? ( dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-libs/check ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/libbsd python? ( 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=Simplified, portable interface to several low-level networking routines
+EAPI=8
+HOMEPAGE=https://github.com/ofalk/libdnet
+INHERIT=autotools distutils-r1
+IUSE=python test python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-libs/libbsd python? ( 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? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ofalk/libdnet/archive/libdnet-1.16.4.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	distutils-r1	57f007adcdf3953627f14277c7eae6e0	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=bfe705a92676daba5d545018978f9fa8
diff --git a/metadata/md5-cache/dev-libs/libwacom-2.7.0 b/metadata/md5-cache/dev-libs/libwacom-2.7.0
new file mode 100644
index 000000000000..c64b7ca84297
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libwacom-2.7.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( >=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/python-libevdev[python_targets_python3_11(-)] dev-python/pyudev[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 dev-python/python-libevdev[python_targets_python3_10(-)] dev-python/pyudev[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/glib:2 dev-libs/libgudev:=
+DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
+EAPI=8
+HOMEPAGE=https://github.com/linuxwacom/libwacom
+INHERIT=meson python-any-r1 udev
+IUSE=doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
+RESTRICT=!test? ( test )
+SLOT=0/9
+SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.7.0/libwacom-2.7.0.tar.xz
+_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=e6fccdb589b9344d546632be3f9cb069
diff --git a/metadata/md5-cache/dev-perl/CGI-Simple-1.280.0 b/metadata/md5-cache/dev-perl/CGI-Simple-1.280.0
index 7e83e6510851..270e35bcec9c 100644
--- a/metadata/md5-cache/dev-perl/CGI-Simple-1.280.0
+++ b/metadata/md5-cache/dev-perl/CGI-Simple-1.280.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/CGI-Simple
 INHERIT=perl-module
 IUSE=test test
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=Artistic
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.280.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=75d894b7281cda256d4fd6c27dcbd972
+_md5_=206c71ce87e0f9f09f0bbf7046121dd0
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-2.600.0 b/metadata/md5-cache/dev-perl/Email-Sender-2.600.0
index 856ccef6de46..f6f00bedb2cf 100644
--- a/metadata/md5-cache/dev-perl/Email-Sender-2.600.0
+++ b/metadata/md5-cache/dev-perl/Email-Sender-2.600.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Sender
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Abstract-3.6.0 dev-perl/Email-Address-XS >=dev-perl/Email-Simple-1.998.0 >=virtual/perl-File-Path-2.60.0 virtual/perl-File-Spec >=virtual/perl-IO-1.110.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Module-Runtime >=dev-perl/Moo-2.0.0 >=dev-perl/MooX-Types-MooseLike-0.150.0 >=virtual/perl-libnet-3.70.0 dev-perl/Sub-Exporter >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-2.600.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9e72861593d5252c229465de65abc915
+_md5_=20ea0995b7332c78990b1bad6313dc20
diff --git a/metadata/md5-cache/dev-perl/Finance-Quote-1.550.0 b/metadata/md5-cache/dev-perl/Finance-Quote-1.550.0
index bc5d85635696..e53a344ae9cb 100644
--- a/metadata/md5-cache/dev-perl/Finance-Quote-1.550.0
+++ b/metadata/md5-cache/dev-perl/Finance-Quote-1.550.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Finance-Quote
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/CGI virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/DateTime dev-perl/DateTime-Format-Strptime virtual/perl-Encode virtual/perl-Exporter dev-perl/HTML-TableExtract dev-perl/HTML-Parser dev-perl/HTML-TokeParser-Simple dev-perl/HTML-Tree dev-perl/HTTP-Cookies dev-perl/HTTP-Message dev-perl/JSON dev-perl/JSON-Parse dev-perl/LWP-Protocol-https dev-perl/libwww-perl >=virtual/perl-Module-Load-0.360.0-r2 dev-perl/Mozilla-CA dev-perl/Readonly virtual/perl-Scalar-List-Utils dev-perl/Spreadsheet-XLSX dev-perl/String-Util dev-perl/Text-Template virtual/perl-Time-Piece dev-perl/Try-Tiny dev-perl/URI dev-perl/Web-Scraper dev-perl/XML-LibXML virtual/perl-if dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-1.55.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3ee4ef99c627e6a508349735372975c5
+_md5_=f23409b5193239ae4b2f169bf58a2add
diff --git a/metadata/md5-cache/dev-perl/MIME-tools-5.510.0 b/metadata/md5-cache/dev-perl/MIME-tools-5.510.0
index e701e10c3d1f..666b26d05418 100644
--- a/metadata/md5-cache/dev-perl/MIME-tools-5.510.0
+++ b/metadata/md5-cache/dev-perl/MIME-tools-5.510.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/MIME-tools
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Path-1 >=virtual/perl-File-Spec-0.600.0 >=virtual/perl-File-Temp-0.180.0 virtual/perl-IO >=virtual/perl-MIME-Base64-2.200.0 dev-perl/MailTools dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.510.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3ad7dc416a3d9acf231b16a0b1cef2b4
+_md5_=575b6471c73a360ac776f977ea0baf4a
diff --git a/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.301.120 b/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.301.120
index 41e9b00a64d6..12c94de8b6a1 100644
--- a/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.301.120
+++ b/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.301.120
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-AuthenticationResults
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Clone dev-perl/JSON virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-2.20230112.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0d66dfd5755644e01d4c625d516c7169
+_md5_=48405d22edd5c4c12469fc10e479e179
diff --git a/metadata/md5-cache/dev-perl/Mail-DKIM-1.202.302.120 b/metadata/md5-cache/dev-perl/Mail-DKIM-1.202.302.120
index e58240844ae4..f26355ff8e21 100644
--- a/metadata/md5-cache/dev-perl/Mail-DKIM-1.202.302.120
+++ b/metadata/md5-cache/dev-perl/Mail-DKIM-1.202.302.120
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-DKIM
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Crypt-OpenSSL-RSA-0.240.0 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/Mail-AuthenticationResults dev-perl/Net-DNS dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20230212.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0c093e0ec99ae61db12c5329e524ad57
+_md5_=5c85da6c3d43f805f73c117cc5f94308
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index e0165c21b75f..0b0a82931550 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/Math-NumSeq-75.0.0 b/metadata/md5-cache/dev-perl/Math-NumSeq-75.0.0
index 6b4ee01aca3e..9e4c9d0e4ab4 100644
--- a/metadata/md5-cache/dev-perl/Math-NumSeq-75.0.0
+++ b/metadata/md5-cache/dev-perl/Math-NumSeq-75.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Math-NumSeq
 INHERIT=perl-module
 IUSE=examples test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Scalar-List-Utils >=dev-perl/Math-Factor-XS-0.400.0 dev-perl/Math-Libm >=dev-perl/Math-Prime-XS-0.260.0 virtual/perl-Module-Load >=dev-perl/Module-Pluggable-4.700.0 dev-perl/Module-Util >=dev-perl/constant-defer-1.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-NumSeq-75.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a6bcd9f3218f4fff7b881d68990e7f8f
+_md5_=1b05152ff71b2e1c877abdebf22cc47d
diff --git a/metadata/md5-cache/dev-perl/Net-HTTP-6.220.0 b/metadata/md5-cache/dev-perl/Net-HTTP-6.220.0
index 446476d0f587..b50b8ff2d4fd 100644
--- a/metadata/md5-cache/dev-perl/Net-HTTP-6.220.0
+++ b/metadata/md5-cache/dev-perl/Net-HTTP-6.220.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-HTTP
 INHERIT=perl-module
 IUSE=minimal test test
-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=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( virtual/perl-IO-Socket-IP dev-perl/IO-Socket-INET6 >=dev-perl/IO-Socket-SSL-2.12.0 ) virtual/perl-Carp !<dev-perl/libwww-perl-6 virtual/perl-Compress-Raw-Zlib virtual/perl-IO virtual/perl-IO-Compress dev-perl/URI dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.22.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4a07e44b465c5938313b8092618c9f2e
+_md5_=0eb448de999aea5514e97be93c6438d1
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r2 b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r2
index 5e81c913df06..4eb6a4f0fb22 100644
--- a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-SSH-AuthorizedKeysFile
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Log-Log4perl-1.0.0 virtual/perl-Text-ParseWords dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Net-SSH-AuthorizedKeysFile-0.18.tar.gz https://github.com/mschilli/net-ssh-authorizedkeysfile-perl/pull/3.patch -> Net-SSH-AuthorizedKeysFile-0.180.0-r2-extra-keys.patch
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=48f13c69bba3e665bc15a47861a3ac33
+_md5_=e477c3133c8114d210ff2e868f02bf16
diff --git a/metadata/md5-cache/dev-perl/Net-Server-2.14.0 b/metadata/md5-cache/dev-perl/Net-Server-2.14.0
index 649775d70717..6da8cda04dfc 100644
--- a/metadata/md5-cache/dev-perl/Net-Server-2.14.0
+++ b/metadata/md5-cache/dev-perl/Net-Server-2.14.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-Server
 INHERIT=perl-module
 IUSE=ipv6 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-HiRes dev-perl/IO-Multiplex ipv6? ( dev-perl/IO-Socket-INET6 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.014.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fbb419208491b4353f244b84bb5bcdb3
+_md5_=469c5ccb56e545a866aa772d50fc1eaf
diff --git a/metadata/md5-cache/dev-perl/Test-File-1.993.0 b/metadata/md5-cache/dev-perl/Test-File-1.993.0
index 5fd47eaed7e0..db1855a79509 100644
--- a/metadata/md5-cache/dev-perl/Test-File-1.993.0
+++ b/metadata/md5-cache/dev-perl/Test-File-1.993.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-File
 INHERIT=perl-module
 IUSE=test
-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=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.993.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7878378422fb11612033cbc17a29c0f7
+_md5_=309671972e70ccebc0d8683a6dfc9d25
diff --git a/metadata/md5-cache/dev-perl/User-Identity-1.10.0 b/metadata/md5-cache/dev-perl/User-Identity-1.10.0
index 7852ab285b4b..eb8b364369d9 100644
--- a/metadata/md5-cache/dev-perl/User-Identity-1.10.0
+++ b/metadata/md5-cache/dev-perl/User-Identity-1.10.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/User-Identity
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Geography-Countries-1.400.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-1.01.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=592f8f98ae64a16ff8af5af24185162f
+_md5_=785cb7d01011e81db400a481a6c7c11c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f9f22e8f7033..858a1ca1a421 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/boto3-1.26.144 b/metadata/md5-cache/dev-python/boto3-1.26.144
new file mode 100644
index 000000000000..19186c89fb49
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.144
@@ -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.144[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.144[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.144.tar.gz -> boto3-1.26.144.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=19c6bcfc191ce918489bff494ff185c2
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.144 b/metadata/md5-cache/dev-python/botocore-1.29.144
new file mode 100644
index 000000000000..50afb807ba02
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.144
@@ -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.144.tar.gz -> botocore-1.29.144.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0a0fb1a94ac28cee470da7b1644eba68
diff --git a/metadata/md5-cache/dev-python/breathe-4.35.0 b/metadata/md5-cache/dev-python/breathe-4.35.0
index 16ac64f4bf86..21c98ebfdc97 100644
--- a/metadata/md5-cache/dev-python/breathe-4.35.0
+++ b/metadata/md5-cache/dev-python/breathe-4.35.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( app-doc/doxygen dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=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(-)?]
+BDEPEND=test? ( app-doc/doxygen dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=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
 DESCRIPTION=Sphinx Doxygen renderer
 EAPI=8
 HOMEPAGE=https://breathe.readthedocs.io/en/latest/ https://github.com/breathe-doc/breathe/ https://pypi.org/project/breathe/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra 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 )
+RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra 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/breathe-doc/breathe/archive/v4.35.0.tar.gz -> breathe-4.35.0.gh.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e6a1c1d159f97701ef43d40e78738fba
+_md5_=229841d2a95c331bc2ea7e0d13476fd0
diff --git a/metadata/md5-cache/dev-python/cachecontrol-0.13.0 b/metadata/md5-cache/dev-python/cachecontrol-0.13.0
new file mode 100644
index 000000000000..ff97ed777bef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cachecontrol-0.13.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cherrypy[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/msgpack-0.5.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.16.0[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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=httplib2 caching for requests
+EAPI=8
+HOMEPAGE=https://pypi.org/project/CacheControl/ https://github.com/psf/cachecontrol/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/msgpack-0.5.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.16.0[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://github.com/psf/cachecontrol/archive/v0.13.0.tar.gz -> cachecontrol-0.13.0.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=2cb9b4f10a415b78793e0c79925e7760
diff --git a/metadata/md5-cache/dev-python/fields-5.0.0-r3 b/metadata/md5-cache/dev-python/fields-5.0.0-r3
index 7f1e6dd16769..263d47e2eddd 100644
--- a/metadata/md5-cache/dev-python/fields-5.0.0-r3
+++ b/metadata/md5-cache/dev-python/fields-5.0.0-r3
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/attrs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/characteristic[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/attrs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/characteristic[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Container class boilerplate killer
 EAPI=8
 HOMEPAGE=https://github.com/ionelmc/python-fields/ https://pypi.org/project/fields/
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2
-RDEPEND=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 )
+RDEPEND=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/f/fields/fields-5.0.0.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b7c5ecb8f96774dbc54bfa257390ca3e
+_md5_=b8681928ae4cdf85c8c940106227e43c
diff --git a/metadata/md5-cache/dev-python/guessit-3.7.1 b/metadata/md5-cache/dev-python/guessit-3.7.1
index 872358bfb99f..6020072b1d06 100644
--- a/metadata/md5-cache/dev-python/guessit-3.7.1
+++ b/metadata/md5-cache/dev-python/guessit-3.7.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/babelfish-0.5.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rebulk-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[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(-)?]
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/babelfish-0.5.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rebulk-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[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
 DESCRIPTION=Python library for guessing information from video filenames
 EAPI=8
 HOMEPAGE=https://github.com/guessit-io/guessit/ https://pypi.org/project/guessit/
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-3
-RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rebulk-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.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 )
+RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rebulk-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[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://files.pythonhosted.org/packages/source/g/guessit/guessit-3.7.1.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3e6f0e9d7760aecc12ab8c321825f123
+_md5_=e29bcc29d23c98aa3635541794034dd4
diff --git a/metadata/md5-cache/dev-python/httpauth-0.3-r1 b/metadata/md5-cache/dev-python/httpauth-0.3-r1
index 4291a8b092d7..cee30612421a 100644
--- a/metadata/md5-cache/dev-python/httpauth-0.3-r1
+++ b/metadata/md5-cache/dev-python/httpauth-0.3-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A WSGI middleware that secures routes using HTTP Digest Authentication
 EAPI=8
-HOMEPAGE=https://github.com/jonashaag/httpauth/
+HOMEPAGE=https://github.com/jonashaag/httpauth/ https://pypi.org/project/httpauth/
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=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 )
+RDEPEND=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/h/httpauth/httpauth-0.3.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c9f4ee203623052e97e69303ee654d94
+_md5_=577b1c5f5c76edcdc2822554decee4cb
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.75.9 b/metadata/md5-cache/dev-python/hypothesis-6.75.9
new file mode 100644
index 000000000000..9d232dadb60e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.75.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_10? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[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_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+),sqlite] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_10? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+),sqlite] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12[threads(+),sqlite] )
+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://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.75.9.tar.gz -> hypothesis-6.75.9.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e13f3b55ff4beb33238710b06dc61b89
diff --git a/metadata/md5-cache/dev-python/imageio-ffmpeg-0.4.8 b/metadata/md5-cache/dev-python/imageio-ffmpeg-0.4.8
index 0537b9797465..9cbfdbbc1638 100644
--- a/metadata/md5-cache/dev-python/imageio-ffmpeg-0.4.8
+++ b/metadata/md5-cache/dev-python/imageio-ffmpeg-0.4.8
@@ -1,17 +1,17 @@
-BDEPEND=test? ( media-video/ffmpeg:* >=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(-)?]
+BDEPEND=test? ( media-video/ffmpeg:* >=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
 DESCRIPTION=FFMPEG wrapper for Python
 EAPI=8
 HOMEPAGE=https://github.com/imageio/imageio-ffmpeg/ https://pypi.org/project/imageio-ffmpeg/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD-2
 PROPERTIES=test_network
-RDEPEND=media-video/ffmpeg:* 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 )
+RDEPEND=media-video/ffmpeg:* 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? ( test )
 SLOT=0
 SRC_URI=https://github.com/imageio/imageio-ffmpeg/archive/v0.4.8.tar.gz -> imageio-ffmpeg-0.4.8.gh.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=aa971eec3fc9b48c5b7a18d0ddd22516
+_md5_=a0d22edc2daa8aefd6338a1a13a82b78
diff --git a/metadata/md5-cache/dev-python/leechcorepyc-2.14.3 b/metadata/md5-cache/dev-python/leechcorepyc-2.14.3
index 8d14a8e94d31..594474153900 100644
--- a/metadata/md5-cache/dev-python/leechcorepyc-2.14.3
+++ b/metadata/md5-cache/dev-python/leechcorepyc-2.14.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ufrisk/LeechCore
 INHERIT=distutils-r1 toolchain-funcs pypi
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=virtual/libusb:= 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 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/l/leechcorepyc/leechcorepyc-2.14.3.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=143f6129f800c8f2a08ace53592d3fba
+_md5_=cec2973941fc8bc4e2c8f7db01329c88
diff --git a/metadata/md5-cache/dev-python/nbformat-5.9.0 b/metadata/md5-cache/dev-python/nbformat-5.9.0
new file mode 100644
index 000000000000..37b00915bccf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nbformat-5.9.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/testpath[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.3:3.11[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/numpydoc[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] dev-python/pydata-sphinx-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/numpydoc[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] dev-python/pydata-sphinx-theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/fastjsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-2.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[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[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[sqlite] ) >=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=Reference implementation of the Jupyter Notebook format
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbformat/ https://pypi.org/project/nbformat/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/fastjsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-2.6[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/n/nbformat/nbformat-5.9.0.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3a8bdf503894cfd004ead20646b0ec6a
diff --git a/metadata/md5-cache/dev-python/netifaces-0.11.0-r1 b/metadata/md5-cache/dev-python/netifaces-0.11.0-r1
index dc430187a0a0..0cd26e2df799 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.11.0-r1
+++ b/metadata/md5-cache/dev-python/netifaces-0.11.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 )
+DEPEND=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 )
 DESCRIPTION=Portable network interface information
 EAPI=8
 HOMEPAGE=https://pypi.org/project/netifaces/ https://alastairs-place.net/projects/netifaces/ https://github.com/al45tair/netifaces
 INHERIT=distutils-r1 pypi
-IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
+IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
 KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=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 )
+RDEPEND=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 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/netifaces/netifaces-0.11.0.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bd29819c8f9782f34a5fc7b5d8693334
+_md5_=47263739fbbc96c4f9505f62fc58b41f
diff --git a/metadata/md5-cache/dev-python/node-semver-0.9.0 b/metadata/md5-cache/dev-python/node-semver-0.9.0
index cc8a582c2be4..e1f5e8b8b140 100644
--- a/metadata/md5-cache/dev-python/node-semver-0.9.0
+++ b/metadata/md5-cache/dev-python/node-semver-0.9.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python version of node-semver, the semantic versioner for npm
 EAPI=8
 HOMEPAGE=https://pypi.org/project/node-semver/ https://github.com/podhmo/python-node-semver/ https://github.com/npm/node-semver/
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=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 )
+RDEPEND=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://github.com/podhmo/python-node-semver/archive/0.9.0.tar.gz -> python-node-semver-0.9.0.gh.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5b3b0cca3e39b3079ae5855659bca76c
+_md5_=721532a41230b0324226e605e56bdbd0
diff --git a/metadata/md5-cache/dev-python/pastel-0.2.1-r1 b/metadata/md5-cache/dev-python/pastel-0.2.1-r1
index 0da06634b42e..baac8b3594e1 100644
--- a/metadata/md5-cache/dev-python/pastel-0.2.1-r1
+++ b/metadata/md5-cache/dev-python/pastel-0.2.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=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/poetry-core-1.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=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/poetry-core-1.5.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Bring colors to your terminal
 EAPI=8
 HOMEPAGE=https://github.com/sdispater/pastel/ https://pypi.org/project/pastel/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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 )
+RDEPEND=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/sdispater/pastel/archive/0.2.1.tar.gz -> pastel-0.2.1.gh.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=06e0fe1a709dcea4223d486573c85dd9
+_md5_=285e2b8f665b1ebe9f16c6f259a72ee2
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.9.6 b/metadata/md5-cache/dev-python/pkginfo-1.9.6
index 98b7eb8497e7..1f4f6008c1ef 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.9.6
+++ b/metadata/md5-cache/dev-python/pkginfo-1.9.6
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.3:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) 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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( >=dev-lang/python-3.12.0_beta1:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] ) ( >=dev-lang/python-3.11.3:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) 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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Provides an API for querying the distutils metadata written in a PKG-INFO file
 EAPI=8
 HOMEPAGE=https://launchpad.net/pkginfo/ https://pypi.org/project/pkginfo/
 INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_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 )
+RDEPEND=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/pkginfo/pkginfo-1.9.6.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bea7daac966f481ebc2164bf2da5ce4b
+_md5_=53872d2bb4bac49eea7c0b39c2e9fff4
diff --git a/metadata/md5-cache/dev-python/pockets-0.9.1-r3 b/metadata/md5-cache/dev-python/pockets-0.9.1-r3
index 073599f32d37..04338f9a02cb 100644
--- a/metadata/md5-cache/dev-python/pockets-0.9.1-r3
+++ b/metadata/md5-cache/dev-python/pockets-0.9.1-r3
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[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(-)?]
+BDEPEND=test? ( dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/six[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
 DESCRIPTION=Collection of helpful Python tools
 EAPI=8
-HOMEPAGE=https://pockets.readthedocs.io/ https://pypi.org/project/pockets/
+HOMEPAGE=https://pockets.readthedocs.io/ https://github.com/RobRuana/pockets/ https://pypi.org/project/pockets/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=amd64 arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/six[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 )
+RDEPEND=dev-python/six[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/RobRuana/pockets/archive/777724c8eabaf76f6d0c5e4837c982d110509b2e.tar.gz -> pockets-0.9.1.gh.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=82688a1e74e34ad67a4f0fabf8ab8fff
+_md5_=f54b8ed972aed495fecb9ff1554e981a
diff --git a/metadata/md5-cache/dev-python/podcastparser-0.6.10 b/metadata/md5-cache/dev-python/podcastparser-0.6.10
index bf7a33984b43..4f2a222da566 100644
--- a/metadata/md5-cache/dev-python/podcastparser-0.6.10
+++ b/metadata/md5-cache/dev-python/podcastparser-0.6.10
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=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(-)?]
+BDEPEND=test? ( >=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
 DESCRIPTION=Podcast parser for the gpodder client
 EAPI=8
 HOMEPAGE=https://github.com/gpodder/podcastparser/ https://pypi.org/project/podcastparser/
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=amd64 x86
 LICENSE=ISC
-RDEPEND=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 )
+RDEPEND=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://files.pythonhosted.org/packages/source/p/podcastparser/podcastparser-0.6.10.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=461531593da09fd2db3de1c2f3ea5acb
+_md5_=d86c1f0a6434705c1d2201fb14b104d9
diff --git a/metadata/md5-cache/dev-python/polib-1.2.0 b/metadata/md5-cache/dev-python/polib-1.2.0
index 4d51771d565a..f94241461c03 100644
--- a/metadata/md5-cache/dev-python/polib-1.2.0
+++ b/metadata/md5-cache/dev-python/polib-1.2.0
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.3:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ) ) 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(-)?]
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.12.0_beta1:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] ) ( >=dev-lang/python-3.11.3:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ) ) 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=A library to manipulate gettext files (.po and .mo files)
 EAPI=8
 HOMEPAGE=https://github.com/izimobil/polib/ https://pypi.org/project/polib/ https://polib.readthedocs.io/en/latest/
 INHERIT=distutils-r1 pypi
-IUSE=doc python_targets_python3_10 python_targets_python3_11
+IUSE=doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
-RDEPEND=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 )
+RDEPEND=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 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/polib/polib-1.2.0.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0ee7753a2e5f1533b6c9d83ef3061e89
+_md5_=bd350a2dd1f9d3dd9ea57c91a2c80963
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.18.0 b/metadata/md5-cache/dev-python/pycryptodome-3.18.0
index cb532f8ce1d1..361f245f6bb8 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.18.0
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.18.0
@@ -1,16 +1,16 @@
-BDEPEND=virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=python_targets_python3_10? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp:0= >=dev-libs/libtomcrypt-1.18.2-r1:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+)] )
+DEPEND=dev-libs/gmp:= >=dev-libs/libtomcrypt-1.18.2-r1:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12[threads(+)] )
 DESCRIPTION=A self-contained cryptographic library for Python
 EAPI=8
 HOMEPAGE=https://www.pycryptodome.org/ https://github.com/Legrandin/pycryptodome/ https://pypi.org/project/pycryptodome/
 INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
+IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2 Unlicense
-RDEPEND=dev-libs/gmp:0= >=dev-libs/libtomcrypt-1.18.2-r1:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/pycrypto python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=dev-libs/gmp:= >=dev-libs/libtomcrypt-1.18.2-r1:= python_targets_python3_10? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) !dev-python/pycrypto python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/Legrandin/pycryptodome/archive/v3.18.0.tar.gz -> pycryptodome-3.18.0.gh.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0ad2ec1dae81b6a2e580651927e724e4
+_md5_=b94be7b037e5caefe764d194f13ee82f
diff --git a/metadata/md5-cache/dev-python/pypdf-3.9.0 b/metadata/md5-cache/dev-python/pypdf-3.9.0
index eb4d03982acd..64d01f2126af 100644
--- a/metadata/md5-cache/dev-python/pypdf-3.9.0
+++ b/metadata/md5-cache/dev-python/pypdf-3.9.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=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/flit-core-3.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pycryptodome[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=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/flit-core-3.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Python library to work with PDF files
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pypdf/ https://github.com/py-pdf/pypdf/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=BSD-2
-RDEPEND=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 )
+RDEPEND=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/py-pdf/pypdf/archive/3.9.0.tar.gz -> pypdf-3.9.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/69b31cff6b183a42f9081709ef9bee4047976f56.tar.gz -> pypdf-sample-files-69b31cff6b183a42f9081709ef9bee4047976f56.gh.tar.gz )
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ae8cf0d6b3f34246304de4ae5b44c857
+_md5_=6836d05f50d916780662fb49a0a7f931
diff --git a/metadata/md5-cache/dev-python/rich-13.4.1 b/metadata/md5-cache/dev-python/rich-13.4.1
new file mode 100644
index 000000000000..77357aff1271
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rich-13.4.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/markdown-it-py-2.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pygments-2.13.0[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/poetry-core-1.5.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library for rendering rich text, tables, etc. to the terminal
+EAPI=8
+HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/markdown-it-py-2.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pygments-2.13.0[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://github.com/Textualize/rich/archive/v13.4.1.tar.gz -> rich-13.4.1.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=55a946e027a1b039d00098ca076084b8
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.17.31 b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.31
new file mode 100644
index 000000000000..6b12f1a4c119
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.17.31
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ruamel-std-pathlib[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/ruamel-yaml-clib[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !dev-python/namespace-ruamel >=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/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=YAML parser/emitter that supports roundtrip comment preservation
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/projects/ruamel-yaml/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/ruamel-yaml-clib[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !dev-python/namespace-ruamel 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=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.yaml-0.17.31.tar.xz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=bf6fe198a433a412b11398afaad11763
diff --git a/metadata/md5-cache/dev-python/scikit-build-0.17.6 b/metadata/md5-cache/dev-python/scikit-build-0.17.6
new file mode 100644
index 000000000000..026d69d6dc24
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scikit-build-0.17.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-fancy-pypi-readme[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hatch-vcs[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/build-0.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cython-0.25.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-1.10.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.3:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] ) ) ) test? ( dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-42.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=dev-python/wheel-0.32.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=Improved build system generator for Python C/C++/Fortran/Cython extensions
+EAPI=8
+HOMEPAGE=https://github.com/scikit-build/scikit-build/ https://pypi.org/project/scikit-build/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-42.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=dev-python/wheel-0.32.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/s/scikit-build/scikit_build-0.17.6.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=9dafffb5eda0688fc4f3b5a326341d35
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 9a883d6dfb65..ebdb8a23ad88 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/connection_pool-2.4.0 b/metadata/md5-cache/dev-ruby/connection_pool-2.4.0
index 97f9d6dbb784..4aac7b8a33d3 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.4.0
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.4.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mperham/connection_pool
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mperham/connection_pool/archive/v2.4.0.tar.gz -> connection_pool-2.4.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=426ddb521d0af807d01b4c045a9f63b3
+_md5_=d90d9af759afdfa4b3798b8d390fd3b5
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.8.1-r1 b/metadata/md5-cache/dev-ruby/execjs-2.8.1-r1
index e154ef211324..077d4c58fd12 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/execjs-2.8.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rails/execjs
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=|| ( dev-ruby/duktape-rb net-libs/nodejs ) 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.8.1.tar.gz -> execjs-2.8.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3be84f8dff16abf4970c98d896419771
+_md5_=3e1673273da43fd4a34db6c5884d2bed
diff --git a/metadata/md5-cache/dev-ruby/histogram-0.2.4.1-r1 b/metadata/md5-cache/dev-ruby/histogram-0.2.4.1-r1
index 35d10da39b66..132438749d3a 100644
--- a/metadata/md5-cache/dev-ruby/histogram-0.2.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/histogram-0.2.4.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jtprince/histogram
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/histogram-0.2.4.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=498e44751f844741d9e5f6c5b8a369cb
+_md5_=e261fb94233a45aa480eff0a48f197e3
diff --git a/metadata/md5-cache/dev-ruby/hocon-1.4.0 b/metadata/md5-cache/dev-ruby/hocon-1.4.0
index 07e4472caa24..8c16e98ba602 100644
--- a/metadata/md5-cache/dev-ruby/hocon-1.4.0
+++ b/metadata/md5-cache/dev-ruby/hocon-1.4.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/puppetlabs/ruby-hocon
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/ruby-hocon/archive/1.4.0.tar.gz -> hocon-1.4.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7b70fb0f19a351e3906a90fe83a5ede9
+_md5_=c0039034ad66b8f5cb38683d6c9806d2
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.5-r1 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.5-r1
index b39fda476b9c..c2a4e3bf4fd0 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.5-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sparklemotion/http-cookie
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/domain_name-0.5:0[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http-cookie-1.0.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e41a66cf023494836094e99f6c8927f9
+_md5_=4b10f711a8704d2ecc6c1935f167c559
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.2 b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.2
index 776e2bbe4887..8e8b42cd0df0 100644
--- a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.2
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/flavorjones/mini_portile
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.8
 SRC_URI=https://rubygems.org/gems/mini_portile2-2.8.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c3cfe1aaf1ef89865358175a07d01266
+_md5_=be108e6a5ac23275b6c73f51fdfef948
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-7.1.0 b/metadata/md5-cache/dev-ruby/net-ssh-7.1.0
index aebbd2d1c43f..a1f3f15cc738 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-7.1.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-7.1.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/net-ssh/net-ssh
 INHERIT=ruby-fakegem
 IUSE=ed25519 test test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ed25519? ( >=dev-ruby/ed25519-1.2:1[ruby_targets_ruby30(-)] dev-ruby/x25519[ruby_targets_ruby30(-)] dev-ruby/bcrypt_pbkdf:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ed25519? ( >=dev-ruby/ed25519-1.2:1[ruby_targets_ruby31(-)] dev-ruby/x25519[ruby_targets_ruby31(-)] dev-ruby/bcrypt_pbkdf:1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( virtual/ruby-ssl[ruby_targets_ruby32(-)] ed25519? ( >=dev-ruby/ed25519-1.2:1[ruby_targets_ruby32(-)] dev-ruby/x25519[ruby_targets_ruby32(-)] dev-ruby/bcrypt_pbkdf:1[ruby_targets_ruby32(-)] ) ) ruby_targets_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v7.1.0.tar.gz -> net-ssh-git-7.1.0.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8c6ab791cc50aeb4499e27673ec64c14
+_md5_=37be1847fd7b2b869911aa3346b97374
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2 b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2
index df441117fb06..044baa86d085 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/heroku/netrc
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/netrc-0.11.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2e26007b3cf8ba925b00e986b0c4122c
+_md5_=556e2ab3b0f2fda4caa54fa0264fac29
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.6.4 b/metadata/md5-cache/dev-ruby/rack-2.2.6.4
index 2de48284ff5f..77284ebeee74 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.2.6.4
+++ b/metadata/md5-cache/dev-ruby/rack-2.2.6.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rack/rack
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/ruby-ssl[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.2
 SRC_URI=https://github.com/rack/rack/archive/v2.2.6.4.tar.gz -> rack-2.2.6.4.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=419b0f0ba662d7327b7d508a8e6e6e85
+_md5_=fddd9ebcbe0a50cc1dd2043a37df07bc
diff --git a/metadata/md5-cache/dev-ruby/rack-3.0.7 b/metadata/md5-cache/dev-ruby/rack-3.0.7
index e84f755aae12..2354992c0082 100644
--- a/metadata/md5-cache/dev-ruby/rack-3.0.7
+++ b/metadata/md5-cache/dev-ruby/rack-3.0.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rack/rack
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/ruby-ssl[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.0
 SRC_URI=https://github.com/rack/rack/archive/v3.0.7.tar.gz -> rack-3.0.7.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9a110e88b5d3b9b63b64095090594e5e
+_md5_=6018fb5bc76f3c253ce059b4081eaa74
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1-r1 b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1-r1
index d93447fdc393..52f22431f0db 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/RubyCrypto/rbnacl
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ppc ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libsodium ruby_targets_ruby30? ( dev-ruby/ffi[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/ffi[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/ffi[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rbnacl-7.1.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fa6d057d0e4a04311795307eea2ef5b7
+_md5_=6ce56ff5372b751f6b5448f69990b305
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.30.0-r1 b/metadata/md5-cache/dev-ruby/rouge-3.30.0-r1
index 0a0cd50e3e28..470bb1ca7cc8 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.30.0-r1
+++ b/metadata/md5-cache/dev-ruby/rouge-3.30.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jneen/rouge
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-ruby/redcarpet[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/redcarpet[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/redcarpet[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.30.0.tar.gz -> rouge-3.30.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5fdfc5a6d7924e461d5689658278f996
+_md5_=b800c95d5a2d94e58030a84529c91181
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-4.1.2 b/metadata/md5-cache/dev-ruby/ruby-glib2-4.1.2
index 0681c7aed41a..f663900eef0b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-4.1.2
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-4.1.2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://ruby-gnome.github.io/
 INHERIT=ruby-ng-gnome2
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/4.1.2.tar.gz -> ruby-gnome2-4.1.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-ng-gnome2	709f4cae42d44b6a5be40645d8e240ff	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4129984888706cb163bc6d763a1d2815
+_md5_=49e50e66b1c7688e21bd8ad4b52f46ef
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r2 b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r2
index af1dd43b836c..d194d0ec3f8b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://arika.org/ruby/termios
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86
+KEYWORDS=~amd64 ~hppa ~mips ~ppc x86
 LICENSE=Ruby-BSD
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-termios-1.1.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6e9ffa9a60e952d390d67a652c733a58
+_md5_=4d73950559a5cc9374cb176e7c201f61
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.3.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.3.0
index 4e8fc1e42e8e..fe8471923e4b 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-5.3.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-5.3.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activesupport-5.2.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/activesupport-5.2.0:*[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 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v5.3.0.tar.gz -> shoulda-matchers-5.3.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=200e701ff9c36a428854d6d4b4e4b85a
+_md5_=abfa32887eeb9ca081709a2fa12b0086
diff --git a/metadata/md5-cache/dev-ruby/slim-5.1.0-r1 b/metadata/md5-cache/dev-ruby/slim-5.1.0-r1
index 31e8ea66d759..815c498e8a8f 100644
--- a/metadata/md5-cache/dev-ruby/slim-5.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/slim-5.1.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://slim-template.github.io/
 INHERIT=ruby-fakegem
 IUSE=doc test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( !dev-ruby/slim:5[ruby_targets_ruby30(-)] >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby30(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( !dev-ruby/slim:5[ruby_targets_ruby31(-)] >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby31(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( !dev-ruby/slim:5[ruby_targets_ruby32(-)] >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby32(-)] >=dev-ruby/temple-0.7.6:0.7[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/slim-5.1.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=317a0f572383f83720448e5f53b6141f
+_md5_=8c205dd1de2f248f4ac58ac42550e8b3
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r8 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r8
index 399aee605d8f..bc0837a40cb6 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r8
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://sparklines.rubyforge.org/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-ruby/rmagick:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rmagick:*[ruby_targets_ruby31(-)] ) 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sparklines-0.5.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=89a0b34cdb1bdee855ce81115a40e6fa
+_md5_=1c7653e5860d656e72aa339421fd0a7b
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.8.5-r3 b/metadata/md5-cache/dev-ruby/stringex-2.8.5-r3
index 9a1767d5a9bd..2e5b2b2d478d 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.8.5-r3
+++ b/metadata/md5-cache/dev-ruby/stringex-2.8.5-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rsl/stringex
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stringex-2.8.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e32b2fcc022a29f1d2a03c4ac2f3726e
+_md5_=f84c4a17e965d5b84238c80d8904063e
diff --git a/metadata/md5-cache/dev-ruby/sys-uname-1.2.3 b/metadata/md5-cache/dev-ruby/sys-uname-1.2.3
index 66401fccbadb..2eb42bcfa768 100644
--- a/metadata/md5-cache/dev-ruby/sys-uname-1.2.3
+++ b/metadata/md5-cache/dev-ruby/sys-uname-1.2.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/djberg96/sys-uname
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/ffi-1.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? ( 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/sys-uname-1.2.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=93f0655ca7c3c5c3e3a9516435b910cb
+_md5_=02adb273b4d3c3773b49eb725b1bee1f
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.7 b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.7
index d15f18c174ce..23784a2d9cfe 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.6.7
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.6.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fxn/zeitwerk
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.6.7.tar.gz -> zeitwerk-2.6.7.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=806b803724327af6ef685ad42ba3234e
+_md5_=5d6f8bc5261476b809f2e5602120d338
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 7dace736877b..12a49a7cd8cc 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/cppcheck-2.8.1-r1 b/metadata/md5-cache/dev-util/cppcheck-2.8.1-r1
index 32c9d66c1822..8e10cf28ab38 100644
--- a/metadata/md5-cache/dev-util/cppcheck-2.8.1-r1
+++ b/metadata/md5-cache/dev-util/cppcheck-2.8.1-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/refs/tags/2.8.1.tar.gz -> cppcheck-2.8.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	57f007adcdf3953627f14277c7eae6e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fc2a2952aabbab4ad54e0d2fed5ca331
+_md5_=0a9107728862faf1204125314b42b960
diff --git a/metadata/md5-cache/dev-util/cppcheck-2.8.2 b/metadata/md5-cache/dev-util/cppcheck-2.8.2
index 1ed21a9be524..726209915363 100644
--- a/metadata/md5-cache/dev-util/cppcheck-2.8.2
+++ b/metadata/md5-cache/dev-util/cppcheck-2.8.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/refs/tags/2.8.2.tar.gz -> cppcheck-2.8.2.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	57f007adcdf3953627f14277c7eae6e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fc2a2952aabbab4ad54e0d2fed5ca331
+_md5_=0a9107728862faf1204125314b42b960
diff --git a/metadata/md5-cache/dev-util/cppcheck-2.9 b/metadata/md5-cache/dev-util/cppcheck-2.9
index a5a526499cec..52989989db11 100644
--- a/metadata/md5-cache/dev-util/cppcheck-2.9
+++ b/metadata/md5-cache/dev-util/cppcheck-2.9
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/refs/tags/2.9.tar.gz -> cppcheck-2.9.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	57f007adcdf3953627f14277c7eae6e0	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9c201e2b1deb7a66af8f2f9edb362225
+_md5_=6f128adb70c668dbbcb969b9b2d90437
diff --git a/metadata/md5-cache/dev-util/elfkickers-3.2 b/metadata/md5-cache/dev-util/elfkickers-3.2
index bf30e91516dd..48ae54f4a6ed 100644
--- a/metadata/md5-cache/dev-util/elfkickers-3.2
+++ b/metadata/md5-cache/dev-util/elfkickers-3.2
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=http://www.muppetlabs.com/~breadbox/software/elfkickers.html
 INHERIT=toolchain-funcs
 IUSE=doc
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~sparc ~x86
+KEYWORDS=~amd64 arm ~hppa ~mips ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-3.2.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=880c34dc68a9ed02f0a1a1a65a15357d
+_md5_=bf3a6b50cbb9c501f3f62dbb2ab86270
diff --git a/metadata/md5-cache/dev-util/strace-6.2 b/metadata/md5-cache/dev-util/strace-6.2
index bea4ef9be48e..bc611c882330 100644
--- a/metadata/md5-cache/dev-util/strace-6.2
+++ b/metadata/md5-cache/dev-util/strace-6.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://strace.io/
 INHERIT=autotools edo flag-o-matic toolchain-funcs
 IUSE=aio perl selinux static unwind elfutils
-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=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 SRC_URI=https://github.com/strace/strace/releases/download/v6.2/strace-6.2.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bf90332189df65c8c934f665fe30ef3b
+_md5_=2b24c2dbb40daa416b1300539e6a2be4
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 9b75742ea0c7..c6d742f1fdaa 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/sil-doulos-6.200 b/metadata/md5-cache/media-fonts/sil-doulos-6.200
index 72b94277189c..c51b55308e94 100644
--- a/metadata/md5-cache/media-fonts/sil-doulos-6.200
+++ b/metadata/md5-cache/media-fonts/sil-doulos-6.200
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://software.sil.org/doulos/
 INHERIT=font
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~loong ~ppc ppc64 ~s390 ~sparc x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/doulos/DoulosSIL-6.200.zip -> sil-doulos-6.200.zip
 _eclasses_=font	aa113a3df9cd0a9693a1c1ee7c34a6eb
-_md5_=3168bbbca60af222b8033706f3ae6814
+_md5_=e00d6f75484ffd9eccdca40be857b128
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 0ce04eab404c..35a5d082fccd 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.89 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.89
new file mode 100644
index 000000000000..1731750422c9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.89
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst prepare pretend setup test
+DEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=8
+HOMEPAGE=https://www.imagemagick.org/
+INHERIT=flag-o-matic libtool perl-functions toolchain-funcs
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=imagemagick
+RDEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
+RESTRICT=!test? ( test )
+SLOT=0/6.9.12-58
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-89.tar.xz
+_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f9a3aeb94470cbeed9ab5b30617c7792
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.1.1.11 b/metadata/md5-cache/media-gfx/imagemagick-7.1.1.11
new file mode 100644
index 000000000000..9d73ec12575b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.1.1.11
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig 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=configure install postinst prepare pretend setup test
+DEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) jpegxl? ( >=media-libs/libjxl-0.6 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=8
+HOMEPAGE=https://www.imagemagick.org/
+INHERIT=autotools flag-o-matic perl-functions toolchain-funcs
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=imagemagick
+RDEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) jpegxl? ( >=media-libs/libjxl-0.6 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
+RESTRICT=!test? ( test )
+SLOT=0/7.1.1-43
+SRC_URI=mirror://imagemagick/ImageMagick-7.1.1-11.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=258fe94c4a3a074ab0dd5edaa8caa84f
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c3ce43ccd266..3d6ef041f391 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/exiftool-12.61 b/metadata/md5-cache/media-libs/exiftool-12.61
index 5f896db56368..48ed8cafac47 100644
--- a/metadata/md5-cache/media-libs/exiftool-12.61
+++ b/metadata/md5-cache/media-libs/exiftool-12.61
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://exiftool.org/ http://exiftool.sourceforge.net
 INHERIT=perl-module
 IUSE=doc test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 arm64 ppc ppc64 x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://exiftool.org/Image-ExifTool-12.61.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a21dcb2f8e88ef37e5f6e38b57d70bd3
+_md5_=b3659488ffe69f76c81f89b0e06f08ab
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.14.2-r2 b/metadata/md5-cache/media-libs/fontconfig-2.14.2-r2
index a672d06b00a4..465f338541a5 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.14.2-r2
+++ b/metadata/md5-cache/media-libs/fontconfig-2.14.2-r2
@@ -7,7 +7,7 @@ HOMEPAGE=https://fontconfig.org/
 IDEPEND=app-eselect/eselect-fontconfig
 INHERIT=multilib meson-multilib python-any-r1 readme.gentoo-r1
 IUSE=doc nls test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 PDEPEND=virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] !elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elibc_Darwin? ( sys-libs/native-uuid ) elibc_SunOS? ( sys-libs/libuuid )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://fontconfig.org/release/fontconfig-2.14.2.tar.xz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f6ee24f9741ec8c511f4f9ee51264e1c
+_md5_=5f59db8adad70e2bb91eac3ba128c250
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.22.3-r1 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.22.3-r1
new file mode 100644
index 000000000000..1711186ea8d0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.22.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) dev-util/glib-utils >=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 ) virtual/pkgconfig virtual/perl-JSON-PP nls? ( >=sys-devel/gettext-0.17 ) test? ( media-libs/gstreamer[test] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!media-plugins/gst-transcoder >=media-libs/gstreamer-1.22.3:1.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(-)?,introspection?] >=media-libs/gst-plugins-base-1.22.3:1.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(-)?,egl?,introspection?,gles2=,opengl=] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.4.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(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.15 ) orc? ( >=dev-lang/orc-0.4.33[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qsv? ( media-libs/oneVPL[wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.22:1.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=Less plugins for GStreamer
+EAPI=7
+HOMEPAGE=https://gstreamer.freedesktop.org/
+INHERIT=gstreamer-meson python-any-r1
+IUSE=X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland qsv 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 nls test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=!media-plugins/gst-transcoder >=media-libs/gstreamer-1.22.3:1.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(-)?,introspection?] >=media-libs/gst-plugins-base-1.22.3:1.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(-)?,egl?,introspection?,gles2=,opengl=] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.4.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(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.15 ) orc? ( >=dev-lang/orc-0.4.33[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qsv? ( media-libs/oneVPL[wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.22:1.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(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.3.tar.xz
+_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	gstreamer-meson	da83e5c4466382945ae200e6ccace9ed	meson	915ec7c25e08d7886558215e6809ca1e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fd3b9cc785912e41732c399383cc8f40
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.22.3-r1 b/metadata/md5-cache/media-libs/gst-plugins-good-1.22.3-r2
index 54a676fed16d..b956f7966bad 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.22.3-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.22.3-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.3.tar.xz
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	gstreamer-meson	da83e5c4466382945ae200e6ccace9ed	meson	915ec7c25e08d7886558215e6809ca1e	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	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ca0b73a53830cccd051bd054559c3c2e
+_md5_=ccfd4d6a831c43f424eb5cf4e5e8cff7
diff --git a/metadata/md5-cache/media-libs/svt-av1-1.4.1 b/metadata/md5-cache/media-libs/svt-av1-1.4.1
index facc230c36ca..185524b87463 100644
--- a/metadata/md5-cache/media-libs/svt-av1-1.4.1
+++ b/metadata/md5-cache/media-libs/svt-av1-1.4.1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/AOMediaCodec/SVT-AV1
 INHERIT=cmake-multilib flag-o-matic
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT
 SLOT=0
 SRC_URI=https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v1.4.1/SVT-AV1-v1.4.1.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=48a07ebc8b8e3d8423f245bbaf95e84e
+_md5_=59b3c78f0817d2b901c1b3be514b69b5
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.13-r2 b/metadata/md5-cache/media-libs/xine-lib-1.2.13-r2
index 1ff46cff3073..d01c08ad6137 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.13-r2
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.13-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xine.sourceforge.net/
 INHERIT=flag-o-matic libtool multilib
 IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc nls
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~hppa ppc ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) wayland? ( opengl ) xv? ( X ) xinerama? ( X )
 SLOT=1
 SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.13.tar.xz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5178a5ebd54aae95c1fe2b9342785f85
+_md5_=a92c44726df072095e8d9a223e144a10
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index b37d7046cd93..538352ef15de 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-4.3-r1 b/metadata/md5-cache/media-plugins/audacious-plugins-4.3-r1
deleted file mode 100644
index 6eb23f8a5f14..000000000000
--- a/metadata/md5-cache/media-plugins/audacious-plugins-4.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen virtual/pkgconfig nls? ( dev-util/intltool )
-DEFINED_PHASES=configure prepare setup
-DEPEND=app-arch/unzip dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-4.3 sys-libs/zlib x11-libs/gdk-pixbuf:2 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1*:= ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3:= ) flac? ( >=media-libs/flac-1.2.1-r1:= >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) openmpt? ( media-libs/libopenmpt ) opus? ( media-libs/opusfile ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-DESCRIPTION=Lightweight and versatile audio player
-EAPI=8
-HOMEPAGE=https://audacious-media-player.org/
-IUSE=aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame libnotify libsamplerate lirc mms modplug mp3 nls opengl openmpt opus pipewire pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-4.3 sys-libs/zlib x11-libs/gdk-pixbuf:2 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1*:= ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3:= ) flac? ( >=media-libs/flac-1.2.1-r1:= >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) openmpt? ( media-libs/libopenmpt ) opus? ( media-libs/opusfile ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-REQUIRED_USE=ampache? ( http ) streamtuner? ( http )
-SLOT=0
-SRC_URI=https://distfiles.audacious-media-player.org/audacious-plugins-4.3.tar.bz2
-_md5_=3892deff4d88deec741ed61c939cd5e7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.22.3-r1 b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.22.3-r2
index 212394f4f5e3..757a5eb95c1f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.22.3-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.22.3-r2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.3.tar.xz
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	gstreamer-meson	da83e5c4466382945ae200e6ccace9ed	meson	915ec7c25e08d7886558215e6809ca1e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6a836328a6fe59a11f82ddf6889d0c27
+_md5_=bdf23edefd10c0e61692c1822731f7e3
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 391f59c7b1ae..b8b428591f6f 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/abcmidi-2023.05.30 b/metadata/md5-cache/media-sound/abcmidi-2023.05.30
new file mode 100644
index 000000000000..c6620796c11a
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcmidi-2023.05.30
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip 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=install prepare
+DESCRIPTION=Programs for processing ABC music notation files
+EAPI=8
+HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
+INHERIT=autotools
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2023.05.30.zip
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=71c7de92834a1d94685a3579089a9bec
diff --git a/metadata/md5-cache/media-sound/audacious-4.3 b/metadata/md5-cache/media-sound/audacious-4.3
deleted file mode 100644
index 037ed2230d4c..000000000000
--- a/metadata/md5-cache/media-sound/audacious-4.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool )
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/freedesktop-icon-theme
-DESCRIPTION=Lightweight and versatile audio player
-EAPI=8
-HOMEPAGE=https://audacious-media-player.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=xdg
-IUSE=nls
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD-2
-PDEPEND=~media-plugins/audacious-plugins-4.3
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://distfiles.audacious-media-player.org/audacious-4.3.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-_eclasses_=xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=888e77ac9ec987cef0a73d287d3d9577
diff --git a/metadata/md5-cache/media-sound/yoshimi-2.3.0 b/metadata/md5-cache/media-sound/yoshimi-2.3.0
new file mode 100644
index 000000000000..7a89bb10c161
--- /dev/null
+++ b/metadata/md5-cache/media-sound/yoshimi-2.3.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/mxml media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
+DESCRIPTION=Software synthesizer based on ZynAddSubFX
+EAPI=8
+HOMEPAGE=https://yoshimi.github.io/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic xdg
+IUSE=+lv2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/mxml media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
+SLOT=0
+SRC_URI=https://github.com/Yoshimi/yoshimi/archive/2.3.0.tar.gz -> yoshimi-2.3.0.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a5c213b9599607cccde3839c5b1c2d08
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 24fa825694d3..7b971b38af67 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/ffmpeg-4.4.4-r2 b/metadata/md5-cache/media-video/ffmpeg-4.4.4-r2
index 63fc85526b07..1c6b4e6afa10 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.4.4-r2
+++ b/metadata/md5-cache/media-video/ffmpeg-4.4.4-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://ffmpeg.org/
 INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs verify-sig
 IUSE=alsa chromium doc +encode oss pic sndio static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus qsv libilbc librtmp ssh speex srt svg nvenc vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r vmaf fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amf amrenc kvazaar libaom mp3 openh264 rav1e snappy svt-av1 theora twolame webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) amf? ( media-video/amdgpu-pro-amf ) amr? ( >=media-libs/opencore-amr-0.1.3-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(-)?] ) bluray? ( >=media-libs/libbluray-0.3.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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-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(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0: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(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-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(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.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(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.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(-)?] ) rav1e? ( >=media-video/rav1e-0.4:=[capi] ) snappy? ( >=app-arch/snappy-1.1.2-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(-)?] ) theora? ( >=media-libs/libogg-1.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(-)?] >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-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(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6: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(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.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(-)?] ) gmp? ( >=dev-libs/gmp-6: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(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] >=sys-libs/libavc1394-0.5.4-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(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.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(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2: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(-)?] ) libaom? ( >=media-libs/libaom-1.0.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(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.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(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.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(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-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(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qsv? ( media-libs/intel-mediasdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) srt? ( >=net-libs/srt-1.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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5:=[sftp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) svt-av1? ( >=media-libs/svt-av1-0.8.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.2.1-r1: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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.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(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.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(-)?] ) vmaf? ( media-libs/libvmaf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.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(-)?] ) vpx? ( >=media-libs/libvpx-1.4.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(-)?] ) vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 REQUIRED_USE=cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) vidstab? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.4.4.tar.xz verify-sig? ( https://ffmpeg.org/releases/ffmpeg-4.4.4.tar.xz.asc )
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=8bf37e43a8e19e857585933ea785a87c
+_md5_=645e8496baa9ed7ed29f1514b6550475
diff --git a/metadata/md5-cache/media-video/gpac-2.2.0 b/metadata/md5-cache/media-video/gpac-2.2.0
index 33a9c4140748..4a1eea4b26e8 100644
--- a/metadata/md5-cache/media-video/gpac-2.2.0
+++ b/metadata/md5-cache/media-video/gpac-2.2.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://gpac.wp.imt.fr/
 INHERIT=toolchain-funcs xdg
 IUSE=a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg jack jpeg jpeg2k mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libogg sys-libs/zlib a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) ffmpeg? ( media-video/ffmpeg:0= ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:0= ) jpeg2k? ( media-libs/openjpeg:2 ) mad? ( media-libs/libmad ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) theora? ( media-libs/libtheora ) truetype? ( media-libs/freetype:2 ) sdl? ( media-libs/libsdl ) ssl? ( dev-libs/openssl:0= ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXv x11-libs/libXext ) xml? ( dev-libs/libxml2:2= ) xvid? ( media-libs/xvid )
 SLOT=0/11
 SRC_URI=https://github.com/gpac/gpac/archive/v2.2.0.tar.gz -> gpac-2.2.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=44a2f5e0fc5ea5eadd1fa7cd0c790f12
+_md5_=3693bb42d5bc92e125c3a832409eae25
diff --git a/metadata/md5-cache/media-video/handbrake-1.5.1-r1 b/metadata/md5-cache/media-video/handbrake-1.5.1-r1
index 2a3c7aa13052..005e703908fd 100644
--- a/metadata/md5-cache/media-video/handbrake-1.5.1-r1
+++ b/metadata/md5-cache/media-video/handbrake-1.5.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) dev-lang/nasm dev-util/cmake 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 postrm preinst prepare setup
-DEPEND=app-arch/xz-utils dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec >=media-libs/dav1d-0.5.1:= media-libs/libjpeg-turbo:= media-libs/libass:= >=media-libs/libbluray-1.0:= media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8:= media-libs/opus media-libs/speex media-libs/x264:= media-libs/zimg media-sound/lame >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] sys-libs/zlib fdk? ( media-libs/fdk-aac:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) nvenc? ( media-libs/nv-codec-headers ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+DEPEND=app-arch/xz-utils dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec >=media-libs/dav1d-0.5.1:= media-libs/libjpeg-turbo:= media-libs/libass:= >=media-libs/libbluray-1.0:= media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8:= media-libs/opus media-libs/speex media-libs/x264:= media-libs/zimg media-sound/lame <media-video/ffmpeg-5.1:=[postproc,fdk?] sys-libs/zlib fdk? ( media-libs/fdk-aac:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) nvenc? ( media-libs/nv-codec-headers ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
 DESCRIPTION=Open-source, GPL-licensed, multiplatform, multithreaded video transcoder
 EAPI=8
 HOMEPAGE=https://handbrake.fr/ https://github.com/HandBrake/HandBrake
@@ -9,9 +9,9 @@ INHERIT=autotools python-any-r1 toolchain-funcs xdg
 IUSE=+fdk gstreamer gtk libav-aac numa nvenc x265
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-arch/xz-utils dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec >=media-libs/dav1d-0.5.1:= media-libs/libjpeg-turbo:= media-libs/libass:= >=media-libs/libbluray-1.0:= media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8:= media-libs/opus media-libs/speex media-libs/x264:= media-libs/zimg media-sound/lame >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] sys-libs/zlib fdk? ( media-libs/fdk-aac:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) nvenc? ( media-libs/nv-codec-headers ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+RDEPEND=app-arch/xz-utils dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec >=media-libs/dav1d-0.5.1:= media-libs/libjpeg-turbo:= media-libs/libass:= >=media-libs/libbluray-1.0:= media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8:= media-libs/opus media-libs/speex media-libs/x264:= media-libs/zimg media-sound/lame <media-video/ffmpeg-5.1:=[postproc,fdk?] sys-libs/zlib fdk? ( media-libs/fdk-aac:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) nvenc? ( media-libs/nv-codec-headers ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
 REQUIRED_USE=^^ ( fdk libav-aac )
 SLOT=0
 SRC_URI=https://github.com/HandBrake/HandBrake/releases/download/1.5.1/HandBrake-1.5.1-source.tar.bz2 -> handbrake-1.5.1.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a3ce31de6c1815f553371b1bfa57ba50
+_md5_=4cc23448289a5b4bef4af6952457be41
diff --git a/metadata/md5-cache/media-video/mplayer-1.5_p20230215 b/metadata/md5-cache/media-video/mplayer-1.5_p20230215
index c0d232824214..6b76029af0ba 100644
--- a/metadata/md5-cache/media-video/mplayer-1.5_p20230215
+++ b/metadata/md5-cache/media-video/mplayer-1.5_p20230215
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.mplayerhq.hu/
 INHERIT=edo toolchain-funcs flag-o-matic
 IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec a52 aalib +alsa aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum mng mp3 nas +network openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran video_cards_mga
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 >=media-video/ffmpeg-4.0:=[vdpau?] sys-libs/ncurses:= sys-libs/zlib a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvd? ( >=media-libs/libdvdread-4.1.3:= ) dvdnav? ( >=media-libs/libdvdnav-4.1.3:= ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( media-libs/fontconfig >=media-libs/freetype-2.2.1:2 virtual/ttf-fonts ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
@@ -14,4 +14,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/media-video/mplayer/mplayer-1.5_p20230215.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c9bde1121083b81fc28886a47ac25022
+_md5_=96f4a299ac0e6ded653c2fe64611dad4
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 70438297bac0..4b866639c24b 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.7.2 b/metadata/md5-cache/net-analyzer/nfdump-1.7.2
index e8979332535f..831c497ffc83 100644
--- a/metadata/md5-cache/net-analyzer/nfdump-1.7.2
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.7.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/phaag/nfdump
 INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=BSD
 RDEPEND=app-arch/bzip2 sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone ) ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
 REQUIRED_USE=?? ( jnat nsel )
 SLOT=0/1.7.2
 SRC_URI=https://github.com/phaag/nfdump/archive/v1.7.2.tar.gz -> nfdump-1.7.2.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1243802a97f02c7f38f28a8a301bf530
+_md5_=184c6c3ac351a079dffe28317501debb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.46 b/metadata/md5-cache/net-analyzer/zabbix-4.0.46
new file mode 100644
index 000000000000..01d7785b3549
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.46
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mbedtls? ( net-libs/mbedtls:0= ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
+IUSE=+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static xmpp java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mbedtls? ( net-libs/mbedtls:0= ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) xmpp? ( dev-libs/iksemel ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+SLOT=0/4.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.46.tar.gz
+_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=5b04195c81cd839e001738d0440a5d80
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.35 b/metadata/md5-cache/net-analyzer/zabbix-5.0.35
new file mode 100644
index 000000000000..008072427f7b
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.35
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/5.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.35.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.35-go-deps.tar.xz )
+_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=adf22fe05b267bf8c5f91f029d55a61c
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.18 b/metadata/md5-cache/net-analyzer/zabbix-6.0.18
new file mode 100644
index 000000000000..421b00a5e762
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.18
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.18.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.18-go-deps.tar.xz )
+_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=460057717176687538a938935a258e1f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.3 b/metadata/md5-cache/net-analyzer/zabbix-6.4.3
new file mode 100644
index 000000000000..5b783cc5f95f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.3
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.4
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.3.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.3-go-deps.tar.xz )
+_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=8004e29306a635e40ece83afe571c104
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index df560dc6e839..93c1085b15f7 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.6.3 b/metadata/md5-cache/net-fs/nfs-utils-2.6.3-r1
index f98795fdd1a0..65acbc080e25 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.6.3
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.6.3-r1
@@ -1,17 +1,17 @@
 BDEPEND=net-libs/rpcsvc-proto virtual/pkgconfig 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 setup
-DEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-db/sqlite:3 dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) elibc_musl? ( sys-libs/queue-standalone )
+DEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs dev-db/sqlite:3 dev-libs/libevent:= caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=NFS client and server daemons
 EAPI=8
 HOMEPAGE=http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git
 INHERIT=autotools linux-info systemd
 IUSE=caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-db/sqlite:3 dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
+RDEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs dev-db/sqlite:3 dev-libs/libevent:= caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
 REQUIRED_USE=kerberos? ( nfsv4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.6.3.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d0a365cc7bdf0bea0830d13337af9731
+_md5_=ef885078dbea64344809c39ac51274a8
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index fafdd0155cb0..075691e0edd2 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/libtrace-4.0.21 b/metadata/md5-cache/net-libs/libtrace-4.0.21
new file mode 100644
index 000000000000..cf4974c11fb5
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libtrace-4.0.21
@@ -0,0 +1,15 @@
+BDEPEND=app-doc/doxygen[dot] sys-devel/flex virtual/os-headers virtual/pkgconfig app-alternatives/yacc 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=configure install prepare
+DEPEND=dev-libs/libyaml dev-libs/openssl:= >=net-libs/libpcap-0.8 >=net-libs/wandio-4.0.0 ncurses? ( sys-libs/ncurses:= ) numa? ( sys-process/numactl )
+DESCRIPTION=A library and tools for trace processing
+EAPI=8
+HOMEPAGE=https://github.com/LibtraceTeam/libtrace
+INHERIT=autotools
+IUSE=doc ncurses numa
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-libs/libyaml dev-libs/openssl:= >=net-libs/libpcap-0.8 >=net-libs/wandio-4.0.0 ncurses? ( sys-libs/ncurses:= ) numa? ( sys-process/numactl )
+SLOT=0
+SRC_URI=https://github.com/LibtraceTeam/libtrace/archive/refs/tags/4.0.21-1.tar.gz -> libtrace-4.0.21.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=8a5c0f08f4f5cae40a264645b2f0663f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index c164f58db59e..df2db8651660 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/electrum-4.4.4 b/metadata/md5-cache/net-misc/electrum-4.4.4
new file mode 100644
index 000000000000..1e56d7bf973f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-4.4.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyaes[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycryptodome[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[ncurses?] ) <dev-libs/libsecp256k1-0.4 >=dev-python/aiohttp-socks-0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bitstring[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pbkdf2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qrcode[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-3.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ncurses? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[ncurses] ) ) >=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[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[ncurses?] ) >=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 postinst postrm prepare test
+DESCRIPTION=User friendly Bitcoin client
+EAPI=8
+HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
+INHERIT=distutils-r1 xdg-utils
+IUSE=cli ncurses qrcode +qt5 test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[ncurses?] ) <dev-libs/libsecp256k1-0.4 >=dev-python/aiohttp-socks-0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bitstring[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pbkdf2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qrcode[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-3.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ncurses? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[ncurses] ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[ncurses?] )
+REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spesmilo/electrum/archive/4.4.4.tar.gz -> electrum-4.4.4.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=39d46605a0c275eb87d4c2bc8587462a
diff --git a/metadata/md5-cache/net-misc/minidlna-1.3.3 b/metadata/md5-cache/net-misc/minidlna-1.3.3
new file mode 100644
index 000000000000..f016a04d07e8
--- /dev/null
+++ b/metadata/md5-cache/net-misc/minidlna-1.3.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig 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 test
+DEPEND=dev-db/sqlite:3 media-libs/flac:= media-libs/libexif media-libs/libid3tag:= media-libs/libjpeg-turbo:= media-libs/libogg media-libs/libvorbis media-video/ffmpeg:= elibc_musl? ( sys-libs/queue-standalone ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=DLNA/UPnP-AV compliant media server
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/minidlna/
+INHERIT=autotools systemd tmpfiles
+IUSE=netgear readynas zeroconf
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=dev-db/sqlite:3 media-libs/flac:= media-libs/libexif media-libs/libid3tag:= media-libs/libjpeg-turbo:= media-libs/libogg media-libs/libvorbis media-video/ffmpeg:= elibc_musl? ( sys-libs/queue-standalone ) zeroconf? ( net-dns/avahi ) acct-group/minidlna acct-user/minidlna virtual/tmpfiles
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/minidlna/minidlna/1.3.3/minidlna-1.3.3.tar.gz mirror://gentoo/minidlna-gentoo-artwork.patch.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e056cee86c7421dffe753c7eec9d4dda
diff --git a/metadata/md5-cache/net-misc/netifrc-0.7.5 b/metadata/md5-cache/net-misc/netifrc-0.7.5
index cce54346b160..0f94d1fa12a9 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.7.5
+++ b/metadata/md5-cache/net-misc/netifrc-0.7.5
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
 INHERIT=systemd udev
 IUSE=+dhcp
-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=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 dhcp? ( || ( net-misc/dhcpcd net-misc/dhcp[client] ) )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/netifrc.git/snapshot/netifrc-0.7.5.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=0bc1fa90364f524bb26bfb0945344e78
+_md5_=9d7b5312c0fc801fc9183379fce6b9bb
diff --git a/metadata/md5-cache/net-misc/udpcast-20211207-r1 b/metadata/md5-cache/net-misc/udpcast-20211207-r1
index 0b8f18e5a4dd..1ed06a360b2f 100644
--- a/metadata/md5-cache/net-misc/udpcast-20211207-r1
+++ b/metadata/md5-cache/net-misc/udpcast-20211207-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.udpcast.linux.lu/
 INHERIT=flag-o-matic
 IUSE=hardened
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2 BSD
 SLOT=0
 SRC_URI=https://www.udpcast.linux.lu/download/udpcast-20211207.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=62c6db511a2c1796549f71e79cc372b5
+_md5_=9d93520bc3f20e3ee8dce5ed1fbf9041
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 9073a5a00b5b..fc65381b8ebb 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230515 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230522
index 7eecd444990a..9adfc2c06477 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230515
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230522
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
 LICENSE=public-domain
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230515.gpg -> openpgp-keys-gentoo-developers-20230515-active-devs.gpg
+SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230522.gpg -> openpgp-keys-gentoo-developers-20230522-active-devs.gpg
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=6926976edac2e064f13865d97bb24617
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230508 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230529
index 5e7702745cd0..2a3b5d4607d4 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230508
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230529
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
 LICENSE=public-domain
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230508.gpg -> openpgp-keys-gentoo-developers-20230508-active-devs.gpg
+SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230529.gpg -> openpgp-keys-gentoo-developers-20230529-active-devs.gpg
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=6926976edac2e064f13865d97bb24617
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index f090c21efb91..a448869c9816 100644
--- a/metadata/md5-cache/sec-policy/Manifest.gz
+++ b/metadata/md5-cache/sec-policy/Manifest.gz
diff --git a/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.10 b/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.10
new file mode 100644
index 000000000000..6f3827dede63
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A collection of profiles for the AppArmor application security system
+EAPI=8
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+IUSE=minimal
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.0/3.0.10/+download/apparmor-3.0.10.tar.gz
+_md5_=9a659da6ea3560b358317b71dc041688
diff --git a/metadata/md5-cache/sec-policy/apparmor-profiles-3.1.4 b/metadata/md5-cache/sec-policy/apparmor-profiles-3.1.4
new file mode 100644
index 000000000000..22f3dd5c6a5c
--- /dev/null
+++ b/metadata/md5-cache/sec-policy/apparmor-profiles-3.1.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A collection of profiles for the AppArmor application security system
+EAPI=8
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+IUSE=minimal
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.1/3.1.4/+download/apparmor-3.1.4.tar.gz
+_md5_=9a659da6ea3560b358317b71dc041688
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 6bf84b0d47b9..72732cf6f7cc 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/apparmor-3.0.10 b/metadata/md5-cache/sys-apps/apparmor-3.0.10
new file mode 100644
index 000000000000..39d69c290bcd
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/apparmor-3.0.10
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl sys-apps/which sys-devel/bison sys-devel/gettext sys-devel/flex doc? ( dev-tex/latex2html ) virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test
+DEPEND=~sys-libs/libapparmor-3.0.10
+DESCRIPTION=Userspace utils and init scripts for the AppArmor application security system
+EAPI=8
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+INHERIT=systemd toolchain-funcs
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=GPL-2
+RDEPEND=~sys-libs/libapparmor-3.0.10
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.0/3.0.10/+download/apparmor-3.0.10.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=70deba800bd2b1fa584ecf2ece54051d
diff --git a/metadata/md5-cache/sys-apps/apparmor-3.1.4 b/metadata/md5-cache/sys-apps/apparmor-3.1.4
new file mode 100644
index 000000000000..bf118a3d1114
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/apparmor-3.1.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl sys-apps/which sys-devel/bison sys-devel/gettext sys-devel/flex doc? ( dev-tex/latex2html ) virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test
+DEPEND=~sys-libs/libapparmor-3.1.4
+DESCRIPTION=Userspace utils and init scripts for the AppArmor application security system
+EAPI=8
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+INHERIT=systemd toolchain-funcs
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=GPL-2
+RDEPEND=~sys-libs/libapparmor-3.1.4
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.1/3.1.4/+download/apparmor-3.1.4.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=70deba800bd2b1fa584ecf2ece54051d
diff --git a/metadata/md5-cache/sys-apps/apparmor-utils-3.0.10 b/metadata/md5-cache/sys-apps/apparmor-utils-3.0.10
new file mode 100644
index 000000000000..bba2906abfdb
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/apparmor-utils-3.0.10
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl ~sys-libs/libapparmor-3.0.10 python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) sys-devel/gettext dev-lang/perl
+DESCRIPTION=Additional userspace utils to assist with AppArmor profile management
+EAPI=8
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+INHERIT=perl-module python-r1 toolchain-funcs
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl ~sys-libs/libapparmor-3.0.10 python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ~sys-libs/libapparmor-3.0.10[perl,python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~sys-apps/apparmor-3.0.10 dev-perl/Locale-gettext dev-perl/RPC-XML dev-perl/TermReadKey dev-python/notify2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-lang/perl:=
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.0/3.0.10/+download/apparmor-3.0.10.tar.gz
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c5ee7da648e6178d42cf6a8616db4ca1
diff --git a/metadata/md5-cache/sys-apps/apparmor-utils-3.1.4 b/metadata/md5-cache/sys-apps/apparmor-utils-3.1.4
new file mode 100644
index 000000000000..b26801f485ac
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/apparmor-utils-3.1.4
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl ~sys-libs/libapparmor-3.1.4 python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) sys-devel/gettext dev-lang/perl
+DESCRIPTION=Additional userspace utils to assist with AppArmor profile management
+EAPI=8
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+INHERIT=perl-module python-r1 toolchain-funcs
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl ~sys-libs/libapparmor-3.1.4 python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ~sys-libs/libapparmor-3.1.4[perl,python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~sys-apps/apparmor-3.1.4 dev-perl/Locale-gettext dev-perl/RPC-XML dev-perl/TermReadKey dev-python/notify2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-lang/perl:=
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.1/3.1.4/+download/apparmor-3.1.4.tar.gz
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c5ee7da648e6178d42cf6a8616db4ca1
diff --git a/metadata/md5-cache/sys-apps/config-site-0 b/metadata/md5-cache/sys-apps/config-site-0
index 8cc5f7ef688d..4dcbe78e9f8a 100644
--- a/metadata/md5-cache/sys-apps/config-site-0
+++ b/metadata/md5-cache/sys-apps/config-site-0
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=config.site to load dropins from config.site.d
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base
-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=GPL-2
 RDEPEND=!<sys-devel/crossdev-20230209-r1
 SLOT=0
-_md5_=344016e3b2b7a0ea4aa58059ee7f606c
+_md5_=364984f3c95da3d00d9d8d962b6307d0
diff --git a/metadata/md5-cache/sys-apps/cracklib-words-2.9.11 b/metadata/md5-cache/sys-apps/cracklib-words-2.9.11
index 59cedc955881..6ebf9581b95b 100644
--- a/metadata/md5-cache/sys-apps/cracklib-words-2.9.11
+++ b/metadata/md5-cache/sys-apps/cracklib-words-2.9.11
@@ -2,8 +2,8 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Large set of crack/cracklib dictionaries
 EAPI=8
 HOMEPAGE=https://github.com/cracklib/cracklib/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/cracklib/cracklib/releases/download/v2.9.11/cracklib-words-2.9.11.xz
-_md5_=83207bfe068e389f30e9866b9fe01311
+_md5_=2090bcf67f7e89bab49279f1b6100b26
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-0.19 b/metadata/md5-cache/sys-apps/gentoo-functions-0.19
index a9947dab325f..71607adc5645 100644
--- a/metadata/md5-cache/sys-apps/gentoo-functions-0.19
+++ b/metadata/md5-cache/sys-apps/gentoo-functions-0.19
@@ -3,10 +3,10 @@ DESCRIPTION=Base functions required by all Gentoo systems
 EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/gentoo-functions.git
 INHERIT=toolchain-funcs flag-o-matic
-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
 RDEPEND=>=sys-apps/findutils-4.9
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/gentoo-functions-0.19.tar.bz2
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=def052cea7d3f6ce7305d63ba57b8de1
+_md5_=6e04df0774521818fb28a39a4f3a8884
diff --git a/metadata/md5-cache/sys-apps/iproute2-6.3.0 b/metadata/md5-cache/sys-apps/iproute2-6.3.0
index 2413520f4cca..e76212e49e58 100644
--- a/metadata/md5-cache/sys-apps/iproute2-6.3.0
+++ b/metadata/md5-cache/sys-apps/iproute2-6.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/iproute2
 INHERIT=edo toolchain-funcs
 IUSE=atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr
-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=GPL-2
 RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) berkdb? ( sys-libs/db:= ) bpf? ( dev-libs/libbpf:= ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) nfs? ( net-libs/libtirpc:= ) selinux? ( sys-libs/libselinux )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.3.0.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6efb1fbed1b940e616771ee87485cb0d
+_md5_=dfdfbbbf8524e00e61de47374d9db953
diff --git a/metadata/md5-cache/sys-apps/less-632 b/metadata/md5-cache/sys-apps/less-632
index 935d408a8abb..6d8f9701dc1a 100644
--- a/metadata/md5-cache/sys-apps/less-632
+++ b/metadata/md5-cache/sys-apps/less-632
@@ -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-632.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c0bc0eb86e91bc3e881aa15d44323043
+_md5_=8b934a8ea91c531f3eded44e605a9db0
diff --git a/metadata/md5-cache/sys-apps/man-pages-6.04 b/metadata/md5-cache/sys-apps/man-pages-6.04
index 37bd5537b464..e1f01394747d 100644
--- a/metadata/md5-cache/sys-apps/man-pages-6.04
+++ b/metadata/md5-cache/sys-apps/man-pages-6.04
@@ -4,11 +4,11 @@ DESCRIPTION=A somewhat comprehensive collection of Linux man pages
 EAPI=8
 HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=l10n_ja l10n_ru l10n_zh-CN l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv l10n_uk l10n_vi
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos
 LICENSE=man-pages GPL-2+ BSD
 PDEPEND=l10n_ja? ( app-i18n/man-pages-ja ) l10n_ru? ( || ( app-i18n/man-pages-l10n[l10n_ru(-)] app-i18n/man-pages-ru ) ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) l10n_cs? ( app-i18n/man-pages-l10n[l10n_cs(-)] ) l10n_da? ( app-i18n/man-pages-l10n[l10n_da(-)] ) l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_el? ( app-i18n/man-pages-l10n[l10n_el(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fi? ( app-i18n/man-pages-l10n[l10n_fi(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_hu? ( app-i18n/man-pages-l10n[l10n_hu(-)] ) l10n_id? ( app-i18n/man-pages-l10n[l10n_id(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_mk? ( app-i18n/man-pages-l10n[l10n_mk(-)] ) l10n_nb? ( app-i18n/man-pages-l10n[l10n_nb(-)] ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_sr? ( app-i18n/man-pages-l10n[l10n_sr(-)] ) l10n_sv? ( app-i18n/man-pages-l10n[l10n_sv(-)] ) l10n_uk? ( app-i18n/man-pages-l10n[l10n_uk(-)] ) l10n_vi? ( app-i18n/man-pages-l10n[l10n_vi(-)] )
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-6.04.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.04.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=9dae963fa6c81c0099eb6f640b59b70f
+_md5_=6a13fdb774ddead8d6777cb6912c5737
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.45.3-r2 b/metadata/md5-cache/sys-apps/portage-3.0.45.3-r2
index 14ec370b9215..c39b0ea27c58 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.45.3-r2
+++ b/metadata/md5-cache/sys-apps/portage-3.0.45.3-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
 IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
-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=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/coreutils-6.4 >=sys-apps/file-5.44-r3 )
 RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/baselayout-2.9 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20220101 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[bzip2(+),threads(+)] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.45.3.tar.bz2
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	eapi8-dosym	741bfa77afb2a9321261501aca58c208	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2a9a7390aaa9e912e0648be0ebb740b1
+_md5_=212e79d3864b87accf5f2d8412833777
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 502e09165f2e..6cff9c86f26e 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/crossdev-20230321 b/metadata/md5-cache/sys-devel/crossdev-20230321
index 4011a25d523c..8841a20e8803 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20230321
+++ b/metadata/md5-cache/sys-devel/crossdev-20230321
@@ -3,9 +3,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Gentoo Cross-toolchain generator
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-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=GPL-2
 RDEPEND=>=sys-apps/portage-2.1 app-shells/bash sys-apps/gentoo-functions sys-apps/config-site
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20230321.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20230321.tar.xz
-_md5_=76278d610c13551f2f8f6dcfb04faffb
+_md5_=86a1c15d55c146476ec54731f64c5c08
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230531 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230531
new file mode 100644
index 000000000000..9410c63df811
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230531
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=mirror://gcc/snapshots/10-20230531/gcc-10-20230531.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-6.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-2.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	8d8abc2af988865cb38dc36dcd4730ad	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=def9e55501092f5121e13dd4dfcd8602
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 2a67951d0349..f7989a6581e5 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-6.2.2 b/metadata/md5-cache/sys-fs/btrfs-progs-6.2.2
index 6043ece0f292..11243499b9d9 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-6.2.2
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-6.2.2
@@ -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.2.2.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=0c3d28705b6d95a422bee135b44ce5b7
+_md5_=7b37d6ec3cd232ae92f8e07f56af752c
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.43 b/metadata/md5-cache/sys-fs/mtools-4.0.43
index d9730d36774e..29dd5062a1ae 100644
--- a/metadata/md5-cache/sys-fs/mtools-4.0.43
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.43
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
 INHERIT=flag-o-matic
 IUSE=gui
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://gnu/mtools/mtools-4.0.43.tar.bz2
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dd06af833894616ad735cfac666ee1f7
+_md5_=e8ea6b0ac9445133406bf1cfab917c0a
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 88f8e2c3190f..5e2471ce2403 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/cracklib-2.9.11 b/metadata/md5-cache/sys-libs/cracklib-2.9.11
index be35034b1592..0f9e3569b145 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.11
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.11
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/cracklib/cracklib/
 INHERIT=distutils-r1 libtool multilib-minimal usr-ldscript
 IUSE=nls python static-libs zlib test python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cracklib/cracklib/releases/download/v2.9.11/cracklib-2.9.11.tar.xz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=5b2e3646ad01f65d4b99e2b9d67dd34e
+_md5_=90176e6d09e6fe6bb23b4ad324396141
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30-r8 b/metadata/md5-cache/sys-libs/db-4.8.30-r8
index b01cc529ef27..3393bb1bb0cc 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30-r8
+++ b/metadata/md5-cache/sys-libs/db-4.8.30-r8
@@ -1,4 +1,4 @@
-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 test? ( >=dev-lang/tcl-8.4 )
+BDEPEND=sys-devel/binutils:* 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 test? ( >=dev-lang/tcl-8.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1: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(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1: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=Oracle Berkeley DB
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	db	88506965221c24fff62bc25586f10433	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b60bb6726c3f3e20ea7a24abc1af08e2
+_md5_=12a75ccc588077a4a8de84d8e910f4b1
diff --git a/metadata/md5-cache/sys-libs/db-5.3.28-r9 b/metadata/md5-cache/sys-libs/db-5.3.28-r9
index d5f28b5e1a8a..fec51f410d41 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.28-r9
+++ b/metadata/md5-cache/sys-libs/db-5.3.28-r9
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf-archive 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 test? ( >=dev-lang/tcl-8.4 )
+BDEPEND=sys-devel/autoconf-archive sys-devel/binutils:* 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 test? ( >=dev-lang/tcl-8.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1: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(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1: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=Oracle Berkeley DB
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=5.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	db	88506965221c24fff62bc25586f10433	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4f0ac2a4608976f961b876a6a9224480
+_md5_=cd7bd3f9c41cf1d9eaf1a3a4f40c8da7
diff --git a/metadata/md5-cache/sys-libs/db-6.0.35-r4 b/metadata/md5-cache/sys-libs/db-6.0.35-r4
index 579ac8856dc0..fce7a38e81c3 100644
--- a/metadata/md5-cache/sys-libs/db-6.0.35-r4
+++ b/metadata/md5-cache/sys-libs/db-6.0.35-r4
@@ -1,4 +1,4 @@
-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 test? ( >=dev-lang/tcl-8.4 )
+BDEPEND=sys-devel/binutils:* 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 test? ( >=dev-lang/tcl-8.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1: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(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1: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=Oracle Berkeley DB
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=6.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.0.35.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	db	88506965221c24fff62bc25586f10433	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=971fe551be71bc128e0eff6636261e14
+_md5_=a427bd9572c4f61e1895dbe6d299828d
diff --git a/metadata/md5-cache/sys-libs/libapparmor-3.0.10 b/metadata/md5-cache/sys-libs/libapparmor-3.0.10
new file mode 100644
index 000000000000..04b4507da172
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libapparmor-3.0.10
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/autoconf-archive sys-devel/bison sys-devel/flex doc? ( dev-lang/perl ) perl? ( dev-lang/swig ) python? ( dev-lang/swig dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare
+DEPEND=perl? ( dev-lang/perl:= ) python? ( 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=Library to support AppArmor userspace utilities
+EAPI=8
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+INHERIT=autotools distutils-r1 perl-functions
+IUSE=doc +perl +python static-libs python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=perl? ( dev-lang/perl:= ) python? ( 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
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.0/3.0.10/+download/apparmor-3.0.10.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	distutils-r1	57f007adcdf3953627f14277c7eae6e0	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=21dbed9fdbbdd1425770c566106a7474
diff --git a/metadata/md5-cache/sys-libs/libapparmor-3.0.8 b/metadata/md5-cache/sys-libs/libapparmor-3.0.8
index 6bfab300ddbd..68e8edaadacd 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-3.0.8
+++ b/metadata/md5-cache/sys-libs/libapparmor-3.0.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
 INHERIT=autotools distutils-r1 perl-functions
 IUSE=doc +perl +python static-libs python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~riscv ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl:= ) python? ( 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 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/apparmor/3.0/3.0.8/+download/apparmor-3.0.8.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	distutils-r1	57f007adcdf3953627f14277c7eae6e0	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=650e35de1807e33d8b1f0f6d4e54bf4a
+_md5_=7c1ab4e459ad12d2013b84a6d0306647
diff --git a/metadata/md5-cache/sys-libs/libapparmor-3.1.4 b/metadata/md5-cache/sys-libs/libapparmor-3.1.4
new file mode 100644
index 000000000000..59512ce1d41c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libapparmor-3.1.4
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/autoconf-archive sys-devel/bison sys-devel/flex doc? ( dev-lang/perl ) perl? ( dev-lang/swig ) python? ( dev-lang/swig dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare
+DEPEND=perl? ( dev-lang/perl:= ) python? ( 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=Library to support AppArmor userspace utilities
+EAPI=8
+HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
+INHERIT=autotools distutils-r1 perl-functions
+IUSE=doc +perl +python static-libs python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=perl? ( dev-lang/perl:= ) python? ( 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
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/3.1/3.1.4/+download/apparmor-3.1.4.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	distutils-r1	57f007adcdf3953627f14277c7eae6e0	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6a56a3d642a9ed57e6b5e89216daad03
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.34 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.34
new file mode 100644
index 000000000000..746764ebc799
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.34
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl test? ( || ( ( >=dev-lang/python-3.11.3:3.11 dev-python/passlib[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 dev-python/passlib[python_targets_python3_10(-)] ) ) )
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) elibc_musl? ( sys-libs/musl[-crypt(+)] !sys-libs/musl[crypt(+)] ) )
+DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
+EAPI=8
+HOMEPAGE=https://github.com/besser82/libxcrypt
+INHERIT=multibuild multilib python-any-r1 flag-o-matic toolchain-funcs multilib-minimal
+IUSE=+compat split-usr static-libs +system test headers-only abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+ public-domain BSD BSD-2
+RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) elibc_musl? ( sys-libs/musl[-crypt(+)] !sys-libs/musl[crypt(+)] ) )
+REQUIRED_USE=split-usr? ( system )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.34-autotools.tar.xz
+_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=331507bf8663a14a20f87532ac1ecd9d
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index ad58e3a294e0..06e98c1d7a38 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libX11-1.8.5 b/metadata/md5-cache/x11-libs/libX11-1.8.5
new file mode 100644
index 000000000000..389efde69860
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libX11-1.8.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-lang/perl ) 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 doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables !<xfce-base/xfce4-settings-4.16.3 x11-base/xorg-proto x11-libs/xtrans
+DESCRIPTION=X.Org X11 library
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
+INHERIT=toolchain-funcs xorg-3
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=MIT
+RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables !<xfce-base/xfce4-settings-4.16.3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.8.5.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	dc625211f72da360ef1de67c86f773bb
+_md5_=9efb20ad06e0137dd9db4f408c926d98
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 52be127df92e..06a5632a4a93 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.8.5 b/metadata/md5-cache/x11-misc/compose-tables-1.8.5
new file mode 100644
index 000000000000..b1579750aba2
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.8.5
@@ -0,0 +1,13 @@
+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 postrm prepare test unpack
+DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans
+DESCRIPTION=X.Org Compose Key tables from libX11
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
+INHERIT=xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.8.5.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	dc625211f72da360ef1de67c86f773bb
+_md5_=b8adac79528c74eb66cd004439b387cc
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 08d6409ce06f..883a557d5842 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-01T01:40:13Z
+TIMESTAMP 2023-06-01T07:39:42Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR39v1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR4Sz9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBz6w/9GveX5QJrhfWAIcuZeyVPWwsT6dLhxhwx2CHmzkdZc5ir0TDp8mN/MMno
-+MzgJhodGogGNpiL34ivjQnoBGFjUWB/GH119m1ORHwTPnW9x91DmDYHv0TmBbub
-AGCtQ1GP2i2y3RQoRT2257KARyh6m/QvVPMfDZK6WDGGQFEBLA0NQfWKw8msY4+V
-eIOs5E54lcCErEbzWEgJZfKSv9gFZvsXqXBuULqcs45uyVSPevbX1SyJcnGB5Ke4
-hqZ0YxLU1Gh1lFIljf8hyfILu+iS9WHsRjfOynh0hakTH/GaWR3qdu+hUktq56p1
-Ff6KH4OZGEvSqxMmVyvBcZBSSF1MNozOUWfgAoeiAXLpUVeZsE005ETDs87Bd3rI
-k2jxDKCqSMt0O3qjLtTKoEQlx7HLdyARFPuHZfBvf3CARYeDvJK5mS7Vo7iui9Jy
-5MHAED6MoRiSdr481cmD4vFllmnnH4ykr46QkftrQCxKSJpAM64kj0MI06JqPrDc
-QuW2YrWVgX/pyyZSVMQwaXAIaBhyzcebhE86E79rjITkP04nzG/J43R3tsmomOcw
-N/Eh9IfxT63+8ZuEmZ8O4oZL1v+UmPAtPyXyr78MJ5/hPqN2v65401uSCkg/yxzY
-rJ/DKSHpudZYS5rlrAnYtkmvlrzaMDqLyLmrWPezvBDPZTeH0NM=
-=gVcT
+klA4Dg/9EEj4r8PVBHvF4V4Mg51bJtOL0mhWE8GjsCx7blmhocET0xqN0fVibBiP
+ONAjqtxEHGJq/q9O/spJr/SGv6BvinakNsybPysPiTFwuM/Nc/+Eww2BDAA81AMh
+d71GT/N8VrFFhxAOVYCnucohAKS5JEwo7iBWV3YgtHZgj4yVXPUP/TWWQAUeks18
+XkgqL4cQTKC1j0Vac/fJ9D8nBUdJeArlfTlCV5xbKlJis8O57exrN9Sux62BEw0H
+dfZqwMBfsrp1H0Nh8LX7U4Y6Bs6TD7RHURyG2kIVObp6+eQl8r8TEjaCVTc1wuYp
+UWrpxV1bzLWLtxAgFRGMCuA2ZGIZYVQvmvPCN4XFfnHxnGA9JJzik2zhK/A0NSXI
+MhxWPQY5DK3Dq/2cKUTdMO842dCD2RF+d92yJB8yNC3xz7RR9dYQbcPz7JtCIdMz
+GDHvsmrbOGaXES0aTZ5y1hS2X7rQ/63Iq6zCL1ly4Jf+oBUEAyo5t/oKeyj8JBnw
+kIq0VcyirDk0kPODYk+VaWONi5HQNXrPzkSUB+Fm3jRvP5R9JUWNZUx2zNWeWbkV
+PFddLhz0NMD1oDzz/FyxRBfj+mBrD2zx3c0Bp2FBJHCKs0A4EchVso8wzTPBGA0q
++4rkv0RjXSSmy3WEJJ94AOYOyMbRjEa0Sbhkwd217yGMvZ/DsAY=
+=p1kR
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5bf3544613fd..5bd9824337e8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Jun 2023 01:40:09 +0000
+Thu, 01 Jun 2023 07:39:39 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 07f32c669ae5..217afa8cecc5 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jun  1 01:40:09 AM UTC 2023
+Thu Jun  1 07:39:39 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index bb38ae723fc1..f22c9ae24631 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Jun 2023 01:45:01 +0000
+Thu, 01 Jun 2023 07:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index a67911da541c..96f816094311 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-08be91eebdbff0de0e033efe30c633219a9859ca 1685582598 2023-06-01T01:23:18+00:00
+410850bb3575a1cbc734e362afaf69f811446cf3 1685604764 2023-06-01T07:32:44+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9601798d5bbb..0dc735a0682b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1685583601 Thu 01 Jun 2023 01:40:01 AM UTC
+1685605201 Thu 01 Jun 2023 07:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 5bf3544613fd..5bd9824337e8 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Jun 2023 01:40:09 +0000
+Thu, 01 Jun 2023 07:39:39 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6bd617956397..4cef984fdcf8 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 79de5daca3f7..52ea2c510f92 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -4,5 +4,5 @@ AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1
 DIST nfdump-1.7.0.1.tar.gz 740435 BLAKE2B dd3d3e63aa076b32e0c9e897b40d3ee8368990792b1a483b69a448dadd7389c23df9800910baad0c5a241a480c5961616c70040fdce992b2a67e3be6680e715b SHA512 5b5da57016dc826650ba80a80a881ab89034778316f47c6797dbc902ed6af6d77cfb722356c3a1d92a4239a934178df56ff4c6cb3bf77e029232e02b905ec1a8
 DIST nfdump-1.7.2.tar.gz 697405 BLAKE2B cf52f2cca5d80070bc00c7a7a87cc4820f04904ddeeebd4fc93cf3a2433bcf5798191daa86f0bfc7ee1f2f92e5d8bb087114d2c17e32b641a224189aeb54f822 SHA512 858d0aaae24f2e38f3708db9fd5cd40e99a6a50d5da5738c8ce4bf898fb153ce439c504d5fe8fb3c296d0069511a6f229ebdfc117f849a482e5ffdf457f06003
 EBUILD nfdump-1.7.0.1.ebuild 1757 BLAKE2B edf62d46671fd56bdb9553704ce06b5981c17f1ec2353644e421a3db487ded72a4029f29d003cf13214d9fe9c93257ef74cd5c198dde17ef0d21deed697bbca2 SHA512 8122bac1d504e7e9b53dbffc7ae373257ee69af7b7480a3f94d4b68f0718add9fb3bf3afe5313bc28d35e60b199dca75da4f53b3a3fe20f89673a8017e9c55f2
-EBUILD nfdump-1.7.2.ebuild 1759 BLAKE2B 98b34c93d09c1e338b23b1b148eafe3e62028572fdebf5a58dd686ef4c8cfe8f3aadea6152618b34ee9982136d385a6b59ea02c6cc333c2bc51f64f49566bb9c SHA512 480ebd9a767b4e5c776413990534a4a60bacf57cc628eaf79c46b001d2532138eb8909af0bf511fa8e76cffd550bbbc4b119362759d1d3e84ec85535a8e6f3e2
+EBUILD nfdump-1.7.2.ebuild 1758 BLAKE2B 088ae84d1d02b96e845ed517a61c05a5d49ec35788e596e5dda7d78bbb904f77144ea1450f08419965782584942200cf703cbc1a332a5f216bc9c7986f9896f3 SHA512 f801d71fc4c6ae489476cbb92ed3de6a38056fb39da068106290c16efbd50f070b259e948dc41c27e7e33e35cdd547ef7a74ce3720eae4eb40a2fb5ee6e930ae
 MISC metadata.xml 1278 BLAKE2B ad9d73532114eb0942a2b5262fe8e5f2b787993950fcd7c8bcb926f9e9e8d93ab94476265976b2e0cc41f3ea46fc6699a0bbb591d0c929208ec5e85d1b399617 SHA512 0bdbda9ccce4611ab88b746f4907dbb0c96d1e5f0dac909e2318c8bdf77de87321f65baadbb886f0c2e1b231cc30c50c70e5363cc9084285d1eaf5897c6f38cd
diff --git a/net-analyzer/nfdump/nfdump-1.7.2.ebuild b/net-analyzer/nfdump/nfdump-1.7.2.ebuild
index 8b1c7b15fed6..d610b9adb461 100644
--- a/net-analyzer/nfdump/nfdump-1.7.2.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow"
 
 REQUIRED_USE="?? ( jnat nsel )"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index b6573a12cbed..6013da0f322e 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -19,24 +19,35 @@ AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-4.0.44.tar.gz 17713321 BLAKE2B 1f75f99430846cfc029d5e541ede7ef8c019a42af0ab6d70be3170052b723877ca54f6554cd9a29f7f436fb6e9d5ffd02913a1b12ad45a2a8ed00432738e5660 SHA512 223d6fdd352e5731487797d839c1741209eae79af78a058d3ba29e5a9eaab5cbf91072ad827bdd676696d3ea518c638d7fd515bff2a257aef3a7ad38f41b3cb6
 DIST zabbix-4.0.45.tar.gz 17906669 BLAKE2B b90ebcfc05e7232257a0cdbde82dba5d96407bb569e3b6f31edb834012bea90b8583cc313444fd9d606bd6fe76bfca21a2e9bb395a36c36c89b2dbc52517f14b SHA512 b5b9b41b50be071f43b38f431d408fd51809745bde5573a33f7c12d0789a905d74fb66c27c196d685a48a555b7bfd13db63638de3f9b8094fdb1692d3d5405c0
+DIST zabbix-4.0.46.tar.gz 17902473 BLAKE2B c791af22719cfd83a9d1350abd3b7d29cd441537580c7a3f2bbfd7fcda690526a7a1c5725ae1848ab8f8a232d10c8e7bcc8c16dffe09409965f4d42e55ba394f SHA512 6d6df0a9ba1b0673d4a9474f3eb841cfa8b7c49d39413a39b7cb84713fb9986243ae83d1cb23b8cdd4e312de8c67a366ea020a989d2dc1da74eed93d094e4688
 DIST zabbix-5.0.32-go-deps.tar.xz 34470664 BLAKE2B aedd50682e9e71686852f5d69c1645c16d52a5c16a0628692452b6fbb1577a775473daad8ab687d23302966aa989dd0257ab38143f3db8ce4fdcf386d94b9689 SHA512 2ca7f5cf5e11eb0770bc16008a9e52436510bcee9e222b17ac58ea47acffd455a1278a9cdee9df9a6e045bfb7deb1df9950fb9ea19e767b8733b8036d9dc1d81
 DIST zabbix-5.0.32.tar.gz 21664895 BLAKE2B d70e68727eec0181398c7624c56aa2ef721a738a7549fa075a66cd94b6225243b7e73ff1b4d2ed96482ca5ac79ac8bcb230e9736f63a5dbe66cc4d0b10a88e24 SHA512 f58ecac976cc3b9e81f738e19ac23185747c005a73060f35137b5964d4144b96263b7dcba7db6d895f39908217aae9ba260ce5a772a4c53d4b24ccd41083f524
 DIST zabbix-5.0.34-go-deps.tar.xz 34446060 BLAKE2B 217331dab5d72629ff0f87c4db92b917a5f8282a5bbafee617cc2e81f0658b7ae56024855533e04929e5d1b53db68d1c9c5229d6e261fa13b5f265268cab6068 SHA512 a0556a8ee421db798a362bfab7591fb2baa3b43396834b0a49b3992240c6c8add54a320fed6061ea3cc71ed5e984a2d54fb49a6785b5304c2422428b9ca560ef
 DIST zabbix-5.0.34.tar.gz 21828229 BLAKE2B 0dbaa0c0f7514b7d0fe621e6d83f37367ba096698abfea30e22a3bfe35e2534f3b7a39e809c3677e829df6d95db527be6d4d87888a361b0bc005313197d5d00c SHA512 53ab66a2c9fd7923826a295b190bc5e5116edb1d69e189ddae09cfe070b1f2756237b0a51a42aecd0229ce4d280b1333ad84d74f2c6503af0dfe5f32cf915fbe
+DIST zabbix-5.0.35-go-deps.tar.xz 34454684 BLAKE2B 98489131a696f7606daa29bcb5de8f420eacf4f6bd89a9bb88e451f61b2ccf5cdf61a77a1de3e486763317e4a3c9dded9fddf400a5e545921ce823a17fc77a66 SHA512 2b6de506318c9656cb8dd8c2ec5f6443be64b9af2a94ed410acba7152d613b07222cbf042d2e490e0f94f82d03f8507d6a53fca36584739b6de8d23010b725bc
+DIST zabbix-5.0.35.tar.gz 21839368 BLAKE2B 8db4fa5ffbd7374e2bc060817a0854625ca99b4b20cbe5dd3f9d264e933c0ebef21efdef68b13d797edf60c388ba1d84a3fa9951ba138176513d120de09a3d28 SHA512 a76e94f2292a5990319e7a154b295aaf4c7421ca40ed9d1b3ea529979151407d3e65bf43b93b36234e84c800dd604cbe7a7154fbe44c1b5316b1d4b00b2e42d4
 DIST zabbix-6.0.14-go-deps.tar.xz 17976336 BLAKE2B e4e29c6730f10e95c84d4f517130e79b44f82ddcfbe1465f7c419356158eba0354b0b3c18b45c8813be218337e354bb4f0be45633716b36a2272dabfa86a025f SHA512 2ae41852f7a84916b27e92e2661c9ff0beb56b3f54f83314a0ccddb55293c5c2a5bbbd090efba3c99f93a1722e0dedd94e4051d63d4dd9c8ff4cd9e084a4b39e
 DIST zabbix-6.0.14.tar.gz 41242602 BLAKE2B 2639e9b210df72f51de1ef2e610e5e1e936a147c8fb892dc15b7dc44008e3535c6df867d314c153283588e8a1a3b63dad65604877ea7471bb2d207a4dbc913c8 SHA512 9750dc6bfdc3966a6be098297744fed507272776212ce2143c70b035c2a0662e6c1fb1a1f423babbd9b69ad6231e6cbe397d5def069192a0c21189ca96670c89
 DIST zabbix-6.0.17-go-deps.tar.xz 18721808 BLAKE2B 7b95d9f8f962dba03859ae52c506f0f3f7c4222feea958b59714f7c16aa86c47345f7144f52d2e934c34929dae81be4a3ca6a98fbd50c143998d4510fd23fbc8 SHA512 7230aff39c5bc95da8db58a5ff4155fbde177bff5811f59aa09ea34ec749d53190ba9ba0aac5bfff1b7d927221b4472133edea82032ab0fb77d72b11472502cf
 DIST zabbix-6.0.17.tar.gz 41601443 BLAKE2B 2c1fd470bf4c441a0bb1d0c8ef71700c22db33c2133a16b3cc107fab3429e9befb027d822c48327f9ef2fd7feed91bf0f72e73282d0f91d3d0046baa973b5345 SHA512 3f82ffe45e6ebdb5851c06a9710671ceccf74a16c01b6fdf53297cd57a69d4221f0b80d3395fb570ac5c508aa09e42d5e497ed73e638c70b388a7c7fc4add9bc
+DIST zabbix-6.0.18-go-deps.tar.xz 18727444 BLAKE2B 2a8e9a929857574104c7af6b423bbfcd1b306aa485a657ec1e163498727684f364a7bc10011661bdc9a4edc862af748f3e80e3de83859c8660f378ec539b47a5 SHA512 dff99d9404ee8f8fe868db8498cc7f8c30783bb09e38913a25222be91045b77e8f4aa02fc8e9afcbc2af0c52c95ce717710151af30e3d662a93dad290c73909e
+DIST zabbix-6.0.18.tar.gz 41926243 BLAKE2B db7c5556896ad6cea107791f4bf5c5128862b941a3dedab74a44d5f3f0770f36122338c5e493c26c4ac07f43091291a9f4c1916b742e97bdf8f70cc9cb07d280 SHA512 775da1d47e095c233c6fdaab0c94dd4eee356825401ac885a8f000681caccda54f0ef508bcf8cb7d1f6def0178cb0aa17b37ec15ae9db032aaaa7faec7542e3d
 DIST zabbix-6.4.0-go-deps.tar.xz 21481908 BLAKE2B 83280695c1f47c9d5c794e8da0e4140ff2c432aa2d2ff14e755f855a621472c81d2dbd5dfad7fd0d735d784f834e0a2c220acb35cb5c3dddeba22494a5a0d674 SHA512 f07faa620d885a3fb81ec1e273de44831f6e95295c309997cc650958b870a9d458289e3dfaf9cea97f1e8067a9b624d2e9a5125394ac3a3117c0875f9f76f8ea
 DIST zabbix-6.4.0.tar.gz 42787621 BLAKE2B defb3819e5320488f5f35d6fbc52877a30313e9f745447559eea40b74d786a55d4a3971b1ff6072eedf805296c9b5bfe98fa3395affb50e2ba5be439091212d6 SHA512 e572c6de1a7e2f1cf5ea4a56886aabe0915d41c0f8fb6e6812dba6f7766deebe8cd743dbc8a80839fc49a794b799b93cd30dfa0741cf6fa7e1652058211f97bb
 DIST zabbix-6.4.2-go-deps.tar.xz 21577064 BLAKE2B 5a695f354b9fab5af34529fdd2d532f5764d70b8b9b233cba602cf76a44d50e092acba1bdcf13563348bc7e234ee4c749ab7880837b27ed506055c8fefb555b5 SHA512 778d4976735d47c6b0fc59ddb79ab9a0c817d19c80ac949ab315805bae4bae43a1e28a6c4d0a2b54fb55a1da3de0edb74df19507aa68b10c9ed8203c0c1d15b6
 DIST zabbix-6.4.2.tar.gz 43141377 BLAKE2B 3d20de6b203d7f04bc90d23a989f7a0f2d85de26d144eb22d4326b056e37a995283105d270f30902c21a167b4421f3929949268f0361107c8efb5a3c22ba41b7 SHA512 72b8842444aade42519d78856231024c1587ad9076ef21597a2dde580a49b99ea884a62508ebb1c08d883430b911a54d8a5f8421bee0d9e99b3610342191632f
+DIST zabbix-6.4.3-go-deps.tar.xz 21580912 BLAKE2B a8d67ca707ebc0b7c873ebc9210643c8409975931e316556ceb47fd8e89eb998a13b7581643f4031de3d1d167e860752edb4589ea4d89037f18b2c14423d954c SHA512 277271b2a15e3fb04a1e30dcfe4b499f874d93e2509283b5acf2b6380f1ad4fb2627d8021c401076277d84f1a2031f6bfae285cbd4e6f2f45ec7daa42294bc59
+DIST zabbix-6.4.3.tar.gz 43369742 BLAKE2B a19cc8fa1fec26b152f84427394d1e1dd947aae62bce69eeb0f7cb3326d84a9eae9e79f17e7583cef36fbb7c6f39560ee0c495cfa61eaf9983238618bb33c406 SHA512 ddb90a0a7699a7cf007ee2efcbc807e573221b92bf4fb104b8dfb07355d79235b5bbd1aae8c70a7edcc42555b5f182230057162cf2bd899ba4b62ed433711f69
 EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
 EBUILD zabbix-4.0.45.ebuild 9427 BLAKE2B 55a59585793b3217720c9a2c44b6371feb9e465fd8ad31adf040b0f8e21c883cee98b1fd26518a7c72e24ad8d42bf2523b575e94af6d80bc7ad739c8372811e6 SHA512 988468624b1f2825a14b9626ad4d53684144078fb97a225b52f8db5aba240a01d13de581a61943b3cb58f7316676c04211d51e4e043a9b487735934d9163accc
+EBUILD zabbix-4.0.46.ebuild 9427 BLAKE2B 55a59585793b3217720c9a2c44b6371feb9e465fd8ad31adf040b0f8e21c883cee98b1fd26518a7c72e24ad8d42bf2523b575e94af6d80bc7ad739c8372811e6 SHA512 988468624b1f2825a14b9626ad4d53684144078fb97a225b52f8db5aba240a01d13de581a61943b3cb58f7316676c04211d51e4e043a9b487735934d9163accc
 EBUILD zabbix-5.0.32.ebuild 10142 BLAKE2B ffd5ab5a402b325ba940def36626cb3c8e6484ae8648010dde643921a793a07850b29c57c5f0b73f74d0fdd0c68c758327906696e4813f5c032cbbc761843bbc SHA512 50a9cfeb2756b2ec52f072566cc906a1bf15b0b9c96c0842dfd8d56e0e1ec26dcc0c170c0d304b8113e086545041aaa6e7acd83d2bba172e280d75f59933c619
 EBUILD zabbix-5.0.34.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
+EBUILD zabbix-5.0.35.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
 EBUILD zabbix-6.0.14-r1.ebuild 10235 BLAKE2B 129b343d0fcc9dfa5be311a53df26d54b26837f78afa6aee8406c767526219908c97416de0bfb5fdde3c4a66279d9deaeb6384a2557459610c7f741d559f81e5 SHA512 bfaf11251a04debe03e6273cb31e92dcf9fe9e94ac1945271fe84ab710a2c3e9146b8196227656cc2959674fceec2f1c6e3187104ea3e7a90ea91d4809e00b63
 EBUILD zabbix-6.0.17-r1.ebuild 10237 BLAKE2B a0a85c490e7435ccb6e5b09c680492b01753fd5485fface0266ba8c8fdcea5255f9db33b9af7c758edd76034f4bd4840d6af5bae02578526deea837917eb526a SHA512 a29049bfb5da89e7cf92a4a471f81274b6a5e29a6b45eee43c838eb4ccf94b078a7d1c9073dc50d5d6e7e14a37abe5c54dd846f74fdf0c51dcd5434dbb8ad2ad
+EBUILD zabbix-6.0.18.ebuild 10237 BLAKE2B a0a85c490e7435ccb6e5b09c680492b01753fd5485fface0266ba8c8fdcea5255f9db33b9af7c758edd76034f4bd4840d6af5bae02578526deea837917eb526a SHA512 a29049bfb5da89e7cf92a4a471f81274b6a5e29a6b45eee43c838eb4ccf94b078a7d1c9073dc50d5d6e7e14a37abe5c54dd846f74fdf0c51dcd5434dbb8ad2ad
 EBUILD zabbix-6.4.0-r1.ebuild 10233 BLAKE2B 56c70004858959aa6c72ccdb9c35821877ee599a57dbecf78720206a180d09e2c2b0aa3dadec3520d386dff8aeddb3cfffaa8571d678000eebf5f8b6b0b04a8f SHA512 dc28d64c532c303f30d42e975f28ab1ee6679122776e83e0121984c51c64ed752a015167075301de84dd041db42de411a3e4682a54fc35fdcdda67b712bc923a
 EBUILD zabbix-6.4.2-r1.ebuild 10235 BLAKE2B 7d9e8144ebeb89090c3866ef306252767d429cec8789832852911edb70e79fdda10295f2ba54f0a4cae78304d96e44273ecff366f73853b0017244d0fcf533a1 SHA512 bae102da1bd6b07f27864bb082f5aca750c3b989db92ab89e31a58d71c311fecc63d08848d6add1f355008886fcde58952d645ce9bf876177a768a0148fc162c
+EBUILD zabbix-6.4.3.ebuild 10235 BLAKE2B 7d9e8144ebeb89090c3866ef306252767d429cec8789832852911edb70e79fdda10295f2ba54f0a4cae78304d96e44273ecff366f73853b0017244d0fcf533a1 SHA512 bae102da1bd6b07f27864bb082f5aca750c3b989db92ab89e31a58d71c311fecc63d08848d6add1f355008886fcde58952d645ce9bf876177a768a0148fc162c
 MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
diff --git a/net-analyzer/zabbix/zabbix-4.0.46.ebuild b/net-analyzer/zabbix/zabbix-4.0.46.ebuild
new file mode 100644
index 000000000000..c15a63c282db
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.46.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static xmpp"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	?? ( gnutls mbedtls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mbedtls? ( net-libs/mbedtls:0= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mbedtls) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with xmpp jabber)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-5.0.35.ebuild b/net-analyzer/zabbix/zabbix-5.0.35.ebuild
new file mode 100644
index 000000000000..6e481bc98c71
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.35.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable agent2) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.0.18.ebuild b/net-analyzer/zabbix/zabbix-6.0.18.ebuild
new file mode 100644
index 000000000000..1404fe7a2c48
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.0.18.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.4.3.ebuild b/net-analyzer/zabbix/zabbix-6.4.3.ebuild
new file mode 100644
index 000000000000..e43f9f4d55ac
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.4.3.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index a52e70c6a40c..8d00ae7ee6c2 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 3ef6acce835d..6973d595a5eb 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -16,5 +16,5 @@ AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf9342
 DIST nfs-utils-2.6.2.tar.bz2 969689 BLAKE2B 8e0a3b309223779824276acd3ede13cfc161b955dc9376cc9426ffe9c604b111f7405088fe8e5a88a2d2ac1413d2742fbdf166a5b04c975e51a9e384e071fa60 SHA512 6e5dcc5147ad551b2ecbf0304e1b0e0713d1eff32c5a511562a6d03660589e027364e38fc9f6de1b06d32d8907d502f63c564a6e56171f58823b0ea68dd3a6b8
 DIST nfs-utils-2.6.3.tar.bz2 978167 BLAKE2B 776b4ce6edc728e1dd2291898f429fbc76327b949008f2a477af887231feb2e27505a94978f819e4e4ed7b2b8574e6c5b8d02a9ca6e94683ec620ce99a909a06 SHA512 870dee2a95f411de6694aa8dddeef2302ef9235389a9bdca381ef719303fdd1a463a815ca67e0336a5121fa68d5b448b1952d539679e38b36f1e6b69c1e2f853
 EBUILD nfs-utils-2.6.2-r1.ebuild 6273 BLAKE2B 13c6ac04c9d4b5c7d117537f6a89c82c9978780f29f5ea1d8949585cc7823e0aae8dec0478d6f2aa07c34d3ec0e98c4ae16015ebbb05fd970ffcfa9300f1661a SHA512 b7d271c5b949d4e248f310016b85d4e3a29e873a7baff6b83bff5512f8f09313cadb6572133bea220970b4c29bdad171a1f8db8cd6031cbdf1287c384103cc5d
-EBUILD nfs-utils-2.6.3.ebuild 6104 BLAKE2B fa8ad0804b123ac9b1ef021349b61f68b6a62ab4de0b1278573b481346ccaacf69a3bce24ec07fc929cbfd4a96196f660df9d9829065fa8e409bd364301b34c7 SHA512 e43f10a71a428c8e676f966981367a767e5edee3b04f3560dc1d1555a29cee4b298cb85d100c9c88e8dc8f68e4840e06869d725ff75b64c47ce202ec3e7ffffe
+EBUILD nfs-utils-2.6.3-r1.ebuild 6301 BLAKE2B a8edfde0c212e188aed7a2cc3f06a23c63ccbb55966ed25706e8cd113f6aa8c5eaa4cfb3d24f7c007fbdd2121bf8864057362a68f23165be53d76aae1c3c65f1 SHA512 5bc093ab3316b6b8ce829c337ce5e5bfeea359bffd0dff509ce3b5924f15cfafd05be50532221dd6923a028dbea822eaa00ff77cde819df3d97041ee5422cbfc
 MISC metadata.xml 931 BLAKE2B 68fe90eceb28d3941cf4a8179320b5e5839b3d84dddab9509f9a1bb7c70f413acbb32ef6fda9cb94349193e258df71edb2a518568780177b4a8cfe155f9b57a9 SHA512 af2f74e21226176eb2873ea5de7f96996f54b73b742800adb444ced7485c8ae3556aba20b47c58c0694655f9a9b56447307483f98fc426b322fe05c56a2ce8a9
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
index b95d66ce7f7f..242fef17126e 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	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"
 fi
 
 LICENSE="GPL-2"
@@ -33,6 +33,8 @@ COMMON_DEPEND="
 	net-libs/libtirpc:=
 	>=net-nds/rpcbind-0.2.4
 	sys-fs/e2fsprogs
+	dev-db/sqlite:3
+	dev-libs/libevent:=
 	caps? ( sys-libs/libcap )
 	ldap? (
 		net-nds/openldap:=
@@ -43,8 +45,6 @@ COMMON_DEPEND="
 	)
 	libmount? ( sys-apps/util-linux )
 	nfsv4? (
-		dev-db/sqlite:3
-		dev-libs/libevent:=
 		>=sys-apps/keyutils-1.5.9:=
 		kerberos? (
 			>=net-libs/libtirpc-0.2.4-r1[kerberos]
@@ -126,6 +126,10 @@ src_configure() {
 		$(use_enable nfsv41)
 		$(use_enable uuid)
 		$(use_with tcpd tcp-wrappers)
+		# XXX: Remove this hack after 2.6.3
+		# See bug #904718.
+		# Patch: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca
+		LIBS="-lsqlite3 -levent_core"
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ad2629b506aa..f5c8d26f36a6 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 13a02249fa87..b78759368808 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -2,7 +2,9 @@ AUX libtrace-4.0.18_p1-build-system.patch 4161 BLAKE2B e2811873721fa703e5f220225
 DIST libtrace-4.0.18_p1.tar.gz 1963425 BLAKE2B fdacd4a44f899dc49fe9571d8e695cd726ea07d1c0595bd7c1f59d53721bd5610126924323c9c7098caf65276219e61265e5e05f23b4a92ae6377268c618202f SHA512 fc2979fa56b0eee25149a3571d0a06e2a46ab6d6fa419b2fc37635ebcf4a8814250005c4dfc5dddb5fb6aa9c74161ab4f475a037e021388054bb62f414b9c5d2
 DIST libtrace-4.0.19.tar.bz2 844871 BLAKE2B ff55935b46fb2193ae2e4ab10971d0983da18be20a52a18664f0e72cb829ab444a22e00aeedbd2df85aebbcd6b8352636c559e55d05466a599cc332f018f14ad SHA512 f2744337b4dcff8fc782cd90e44ea6f21cfe120840f626dfac365d3ffaecb82bfdd04a35458b67f663addc1f7ae792c5b0ec7538ed90a2deb386586bc55e1c54
 DIST libtrace-4.0.20.tar.gz 3722006 BLAKE2B f68ededebef71673d6e3a655cb116a5a6d4cdee05ba5150edd85abd45863460208715ebb5eab3ee29254864f0130a594649db0baed99f7ced5d1d968472a595b SHA512 b4d00f0d6f8286eff9bac5408bd10244922f4ab262e3dec5dd6f0984ec9f538ab5ac6e554686e33f92168d687275629ec1725d4ebb7c491fe4bdaffd57058fc0
+DIST libtrace-4.0.21.tar.gz 3741856 BLAKE2B c7178cdf9721dbbce423d38236ee1fe470f32b86af393c10600a326dfbd2e84f28df27584d4ed99590c00cb8042d4472782712024c4398b95e954565d50c33fc SHA512 0215488a36c6bcb5619d01f6f73f42c14d63b291233c3cf2668434f78e0d60c1faac6bb1f7927cdd6448771e5c0de8e1012dcc954c8815763079f5ebd0abe601
 EBUILD libtrace-4.0.18_p1.ebuild 1456 BLAKE2B 25e2ebecd9c9fdf86ee7d62615f07a8af97ac2e9dd061655d87980e03a4d8ba47630da0e2f0547f9ac1adf4f142ebd3a2f7e557fe7b09a769ca7c3b52182a33d SHA512 89d29bfa58b0ddebd0030024ae5a30c913bde1b5f5a3342580f150c695ef55c00f842207596a983e30d2cac8f2d8d187f201fb67b5ae0ec948214202b465b323
 EBUILD libtrace-4.0.19_p1.ebuild 1339 BLAKE2B a3f93afb3b35142ee55f965491aa615f66504409dfcc80dc2bfbb55baedf5e0e241ec45a61283ecf9adf1ea20538533145a5b3f041643f0c1f484fe6e444a9fd SHA512 0c168524b0f3e48a68c3238f9a93ed90a8cfe36ff7892b422a763bf1e5c3d0b33416b9c28817d8980db64c1a9437afd8ea8fb608b384c9e3e9f5759e7297340c
 EBUILD libtrace-4.0.20.ebuild 1384 BLAKE2B cd88c9d87fb57ca94480fb2cbee359cbbddbe3dfcbfbf31d44c0288d624ec4b035f014466424d9522928e4a401cc9e68a0ca163b11a414d610645e66d9ebac5b SHA512 5625d53e63fe54e62689d05beb44484fd6baa66fdfeed1cb88cf316320ef9927618262a91656a8613f182d26f5d5fa6d3582abd1e27d0e6d27c08d531e5adead
+EBUILD libtrace-4.0.21.ebuild 1392 BLAKE2B 6945da5460e6adb792a35e4711d5f736559bde6bda3fcab4bbe7ca1ac31f644930616734b3cc07d3abf3372964397d34068b650e870ef64ac6979337fe328c02 SHA512 cf76465d8354a92b91c3b9d97a9d7b857af0a8a1090d2ea17c6847f2e61fab7db7c23ac9acbade296fd8952750d173023473ae60d207c8f5b20c68b9ef9cb1d4
 MISC metadata.xml 525 BLAKE2B 02976e0d1f606614b5902644f5ee4d6580f6b0db53fb5a348a44a0e653052007a1e9f31bbf8185f0b2fc5cd890ffac517aae512c78625e8f30cdda4223f7a5f3 SHA512 fb048667eb5579363b3a62b1c6b7ac2d1f3e2a25b980f9f485b418dcf9d794f27608de847f7eb444765ef69dfcbcbd710af87f051d492fdb2b21f05a1ff231a8
diff --git a/net-libs/libtrace/libtrace-4.0.21.ebuild b/net-libs/libtrace/libtrace-4.0.21.ebuild
new file mode 100644
index 000000000000..5416f1837ee6
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.21.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A library and tools for trace processing"
+HOMEPAGE="https://github.com/LibtraceTeam/libtrace"
+SRC_URI="https://github.com/LibtraceTeam/libtrace/archive/refs/tags/${PV}-1.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P}-1
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# doxygen is always needed for man pages, but USE=doc controls installing docs themselves
+# (not man pages)
+IUSE="doc ncurses numa"
+
+RDEPEND="
+	dev-libs/libyaml
+	dev-libs/openssl:=
+	>=net-libs/libpcap-0.8
+	>=net-libs/wandio-4.0.0
+	ncurses? ( sys-libs/ncurses:= )
+	numa? ( sys-process/numactl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-doc/doxygen[dot]
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	app-alternatives/yacc
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# Comment out FILE_PATTERNS definition (bug #706230)
+	if has_version ~app-doc/doxygen-1.8.16; then
+		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
+	fi
+
+	# Update doxygen configuration
+	doxygen -u docs/libtrace.doxygen.in || die
+}
+
+src_configure() {
+	export LEX=flex
+
+	econf \
+		$(use_with ncurses) \
+		$(use_with numa) \
+		--with-man \
+		--without-dpdk
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		docinto html
+		dodoc -r docs/doxygen/html
+	fi
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 532ade211dcf..f9f32da8fef1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index ef9765c4ffbc..5f98caa29383 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -3,9 +3,11 @@ DIST electrum-4.4.0.gh.tar.gz 5627801 BLAKE2B 27ed9fff7586f9efe18a76f3cfa6d0cc4d
 DIST electrum-4.4.1.gh.tar.gz 5631256 BLAKE2B cefa27c7b770429004a221143f4291285f2ad6f3ca6f1f58c5c98ce6b6efbc316ea6b857a6abf8ed899cf5feac1f3505fd83189849aab72f144af9e7ce4d546d SHA512 075253fc89063d8fa6adcdc9d3e4c7cbd5caa27efe9f5dca8ddf5ef3863ca25690f2a4280a4999d6d3da7d32ece10dd9faf2ba560d2b13a0c9887237daa6382e
 DIST electrum-4.4.2.gh.tar.gz 5635869 BLAKE2B 7ba1941a59e5db7578d2b7fe26997c9bda92467362422fc3b3741eefc5c52b872cbb0c9c5caf7454ae4b6136a37b498ba2afd1b0f19ace0f566de68a9e40b3bb SHA512 50509a7890a9697dfb59ec6d8cb3f2d5243b37acbff2c322cb7a6f4b350dd18fc5a963a30af6cd4e918ea02306df4da7252158ddf268fc87762ff598e2eb33e8
 DIST electrum-4.4.3.gh.tar.gz 5629690 BLAKE2B 56f1bf2500500eb9fcd3b0397adee2f46865ab628004c62b2ffc36b7a019b1bd94b7c84576b35afda70116fb290476432fb1363eeb511d8cd4e6342c3a920975 SHA512 077742c404cce57fbf330b28a36c277dc22c10027c8f412ea192a7f7b917b37b22bbb85dc6cdc654daaacc28f98659dac406879a183448b20b0377a86697f486
+DIST electrum-4.4.4.gh.tar.gz 5630721 BLAKE2B 89505aee1be9fd66a57544d7fb9dc01b09c121529aebc63021f460a4a210bdce7d911854d3547e4710b6d44f329abe8fdc3c59d2a2776b1f470cf26c91de6e6a SHA512 cb59ee0f0a427bf6aa3d6d707a4a188aa0e4c9e957af748908c1f617ac49416a0015a6c5f4763b6ef5e4f67a7fcb827f2bd31825e8b42ebc3cca7da0c72a1bc0
 EBUILD electrum-4.3.4-r1.ebuild 2896 BLAKE2B c5d42f5a55aab16022835b66633d77a156fe7c69b8ee3ee889a9609be5e824eebfafee27114776af6cfd03ac887fcb52c29f4cd44cd70faaeb58bbe33653a4c7 SHA512 11a88ece051a5107df2916717b7c0f5b08792a88d43f5d4d512ea91ad9683b01236fd9caa75d267a52888a01fccec63dffed51f1b66685749685b355dff262d3
 EBUILD electrum-4.4.0.ebuild 2898 BLAKE2B a8ef6fc4fffef8e44732cd7e3f523357738db98da2907e361644df6c5da236f8e6989d3b9f2047a65538fb045d509cadb21af22a600ae99ec23f1a8e36e4d362 SHA512 1785c57717ec7cbb733cb3585d7a7f80a9c57a0e6427416b56a20a28d672f01fda7561a8df25305c886c3ba2b0b92c42c04c7aeb079054bc23c895d1c135714a
 EBUILD electrum-4.4.1.ebuild 2898 BLAKE2B a8ef6fc4fffef8e44732cd7e3f523357738db98da2907e361644df6c5da236f8e6989d3b9f2047a65538fb045d509cadb21af22a600ae99ec23f1a8e36e4d362 SHA512 1785c57717ec7cbb733cb3585d7a7f80a9c57a0e6427416b56a20a28d672f01fda7561a8df25305c886c3ba2b0b92c42c04c7aeb079054bc23c895d1c135714a
 EBUILD electrum-4.4.2-r1.ebuild 2898 BLAKE2B add50631480377c0e949a09c6177cdb01ab5fe5bba55c863c49bce88e929268985f8bdcdb82f1d7611c17ad72010712e4f6a551b63b47d9cdfebcfc360da5129 SHA512 e858b342327d8be65e74654287c360c65708e0d046f498c3ac1626db4af5ffa910eb33f8c6ae21063ba95b9755aa4728f65f156b5f06d9856252016dd7c0e4aa
 EBUILD electrum-4.4.3.ebuild 2898 BLAKE2B add50631480377c0e949a09c6177cdb01ab5fe5bba55c863c49bce88e929268985f8bdcdb82f1d7611c17ad72010712e4f6a551b63b47d9cdfebcfc360da5129 SHA512 e858b342327d8be65e74654287c360c65708e0d046f498c3ac1626db4af5ffa910eb33f8c6ae21063ba95b9755aa4728f65f156b5f06d9856252016dd7c0e4aa
+EBUILD electrum-4.4.4.ebuild 2899 BLAKE2B c0abcbde08839e5ae0d1f30a673b5406c67d47ee7509e1882a14601f0e00bf8f6060c369de1d3c89ac26fa8443ecb4be093419578d88205654d6149bf6584d39 SHA512 a2a98445367c09daa5a1f31bfdce240129d002472d946c2c4ad9581a84a18caef3688d32f789eb0783147411bd805900485f83c0d790e4e0d5a1330a60418875
 MISC metadata.xml 637 BLAKE2B ec4a0e57a1a11fa3a430c40b317e9a857b4128c7815fcd9fabe44adf85c47985325f4df3da9476b19f687026a145c7abf16a6a1ef6c8e25dd217732cdf77a076 SHA512 599ade68d31da44232ab7f520f0b9c054e7a26757aa7eed4f06350487d6c7c1dfc12bf2ba3dbddeb8ef8e8f0b67d093b91999cec422b3a5ea6dfadc9acf2fbc1
diff --git a/net-misc/electrum/electrum-4.4.4.ebuild b/net-misc/electrum/electrum-4.4.4.ebuild
new file mode 100644
index 000000000000..693674eca7e3
--- /dev/null
+++ b/net-misc/electrum/electrum-4.4.4.ebuild
@@ -0,0 +1,112 @@
+# 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} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="
+	https://electrum.org/
+	https://github.com/spesmilo/electrum/
+"
+SRC_URI="
+	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	<dev-libs/libsecp256k1-0.4
+	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/bitstring[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.20[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+BDEPEND="
+	test? (
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
+
+	# make qdarkstyle dep optional
+	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
+
+	# remove upper bounds from deps
+	sed -i -e 's:,<[0-9.]*::' contrib/requirements/requirements.txt || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test "${v}" -ge 4.3.4 && return
+	done
+
+	ewarn "If you are new to BitCoin, please be aware that:"
+	ewarn "1. Cryptocurrencies are volatile.  BTC has been subject to rapid"
+	ewarn "   changes of value in the past."
+	ewarn "2. Cryptocurrency ownership is determined solely by the access to"
+	ewarn "   the private key.  If the key is lost or stolen, BTC are unrevocably"
+	ewarn "   lost."
+	ewarn "3. Proof-of-work based cryptocurrencies have negative environmental"
+	ewarn "   impact.  BTC mining is consuming huge amounts of electricity."
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index e752799315ab..999fae84ab22 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -2,6 +2,8 @@ AUX minidlna-1.0.25.confd 313 BLAKE2B f08adcd103be5fcffa02d2c62ca85537cb5803336b
 AUX minidlna-1.1.2.service 230 BLAKE2B 13db2b522a5c27143106f7d45410f94c657133440a5e352794cc4fc48c818865b28087c666911c905efd3fb9c00b6aa9f79f9d0b014eae9130db0d40b5a0ec20 SHA512 0cfa770c43097007dce2c440512e4ca27e02678a08299c8343c91d2e9f70d4756bfd9527c6747a484c639e0e8467cad3d5f2f5a216684ce75495be084e6ac5df
 AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb263d87ef4ab18a128f55117929c6d244de72e5e663e06579a551ff1aa9df385afd277135aa1a2ed0201bbb SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2
 DIST minidlna-1.3.2.tar.gz 736820 BLAKE2B e35266be94e4585f399c80a6909318ce973d443506f6becdacdb00802ed0ce060ebf8401ff1b5dfef0b451f609d98f805c80b9a0c87e23d14084338047418620 SHA512 1dca810aeb59f19f530b5fd589beb04085b65ece94a55a54f2f7a0b771e7c5487493f13e6d9120e0b9aced08b0f98de58640dec26def214333dae1fea951f589
+DIST minidlna-1.3.3.tar.gz 824527 BLAKE2B 489b7ecb54a20f6111a65388ad2c52d477164046131af490cbcef7cd3ff2b841644f549bcad708ea6d4548f4111d5b2b63bafc0f079edf160467b85c682cbc5b SHA512 3571af71b49d46aacc273a9b35e2c78aeccb966c1d6122f8186074c34f9a177ac60622ccf29f307d8d73f502c7a99f023f96f0c43bbd398c7ef82bb57d77cc1d
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
 EBUILD minidlna-1.3.2-r1.ebuild 2073 BLAKE2B d5503a19aeb99ee3fd1697a4d7ad20e42ea8a61e142ff320b23dcab1b77cdb1c7d547846abe8c0a3fb9eff32ef1a64cafe2596d06c059ae4bd3675e48bd385de SHA512 e45b2385143f58461f5921b56eca2be9d2ef371a68795b928c0e4ebd2cd24b4b57674c790b593c10bab2f0de181677c1cca18f7885bf4aa777adb9b1b6528f14
+EBUILD minidlna-1.3.3.ebuild 2076 BLAKE2B 661d3b2cc63ebd006e884b3f4e72fe9cb712340d55c4885bae0bcdf12d8228a21bbac47167295909a90f73b2115cca5d3f12551a03f6880c87e56c50257ccf6b SHA512 424e208862ef14ab0e5a48d7780918ab754d877770c8f3f6c6492e3b5fca5eb6367475ba6f82c4eca2ec22e54bf4128fb49a81241f40d211239b60e50ab10dc1
 MISC metadata.xml 513 BLAKE2B 6e851975b83efd7972d5d58c85093a36bf0f51845cb6ef1f7d7b37dab65dd913a5bbd6e5f163b2142eee11d6860b55e1bd346e23b5f4f427ca0812701149eede SHA512 99fe90016717a048a38feec908049f5f0c7b81045dc9e8953b204eb22e858f74b876fd5ae3765cbf88204f9f6ece87310dccb2123bdb1cc007e3c9049967a4e1
diff --git a/net-misc/minidlna/minidlna-1.3.3.ebuild b/net-misc/minidlna/minidlna-1.3.3.ebuild
new file mode 100644
index 000000000000..ff6c52a2f27e
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.3.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd tmpfiles
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="https://sourceforge.net/projects/minidlna/"
+SRC_URI="
+	https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz
+	mirror://gentoo/minidlna-gentoo-artwork.patch.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="netgear readynas zeroconf"
+
+DEPEND="
+	dev-db/sqlite:3
+	media-libs/flac:=
+	media-libs/libexif
+	media-libs/libid3tag:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libogg
+	media-libs/libvorbis
+	media-video/ffmpeg:=
+	elibc_musl? ( sys-libs/queue-standalone )
+	zeroconf? ( net-dns/avahi )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/minidlna
+	acct-user/minidlna
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+PATCHES=(
+	"${WORKDIR}"/minidlna-gentoo-artwork.patch
+)
+
+src_prepare() {
+	sed -e "/log_dir/s:/var/log:/var/log/minidlna:" \
+		-e "/db_dir/s:/var/cache/:/var/lib/:" \
+		-i minidlna.conf || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--with-db-path=/var/lib/minidlna
+		--with-log-path=/var/log/minidlna
+		--enable-tivo
+		$(use_enable netgear)
+		$(use_enable readynas)
+	)
+	use zeroconf || myconf+=(
+		ac_cv_lib_avahi_client_avahi_threaded_poll_new=no
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	default
+
+	#bug 536532
+	dosym ../sbin/minidlnad /usr/bin/minidlna
+
+	insinto /etc
+	doins minidlna.conf
+
+	newconfd "${FILESDIR}"/minidlna-1.0.25.confd minidlna
+	newinitd "${FILESDIR}"/minidlna-1.1.5.initd minidlna
+	systemd_newunit "${FILESDIR}"/minidlna-1.1.2.service minidlna.service
+	newtmpfiles - minidlna.conf <<-EOF
+		d /run/minidlna 0755 minidlna minidlna -
+	EOF
+
+	keepdir /var/{lib,log}/minidlna
+
+	doman minidlnad.8 minidlna.conf.5
+}
+
+pkg_preinst() {
+	local my_is_new=yes
+	[[ -d ${EROOT}/var/lib/minidlna ]] && my_is_new=no
+
+	fowners minidlna:minidlna /var/{lib,log}/minidlna
+	fperms 0750 /var/{lib,log}/minidlna
+}
+
+pkg_postinst() {
+	tmpfiles_process minidlna.conf
+}
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index b6585c53e5ee..668ef8332e06 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -4,6 +4,6 @@ DIST netifrc-0.7.5.tar.gz 86884 BLAKE2B 6ca9b8034fe69767910814021df783710cf6b6a4
 EBUILD netifrc-0.7.3-r1.ebuild 2072 BLAKE2B cb870e8d15264a0159abd7bb6454045c80402081ce021de25ec78e76a71bcf136d8d48cdf8308e8c19176e000ceb649fec3c53e13cad0294270e4364149a9815 SHA512 dd35e00d33a06f0159b7cfe71a0f95cbfbddf9d397975400f03384998b35533fee4e1bd36b16be95527b2b12f09e21e6e3eb96803c2f845c8ff65b5c78124063
 EBUILD netifrc-0.7.3.ebuild 2059 BLAKE2B 04bce3c3cdf9b43384e6918de8e91b59ee43fa74a23715c409bff93a7861b968225e604d40a412cb20440d0f3afaa53ea750eeded1a4b674074ee2e306da9ed5 SHA512 c907ae80e8b9a4552b2f5129efe0133ea48341584cae701acc3b37f3a172936413a0a6f9bb93e04b98139590230373121a0bd24cdfd5e4a3dddc7e64bd87fe5f
 EBUILD netifrc-0.7.4.ebuild 2078 BLAKE2B b913955dca57c09b86e38a2eba96525f8b2bec3b3b1f7e8412dea978b234d280120b3e492fbb6cff94ea02cc95204d39c33b2b722d9676ca4881292117c32a04 SHA512 c782893e1c88ae5f3fc916d31f790f652625d953be780e9b8c6a6691940848cd22d665708c5b46d34e110e0e026b78fdebc3ef8bde22cbca91271aaabe577685
-EBUILD netifrc-0.7.5.ebuild 2077 BLAKE2B 3da53e4934351ce13df2f3835012d7e25bdd9726052dd4402b1d91ae641ce6d005facc2bde0750d32d60a9658143fd4116e5c966d13dedd170cc1d56b5f68ee4 SHA512 bdfd3e786d567578618778251cbe9a736110d54b120ecdb4b2460b60d24cd293550725d0de15e14f895971a079337af463206c11c683513492bf4ae851e2a546
+EBUILD netifrc-0.7.5.ebuild 2075 BLAKE2B cca9e4f965959bbd8575da25dc98b856678084e7e9ca8767109f8e864fa0b559f862d8907a79cfc20c030e8d594a6bb9c7799b8cc8abf7c0c75e2cf4f594da62 SHA512 8157028900f4ebc69d9179a4ee5c7867015ba8608f892321fa232224b23f7f518e9f014e1b38c7865a58c69b124f03f7edaf0203a00242d8b81d43b9f5da2b35
 EBUILD netifrc-9999.ebuild 2080 BLAKE2B 76d60bca2a2ffd8804e78020dcb750d2cb79e2eae57160d210384c49a0e122a66e0c3ff3163abcc9bc8bd435a4044e02ae37905ac4ecddf1ad34945ebc602d8f SHA512 89d90b589da0980142a5cc5be13f5d1bfd305ce4e3b41648425649ff23c1d886a35a7cc395e95702d1cccb5582b63027d61e6041bf2fd7830d4f8e49bb4bdc9d
 MISC metadata.xml 590 BLAKE2B c31ae830efc67c90566de9c4b3c4c7edaaea06f4e248295405d73e89e3fa61c925999e6cdfb89d37e1bd484442fe196c966ae256faa03355a31d331340b0f1ce SHA512 c1b6c24f5ee1cafde0e950fcbfa926f35529f991c1eb91436473d4d0ac8d338941b9b18bab62319fce712a3a14d04fd57019e433e584f4f2fc52a3591b8585f6
diff --git a/net-misc/netifrc/netifrc-0.7.5.ebuild b/net-misc/netifrc/netifrc-0.7.5.ebuild
index e31fe4b745c9..0bcee6d3b742 100644
--- a/net-misc/netifrc/netifrc-0.7.5.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	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
 
 LICENSE="BSD-2"
diff --git a/net-misc/udpcast/Manifest b/net-misc/udpcast/Manifest
index 4e4ee6c70891..7bdf086278cc 100644
--- a/net-misc/udpcast/Manifest
+++ b/net-misc/udpcast/Manifest
@@ -1,5 +1,5 @@
 AUX udpcast-20211207-musl.patch 1018 BLAKE2B e8adbf4ee6317e514d05003be17c45a2eabd7fe547462b1a09aa0cf9e6a691bc2933e5bb5745a45218471aabdc89ac6046ecfcfd672ca9e93fe858a1416fc09f SHA512 4ef72c0a4484d6782b0b42c689950c20de04746ea5cdd2f3527fe42c1599c906393d22da00ad84a9aa4bac0c4ed643a2c9075116ef96a60f1f7b57b003641b66
 DIST udpcast-20211207.tar.gz 171148 BLAKE2B 96a7b1a30e19a2b83ce2ab7d8491ad430838f1305b83b728e6b43343404440b5a7fa9ee0afd0c00f8203937803a691065af31d7dc51633f26d019955e9ac8ed0 SHA512 89010c781d99a60e335213e88867c9114b51f3d75bd4ebfa38bcd1382e5925be4f316faf8c24ea55b087edb2115e18b5fd3cceac70a65371f91227528d218e89
-EBUILD udpcast-20211207-r1.ebuild 596 BLAKE2B 5d2779142b376faee42127ee9332d18545b14cfed4ffddb0ee47c70ecd38b815405060e2245b5eef67454e819fe922d6684c0ccb313e4d0b183863093689330c SHA512 3e6ab839a52c7cf7a5f9667958e2716f127737f92c2bd8e045a39e30984034790af0b0c6daac5a96080b78da525654d77074e887405eacd1df4c294a09c31fea
+EBUILD udpcast-20211207-r1.ebuild 595 BLAKE2B bf55e73bf56e9ed5bb2f8daa445d6cce86186277c2a47a775d44ee6512d51d3abe0c41063c6de1ed1fbd4647e93635455c983a56a83c6159234135118479e09e SHA512 6a6a2e6cc37232406051171c3109b18aadf57aa0b4daa45978f4440e28dd3fbe3f0b45df5253b86a85d1d065c4f02a112d2516eba871cf99380867e5c3dbe29f
 EBUILD udpcast-20211207.ebuild 536 BLAKE2B 6b7e36769c67ba06d826f1624cb746de21eef8311bd67971ba60ecda54a696cd5091eed4a8c405f94791987e46b7e5bd73699ccf3d90c6a63ce3fb8a42729a7b SHA512 5f44008050f6e329f8803357849a6ce9be98243bb6862fa7077ebc7f173b4cf837bd5f20c6477416771ebf2e4ebfd0ca23d7ebabcb8dde069bd09d499eb91d14
 MISC metadata.xml 693 BLAKE2B d5fe9bbc4fd2deb6aa08eb6326e888f4cbb9e3e15491909d435f10b1dee78898d6c41a3906c750fb2f97a3bf92b407971af009425f664541697e1d82c6f5d92d SHA512 b4e5471bb9d81ee5d52ce35ce77e18c92cdcc5cec6cf32fdcb6537c3af4b361e8f11dae8446901c7669ba0489d5fe7cae57a3809c6d0314d1001f1f9b94f7429
diff --git a/net-misc/udpcast/udpcast-20211207-r1.ebuild b/net-misc/udpcast/udpcast-20211207-r1.ebuild
index 11fb3b0fac1e..7814b8405147 100644
--- a/net-misc/udpcast/udpcast-20211207-r1.ebuild
+++ b/net-misc/udpcast/udpcast-20211207-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.udpcast.linux.lu/download/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="hardened"
 
 BDEPEND="dev-lang/perl"
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index ac3dbac6a745..64c664008e35 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-gentoo-developers/Manifest b/sec-keys/openpgp-keys-gentoo-developers/Manifest
index 331502231ad8..e80ed31411b4 100644
--- a/sec-keys/openpgp-keys-gentoo-developers/Manifest
+++ b/sec-keys/openpgp-keys-gentoo-developers/Manifest
@@ -1,9 +1,9 @@
 AUX keyring-mangler.py 3005 BLAKE2B e5435432b79156c26120af950f46f9a916af7261a78b40081eb140e18b3fd4f0d2ce55cd2ed305bdd4f60b569edfb513c1151a6255838a750d37225715e87e4f SHA512 bd4dc3dee66c0f0b8b657da1fabfbda96ea03b77d1080fa1d07b14d2a9571fe91f7589131893b75548122e772678760c7722fd8a46e120c40d8dbb8cb4341dc9
 DIST openpgp-keys-gentoo-developers-20230403-active-devs.gpg 3033398 BLAKE2B 233549fa600d855df1f4130224c63b10d0df3312886bef1c0486553db3025554a4fff7af104a3f0869390d53837a8d0182d830432e855273da28c753ea579d7e SHA512 33264b9ef002656f5c58dc2b2ff568d01b624c68e2e42db0d388b9a99b45c2d605df0d5db7b5029c0946f524fa7168252ba87908336e6f9ad0717c20d43cd112
-DIST openpgp-keys-gentoo-developers-20230508-active-devs.gpg 3084780 BLAKE2B e7bdf7d2dd4031c63b8acc326c4f11b1f31639d97fa18eb37ec40805789e6c574d5443b0028f204375d0854e661ed2893ca960e9663b41c67b91d87d4e50466d SHA512 bcd0bc704e36dbfdb37cce3739336af7767c64eb9e443607c743c608274676b779e158bdb34ab22d6da6921c3c7b43ecd729c856600c530757fb7da020bf9d67
-DIST openpgp-keys-gentoo-developers-20230515-active-devs.gpg 3093773 BLAKE2B 481e754067cf3ecdce5792490bda2ea9a8afa412c3b6442955f588b2a1c084032ec9d191b39a1931a25e72b291f21dc6e6011b27badd39688420d58743aafa20 SHA512 4c5f7b90e228c639b720932841d404b87cb730929c6955d1441771d1213111375c390aae675176f2a3a99b8dc1d24cdf4f4986f0dfd6025f36d4d84c8eb44c02
+DIST openpgp-keys-gentoo-developers-20230522-active-devs.gpg 3094133 BLAKE2B f6c9ea88ab0bb97e4a43731705d346e75b21b0ccd0c7fbf6c0e4c1cd8408cd7e27c14e3e6bf2c1a60853d27bc8ec6881d2d5832e15bb6bd265a15f95e61d1b46 SHA512 72febc57dbeb9a4ea8431f2d36870181e91b019b414fbba1660689fea574f10881e39ca36ab9b6a648b3297cfef10123b191c5c7d643c07087a267b0f993f580
+DIST openpgp-keys-gentoo-developers-20230529-active-devs.gpg 3094133 BLAKE2B f6c9ea88ab0bb97e4a43731705d346e75b21b0ccd0c7fbf6c0e4c1cd8408cd7e27c14e3e6bf2c1a60853d27bc8ec6881d2d5832e15bb6bd265a15f95e61d1b46 SHA512 72febc57dbeb9a4ea8431f2d36870181e91b019b414fbba1660689fea574f10881e39ca36ab9b6a648b3297cfef10123b191c5c7d643c07087a267b0f993f580
 EBUILD openpgp-keys-gentoo-developers-20230403.ebuild 7522 BLAKE2B d48c00f39d882d632ad70651e47e06887af88a320623d6f5009ad735ff449895d18bc00838bc4fe72c905ebfbef233cffec407a359280fd4e88fb44b433e7e97 SHA512 7fa3f01773d5a3dfdc4f4221d6a15872f7eb74cbd262237fb6b5a8508b175a2e82679120efa5f686392f99402f71dfb1fcf833d5fbed76aaecb1aee37ac4ffac
-EBUILD openpgp-keys-gentoo-developers-20230508.ebuild 7530 BLAKE2B a43990c1c1441f877c04ddeb45d3a96cb829c223d26986129f520219afe2e8dd43e67f9878e666fc71fbac357dc77e54426a20cc352029ed199e3374e958feb3 SHA512 9a896722504447f82d1e3431b4f9a38ac523a08c4f6e4cbb798e75133b20a2b54d4abe220b6ba5c7848804fb3b0aad9f02ede441acd36f11cd988d45c87eda50
-EBUILD openpgp-keys-gentoo-developers-20230515.ebuild 7530 BLAKE2B a43990c1c1441f877c04ddeb45d3a96cb829c223d26986129f520219afe2e8dd43e67f9878e666fc71fbac357dc77e54426a20cc352029ed199e3374e958feb3 SHA512 9a896722504447f82d1e3431b4f9a38ac523a08c4f6e4cbb798e75133b20a2b54d4abe220b6ba5c7848804fb3b0aad9f02ede441acd36f11cd988d45c87eda50
+EBUILD openpgp-keys-gentoo-developers-20230522.ebuild 7530 BLAKE2B a43990c1c1441f877c04ddeb45d3a96cb829c223d26986129f520219afe2e8dd43e67f9878e666fc71fbac357dc77e54426a20cc352029ed199e3374e958feb3 SHA512 9a896722504447f82d1e3431b4f9a38ac523a08c4f6e4cbb798e75133b20a2b54d4abe220b6ba5c7848804fb3b0aad9f02ede441acd36f11cd988d45c87eda50
+EBUILD openpgp-keys-gentoo-developers-20230529.ebuild 7530 BLAKE2B a43990c1c1441f877c04ddeb45d3a96cb829c223d26986129f520219afe2e8dd43e67f9878e666fc71fbac357dc77e54426a20cc352029ed199e3374e958feb3 SHA512 9a896722504447f82d1e3431b4f9a38ac523a08c4f6e4cbb798e75133b20a2b54d4abe220b6ba5c7848804fb3b0aad9f02ede441acd36f11cd988d45c87eda50
 EBUILD openpgp-keys-gentoo-developers-99999999.ebuild 7524 BLAKE2B b25f55fc15605a7ae98ea6c232c3c52c522478eef6e7c0454560874de41639b9af22b569b45e5363481ce5b1f0e55b0fae92c9be98fdd9cdd5a7a2c1b4cbd195 SHA512 59df2a70e59e2c029f383c971e0a00cd10c11fa8c8eaaf692fca4c11645a5877f0c0a4d121257fee42442b1f9252b497ba625e1ab1c4fd4d08aaaf59d91eff1d
 MISC metadata.xml 264 BLAKE2B 630ac0044f623dc63de725aae23da036b649a2d65331c06fbe9eb66d18ad1a4d3fd804cdffc4703500662b01272063af346680d2550f2fb6a262d6acee8c6789 SHA512 3cf1981080b4a7634537d20a3e837fa802c52ae5ee750531cc4aa3f8478cda78579375602bc058abbd75f9393f9681b79603c3ddd9af809a1e72f7336a708056
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230508.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230522.ebuild
index efd0694ab707..efd0694ab707 100644
--- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230508.ebuild
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230522.ebuild
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230515.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230529.ebuild
index efd0694ab707..efd0694ab707 100644
--- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230515.ebuild
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230529.ebuild
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 38fcac44344b..652cedee07bd 100644
--- a/sec-policy/Manifest.gz
+++ b/sec-policy/Manifest.gz
diff --git a/sec-policy/apparmor-profiles/Manifest b/sec-policy/apparmor-profiles/Manifest
index 6da8e9241792..518ae622b775 100644
--- a/sec-policy/apparmor-profiles/Manifest
+++ b/sec-policy/apparmor-profiles/Manifest
@@ -1,8 +1,12 @@
+DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20 SHA512 94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
 DIST apparmor-3.0.8.tar.gz 7946880 BLAKE2B bbff6c0223b9f20cb53d96cb2e41aa4b7eee51b35a2c010cdd394f85517e87c9a34fb7182f600ba212e99baf4ee1a16a5bfd7e92ec6a9fb9ce6076a216cd89e1 SHA512 539e955b24c6f4f62ef0d7885fc341e4f6bc69ee840981426fb6a40f8f8e5c945f774246cb0efe1a76e778b8047d4a7fe315ab062d2dbe17e524b8527d5a8087
+DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae SHA512 db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4
+EBUILD apparmor-profiles-3.0.10.ebuild 620 BLAKE2B 4cfbcf58464c8408af2904151b7626d8104b759d010b135dd65317a9be791a8ab534a556c48a6c6f02d955739804471a021d35b35a75734016d11b487395c860 SHA512 434249b7971d88bf749277ca248a5698108810150bfcb88bb30109c850079353c203b0f4ef813d5031f999d3dea0953694f85960ee513304f7af6c9a12905423
 EBUILD apparmor-profiles-3.0.3.ebuild 619 BLAKE2B 9ecd10e83dc7bcfe419090b883a22b8dab2f55588dad44d1c4f88229aed9ab9cb706d3403a9828dc265ac0178f0564de52523d9dc4e15aa0d313e5d42be2d779 SHA512 7ff6ebf876e2148d0d75adfa9cb2702a623587adb2935003010adfb7ec7d09de8a402b83b1bd5dcab52a4126dbd36e3b6b07d2701aeef08365d979b396a881a1
 EBUILD apparmor-profiles-3.0.4.ebuild 619 BLAKE2B 9ecd10e83dc7bcfe419090b883a22b8dab2f55588dad44d1c4f88229aed9ab9cb706d3403a9828dc265ac0178f0564de52523d9dc4e15aa0d313e5d42be2d779 SHA512 7ff6ebf876e2148d0d75adfa9cb2702a623587adb2935003010adfb7ec7d09de8a402b83b1bd5dcab52a4126dbd36e3b6b07d2701aeef08365d979b396a881a1
 EBUILD apparmor-profiles-3.0.8.ebuild 620 BLAKE2B ae90a9a81c56885d7ffc87bd7edf63b74212e4ea4928f2a3d92553c111b743b1137754947faf220569cddc590d01d9539ad9d5e3120dedff8f1e1f9c9e3241c5 SHA512 4e6462626b2411cce46c6a64645ee07236a6b353e51792b9e6870768d26c10ea967b4ca204bd4fe950030cb7c3858d6ff8ee12acd98c34495115145665a14369
+EBUILD apparmor-profiles-3.1.4.ebuild 620 BLAKE2B 4cfbcf58464c8408af2904151b7626d8104b759d010b135dd65317a9be791a8ab534a556c48a6c6f02d955739804471a021d35b35a75734016d11b487395c860 SHA512 434249b7971d88bf749277ca248a5698108810150bfcb88bb30109c850079353c203b0f4ef813d5031f999d3dea0953694f85960ee513304f7af6c9a12905423
 EBUILD apparmor-profiles-9999.ebuild 731 BLAKE2B 21d9b23294a71fcb480aba7c64f33a133038a3171b6c4bd3999ea30489788def582d9ab1cdde85424753d0c66280488fc2c88421222973405efdcaaad7faa030 SHA512 8ebe8207d72e3b06bf32cafa49e78e52b29a9d4fcae3fcfb87c605281ebf88e836317957635691d440a069e30705e44d9f51abe636069eb79483b2091f23da62
-MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
+MISC metadata.xml 499 BLAKE2B ae7166545eb4d691cb446ee37d1e0e251c02f7f19f57bf9d4f31f55e78c707226767e0721e167a32acfb164e65d2203efcd3e54571693066cc03a98d5125425d SHA512 54421c54122fcfa7b849a8e08359d546dc1084a694b1123793d7c6cb6fa21e3e44e93d71a719da4ae0c3ad1ce85a0d53a28e0531654d79cf856db11f03621b8b
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.10.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.10.ebuild
new file mode 100644
index 000000000000..4e6f316ad541
--- /dev/null
+++ b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="A collection of profiles for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal"
+
+RESTRICT="test"
+
+S=${WORKDIR}/apparmor-${PV}/profiles
+
+src_install() {
+	if use minimal ; then
+		insinto /etc/apparmor.d
+		doins -r apparmor.d/{abi,abstractions,tunables}
+	else
+		default
+	fi
+}
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-3.1.4.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-3.1.4.ebuild
new file mode 100644
index 000000000000..4e6f316ad541
--- /dev/null
+++ b/sec-policy/apparmor-profiles/apparmor-profiles-3.1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="A collection of profiles for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal"
+
+RESTRICT="test"
+
+S=${WORKDIR}/apparmor-${PV}/profiles
+
+src_install() {
+	if use minimal ; then
+		insinto /etc/apparmor.d
+		doins -r apparmor.d/{abi,abstractions,tunables}
+	else
+		default
+	fi
+}
diff --git a/sec-policy/apparmor-profiles/metadata.xml b/sec-policy/apparmor-profiles/metadata.xml
index 22230f2666f5..e22db4165e51 100644
--- a/sec-policy/apparmor-profiles/metadata.xml
+++ b/sec-policy/apparmor-profiles/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">apparmor</remote-id>
+		<remote-id type="gitlab">apparmor/apparmor</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ab4ca0c64d31..52002ed2ae60 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index ef7a9b5aa83f..b078819eeedf 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,7 +1,11 @@
+DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20 SHA512 94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
 DIST apparmor-3.0.8.tar.gz 7946880 BLAKE2B bbff6c0223b9f20cb53d96cb2e41aa4b7eee51b35a2c010cdd394f85517e87c9a34fb7182f600ba212e99baf4ee1a16a5bfd7e92ec6a9fb9ce6076a216cd89e1 SHA512 539e955b24c6f4f62ef0d7885fc341e4f6bc69ee840981426fb6a40f8f8e5c945f774246cb0efe1a76e778b8047d4a7fe315ab062d2dbe17e524b8527d5a8087
+DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae SHA512 db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4
+EBUILD apparmor-utils-3.0.10.ebuild 2280 BLAKE2B f96f75d673edba6ac46b2de6a17e3a609805a6ca1598d774dff4b9e7c3ca3051d856dcb487350210d0c3dba58ea2ffe8b36cc4b1545e82c9976bc8115f741f31 SHA512 f2f75f5196392ec540856aed20ceedaf2b9bf222fb664238360802bd9f09fda9a45e4531ba570f9bd6d44c173b3d37333ca1357be0bdc8ceb330c3e25bcdfbe1
 EBUILD apparmor-utils-3.0.3.ebuild 2270 BLAKE2B 6cbc487e75d50e8915696d5436cb3193a0f5a602bb8e83a86b78a1fd55afb2aabaa5edc15a3c3b8ec9c5ff0739d7a487eda6928c57505ebda42d3d11fb9fc5fd SHA512 5b72d153dda80c45f8e8ea542454da818016fb3c867d0c1f9f1488d7926564fbbe5a6005658fe0a9300bcc0222b585552e9d7649e12aaf56007adf0a37f1c00b
 EBUILD apparmor-utils-3.0.4.ebuild 2277 BLAKE2B a8e87dbc8ca4ec8091d6a01e88c88bd01e8261c6783449526257b58d0559608db9d2674712e20cc5dda20cf956259e515a890a7dcde72ac9a40282c9d2b5c30e SHA512 8a93dbbf151e24554a40c7bd6dfa9041c5ebaf5e924f77b30c9f7d7f8a4a78300827a2942b0a548c98bd0662d5ec4251fe4dd82ed443eaa392c55a83677763c0
 EBUILD apparmor-utils-3.0.8.ebuild 2279 BLAKE2B c08a2f6fab0c921fefc2f80b09292b89b1b6a2c38a004446f70b5da9540570001126d1573e40f3c8a5ddb9ff35c270866cc52573913799ddfab0c69a68aa94f9 SHA512 46a9b8ffbc4f277d66abac1a6d7d47c112e7a8262eff30be0b228830d39215a112997bdcc4f0b0fdef237363a430920916c70d2078d12ec7debb85ba9b05465b
-MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
+EBUILD apparmor-utils-3.1.4.ebuild 2280 BLAKE2B f96f75d673edba6ac46b2de6a17e3a609805a6ca1598d774dff4b9e7c3ca3051d856dcb487350210d0c3dba58ea2ffe8b36cc4b1545e82c9976bc8115f741f31 SHA512 f2f75f5196392ec540856aed20ceedaf2b9bf222fb664238360802bd9f09fda9a45e4531ba570f9bd6d44c173b3d37333ca1357be0bdc8ceb330c3e25bcdfbe1
+MISC metadata.xml 499 BLAKE2B ae7166545eb4d691cb446ee37d1e0e251c02f7f19f57bf9d4f31f55e78c707226767e0721e167a32acfb164e65d2203efcd3e54571693066cc03a98d5125425d SHA512 54421c54122fcfa7b849a8e08359d546dc1084a694b1123793d7c6cb6fa21e3e44e93d71a719da4ae0c3ad1ce85a0d53a28e0531654d79cf856db11f03621b8b
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.10.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.10.ebuild
new file mode 100644
index 000000000000..24b253ee6dba
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.10.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-lang/perl
+	~sys-libs/libapparmor-${PV}
+	${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+	~sys-apps/apparmor-${PV}
+	dev-perl/Locale-gettext
+	dev-perl/RPC-XML
+	dev-perl/TermReadKey
+	dev-python/notify2[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	virtual/perl-Data-Dumper
+	virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+	default
+
+	sed -i binutils/Makefile \
+		-e 's/Bstatic/Bdynamic/g' || die
+
+	sed -i utils/aa-remove-unknown \
+		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+	python_setup
+
+	pushd utils > /dev/null || die
+	# launches non-make subprocesses causing "make jobserver unavailable"
+	# error messages to appear in generated code
+	emake -j1
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	export EXTRA_CFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" USE_SYSTEM=1
+	popd > /dev/null || die
+}
+
+src_install() {
+	pushd utils > /dev/null || die
+	perl_set_version
+	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+	install_python() {
+		local -x PYTHONDONTWRITEBYTECODE=
+		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
+			--root="${D}" --optimize 2 --version=${PV}
+	}
+
+	python_foreach_impl install_python
+	python_replicate_script "${D}"/usr/bin/aa-easyprof \
+		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	emake install DESTDIR="${D}" USE_SYSTEM=1
+	popd > /dev/null || die
+}
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.1.4.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.1.4.ebuild
new file mode 100644
index 000000000000..24b253ee6dba
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.1.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-lang/perl
+	~sys-libs/libapparmor-${PV}
+	${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+	~sys-apps/apparmor-${PV}
+	dev-perl/Locale-gettext
+	dev-perl/RPC-XML
+	dev-perl/TermReadKey
+	dev-python/notify2[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	virtual/perl-Data-Dumper
+	virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+	default
+
+	sed -i binutils/Makefile \
+		-e 's/Bstatic/Bdynamic/g' || die
+
+	sed -i utils/aa-remove-unknown \
+		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+	python_setup
+
+	pushd utils > /dev/null || die
+	# launches non-make subprocesses causing "make jobserver unavailable"
+	# error messages to appear in generated code
+	emake -j1
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	export EXTRA_CFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" USE_SYSTEM=1
+	popd > /dev/null || die
+}
+
+src_install() {
+	pushd utils > /dev/null || die
+	perl_set_version
+	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+	install_python() {
+		local -x PYTHONDONTWRITEBYTECODE=
+		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
+			--root="${D}" --optimize 2 --version=${PV}
+	}
+
+	python_foreach_impl install_python
+	python_replicate_script "${D}"/usr/bin/aa-easyprof \
+		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	emake install DESTDIR="${D}" USE_SYSTEM=1
+	popd > /dev/null || die
+}
diff --git a/sys-apps/apparmor-utils/metadata.xml b/sys-apps/apparmor-utils/metadata.xml
index 22230f2666f5..e22db4165e51 100644
--- a/sys-apps/apparmor-utils/metadata.xml
+++ b/sys-apps/apparmor-utils/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">apparmor</remote-id>
+		<remote-id type="gitlab">apparmor/apparmor</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 283ee1c43ceb..ac735a6c44a0 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -5,10 +5,14 @@ AUX apparmor-init-1 1235 BLAKE2B dbc333d8a90ec66303594db87b1865488813ad6698a3bcf
 AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31
 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7
 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d
+DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20 SHA512 94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
 DIST apparmor-3.0.8.tar.gz 7946880 BLAKE2B bbff6c0223b9f20cb53d96cb2e41aa4b7eee51b35a2c010cdd394f85517e87c9a34fb7182f600ba212e99baf4ee1a16a5bfd7e92ec6a9fb9ce6076a216cd89e1 SHA512 539e955b24c6f4f62ef0d7885fc341e4f6bc69ee840981426fb6a40f8f8e5c945f774246cb0efe1a76e778b8047d4a7fe315ab062d2dbe17e524b8527d5a8087
+DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae SHA512 db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4
+EBUILD apparmor-3.0.10.ebuild 1866 BLAKE2B e2504cf60150d113cffe2b3efb39286eeeaf5f2be443f3f61fb856d85f4b9528a44f422440b1fc2b446d9b081c36809733f2e8ce9cb4b203f6d5ba690f44b7ce SHA512 2408877e9f9a7236bf91de8fbf06cadd3305b590c121e79d8db6ab2b85ae2e23a710572f4fd1de78bfa6f729411ef3db6950813e0bd702794c1da8143a4f9a0b
 EBUILD apparmor-3.0.3.ebuild 1763 BLAKE2B b08f4e025cb7866350dcca9c57d94996e3ec507eae470a5c9611004c5514127c6e719cca5e4abcf5e6f8df7ae599a40a8f2d410e631dd91e8ff35febeef548ee SHA512 296eb06895512c14a600ae078b4c6908aefc4668e3b5095f970e254203613b0e11a151de7869804c06ba76212da8bbc2b82e80e70028a549603daf99641a0f61
 EBUILD apparmor-3.0.4.ebuild 1864 BLAKE2B 401c21b50f4c7fbd3efb0e0b9ea22e90063d640cfc881260b05921d7f7fa2949d3f5a5620871c574d02b7fb85e4d0ed27bcab2fa4f294c48f2c932f775a0e12b SHA512 4b2f7147e987329afe14623b07c2528765c87e07b25b2fb3c12f92c5622a04e4e3cb3a4036df3255772b186ccd9fac500ae83ca36cdaf20faf6690cab7e0e38d
 EBUILD apparmor-3.0.8.ebuild 1866 BLAKE2B a474d097be7e5d4c2e45277dbd0de0e9995a98cbcb8abf55db37adf31acfbd4737308798bc1b0aca335311d4df1729047bddb25f60195e6615ba7f5fb38455b3 SHA512 b335de4e50168544078306c5dc3b152491073481e825ea818ebb4a37e0a6be29f07a0c11c30e96d358c64453f388a885e5f6e14ad40b21a3bf9e88540ff2cac7
-MISC metadata.xml 504 BLAKE2B edf9792c3f360d289cb22c814eaa900cd6acc6237a58a1b793920d149fd3b647f9918a4f61ad319d986352f539858558f4bfab88e4673661263520f3e5b9f1c0 SHA512 7f2bd6a32991df3e64456ad5fea24002ddd1e2b111dc6107700676f488432994cd917d20fa0b1c169e1c4b43b0ac0b2935d52813174391df8fa2c805b27f2e89
+EBUILD apparmor-3.1.4.ebuild 1866 BLAKE2B e2504cf60150d113cffe2b3efb39286eeeaf5f2be443f3f61fb856d85f4b9528a44f422440b1fc2b446d9b081c36809733f2e8ce9cb4b203f6d5ba690f44b7ce SHA512 2408877e9f9a7236bf91de8fbf06cadd3305b590c121e79d8db6ab2b85ae2e23a710572f4fd1de78bfa6f729411ef3db6950813e0bd702794c1da8143a4f9a0b
+MISC metadata.xml 561 BLAKE2B ecf6168d52a5439c66d279f085c81e17d2b1ca364253ef330f2a0cb014c4e8e6b49e8fca22a56918eb823e178c7ce59990102b97ca6e79bdfee00c1978f0f404 SHA512 5097e76d16e7970d666f3e548b70e1b15c4cfab12d8ab0ea60dae1cf0fa8d8e6a4cd4da55fa4c87ba4ee7ffb0089df8ef0f5dbac568bd1aebfd485193848de9e
diff --git a/sys-apps/apparmor/apparmor-3.0.10.ebuild b/sys-apps/apparmor/apparmor-3.0.10.ebuild
new file mode 100644
index 000000000000..3c6676d4ab63
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.10.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="doc"
+
+# Was restricted previously b/c needs apparmor support in kernel
+# TODO: add check to ebuild
+#RESTRICT="test" # bug 675854
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/which
+	sys-devel/bison
+	sys-devel/gettext
+	sys-devel/flex
+	doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.5-makefile.patch"
+	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+)
+
+src_prepare() {
+	default
+
+	# remove warning about missing file that controls features
+	# we don't currently support
+	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+
+	# bug 634782
+	sed -e "s/cpp/$(tc-getCPP) -/" \
+		-i ../common/list_capabilities.sh \
+		-i ../common/list_af_names.sh || die
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCPP) -" \
+		CXX="$(tc-getCXX)" \
+		USE_SYSTEM=1 \
+		arch manpages
+	use doc && emake pdf
+}
+
+src_test() {
+	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
+src_install() {
+	emake \
+		CPP="$(tc-getCPP) -" \
+		DESTDIR="${D}" \
+		DISTRO="unknown" \
+		USE_SYSTEM=1 \
+		install
+
+	dodir /etc/apparmor.d/disable
+
+	newinitd "${FILESDIR}/${PN}-init-1" ${PN}
+	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
+
+	use doc && dodoc techdoc.pdf
+
+	exeinto /usr/share/apparmor
+	doexe "${FILESDIR}/apparmor_load.sh"
+	doexe "${FILESDIR}/apparmor_unload.sh"
+}
diff --git a/sys-apps/apparmor/apparmor-3.1.4.ebuild b/sys-apps/apparmor/apparmor-3.1.4.ebuild
new file mode 100644
index 000000000000..3c6676d4ab63
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.1.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="doc"
+
+# Was restricted previously b/c needs apparmor support in kernel
+# TODO: add check to ebuild
+#RESTRICT="test" # bug 675854
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/which
+	sys-devel/bison
+	sys-devel/gettext
+	sys-devel/flex
+	doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.5-makefile.patch"
+	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+)
+
+src_prepare() {
+	default
+
+	# remove warning about missing file that controls features
+	# we don't currently support
+	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+
+	# bug 634782
+	sed -e "s/cpp/$(tc-getCPP) -/" \
+		-i ../common/list_capabilities.sh \
+		-i ../common/list_af_names.sh || die
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCPP) -" \
+		CXX="$(tc-getCXX)" \
+		USE_SYSTEM=1 \
+		arch manpages
+	use doc && emake pdf
+}
+
+src_test() {
+	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
+src_install() {
+	emake \
+		CPP="$(tc-getCPP) -" \
+		DESTDIR="${D}" \
+		DISTRO="unknown" \
+		USE_SYSTEM=1 \
+		install
+
+	dodir /etc/apparmor.d/disable
+
+	newinitd "${FILESDIR}/${PN}-init-1" ${PN}
+	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
+
+	use doc && dodoc techdoc.pdf
+
+	exeinto /usr/share/apparmor
+	doexe "${FILESDIR}/apparmor_load.sh"
+	doexe "${FILESDIR}/apparmor_unload.sh"
+}
diff --git a/sys-apps/apparmor/metadata.xml b/sys-apps/apparmor/metadata.xml
index a1ec120ea86f..1e1894290d46 100644
--- a/sys-apps/apparmor/metadata.xml
+++ b/sys-apps/apparmor/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<remote-id type="cpe">cpe:/a:canonical:apparmor</remote-id>
 		<remote-id type="launchpad">apparmor</remote-id>
+		<remote-id type="gitlab">apparmor/apparmor</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/config-site/Manifest b/sys-apps/config-site/Manifest
index e44cbf0adb5b..95263ba7ee4a 100644
--- a/sys-apps/config-site/Manifest
+++ b/sys-apps/config-site/Manifest
@@ -1,3 +1,3 @@
 AUX config.site.in 311 BLAKE2B 95398d6619e4a02f9a19af7f99e6cd5fa838260b19c97639ae4c98b04d31ef6d255f55d42a3dcf85096b2cbbd701aa87096b61aae0e2df475686a4db70f495fc SHA512 1d23537502b172ee31bd23612dc1ef20ec8c08936c45945d0fbfa0b1d7ddf28fd94a17d8aceeb20e8aeac98b2aa44ec31d4f06e854fc42a97b215211b143d7a8
-EBUILD config-site-0.ebuild 591 BLAKE2B c9aff526bc6221e6e0cb1ff45e5d56f8f9f8944941c76ec42b4b25a26326eeb0a0ea0e396628df549bb5126f7f4037a2d512f0fa679ab19b7b21cd725d38acb0 SHA512 562268105ba346522ce9daeb037c325ec5d8999a5538771f999e10dc61b140018deabedf952fe9c25a46fa9114361a7012103a6c190ba054bc892150e57ae2ba
+EBUILD config-site-0.ebuild 585 BLAKE2B 61766932e71ae2fc9aef1f06607d0703cc45b3ca62a2147132145196bc190014badb5332b68432d348c2936c35ff6e5d04b0d154c6858a4652451b8d0466e247 SHA512 72034ca9c7e8fb8b80bec7b0ba650c2f81bf9dcad4db383b7eb5d8309f5a0c6a14f131b87b56045e31059288addeffa7c20ac9521d47b9ffa98a78bdecd118e0
 MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/sys-apps/config-site/config-site-0.ebuild b/sys-apps/config-site/config-site-0.ebuild
index 79fa9a781017..31433cf24f67 100644
--- a/sys-apps/config-site/config-site-0.ebuild
+++ b/sys-apps/config-site/config-site-0.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 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"
 
 RDEPEND="!<sys-devel/crossdev-20230209-r1"
 
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index fdd082811dea..e486a1bb1e26 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -2,6 +2,6 @@ DIST cracklib-words-2.9.10.gz 5537751 BLAKE2B af3fb563a6f57a7cec0843c01ab2b344f7
 DIST cracklib-words-2.9.11.xz 4157220 BLAKE2B 1ee0c82a6b7d4bcfedd8f4c99feac0f8de68cce061e41f16962a7f7893bd91443d2677533ea3e9e6a16cb5f8fa37bc502d691552d899dc07bcddcddc762f1354 SHA512 09e4bf6ad6064accc88d9206e2b2dd28f0e80f827c600f510dc9bb8ac5d51454da2dfbd8e80f2683af501b6f298fb53fb4cf2fb2b5d668940cc6f64701ed6730
 DIST cracklib-words-2.9.8.gz 5537586 BLAKE2B ca56229852211094c17b2a612100b5b6e4e4f6aafa7cbfae8f779296370b01e5cae26d7d51dd69af6291946a1781cd19f8652bdff7f358c2e50d26c9e263c2fd SHA512 1700c56b9776b7ae4684b9ab1e784dd7707550bce2149301f662618a4f00a2eb0ba2d1a206c09aac22f7d95bc561544d412d2fdac5008fc3aabc4872e8a74afc
 EBUILD cracklib-words-2.9.10.ebuild 728 BLAKE2B 009d8a7899bbfaf38d8a7ecaabb817797a86f84892dac12bd201feb27a8a6cc6f9431b600b22fff4e985f99216bb8ca2b9a0621c7449c5645237103f5b0e591b SHA512 17eaf4cf0a0b49327a6a65ef403049d7f856084ed184d62b8d9761002b0f2f68673ae68d945c24ad7026e0a96fc4e0a83c9169a0c76fa1a8c1f1043ece370bef
-EBUILD cracklib-words-2.9.11.ebuild 734 BLAKE2B 40d8acb2408161afc3ef9dd4012eacd6f766824c8a7ec4de15c7f89db04ce8e67dadbea9929ef7f32c482419d8d0163ae8b86f3d4fecfc8ce4ffd77a562db96c SHA512 55087c565311b40af9f702e56bbbdc1f688b81de4538ea4262d54f93f134a2ed3122fc25e919a67cfa17da3719452f3d4a34747048649063456cde141dde1f62
+EBUILD cracklib-words-2.9.11.ebuild 728 BLAKE2B 951dc8faaf7914bd78e84e60d5c0519e8ff4268a79c95e4fd21e11b9e1dd70e7da2fb37e907b0f0812c36146edbb8cc26c9bea0821552423728fda9ec836aa40 SHA512 1aa753cecb33d2f8badfc737a33457ca03d19c5b230a4899ee26fd13c2cd566186a8e3cad8c3e52e9d8ba13b0d6d79dd7b902163756c56397b30917297dcd9c1
 EBUILD cracklib-words-2.9.8.ebuild 728 BLAKE2B b6e97b83706fd6c937d8246b3d31b3c55327eb3fa91078c592369355bc4e5ed72e760ca350439213aa38218378eddc7dd511571a3ea780cfefe8aa7f5c78af8c SHA512 92b24a5dec549ae8641b6d8df8bc84171f7e4ccef9a215cc645887aee3666c36d3dff68109d80ed1462c412c6900f4229f273bdb8051ed4a3a2fa4da8d099b39
 MISC metadata.xml 417 BLAKE2B d57320d6e9f27d403b1fbeb93aab3a2ee1773ccbdafb0d56290a767cf0c4b0d12e20c2fd8a12e63bb132fd0ceaa06b7c7e0d6be9d3ab841e0af67164a3006d10 SHA512 e632e2c3f28aee9318c902efdcf62960d8c2420e0bd7beae9b352d51d34a1c3d92a4fceec0daa32c2d11338b38eebdc9ee7d48951abf9f0d2a82dd58dbb74bca
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.11.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.11.ebuild
index 54f29a15b593..048a5590ac4e 100644
--- a/sys-apps/cracklib-words/cracklib-words-2.9.11.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-2.9.11.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	insinto /usr/share/dict
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index b3bf92265a8e..3b0bc59556ea 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-functions-0.17.tar.bz2 10798 BLAKE2B 1b725945421ab36b1412f9addc22e9fe299c0e6460790ee2832b9f63d4c06b86bb0d054b01505640a5dc1e62f3cd257628717fec852116a4c8b2c9f9d2d149ee SHA512 6a3de93b5e4d761a53a622f41e6079606cc4ad8a964771d49dafdefbb632afdf722fd055d261e494aa0be956c4160c49a775ab40c927c5340b8e4da275ef51fb
 DIST gentoo-functions-0.19.tar.bz2 12079 BLAKE2B be0a3a54d4dee1755866047b670a69cd6fec368239123c3f0c08180b79a33c20147bca0e35e568faef6877513551e731bdf0c181aeb0460f6574d2d708219373 SHA512 2674d3fe5724cc6d685ae58bf0ee33f4a1bdba2c5e5809cfb193fd0a710d4678c2d9392c2c62d2321cf455f524950266dc1629ab684fe46632d179e539d5a39e
 EBUILD gentoo-functions-0.17.ebuild 801 BLAKE2B 4978d1de5281924566ba4f25eb79c7b4960fad0288a6bf6a51a2e1815a1bce61bd8f284c2ba4912812e3be8a703fcbe52b95ccc489b4de726ed22684fd34c5c2 SHA512 96e464b073d00a9901e8d899a3d88371267966f58a314b3c800f475d112ef349f77ddcfd0d78b68c508a4707d15c81f4fe4c0a1e1d5cdfa557352ead09729797
-EBUILD gentoo-functions-0.19.ebuild 885 BLAKE2B fd04a8b67e45517aa030500507ca31d2e77e119a614d74e1ce4d17b243993b949a44912ff860f451d61c387868fc1bbe8b41d157989054d336baa818456ef616 SHA512 7dac7df3ec5f0acec19c0d4ccdc35e398772bb133de879378602357a60cc8ee06f82d850db4ffe52b70baf85ada46a0da52fc975d0e7ca734f93e0c8f957df7c
+EBUILD gentoo-functions-0.19.ebuild 878 BLAKE2B 29addb66306cd7b254cda78b17af172c45b7f8dcbec98842a5c3202b42c46f09c58498350b089f1df11ac70089b8bba937460b9c6d32940f59e17ffc81f5a991 SHA512 c6f3cd39153cef5054082da8d68405cba639090e59662b26971e6a595efbc1733a541008f361a8f3068433865cd0356fc161f533c3e08d373c375c9bced54c75
 EBUILD gentoo-functions-9999.ebuild 885 BLAKE2B fd04a8b67e45517aa030500507ca31d2e77e119a614d74e1ce4d17b243993b949a44912ff860f451d61c387868fc1bbe8b41d157989054d336baa818456ef616 SHA512 7dac7df3ec5f0acec19c0d4ccdc35e398772bb133de879378602357a60cc8ee06f82d850db4ffe52b70baf85ada46a0da52fc975d0e7ca734f93e0c8f957df7c
 MISC metadata.xml 416 BLAKE2B 08b6d649521646ff28c4738fbc3b9a292740bceb2430dab5ee4391bded078bd0c05dff69a28f722a1c23bbbb86af546935a055f93720ea759b141902f367394a SHA512 88409b09c14a2eb4859166e88f4a59ffc2e84e18a246b942f50ebd58bf83f0e6710f0405f08d102853cbd94562140a267cb60db29b4170893b7c3b3e24ec1ae3
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild
index d704dea16611..94c022cc90b4 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
-	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
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index db8511392361..1fc80f865ea2 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -13,6 +13,6 @@ EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94
 EBUILD iproute2-6.0.0.ebuild 5943 BLAKE2B d85a48405ed9359c187e770afdd7583f54c3905ee5b58488a604369957333a79c9d0f3c3964436116e5799ad9d8e7ade1ad51c02d89cb10983b9d5f11d015297 SHA512 6df97340ce887a0f9a1319c5a4458872cf8157c3131cb8dd27027fd18867571a6b80267974c1c0009996e4fd8fa6431434d5ae61ab2fc0b0c988ba3668c7f84e
 EBUILD iproute2-6.1.0-r1.ebuild 6000 BLAKE2B 49f03ac76621e34f65217bfbed93815d72914a081dda6598b1ce789dff8cf3f19697b199dde9a9e235738ef35b0cfcbdef04ba4652d3022dee49cd32b7f11a66 SHA512 d8a3fadd4a4ac3a1539f1b6c0e74320b321114ea3ddba75111606362f49412e04b6ca578cfc0f07d2fbc460d2639a1bbe8727c08e65cf103f29c552dc93b3bc5
 EBUILD iproute2-6.2.0-r1.ebuild 5955 BLAKE2B fc3cf5a97c950bb2a6c52d358e3e69d9b20a48c395185003aaf41ebe6f116d29603a1cbf44c149ccca285897d0db22fb47ec85b99a136ca606fdc51c637085ee SHA512 758771a80b246ec00a63288623875f9c37ced74d6082155b1be9035b2a97a2743fbd465e6c7bfeb038db3ac51c3194180a598f95dc9ea7f236dbad1eb729dada
-EBUILD iproute2-6.3.0.ebuild 5963 BLAKE2B 7ba37fa4579eaea479d365ec7d1f964e238335403e0f6eb4042f56dbdac2d0151249a53d5e95ade07f66d75e9a9801dcde755c8009f463c959f08da59446858d SHA512 a17546ddc1d04498e42d2d34e698f5844a978684f8f1475272e98030d9d5ac5d5069e84831f43b6576185da37b017ca08306e621117ac453c5d1e415929d8986
+EBUILD iproute2-6.3.0.ebuild 5956 BLAKE2B a75287a327aa82de327f6ebe1c8fabd615153011f55b276ddf070681f6bd7e82c3446dd7e0576b1bd7bd4898834f9cc9c611912b8d73bae57a8b5b9f1f19db47 SHA512 f7f33727d36012dab73e1d29b749b181f6aae53a09a549a21c51a2dd1f603ab6fc9d50bb6a6055e5b7b42f467fab465ad7fe5093848b9a0755fb9674b7fc478d
 EBUILD iproute2-9999.ebuild 5963 BLAKE2B 7ba37fa4579eaea479d365ec7d1f964e238335403e0f6eb4042f56dbdac2d0151249a53d5e95ade07f66d75e9a9801dcde755c8009f463c959f08da59446858d SHA512 a17546ddc1d04498e42d2d34e698f5844a978684f8f1475272e98030d9d5ac5d5069e84831f43b6576185da37b017ca08306e621117ac453c5d1e415929d8986
 MISC metadata.xml 973 BLAKE2B e505f65ebcc30561fe249ede546cbad6289a0be929be6105379c25674e1dbade56fc62fa75839b0485099f13bc175daa55ad8b86f0a346e52907cfa00c4bb3f1 SHA512 a7e201275dd562c097d66083225e74221f81d89a7efac98b7c05cc7c508100a94b9e928854796cfbfbfeb679acfe34fb79026f7d04df8e07f57132ffc64be525
diff --git a/sys-apps/iproute2/iproute2-6.3.0.ebuild b/sys-apps/iproute2/iproute2-6.3.0.ebuild
index 32423402a1c3..c4f40478d73c 100644
--- a/sys-apps/iproute2/iproute2-6.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.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"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 9a20d727ccc0..f84c7495829f 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -7,7 +7,7 @@ DIST less-632.tar.gz 375440 BLAKE2B 26c27a2e25882a4ce34e5e6e83bc0af784c8d4e8ac20
 DIST less-633.tar.gz 375733 BLAKE2B e9df180794af365f86734c6b8fde766c1bba42b111717ee5e1cf11001fc7ec3d78910db9bb7c51a76816086f599808b1b60f514011ec40e37650d6bc4f8b3d5c SHA512 a29aaf72abca07fb29d12f218bbd422a39e3898b3d53e8dbd5265ae47ecf68b88c3381aa3a9bf7caa8db1e2d8e2c138b333f0d69fddd4cf014e39118c53f7fb1
 EBUILD less-608-r1.ebuild 1587 BLAKE2B 68675bd30388ab95aa57d8fc90bcd98fc6b27f26e9bd77d193880726fbcb9b141b8d916164bca303b12f330fa88dd62afb93d9eaff23f8b626bbbfb73d5c2bc5 SHA512 f05b649f662a46232fd2ba93335ff906ed7457b4f3581a48d0d273f1744ca39d1cdd90502a1a6e6770cba17091663107a5071b974217485fd1bc3218dfe55537
 EBUILD less-608-r2.ebuild 1634 BLAKE2B 87c9824276ec63f523bef354cdc92a91f6771e43adcf141c8a8e0b6ae20eb2391a15bdd8c37d18527d04135c873fe4330207bcbd331fabf20f7c3e0cbfc03343 SHA512 5f97824ddd3760ddc995d2eff9d915f023e9162a803e1fcc098abc2cd56745b250df1b37646e7cb533c74bbd3436bc4784e70f3cd7cd76716dfe7a32acdc6279
-EBUILD less-632.ebuild 2196 BLAKE2B 5029b2a8d8dbaa4b10272dd8327ce8c3447729ebbfdf06ac7783a036e03719fe6707039100054c1a9cd4014317b2a1e0f5d6c1baf9c545e9c62963a6115ee9a6 SHA512 7a41769096ec6a680541f67101781672037f688078e02adefcb36a93db2610298ae456482f63d23dfee4ae696fcb090bf127e75783d038d63cf18f95ba10dcb4
+EBUILD less-632.ebuild 2189 BLAKE2B 0b7d29b4ae621d21bbb0941c19c5e4cf77ae028f0ff4a31989ade340446f8a394cd44d8635758b5e99dd981ecc4e882e94d8e6c82dff27679a580ef9b5c1ce85 SHA512 44a0ba199f454553a831b6bcdd744d9e76b1ec513720839c65f92357808c6f5c214a1e5786a05e2bf366b68ed0801e0fcb9c0e24efba9b1135a3ef855e238f5e
 EBUILD less-633.ebuild 2196 BLAKE2B 5029b2a8d8dbaa4b10272dd8327ce8c3447729ebbfdf06ac7783a036e03719fe6707039100054c1a9cd4014317b2a1e0f5d6c1baf9c545e9c62963a6115ee9a6 SHA512 7a41769096ec6a680541f67101781672037f688078e02adefcb36a93db2610298ae456482f63d23dfee4ae696fcb090bf127e75783d038d63cf18f95ba10dcb4
 EBUILD less-9999.ebuild 2196 BLAKE2B 5029b2a8d8dbaa4b10272dd8327ce8c3447729ebbfdf06ac7783a036e03719fe6707039100054c1a9cd4014317b2a1e0f5d6c1baf9c545e9c62963a6115ee9a6 SHA512 7a41769096ec6a680541f67101781672037f688078e02adefcb36a93db2610298ae456482f63d23dfee4ae696fcb090bf127e75783d038d63cf18f95ba10dcb4
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/less-632.ebuild b/sys-apps/less/less-632.ebuild
index 40f831510273..bcb2f60a7a11 100644
--- a/sys-apps/less/less-632.ebuild
+++ b/sys-apps/less/less-632.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/man-pages/Manifest b/sys-apps/man-pages/Manifest
index d26efe4f8ccf..464bad4028ea 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -10,6 +10,6 @@ EBUILD man-pages-5.13-r2.ebuild 2248 BLAKE2B 500770a4a21b8d236eadda9eaac53e581d9
 EBUILD man-pages-6.01.ebuild 3405 BLAKE2B c8130de04784669488dab75485aafa711a3c6f649a6b0f9a5ad6d45fe12f63847fb3b6690e4862381aa5ccb5b22c2be1641b992f4031ab57b9452d3159e10be5 SHA512 e8364c65c48a3f6fa3e2d36b5a8b3ea70c7bc090d1c4f4fe03d55ea538ee248d85fd9d92c19683760d0e8c2f4b2718ce9e22b143aba1e718e886cb9f8bbdb777
 EBUILD man-pages-6.02-r1.ebuild 3384 BLAKE2B 2dcb051a1bae08360839c923125f5783abba112c923e98e3d707ac9768895e4a24af132b6b469858c8fc00e0ee73362758fd8d800f25eaccc368ab7af90f437e SHA512 0d58e0b646a4949e750d4a0444278930302d453b3829d72c9dcbeef2fcfbfcc817529e1e04feb708b10e5410bd27e0c248b7de95ba61370c700f0f9b1def6455
 EBUILD man-pages-6.03.ebuild 3384 BLAKE2B 2dcb051a1bae08360839c923125f5783abba112c923e98e3d707ac9768895e4a24af132b6b469858c8fc00e0ee73362758fd8d800f25eaccc368ab7af90f437e SHA512 0d58e0b646a4949e750d4a0444278930302d453b3829d72c9dcbeef2fcfbfcc817529e1e04feb708b10e5410bd27e0c248b7de95ba61370c700f0f9b1def6455
-EBUILD man-pages-6.04.ebuild 3586 BLAKE2B 90622d78e50d167165c575a7c694f7c9b22f10ed3b57223dac98d6aee3bb5cb2bb5ad9d0bffa097abf18326a6bc8024c7c0ad17b1421a92a27357ea0047766f2 SHA512 9a5a4f711d58ddeba275092cc96e8c12607d4d38187254ffd6cacd65830fbfd3f53d037809e7c8ef82e40926ffb9b8bedcdb6275c49a97b52eab5b70803b4ebc
+EBUILD man-pages-6.04.ebuild 3578 BLAKE2B 33598473023dead3e9748f7168f0bd5fd9f5999ecb4d39bda871486c44b9ca8b2785cc08b38f572acc730f567a1cd65d816d23b2a86c5de6ecb7a701843fef60 SHA512 f0ebd604204f0adf0fee45e4e5dd0c84bcc0eed78b488240e674af61d4c5c23fada209c55f78f991f41221fe2c8a8d085f8dc853e9ae9887ee6794949ff3f123
 EBUILD man-pages-9999.ebuild 3586 BLAKE2B 90622d78e50d167165c575a7c694f7c9b22f10ed3b57223dac98d6aee3bb5cb2bb5ad9d0bffa097abf18326a6bc8024c7c0ad17b1421a92a27357ea0047766f2 SHA512 9a5a4f711d58ddeba275092cc96e8c12607d4d38187254ffd6cacd65830fbfd3f53d037809e7c8ef82e40926ffb9b8bedcdb6275c49a97b52eab5b70803b4ebc
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-6.04.ebuild b/sys-apps/man-pages/man-pages-6.04.ebuild
index 19396bc206bf..ac3c9f3aa840 100644
--- a/sys-apps/man-pages/man-pages-6.04.ebuild
+++ b/sys-apps/man-pages/man-pages-6.04.ebuild
@@ -40,7 +40,7 @@ else
 		"
 	fi
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e11e73871f5d..6e5b19a35703 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,7 +7,7 @@ DIST portage-3.0.46.tar.bz2 1148375 BLAKE2B d97698eb3341a8d04980e021e5be8650193b
 DIST portage-3.0.47.tar.bz2 1148789 BLAKE2B 268589c37a6bdc36377f3e407b16bebfb9876adc1d89ee7576f3ebbee42bc0799f5a225dfd53ffedeeded91ca4403383d4811b4f104448c1b2fc6c277ca94ef1 SHA512 abbd2446d0da0b5d298a235c2cc7d2d4e001e9f012b6e22149fed4514b52dc938b0377b2551f45e3505b9dddeedd7170951ff967310708ec3b93610b775a7c02
 DIST portage-3.0.48.tar.bz2 1150955 BLAKE2B ca61adcfa66c96f702f5f05436d100102adbd6b2d5028b100dc2793dba8e0f8d8a17520bc6a4165254e2bcebd1fb798d67f7e0e1f46abc776adc351a42ba93c9 SHA512 46dcfbb833838a16a6c8f8dc4062bd2b9a37d0f34e1f884a74abf74846e7236381c2dfa06cf36c50a978d930834784c3ecd44208ff64f4cc289b7df1522d7fae
 EBUILD portage-3.0.44-r1.ebuild 9185 BLAKE2B d1477b9433d5d369f10b4332293c0686be65cf0a3c343612749e437b8db10e9609167e430dd051fbb8fdbf0c74ca2e8b67fd84868d0e7aeebcd678aaf9c4e70d SHA512 58f4dd151193fd9fb626855a1e05804f4ffe8ddc88f3431db59dde337fb7e07fd319d4583f15108aaa853d1b8ae13d4586af5ab203c2703dc6ff15d5837a7086
-EBUILD portage-3.0.45.3-r2.ebuild 9034 BLAKE2B 14f9d103cb065925f1487975448bc3bc2da871676a6216782f8fbda37823a063ffa74601630f316e66a3acf611381ae2e2610138faf6df977b648035d4234643 SHA512 de460773918dade93a80b3bf3253fbe02530024534a4a673c803d0440ebe24e7bc2af5322193864577180af831895096d8ea6cf12477c3b0dab6f0280833e65f
+EBUILD portage-3.0.45.3-r2.ebuild 9031 BLAKE2B 1af81fc875adff019b36bf41bd1ba0d0960bd65b7291f331f5cc28d92cab4d9677bc36b8af0e0d5855a3dd8698d0d99af54f86fe826d51471710f05764042116 SHA512 4aee35177c81e0550acc3c0e270d8e6162aabf8ed4f6d241b7e2d49e358b905cc67a1de5fab99944a18ff84b18f5dcbd4e8f3f9f1601704816f3d4ce46387dbc
 EBUILD portage-3.0.46.ebuild 9034 BLAKE2B 14f9d103cb065925f1487975448bc3bc2da871676a6216782f8fbda37823a063ffa74601630f316e66a3acf611381ae2e2610138faf6df977b648035d4234643 SHA512 de460773918dade93a80b3bf3253fbe02530024534a4a673c803d0440ebe24e7bc2af5322193864577180af831895096d8ea6cf12477c3b0dab6f0280833e65f
 EBUILD portage-3.0.47-r1.ebuild 9272 BLAKE2B 5cfd00aa50d078fe299c5cf244064ddf63e9b31a713d96a515c6dac9efd4b2e9964630de983a1707831ef06df49286ea123b9c4dd6503162bb107202f60e71c4 SHA512 3914720ad172677040d9016783145c325ae2504df00180811bcb0418ca983f3c843e57d08ef76d749cddaea4a491e4b95148a62ac85de625a33e083b5289f4c1
 EBUILD portage-3.0.47.ebuild 9200 BLAKE2B a3cd513f441aef9205bc0761ee782b82d6721181243d6bef4dab5bbafa47a54a4e470d8eb805a2c31f3ee40b0a8b426578a46cb7bf406bdeb1485b7d20a10f79 SHA512 6b2f57982d6bb6e6ccab936f9cf995817bb8ab93c67f81615ca74151bea13d832a29998ee70cff7a7ac3859c2c5648cfc75ed89af8f807665bc05bc09dd45407
diff --git a/sys-apps/portage/portage-3.0.45.3-r2.ebuild b/sys-apps/portage/portage-3.0.45.3-r2.ebuild
index 77a95c1762c4..4aaa5e847f1e 100644
--- a/sys-apps/portage/portage-3.0.45.3-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.45.3-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-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"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 924621a95614..5bcb212049c2 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 7e8eff9d4813..1e468d5da9b0 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -2,6 +2,6 @@ DIST crossdev-20230209.tar.xz 29608 BLAKE2B 591e854f798c4abf90950a5ab229b14740cd
 DIST crossdev-20230321.tar.xz 29620 BLAKE2B a5070ccf8b5e4fd9a6f63f6a903126a6eb199d7dfdcfbe93f0917a66894c4eef2df5749c0fddaf564fe013b40a14d88b2686700034642fb1d876b51731964a49 SHA512 c300b506bb7ed4aa5d43601b37c8298367f6e5307a97b19a23f39e9559e54d2bfdb6e2b7a5fde4d5ff0b4a9b02c1b6f05be92d1857352db6cde9a469c9159e5f
 EBUILD crossdev-20230209-r1.ebuild 1016 BLAKE2B b319bb7109067bdac8d2f2bc2d668b503e82218fde9f6b89e4ac4ec16fa8c4738c701940ac7a36f78a4ceb29be09bcee0fd881433a3fc695123b67607633884c SHA512 3e94cb122111a1211e3c15c125d107b5c456ec9b5251920296354ad35b6f15916a3cfbfa0c5a8a1a6ccacf3e7b80553b6618fec4decd1a9451ae1a06fcfa6a15
 EBUILD crossdev-20230209.ebuild 891 BLAKE2B 9d870c06d56248c1b55f02b826923b09774db6fbd1e13e51ca2b4bdbcfba204b19366188505e47bffade3556a9715fb1382f160f91dc8493763cfb49c12ca5fd SHA512 a7fbc95cedf2d57e5e94b394080af8eaacebfaa284184d250b909a7e26941b6bfaf755e4b39cb000c4ff38884a7dd05830a5aa493dc399d9913680ebfcea6ab7
-EBUILD crossdev-20230321.ebuild 1016 BLAKE2B b319bb7109067bdac8d2f2bc2d668b503e82218fde9f6b89e4ac4ec16fa8c4738c701940ac7a36f78a4ceb29be09bcee0fd881433a3fc695123b67607633884c SHA512 3e94cb122111a1211e3c15c125d107b5c456ec9b5251920296354ad35b6f15916a3cfbfa0c5a8a1a6ccacf3e7b80553b6618fec4decd1a9451ae1a06fcfa6a15
+EBUILD crossdev-20230321.ebuild 1010 BLAKE2B a64fa6ef90a381fbce529d3c7ba223544b85260293dc3f59606725c83fa378f033d3a59bf65673d7c6adfa50e205d0411c1b37df51227b0e682661b04d1b1a1f SHA512 bde735d4c4b48e9b58cc53ca50ed2fe41df89ecee858439bf6d195f5671fbcf55aa9423329d4492a60a774debd16f2f24cd29246922060f12fe5704ee43bcea3
 EBUILD crossdev-99999999.ebuild 1016 BLAKE2B b319bb7109067bdac8d2f2bc2d668b503e82218fde9f6b89e4ac4ec16fa8c4738c701940ac7a36f78a4ceb29be09bcee0fd881433a3fc695123b67607633884c SHA512 3e94cb122111a1211e3c15c125d107b5c456ec9b5251920296354ad35b6f15916a3cfbfa0c5a8a1a6ccacf3e7b80553b6618fec4decd1a9451ae1a06fcfa6a15
 MISC metadata.xml 624 BLAKE2B 3f6609db4ad549927d9e7c0f259926de694435707aba7fabd2d08333294bc38bad42b59b7ab9f6372bec292708ebfdb88d88ee0e8dca1ed29389e33427a1d46e SHA512 4605364fe155bb8facae233aa29fadae23fe3d1f012451f8611933252f81aa3d3337ac9d68feabe059c959e2a94a67a85e6d88f7fa08d6d31e2418034b60010a
diff --git a/sys-devel/crossdev/crossdev-20230321.ebuild b/sys-devel/crossdev/crossdev-20230321.ebuild
index d15bf1ee5010..64115d94f873 100644
--- a/sys-devel/crossdev/crossdev-20230321.ebuild
+++ b/sys-devel/crossdev/crossdev-20230321.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.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"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index da0917256e38..33f20aa94423 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -4,6 +4,7 @@ AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097
 DIST gcc-10-20230426.tar.xz 72118868 BLAKE2B d87cfd78d96585877abc20ed213e4d2fba36556279a5bce5d185de34a59f8cde1250d7322543533922ef224ac8508c1d3fe597c652a648e6e7f08bc19cb2f11c SHA512 805fbb840e6bd8cdd53f954b13c768c0ea0635c099094f6f0b0b04f00120dcde7cf3950a01e199d674b39ff764e9119a548b2f7a156ab2b5d598bd68ed56ce24
 DIST gcc-10-20230517.tar.xz 72135000 BLAKE2B 8ec87088ace2bf7cc355357b8c9b12e61646366ee1204a360f3be0dcc8b7d426ba5fbb7eb46b4da4c937f5b63d2181a3935f2894f40556f1472dd2a91197b38e SHA512 ae685e1e3fc3460ea49bd86b2b583ef97c71ed279cce6f06b293bd9c7f7ac5ae477b2f2057c4ed927114249e41f6f7978f13db678cd92935dc1250bdd11c94c5
 DIST gcc-10-20230524.tar.xz 72147352 BLAKE2B 0e85c88676c72a1a3e1e39143b3e263ff12ca5956b6bacbcd7ebcd377bcc01179133249d16a926399dd0a30ec946470f6f794247ff0408492b457bb01ad76c50 SHA512 0e6b499b7914970f00ab1eeeffc070308e3a3dd474e7b974572fd7537d271c4c8533d2ee72482c47a8b4da8b69ba5246e58eee586a58ccd58e35c502f1986c6a
+DIST gcc-10-20230531.tar.xz 72141512 BLAKE2B 266073f3d5baa50aad8dc9dacb859a355ddcbe0295e0fd1f99d7ae3847b495bb96e5eb06b5dac9d4ba1a16325fc90724720992d7f5e90e4081fff754a3f8219e SHA512 19d81824624da4555e567ab8f5a1f1a3f9eac0a8360d27a402b45554cd9b1a644f37e0354df8ba4f8dcc2ac493e149f0fda3de4249457158db267afcfc81a87c
 DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
 DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 4cac3340108fb378c76ad62b728429f3c97f348d178744e7536575f3576ca8aa682b878b7df3b1c162dccae64a3cb56c66d8d60eae323e1ece2de4278084fdbd SHA512 9d6c84325fbc118cee01347468ce729c278e5b026b16da945fe54050726e26f86a46ee7b71a01a47cf927b70bfcce459c49a6bc4fb93dcfaa047c76d4c5bc5bc
 DIST gcc-11-20230427.tar.xz 76165128 BLAKE2B dd896b418c1fce35a61005d5b5c90cfd1246d37d23c2a8fc08bacd7d7ca84c353f3ccf5de2370ae5e5ca95c7ae3deab3565b3f65eb78b611dbe5ad4a256516f0 SHA512 fada917a832be5d2e15ee32f24e19fc87b851dc8e6fc75d1be6d25d3510dba408ae3ef3b245ff239c51aa3d243c95f12269695611e5c8965ba55f5aa4730778d
@@ -34,6 +35,7 @@ DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f7
 EBUILD gcc-10.4.1_p20230426-r1.ebuild 1445 BLAKE2B a6a759d0f07a343e09ec0f276aada26220d8744454d84eb2a90d46ff4ef5276eb8a5f2fc4199322bda0244e5333d6ca78b4e8371d2a5dc766b74666c314fffb2 SHA512 28546255497f945a181ab16cc75496c7d2a72bad7e145317e30c3b839836d9947bbc3c6bcd8d668924b54affabef0656288a753c25f4f77be64ac24b1b90f62c
 EBUILD gcc-10.4.1_p20230517.ebuild 1453 BLAKE2B be0cbe27af5fb742f25225df5129206859e388444f402947ce370dbb422e738b73edeb63861f2ead6732c201095f6885ea154d87e99c5f40468f9c8918eef7e2 SHA512 6253acd2ae9a4123288c1d44686d34544b5e2bc591fb491b78f61eb1852d3e21d661236debbbf0157380025fc20b3c044c3590abe22bb4dd1689430157ec2d45
 EBUILD gcc-10.4.1_p20230524.ebuild 1456 BLAKE2B 2db886f16d10f1cab503b8fda8a3c38faa3b1bfa578cd7b57edec00c514e948358b7f14b692b51eb0d164d3c82937f82fdae08ac25c916a975766a00cdb8da39 SHA512 0a5292a1f67a75443a2090ec9f83ffd85f413f23ce8d30663282803c0fa972078fbb8f7dfd861864944de143b1ea204896322f9f8fdd0045fb8b705e5c86cd81
+EBUILD gcc-10.4.1_p20230531.ebuild 1456 BLAKE2B 2db886f16d10f1cab503b8fda8a3c38faa3b1bfa578cd7b57edec00c514e948358b7f14b692b51eb0d164d3c82937f82fdae08ac25c916a975766a00cdb8da39 SHA512 0a5292a1f67a75443a2090ec9f83ffd85f413f23ce8d30663282803c0fa972078fbb8f7dfd861864944de143b1ea204896322f9f8fdd0045fb8b705e5c86cd81
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
 EBUILD gcc-11.3.1_p20230427.ebuild 1334 BLAKE2B cb480f1ae20bc31900948f61f48a050ed177d6303a76d555a596636767871bca8ff6446466970fbc43e2fe02f047c22a27416eb3b580812ee481b8ce4d630850 SHA512 fa62bf94450bae1fab07cc2e4030a13e2c58e06518ba44f86710049343ceeb8e535ce108225234e8b7fe50523d62414dcaf1d0148e80607bc1f6a8d0e13941b7
 EBUILD gcc-11.3.1_p20230518.ebuild 1343 BLAKE2B 8ecf0b1616754df373f3a76b1e663176eecefbd2ac79752053d8df7276046ad45187cb40900ab4f61e9ef9afb30fab0d09113476397fa8da8b06821d61ffe1ec SHA512 e7e28819115d9ec9626fbc83f5539dec278e45cb78781a48fd6f141b38a8cbf4cd459c1e134ae2636e7613a336322cafd42e7feef14fe793a8aacd29f6fafb53
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230531.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230531.ebuild
new file mode 100644
index 000000000000..b3e373b6fb27
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20230531.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.5.0"
+PATCH_VER="6"
+MUSL_VER="2"
+MUSL_GCC_VER="10.5.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 02f4d40e0cd8..10aaa0ecdb72 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 ac746a95ce9e..7a3d338a9908 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -3,7 +3,7 @@ DIST btrfs-progs-v6.2.1.tar.xz 2415064 BLAKE2B 8ea7d9815e34c569dd82e53dc1f982c82
 DIST btrfs-progs-v6.2.2.tar.xz 2437300 BLAKE2B b3d0de668baf771ff08c59d20407525be841b06747b771efc013b0c2d1d24ed03caf472b7c9b03499f60140f6f84e2edbcb690cba503a7eb8037af038de79d52 SHA512 967e1c1a6b956a4e11a794aad090d1cf370fd98e4186525ccfbbbc9ae3f2bb66ace1d684730f93c558403b7ac1c991aec3d04d07548b19ee1516352a069431db
 DIST btrfs-progs-v6.3.1.tar.xz 3155540 BLAKE2B 5f8ec51f11d705bb4ada2e000143933484bae2f3a5dedb5c1abac37950de44fa0fa762cc09012ca6702b96591264027b28c17392303db414a5651657cb086c7c SHA512 a567a02f565a44dd06f54b3fd03187d259235eedf8033457368add217c87b2304e8c80ca5e2a35bdffc14e43b6889361183c6dcd5e2f4ad6fe7bfc5eb4127e65
 EBUILD btrfs-progs-6.2.1.ebuild 3580 BLAKE2B e66421da8398d9b6856958d4c13ac3fd8271e9773987e13540dfbe1bc69a99780b2654d0b95842770bf1195792592afc19c949ab07786d4748d9ef06fb5e9d86 SHA512 174ab73eabf5af68987a3fd2f13a09d913d947150407cce8a4c6f9af4e2437bb5fe287acaf074cb19e7ecc8477aafa229b13195ba8a9d6674f1a7858b7d759fb
-EBUILD btrfs-progs-6.2.2.ebuild 3548 BLAKE2B 76295699559d46f5b1f34ceda5404b5aed82b34f6d4af89512c3c77bd2f2bd8e0552d84352abaddd9c09874efc3f7a90ce2248f517f99bcb53e4f13bd12851b9 SHA512 560bcc24716f1bbd2c06f0145b5693a7ed023d068d2662dafbfdacb7800ca8b32be5298e5d51b134e46e072e91abce49590efec6e306a3612446b0313c1377f1
+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-9999.ebuild 3553 BLAKE2B a9a3dbcf35d320f5a4bff03a0956d056b1ab997b903bd544023c630e242d801896bd9d6c561693c44f57176a123a9191286ef29aafeb1eda4ae7d7e8f074c51f SHA512 b562bc54b02440f127558948ff3fdc46f0e705482729a76539904c72628e556bb818b25f991a8c7c38005878408b6c1a95a55d99c3c7c513be1862181db07050
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild
index 039f115b5537..e2a1bc6c20a1 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.2.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.2.2.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/mtools/Manifest b/sys-fs/mtools/Manifest
index 05a0e8d1aa89..e3884b10147d 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,5 +1,5 @@
 DIST mtools-4.0.42.tar.bz2 441506 BLAKE2B 07afec0aea49427ec71ae8ddde9c1dceb33b2533e9acbde3564b0715efce784b5ea8c2122ff588f84e42435abb73ac9912520fd654a078bf0336e62f35f3ce2a SHA512 fd8d56d2dea9ce5e2b311b29ebdd4d89ec7baaf5f2fbfdc85019d480eff4d198ebf0e591c0f28ee1e39d8b81d49d7d4e9ed94b0e94e5b02ce9bbc03632124811
 DIST mtools-4.0.43.tar.bz2 443673 BLAKE2B d000839bbb6bc647eb5a32b08b40b1350cd0a85fd564f0705ecbfe20f8f4ef21bf2d59cd0ccd7a159c829c019c6c2f3cbdef82ff3f4a9e8828cc13d44ddabd1d SHA512 b70e483688124a653dd333ab127494dab12d413809680a4846dc4ae5c166a0b9938a2ab290e518c1f1a5b18ed96d2c2a29d92d61b16b772a4ab5e495379fe410
 EBUILD mtools-4.0.42.ebuild 1066 BLAKE2B e9962aac85a2cb4f17c35ae286c2191c447c98a83cfbbe681d1683e30f0e4ab83d28030f1912571918120742189ddd10900da13fc0ec9f5631845987e26c3cd7 SHA512 a0eedcc4ee8c2a9e37ca146efc3627dd6984917710269d0066930180490253f27c6e306f853a94949a263eefcd44e6c4a7e723d0dda3df3e6f7462830f4d228b
-EBUILD mtools-4.0.43.ebuild 1073 BLAKE2B de6bd9ca3d6f3276e415896192d0a91e496206ca5f7c6f5bbf903ce6f8409e99c79e9f601e76f8ab5927ef4e6611850af1978dfeab0ccfe552792d208c59a63b SHA512 8526e406fa09bede6ed5a6f4c846f6a097c07d5c21412dbee2d2ee4f14e781d84aeeac372cf7f692f7812d7c3d58850a8cc72775c3fd112f4c31cca4bcb031af
+EBUILD mtools-4.0.43.ebuild 1067 BLAKE2B 3b1a24d79e1968f11f5c606fe8bc29021ad951000cfdb8f6de9edc41f03855bf255558d5cb8ba0179af6d7312d1f3d525f33ce37b25c26269b1770613a192dc3 SHA512 72043d5ada7329a704591630a6a82825e9b926ad16b3d9afcde43c6b1d84bfb5948c4c1da5063c693c7078d35cd0e47142f24a8e4f0529c115d4e12d3339ccf1
 MISC metadata.xml 375 BLAKE2B 7b9f85cb5e60ac6716012455042af65e14007d0b913842352098db7a79256b07096b51645ad294dad1d3be6f7acd3aa05bf52985a0cafce9faa78bde4de0a073 SHA512 827ce3643138e41a4ab9b652e16035bfa9e9a0714e69e979841feca48231d4bdbd37252e1d3aa2b5c4753e38215eadc58f8e43c00914ec9888d66078ea5f91c4
diff --git a/sys-fs/mtools/mtools-4.0.43.ebuild b/sys-fs/mtools/mtools-4.0.43.ebuild
index 071c11e37af3..b1cfe03e6f81 100644
--- a/sys-fs/mtools/mtools-4.0.43.ebuild
+++ b/sys-fs/mtools/mtools-4.0.43.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gui"
 
 RDEPEND="
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 0f4e4dbee5ef..2de821ab734b 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 77431fdc3cd9..eaa098743b7f 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -3,6 +3,6 @@ DIST cracklib-2.9.10.tar.bz2 620648 BLAKE2B f4ebf4aea6da81424a8b9fae9c204260f602
 DIST cracklib-2.9.11.tar.xz 461116 BLAKE2B 46b499e465c1c268b772781a9c8ce573a5167ae2e0ac919b403acdb9a14c35140dfb53909eef6e41600e26c2f87d905b3d6d05380c66f053d091765b58a264f4 SHA512 c32e509f757344a1f0b7032ad3b6dc47a8759852a94e511c92073d85bce55f45d48c389d9eb34c993e1d61ad5c1542150672f3e8bc147148ebbb04d3319a2409
 DIST cracklib-2.9.8.tar.bz2 613017 BLAKE2B d9a5d922d6ac777b08cec9c427c0cde48666cdf67bf4136eb5866a0111b101c795dceb8e206e90bff31d1c8d26505bc1a950e8ea079562d8afd601641a7caf0c SHA512 bba1b82067156f44095b282c70c06a05e58572cde7ad2430dd24c4b42ae98be86708ea86ba8b7104aa5887e16ac90d7cf3ae613b84ab9c0f7602307d78b75371
 EBUILD cracklib-2.9.10-r1.ebuild 3024 BLAKE2B d7eefb1fbb881bae3e03c5ea965bb30a2351818031e2cec2377af3a5efebd9331851738e15d51d166db2baf894aa0dd2e629e921252091640a59cf0ac7e48798 SHA512 4097d63d975ff66648b79e11f582df57f2da06ecf8465aa4c6f93a91a38505915d06417775208d968cc3dee4a314664b9e043991e15598df912289a9a00312c0
-EBUILD cracklib-2.9.11.ebuild 2973 BLAKE2B 209b9bf5f1d0a75cde91d38fed36a774398fc023ab739bb08a0d4b9958fc82742e932dec534640239486374d632fc970ce99682d6b659751bd89a0351d82ef3f SHA512 55edd6c99c1329b2e1f05f4df2964b87cf74754914829ea25c2cd7aa0a40371584f420301dc7d6683c234ea263f95dafdf9d64bbc58750d567a4d89d881a63b7
+EBUILD cracklib-2.9.11.ebuild 2965 BLAKE2B 45d4ce00f9865292088adc3545c2510da4c5fa8d4aea3a9fbe3a03a8a1cdb1ee8d05b0146800dd504d6c6129d40d805d5d1015bcc51d6e87fba20c372103644f SHA512 15b3125d572877c095412a1c73842296c7e5244adc1bdc5fe35dff7e7764f865510b8971f14db9ce46bee02fffca4ccc37332ded7acef71967ec84638c6aee12
 EBUILD cracklib-2.9.8.ebuild 2672 BLAKE2B 88614b0d1a368daaf22b2249ab50f8f4fb0c03d249ecc8b700a0e8800128c21e2224d437040c43886c620ca2224c2bc97aa2c24a58a7bea095cf4f29c8aed5aa SHA512 6b265982b4405a42f0581511432942f37f6ecbe1136f9cd7d40eb4f142810b3f2b4a38b477378bc748b8483f86bbdf846d5d55f4375b1b903b74689a6d815e69
 MISC metadata.xml 385 BLAKE2B f81e1ac44f5a4c3f647473385363eed564accca3b62ecde3cb35fab14112af1ceb2a25dc2816fc096aee9c3ed15006252f32491583861689ed70d49218684360 SHA512 6d9908f12c310ef22feeae2216236f9b632dc5204916fbb5693cc53bb58e592dc44f49c45d2c8bc22addd69cc5e4e63df463a23299d09a637f4f0f7379e7b796
diff --git a/sys-libs/cracklib/cracklib-2.9.11.ebuild b/sys-libs/cracklib/cracklib-2.9.11.ebuild
index aad59cf9265b..8be12c0d3441 100644
--- a/sys-libs/cracklib/cracklib-2.9.11.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.11.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls python static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 41148f72fa1e..c706a8b1c5f6 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -10,7 +10,7 @@ AUX db-6.0.35-sqlite-configure-path.patch 748 BLAKE2B 570c499549fddd62fa4d14a6eb
 DIST db-4.8.30.tar.gz 22887305 BLAKE2B 10487580a371fa97ef5e468e1fcc4af68490934a82467da88b723f7d4ce403cd5f2b77bd95c218dda58161fe30bfef81f5093a8e5176f5ad5f482251c07c6423 SHA512 d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1
 DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa64d5ff8dcb3b5e01ee3501fd75d9a73b8f5fa54d8907717d93546fbb5348ee70119e877fa2f17d301ecf50d SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
 DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
-EBUILD db-4.8.30-r8.ebuild 4384 BLAKE2B 6a45b3a7b6d0ba006a683806fc13e96378d2450c86a003c49af63dc632cdf45184294ad211b219a6888c2aeb974ca8ce685381962c9e384e1fc58983a51348bc SHA512 017627d4258b824b0669ca5f528ccb3a56debc2e807029ea6dd850ca0b873dda1301766663f9f9d666be0bf71abd45487833dacf98003a209ffb5821e5663db7
-EBUILD db-5.3.28-r9.ebuild 6374 BLAKE2B 6a73a04f2bff18a7200df8d3a319a0b39d7efb7419056887d5eba9e5cf6bbf8c1d3feabf60421a168b79063c855bb4a8b9e4a4c58138fa2b38504e3f0655350f SHA512 ccc234f5be61b8b44420b890ef2ad494433e21548d5f116d0711a73003cbe19e116fabdfdcad294fcaf01666b74b3bd7ced090375561f0beb17ba65b6277d560
-EBUILD db-6.0.35-r4.ebuild 6228 BLAKE2B 6c533595bbe2d1888c296eabaae5eb40f1335c81a76d1d95a3b4bbd2123abc673dee0e08e90c323ab7a59c95ab8890da483aa53cec93c92079000021e4d943b9 SHA512 18497321dd41cd1025c2e9ebffae12a0e0acb70843dd73c7db668bca86d31246cd3e60ceebfb1d06367061a47e8cbde3fa51053c67917000d567d1c4d663541f
+EBUILD db-4.8.30-r8.ebuild 4451 BLAKE2B 628a7ad196d6d67e5a9107f4c0c31d784e7c4cb335d02145296f39513daf62471ec4c636a608c2ed8b0e3beaa7fb29423b8cc83765f42ecb210abb0157c50c9d SHA512 ec423313003488ef87c6adadc666f8662cbecb827203eb9e3a77609025b8c4b233bf01f47b57bdca0905c31ad903e4e888bcc0ee9b2b9b7061fe2441df482e0f
+EBUILD db-5.3.28-r9.ebuild 6435 BLAKE2B 91d0829b5d2c3d9e4afb289b696c55b0034a3e212c3cfc1e87552aab104751dcf07a95c8fdf59d470d6228519aaae972202697a44a9c001dfa6c1a0b0e8e123c SHA512 895e9f229880df53ad39f90b43788e9e0952de7ebb480eda49ba059fc37097b2801ab5315ca22d40481838428b9ac8af007a86a9cc1fb73c4429f5d3bc59ff7b
+EBUILD db-6.0.35-r4.ebuild 6295 BLAKE2B f4670c1010430c9afa73f5fc0aadaa9257710e9df008c1d4cabb37a5d80249e62c23d0d6d616519afab07239cef81e333deb7e6d9f66b6cf7233543c3e2bc489 SHA512 9083b9d378fa318cddc2a0de7ca401952227d007e55961e4412264a8f80fe9657fc28cdc0591bf2db0d1830a5e6ae5d95da790d8e2c5bb3cb7d13a292f025100
 MISC metadata.xml 1261 BLAKE2B 81cfdd965f4e2e0342d812c6c1fd602c43ca8bbbb23bd12f230444d26bee578f9ba2af781a8390bb754b66b4699c6aada379dea90397798f8a489a7fd11b85fb SHA512 08d43450d54a8718639ae2637f13da7626415e99a8fa5948c5107b7a973161f31b3b0cf58dc538dd48a18db996f020d57d20edefbcdd8e37c6e58c206c3aab6e
diff --git a/sys-libs/db/db-4.8.30-r8.ebuild b/sys-libs/db/db-4.8.30-r8.ebuild
index e40d00b495fe..f5906a0c970e 100644
--- a/sys-libs/db/db-4.8.30-r8.ebuild
+++ b/sys-libs/db/db-4.8.30-r8.ebuild
@@ -36,6 +36,8 @@ REQUIRED_USE="test? ( tcl )"
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+# Need binutils for tc-ld-force-bfd
+BDEPEND="sys-devel/binutils:*"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8-libtool.patch
diff --git a/sys-libs/db/db-5.3.28-r9.ebuild b/sys-libs/db/db-5.3.28-r9.ebuild
index 4918af5d46fe..1d029d38e96b 100644
--- a/sys-libs/db/db-5.3.28-r9.ebuild
+++ b/sys-libs/db/db-5.3.28-r9.ebuild
@@ -39,7 +39,11 @@ DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 # bug #841698
-BDEPEND="sys-devel/autoconf-archive"
+# Need binutils for tc-ld-force-bfd
+BDEPEND="
+	sys-devel/autoconf-archive
+	sys-devel/binutils:*
+"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db${SLOT}/db.h
diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 93dc0fcf54a6..20268a5c9996 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.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
@@ -38,6 +38,8 @@ REQUIRED_USE="test? ( tcl )"
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
+# Need binutils for tc-ld-force-bfd
+BDEPEND="sys-devel/binutils:*"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/db${SLOT}/db.h
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index 8b76e29f8fab..827453ca9aa8 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,7 +1,11 @@
+DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20 SHA512 94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
 DIST apparmor-3.0.8.tar.gz 7946880 BLAKE2B bbff6c0223b9f20cb53d96cb2e41aa4b7eee51b35a2c010cdd394f85517e87c9a34fb7182f600ba212e99baf4ee1a16a5bfd7e92ec6a9fb9ce6076a216cd89e1 SHA512 539e955b24c6f4f62ef0d7885fc341e4f6bc69ee840981426fb6a40f8f8e5c945f774246cb0efe1a76e778b8047d4a7fe315ab062d2dbe17e524b8527d5a8087
+DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae SHA512 db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4
+EBUILD libapparmor-3.0.10.ebuild 2495 BLAKE2B 1c5c909213583e3472f5aeb4fb7e021bd230d22cd4df609575c5331cb7715fba8ccc60b44d3f5fd157f98bed7b682ec3bb8c9d8565d1200aa56b401644ec2fcb SHA512 a5c78da30525adac65b9a6894e45f85a02e412d4156aa137f7eea3e1affca373ea9054ea33a80fee00b046fa4e73312a94d4b032f50e5cc2217b37abe03fb16b
 EBUILD libapparmor-3.0.3-r1.ebuild 2128 BLAKE2B 40a70e7f88ced1951e93f7ecf72803ab4ef401e9a21c416c08529befdc4a01a13dfce469bb0f9260c146f5da00d96f6fa9d8d6d295b110752b848d28c89d44b6 SHA512 56bd6c9e85004d359804c3342e188994e8f1faec319eb112e20d6a0f12ca0d1434695e27f2056e5bad9385a541b41b1a8bf7f074e1dddeb2486fef0aea8c7d2f
 EBUILD libapparmor-3.0.4.ebuild 2492 BLAKE2B e5f7a9ec43864f275a255b2859f0ba71d0ee1bc2319eebb500849bc84caa07b80782f091ee377d74caeb96181564bac16f3349f17649898accf4dc118c3e15d2 SHA512 2afbc4fd3c8793bdc57f977163be1cc85c371aef6b4e8ec6f043c343640aa510f15d43c8d4b4fb5a6fbd0ca103acf73ee446feeccfe39d0073a7fe50c22384da
-EBUILD libapparmor-3.0.8.ebuild 2494 BLAKE2B 07d8eb66dad3b022cd372dea0eb58484cc3a4714d0aa8118da833e2825a79c73327e01d7878f8c222005e33681395591ec99541a7b4c4f3b0ab6fabf5406bcf8 SHA512 167d7354de4edb07abcf222c79ca8dbe71b4ec8ba6724bd7506b6ab63b3d7db3644abe8b71df5f2a8bcd4f2d1a897277ab26020fb0f4ba15a57f024312afc41f
-MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
+EBUILD libapparmor-3.0.8.ebuild 2493 BLAKE2B 9eadc454d3df76f9b5752f4ddeced54bf3255b56b60e93caceb045695d0b43405ba14cbeddab58a648aef98de40eb05a67cef4e3152b51b4bba022894f4631ec SHA512 05094fe57768430bc4d4111e5cbc8a0800fd04ba10b7e24748f2e7fa1edf79fb6fad1f9179cdd5435d4ea09a42a418b6d3df169f45f71fc58bc017cd7dd1330c
+EBUILD libapparmor-3.1.4.ebuild 2511 BLAKE2B d8ca4ea271bfbef8b95eec7d6aed8851a595aa85a306af310e779e10e313c6260a72fb00b2e0da225b6b06a2506f4a0f355ad8b29fb1578615de27bdd4316173 SHA512 d6414c82ec3a666e3377f93c2d98aad8126565174b0f0ad74d4f9140d21c9ac53dc56cef3308a62a41a9f247480eff931f7774d33f67dbb826b402df27c8d70b
+MISC metadata.xml 499 BLAKE2B ae7166545eb4d691cb446ee37d1e0e251c02f7f19f57bf9d4f31f55e78c707226767e0721e167a32acfb164e65d2203efcd3e54571693066cc03a98d5125425d SHA512 54421c54122fcfa7b849a8e08359d546dc1084a694b1123793d7c6cb6fa21e3e44e93d71a719da4ae0c3ad1ce85a0d53a28e0531654d79cf856db11f03621b8b
diff --git a/sys-libs/libapparmor/libapparmor-3.0.10.ebuild b/sys-libs/libapparmor/libapparmor-3.0.10.ebuild
new file mode 100644
index 000000000000..5c05cbe49d77
--- /dev/null
+++ b/sys-libs/libapparmor/libapparmor-3.0.10.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..11} )
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools distutils-r1 perl-functions
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Library to support AppArmor userspace utilities"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="doc +perl +python static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/autoconf-archive
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-lang/perl )
+	perl? ( dev-lang/swig )
+	python? (
+		dev-lang/swig
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
+
+# depends on the package already being installed
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# We used to rm m4/ but led to this after eautoreconf:
+	# checking whether the libapparmor man pages should be generated... yes
+	# ./configure: 5065: PROG_PODCHECKER: not found
+	# ./configure: 5068: PROG_POD2MAN: not found
+	# checking whether python bindings are enabled... yes
+	eautoreconf
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	# Fails with reflex/byacc, heavily relies on bisonisms
+	export LEX=flex
+	export YACC=yacc.bison
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with perl) \
+		$(use_with python)
+}
+
+src_compile() {
+	emake -C src
+	emake -C include
+	use doc && emake -C doc
+	use perl && emake -C swig/perl
+
+	if use python ; then
+		pushd swig/python > /dev/null
+		emake libapparmor_wrap.c
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C src install
+	emake DESTDIR="${D}" -C include install
+	use doc && emake DESTDIR="${D}" -C doc install
+
+	if use perl ; then
+		emake DESTDIR="${D}" -C swig/perl install
+		perl_set_version
+		insinto "${VENDOR_ARCH}"
+		doins swig/perl/LibAppArmor.pm
+
+		# bug 620886
+		perl_delete_localpod
+		perl_fix_packlist
+	fi
+
+	if use python ; then
+		pushd swig/python > /dev/null || die
+		distutils-r1_src_install
+
+		popd > /dev/null || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto LibAppArmor
+	python_domodule LibAppArmor.py
+}
diff --git a/sys-libs/libapparmor/libapparmor-3.0.8.ebuild b/sys-libs/libapparmor/libapparmor-3.0.8.ebuild
index 0c69cd475d4f..4258666a130d 100644
--- a/sys-libs/libapparmor/libapparmor-3.0.8.ebuild
+++ b/sys-libs/libapparmor/libapparmor-3.0.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
 IUSE="doc +perl +python static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/libapparmor/libapparmor-3.1.4.ebuild b/sys-libs/libapparmor/libapparmor-3.1.4.ebuild
new file mode 100644
index 000000000000..8e813734231e
--- /dev/null
+++ b/sys-libs/libapparmor/libapparmor-3.1.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..11} )
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools distutils-r1 perl-functions
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Library to support AppArmor userspace utilities"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="doc +perl +python static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/autoconf-archive
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-lang/perl )
+	perl? ( dev-lang/swig )
+	python? (
+		dev-lang/swig
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
+
+# depends on the package already being installed
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# We used to rm m4/ but led to this after eautoreconf:
+	# checking whether the libapparmor man pages should be generated... yes
+	# ./configure: 5065: PROG_PODCHECKER: not found
+	# ./configure: 5068: PROG_POD2MAN: not found
+	# checking whether python bindings are enabled... yes
+	eautoreconf
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	# Fails with reflex/byacc, heavily relies on bisonisms
+	export LEX=flex
+	export YACC=yacc.bison
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with perl) \
+		$(use_with python)
+}
+
+src_compile() {
+	emake -C src
+	emake -C include
+	use doc && emake -C doc
+	use perl && emake -C swig/perl
+
+	if use python ; then
+		pushd swig/python > /dev/null
+		emake libapparmor_wrap.c
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C src install
+	emake DESTDIR="${D}" -C include install
+	use doc && emake DESTDIR="${D}" -C doc install
+
+	if use perl ; then
+		emake DESTDIR="${D}" -C swig/perl install
+		perl_set_version
+		insinto "${VENDOR_ARCH}"
+		doins swig/perl/LibAppArmor.pm
+
+		# bug 620886
+		perl_delete_localpod
+		perl_fix_packlist
+	fi
+
+	if use python ; then
+		pushd swig/python > /dev/null || die
+		distutils-r1_src_install
+
+		popd > /dev/null || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto LibAppArmor
+	python_domodule LibAppArmor.py
+}
diff --git a/sys-libs/libapparmor/metadata.xml b/sys-libs/libapparmor/metadata.xml
index 22230f2666f5..e22db4165e51 100644
--- a/sys-libs/libapparmor/metadata.xml
+++ b/sys-libs/libapparmor/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">apparmor</remote-id>
+		<remote-id type="gitlab">apparmor/apparmor</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index a2ff5ddad568..2d80cddfb49a 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,6 +1,8 @@
 AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d SHA512 3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d SHA512 998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329
+DIST libxcrypt-4.4.34-autotools.tar.xz 621732 BLAKE2B acf1801d890f522b9a098943f55f8551652ef3e0620bee5e7f3c297b7d0867ba6bace71fcf106474d25e95bcf4bd57e4ced6b51782cbaf0d42cca1643668407b SHA512 ef04ee78bf2e28e715fa673a1af728209c11838c66f7ec13cef40332595f77b878ac698616d6ef861b86879b0addd5581350041e889f2cef2ed1363f0ed93ffb
 EBUILD libxcrypt-4.4.28-r2.ebuild 9464 BLAKE2B d5171d0edf8f3028b0e099273a4adfed9a4e7b4f8374f181f0802c37fccd096a6ab2e1823b2915191f54f7b7d48a2e7cd9fe7c91ca156e3f08fc09a50c33a885 SHA512 7e66fd6af9a2f925b881d23351ea3df2e50d8bce59830b253925b9b813b649594fd26b9700c8823a1ebd29c52079d0002b1a99c7367a82c2a6978986b357f640
 EBUILD libxcrypt-4.4.33.ebuild 9290 BLAKE2B 950410645ae7c368f5498ca33d26080af50f7e7123b62bb56c7c06c1599fda660efdfd00cf58ad3ef5015562b4541deba9c4791419223413591cc6786880550e SHA512 6623e4c543384119cf360b1de1ed00b775c51fc8d69653a94cfea2095491c8ae576299ab498a524b51ca477bcb5fbd14c659e886a7a12dd41371ac87b974e3cf
+EBUILD libxcrypt-4.4.34.ebuild 9289 BLAKE2B 8a18e3f0c65d971b0733845424cde5f0332feca059c3caabe42b3b3ffcb3778c8609a9a904e8d56a3f88dfa4e1cfc742052794c0b0c6789baaa66b8895fbc346 SHA512 06edc8cfbefe910761d669631e33c1e9ae96670e65668a2e5cd8858c6ae760bb86ec26b7c847d8e28050d74731a8b9ec54f7f4174a12f975f1b96f7a491ebe38
 MISC metadata.xml 913 BLAKE2B c2b3f52bd72bb46b0de4eb4a5f47dcb3aacfd248b811bcdc88db88c6f9cbe3ed1af4fda3e643b350fd22131273af03f2f888d78d306f0f7274d9432eb65075a3 SHA512 0ebbc3c2aa661f1a40e7f654384a395662b1b0235f145c7778b7b86bfb65ad09d4e8900bc6ede94413f057e769397c355bfd1bcafe8540acbf7e00e5451400c9
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.34.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.34.ebuild
new file mode 100644
index 000000000000..331a6cc1c58c
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.34.ebuild
@@ -0,0 +1,340 @@
+# Copyright 2004-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit multibuild multilib python-any-r1 flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
+HOMEPAGE="https://github.com/besser82/libxcrypt"
+if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+	inherit autotools
+	SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
+fi
+
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+compat split-usr static-libs +system test headers-only"
+REQUIRED_USE="split-usr? ( system )"
+RESTRICT="!test? ( test )"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+is_cross() {
+	local enabled_abis=( $(multilib_get_enabled_abis) )
+	[[ "${#enabled_abis[@]}" -le 1 ]] && [[ ${CHOST} != ${CTARGET} ]]
+}
+
+DEPEND="
+	system? (
+		elibc_glibc? (
+			${CATEGORY}/glibc[-crypt(+)]
+			!${CATEGORY}/glibc[crypt(+)]
+		)
+		elibc_musl? (
+			${CATEGORY}/musl[-crypt(+)]
+			!${CATEGORY}/musl[crypt(+)]
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-lang/perl
+	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if has "distcc" ${FEATURES} ; then
+		ewarn "Please verify all distcc nodes are using the same versions of GCC (>= 10) and Binutils!"
+		ewarn "Older/mismatched versions of GCC may lead to a misbehaving library: bug #823179."
+
+		if [[ ${BUILD_TYPE} != "binary" ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]] ; then
+			die "libxcrypt is known to fail to build or be broken at runtime with < GCC 10 (bug #823179)!"
+		fi
+	fi
+}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=(
+		$(usex compat 'xcrypt_compat' '')
+		xcrypt_nocompat
+	)
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# WARNING: Please read on bumping or applying patches!
+	#
+	# There are two circular dependencies to be aware of:
+	# 1)
+	#	if we're bootstrapping configure and makefiles:
+	#		libxcrypt -> automake -> perl -> libxcrypt
+	#
+	#   mitigation:
+	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
+	#		and the ebuild uses that.
+	#		(Don't include the pre-generated Perl artefacts.)
+	#
+	#	solution for future:
+	#		Upstream are working on producing `make dist` tarballs.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# 2)
+	#	configure *unconditionally* needs Perl at build time to generate
+	#	a list of enabled algorithms based on the set passed to `configure`:
+	#		libxcrypt -> perl -> libxcrypt
+	#
+	#	mitigation:
+	#		None at the moment.
+	#
+	#	solution for future:
+	#		Not possible right now. Upstream intend on depending on Perl for further
+	#		configuration options.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# Therefore, on changes (inc. bumps):
+	#	* You must check whether upstream have started providing tarballs with bootstrapped
+	#	  auto{conf,make};
+	#
+	#	* diff the build system changes!
+	#
+	if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+		# Facilitate our split variant build for compat + non-compat
+		eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# Avoid possible "illegal instruction" errors with gold
+	# bug #821496
+	tc-ld-disable-gold
+
+	# Doesn't work with LTO: bug #852917.
+	# https://github.com/besser82/libxcrypt/issues/24
+	filter-lto
+
+	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
+	# https://github.com/gentoo/gentoo/pull/28355
+	# mold needs this too but right now tc-ld-is-mold is also not available
+	if tc-ld-is-lld; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+get_xcprefix() {
+	if is_cross; then
+		echo "${EPREFIX}/usr/${CTARGET}"
+	else
+		echo "${EPREFIX}"
+	fi
+}
+
+get_xclibdir() {
+	printf -- "%s/%s/%s/%s\n" \
+		"$(get_xcprefix)" \
+		"$(usex split-usr '' '/usr')" \
+		"$(get_libdir)" \
+		"$(usex system '' 'xcrypt')"
+}
+
+get_xcincludedir() {
+	printf -- "%s/usr/include/%s\n" \
+		"$(get_xcprefix)" \
+		"$(usex system '' 'xcrypt')"
+}
+
+get_xcmandir() {
+	printf -- "%s/usr/share/man\n" \
+		"$(get_xcprefix)"
+}
+
+get_xcpkgconfigdir() {
+	printf -- "%s/usr/%s/pkgconfig\n" \
+		"$(get_xcprefix)" \
+		"$(get_libdir)"
+}
+
+multilib_src_configure() {
+	local -a myconf=(
+		--host=${CTARGET}
+		--disable-werror
+		--libdir=$(get_xclibdir)
+		--with-pkgconfigdir=$(get_xcpkgconfigdir)
+		--includedir=$(get_xcincludedir)
+		--mandir="$(get_xcmandir)"
+	)
+
+	tc-export PKG_CONFIG
+
+	if is_cross; then
+		if tc-is-clang; then
+			export CC="${CTARGET}-clang"
+		else
+			export CC="${CTARGET}-gcc"
+		fi
+	fi
+
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			myconf+=(
+				--disable-static
+				--disable-xcrypt-compat-files
+				--enable-obsolete-api=yes
+			)
+			;;
+		xcrypt_nocompat-*)
+			myconf+=(
+				--enable-obsolete-api=no
+				$(use_enable static-libs static)
+			)
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+
+	if use headers-only; then
+		# Nothing is compiled here which would affect the headers for the target.
+		# So forcing CC is sane.
+		headers_only_flags="CC=$(tc-getBUILD_CC)"
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${headers_only_flags}"
+}
+
+src_compile() {
+	use headers-only && return
+
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake check
+}
+
+src_test() {
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	use headers-only || \
+	(
+		shopt -s failglob || die "failglob failed"
+
+		# Make sure our man pages do not collide with glibc or man-pages.
+		for manpage in "${D}$(get_xcmandir)"/man3/crypt{,_r}.?*; do
+			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
+				|| die "mv failed"
+		done
+	) || die "failglob error"
+
+	# Remove useless stuff from installation
+	find "${ED}"/usr/share/doc/${PF} -type l -delete || die
+	find "${ED}" -name '*.la' -delete || die
+
+	# workaround broken upstream cross-* --docdir by installing files in proper locations
+	if is_cross; then
+		insinto "$(get_xcprefix)"/usr/share
+		doins -r "${ED}"/usr/share/doc
+		rm -r "${ED}"/usr/share/doc || die
+	fi
+}
+
+multilib_src_install() {
+	if use headers-only; then
+		emake DESTDIR="${D}" install-nodist_includeHEADERS
+		return
+	fi
+
+	emake DESTDIR="${D}" install
+
+	# Don't install the libcrypt.so symlink for the "compat" version
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
+				|| die "failed to remove extra compat libraries"
+		;;
+		xcrypt_nocompat-*)
+			if use split-usr; then
+				(
+					if use static-libs; then
+						# .a files are installed to /$(get_libdir) by default
+						# Move static libraries to /usr prefix or portage will abort
+						shopt -s nullglob || die "failglob failed"
+						static_libs=( "${D}"/$(get_xclibdir)/*.a )
+
+						if [[ -n ${static_libs[*]} ]]; then
+							dodir "/usr/$(get_xclibdir)"
+							mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \
+								|| die "Moving static libs failed"
+						fi
+					fi
+
+					if use system; then
+						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
+						# to allow linker to correctly find shared libraries.
+						shopt -s failglob || die "failglob failed"
+
+						for lib_file in "${D}"$(get_xclibdir)/*$(get_libname); do
+							lib_file_basename="$(basename "${lib_file}")"
+							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
+
+							# We already know we're in split-usr (checked above)
+							# See bug #843209 (also worth keeping in mind bug #802222 too)
+							local libdir_no_prefix=$(get_xclibdir)
+							libdir_no_prefix=${libdir_no_prefix#${EPREFIX}}
+							libdir_no_prefix=${libdir_no_prefix%/usr}
+							dosym -r "/$(get_libdir)/${lib_file_target}" "/usr/${libdir_no_prefix}/${lib_file_basename}"
+						done
+
+						rm "${D}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
+					fi
+				)
+			fi
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+}
+
+pkg_preinst() {
+	# Verify we're not in a bad case like bug #843209 with broken symlinks.
+	# This can be dropped when, if ever, the split-usr && system && compat case
+	# is cleaned up in *_src_install.
+	local broken_symlinks=()
+	mapfile -d '' broken_symlinks < <(
+		find "${ED}" -xtype l -print0
+	)
+
+	if [[ ${#broken_symlinks[@]} -gt 0 ]]; then
+		eerror "Broken symlinks found before merging!"
+		local symlink target resolved
+		for symlink in "${broken_symlinks[@]}" ; do
+			target="$(readlink "${symlink}")"
+			resolved="$(readlink -f "${symlink}")"
+			eerror "  '${symlink}' -> '${target}' (${resolved})"
+		done
+		die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug."
+	fi
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 304700735dc9..1431d3938389 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 4f282768d3d5..29632aabb8f2 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,5 @@
 DIST libX11-1.8.4.tar.xz 1835316 BLAKE2B f9f5d1b97e8ac6f8f0edc490a270f98ff4fd901c2054c309bce1f1b3eb690704193e18cd470f682c663090210b14a9498b9259b6acc0e902053e7ab0ca9df076 SHA512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e
+DIST libX11-1.8.5.tar.xz 1811288 BLAKE2B 13ccdcec5d3cd31b8be88402aa7821a1d28520e90e454b816abdf773f21da5cc1690eaa4f17c6f34a3f1254e3b6d21a8a38228428cb113f7198d981f39d1c3eb SHA512 5274f6073ead119c8f915d302f1e2bf9579f88d28a2a2d084a4be2050b14fb605efe91099c89ba55aeb7ad36ae0ecbd519b0808be0e29f56367d5dd8faa063d3
 EBUILD libX11-1.8.4-r1.ebuild 1006 BLAKE2B 8ea7476bf009cf313eec3224dbe1588b31d2facaf99106b4a5bbf3d8235417c29cb778fe7baea1850a4bf5db4a2aba30c3b89054e79f4296044a16b9a406dc01 SHA512 3e0bea40df7719fbbaaf3080341fbe5947bd79146b114b3f489a07534dd57c9f7314f9e71da68051e4f6d88e3a80edd756bfa31a6632639eb7f8d2aed4edb767
+EBUILD libX11-1.8.5.ebuild 1014 BLAKE2B b5d949580a276b2796227531c292b26e893ad83769d741a2ef45542785b5011ae15e8aef58de97c39b46724514caa0d610bf6e5ade86f019aaa00842ba5fb49e SHA512 409373d45f74cf33ab290b0d5b8376222ed3711ae4e5f8ba2139ab65a72c03df53d145661bbfb35b9604ce579dfcd2fde4aad11ddf4e66efce6378c6e8262ffa
 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-libs/libX11/libX11-1.8.5.ebuild b/x11-libs/libX11/libX11-1.8.5.ebuild
new file mode 100644
index 000000000000..28f7a5710fd8
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.8.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX=xz
+inherit toolchain-funcs xorg-3
+
+# Note: please bump this with x11-misc/compose-tables
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	x11-misc/compose-tables
+
+	!<xfce-base/xfce4-settings-4.16.3
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans
+"
+BDEPEND="test? ( dev-lang/perl )"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		--enable-ipv6
+		--without-fop
+		--with-keysymdefdir="${ESYSROOT}/usr/include/X11"
+		CPP="$(tc-getPROG CPP cpp)"
+	)
+	xorg-3_src_configure
+}
+
+src_install() {
+	xorg-3_src_install
+	rm -rf "${ED}"/usr/share/X11/locale || die
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index b88a271cf55a..958ac0fa2f9e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index aecf38203760..48958ec5cb92 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,5 @@
 DIST libX11-1.8.4.tar.xz 1835316 BLAKE2B f9f5d1b97e8ac6f8f0edc490a270f98ff4fd901c2054c309bce1f1b3eb690704193e18cd470f682c663090210b14a9498b9259b6acc0e902053e7ab0ca9df076 SHA512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e
+DIST libX11-1.8.5.tar.xz 1811288 BLAKE2B 13ccdcec5d3cd31b8be88402aa7821a1d28520e90e454b816abdf773f21da5cc1690eaa4f17c6f34a3f1254e3b6d21a8a38228428cb113f7198d981f39d1c3eb SHA512 5274f6073ead119c8f915d302f1e2bf9579f88d28a2a2d084a4be2050b14fb605efe91099c89ba55aeb7ad36ae0ecbd519b0808be0e29f56367d5dd8faa063d3
 EBUILD compose-tables-1.8.4-r1.ebuild 966 BLAKE2B 3d311500f1975ad468872ba6a7a0455cd12373136383bf6cd8cc9b79e226398217d3b6ea512a3e524594eb35f01978a6501e6ec72bbb2f22489075e4f478c53f SHA512 ccd113992763322e33b1d1fa398195edaf7d38271170053de474bc348e0b4d85858ca8ba8eafd524750515404700864c179fb7adf2b8f0e7a90495427297b005
+EBUILD compose-tables-1.8.5.ebuild 974 BLAKE2B 74281676596e04ff3c8696d915cb7707e25912ec6813ef814e9e7daeaaebf04e768887648938623bacc1e70cdb2d570a827bed63d07ffccf24bbbaebc25190c8 SHA512 fedef15036db889166c5efe40ad4e2184611bb014f955695a28b1a7774ed11ad1d5aa561ad0fda8e4b20cd29373ce7d8a64126a5e0e3942370c514e19cb6ecdd
 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-misc/compose-tables/compose-tables-1.8.5.ebuild b/x11-misc/compose-tables/compose-tables-1.8.5.ebuild
new file mode 100644
index 000000000000..07d749e49aed
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.8.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_MULTILIB=no
+XORG_TARBALL_SUFFIX=xz
+inherit xorg-3
+
+# Note: please bump this with x11-libs/libX11
+DESCRIPTION="X.Org Compose Key tables from libX11"
+# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
+SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
+S="${WORKDIR}/libX11-${PV}/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# Only needed by configure
+DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libxcb-1.11.1
+	x11-libs/xtrans"
+RDEPEND=""
+
+XORG_CONFIGURE_OPTIONS=(
+	--without-xmlto
+	--without-fop
+	--disable-specs
+	--disable-xkb
+	--with-keysymdefdir="${ESYSROOT}/usr/include/X11"
+)
+
+src_compile() {
+	emake -C nls
+}
+
+src_test() {
+	:;
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C nls install
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-06-01 09:25:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-06-01 09:25:36 +0100
commit	9b9c22874161d13ca8d50c952d549f2390f3f179 (patch)
tree	008ed76c56f51f6f3c30370c7b6109476f3dd4e4
parent	51f111b675c30c05f05128be7836616634098bae (diff)