gentoo auto-resync : 11:11:2022 - 09:29:30

author: V3n3RiX <venerix@koprulu.sector> 2022-11-11 09:29:30 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-11-11 09:29:30 +0000
commit: 7d6f532c36268a2a8f53fa33c8e547c59702faa6 (patch)
tree: 6fd7a5cb102e736fe8969482dbce6c8a98808f6f
parent: b4899ed9fc78f45325ef4e2ebd460869e53a605d (diff)
278 files changed, 2889 insertions, 1065 deletions
diff --git a/Manifest b/Manifest
index 07138c40bed5..ac46f49d1ee5 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29592 BLAKE2B 891c22ab967ec45ec881b0ef2d292a049e5928e8b1e90d6df417a666e470526bdacf9391da24d4b7ffc69990073cb34a4310cf05ec1cb8a72d7304d7078c3914 SHA512 a25ad0cf4027a6b662181bb5f5949d74c4837c162b79bb4026e8612195a649da07cea05a2beea77e09fd0a7333908dc1e98c772c3e839d1d80e9cfc764dd7e7e
-TIMESTAMP 2022-11-11T02:39:42Z
+MANIFEST Manifest.files.gz 29613 BLAKE2B 238eab0bfa382cc08aedb5c014e586907ee5aaa5639cfc903b4c434e97e649f07b91e3c40a98eebd2443577d70367d4fe75b9a19cc02f91e47f125de94647536 SHA512 42fb502fe6bb6aad496840a8491a591bc130f9a163ba70ad3835c5af98bc27f4306e9d68ec4335434130c86faba456f505f34e513e82e1f46baafa813827f9bb
+TIMESTAMP 2022-11-11T08:39:42Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNtte5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNuCk5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDjLw//djzT2zK/fHIZ4zSTjo8to27zB9cBLAUiTy8yzxJeyvmQbi0gkTt8knBM
-rnod8jNiouJcrmnr90qI2HMQNH1QovAsDmjHHl25sqfDY0Osq129hyerr8Ozus2L
-6BMQ4QXequtJFsyVwnL6xB5ii2eZCQK5RHjGUup0cFSak876J/Qno2MtW5+h4DFt
-On3JJjz3qmVama63SsgB2AmhckmCdHZZ4PBzWtBpyr/e4sMnQXP01Gob7urqeQhS
-uFqBHAuEz1YVOaQvX/bF555fNC5uqZ99CefARJhqIfGj8CpsZcZpArtxHS6xxbwD
-PWSNyK2Ndx7rmt+cAx0826l726I3OKBhs5+whZRMbgJQDSLWTdJfdtzrG0zbmoic
-y39Oxi8C4OqFCliTdF3LmVPzm0kb4hOd6yurO0HxyFzE8PCR6vGGCkXP9Gdq70L+
-O9A6bnyyaUVW4mmNXZ0MRTFmwryeLYtUMwQLC7dOm97+r/wcbypbmDn0+DCT2ued
-RL2XPo4YjeaYjG2JA0X0jNYr6JnlAnlQWNEDtUHdvloSUdL8Y5dcLPxE2zbgfFP7
-Fu/wF0QQFHB21oAap6MA0yNZi2aYa/cbRNG8v9EUJpxrm1Sn11M6Q3KvFUrx/mK0
-Vsx+Z0dsnZgDDQsK38iF7qAKfezWaY3HX/8HNQPp6OGPIB8xpwY=
-=p6Og
+klDg+Q//S82e0vuaK7g6wYxL0yuX79MbT5vFWxSEQzIWy2O4ggY/F+iDImPh9nVy
+KSMquvEDoeDBHMk1YlM0IZi932+7VaIZ6DTzQmZzm+qbd3v3/50f+luMbcPVIEb7
+NuVNPRLnxDHOqKULAqvjcxSFqT+ClbFz849sBx8oxh8QEbhUmk4fotWXCTgec09m
+xYxBoa1SgbqPGhmXpLB+v1skilblg4deC+8FjOWXg/AUoHgXLfyhpIH5EC7L02Yh
+0UopTSfj5U3CJJQbgCVe2dWnOsteNUgTLXPpSVLVX9V9HMzhSRBjf7BT8DMHqYIB
+BIgK5wp0+uMb6ltL5DO4pwJkg8O/wXNd51x35pgrX5Jrz1aPCuON3RAlLEopRV0y
+06SNATSIzEiLvmHp4BhFnEhnrGPVY+S5tSJYyeEQ+a18wDsmOMvrSfqEAWxFMJsS
+w3punCb5Sx8K/Vvk+/+TXKVi8XZ5SBWkp4ouR/XZNrDCQVlMIUMftHXx9MDBgAXQ
+aF0hO1OahV7Inkd43zTSTKKFmxqcOvLJaJ397Hq1YsQAjNJrVi9gRw5XVWrlMvrx
+k9vwGNB88Eb/sJaubTAaJlyfag2sUBELq3QKQ6MNCJP4ub67uMhxEQ/vrNFCl7Qt
+cFVLDW84vrp9ZDwFfiqsLbB81AdUuBw/USvMF2gfoiTdf1LrTKM=
+=TZg8
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 786dc103d707..9135f17902e1 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cae6b31e7bff..875196a3c6b8 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index f46d3d1b1a46..b2a3d61b4c0f 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -12,6 +12,7 @@ DIST aws-cli-1.27.2.gh.tar.gz 2295292 BLAKE2B 6a2bf1e05b8e72880c8f2337da4fbe6dde
 DIST aws-cli-1.27.3.gh.tar.gz 2295495 BLAKE2B cd396d324f2a7c81df2488e61cd021819d2498fbd1ff58f7e75d24f523df7d17f463eb4133339f429be4f8b1e3ae4eab20dc0bf45b140c2aaa7a91d576f9274e SHA512 6efeae8478486073aac0ebbf56ea10cf337b06be6b2306ebbbc489600e52fac28f4c95f8b8435f5e3a9a9342da59c9ca164a019d04ec17363ecbba533a53d7d5
 DIST aws-cli-1.27.4.gh.tar.gz 2296705 BLAKE2B 604306821f91decf0fb6f88d1115000164f393c8a878b5990ca25a2f8d36972a88832079844656e26f084c729aa0e05014e9ff9ca95d1e820346214f5d1bfde1 SHA512 0753e78e43e3d26fcb906c068e78e23ca3ecfbd4607d1f9d8487922d6a1e6b5598b80b9d2cae6236f6b4724e1667b51132c90b66eec7c427ca35aa6f7b3c5f24
 DIST aws-cli-1.27.5.gh.tar.gz 2298711 BLAKE2B 190b2483cf09d4eff2848cc0933a957ae0f6e8fc88a24bc5a0bc637d6c659427fa4145a5509a6fea731fc0f5e09979d8714bdbb0627c0257db4ceb6bd5e09eb9 SHA512 b147660b72604ed29bff27d76ead2018c3c924339472a6499b4553cbb439d239bef11c6ab24a34303b01407da94e79fb5e3729576492340cf097399a637713c0
+DIST aws-cli-1.27.7.gh.tar.gz 2299694 BLAKE2B 9a68f642120506d1b7f002a261961f40c0b91c43a10e2522f9162ad53ad70a0b8054d9c2accc7d6267c1ff3460970b05c90d0e21a7590a084e82df553a478a9b SHA512 067d7d0491ff9f83be84e709570a9e6ed8e6cdbe47698c0924c2c776fa6b682cf130e7e0b0569e68b94a92e5fee84c60cdd02ad570e262dca81cf644a168e6ac
 EBUILD awscli-1.25.89.ebuild 1856 BLAKE2B 554e1053c19d16d4e0aeccddbd3a49b42ab412ba342ddd888b11552f1abede7a405f743edbabbda0cb4d42dfc95c0f29da64aab08d09c0cf3b24b0771438f23b SHA512 563c00bd712002ea3b3771e7f6c2f27b478fb78cd91b1009cf498e487b81c8abe04e754873f77f625e56594f34e282307c325cc6609bee2f6e856d0e461aa252
 EBUILD awscli-1.25.97.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 EBUILD awscli-1.26.0.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
@@ -26,4 +27,5 @@ EBUILD awscli-1.27.2.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231b
 EBUILD awscli-1.27.3.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
 EBUILD awscli-1.27.4.ebuild 1844 BLAKE2B 7f8265feaccca47c18e706c8f216be88116d7bb0e406e5dbaf1a4d92826de02fb80b522daebbadca297d26fb5e84a9d2739c998ddf8ae736c304c4b046df7b87 SHA512 17fbf378dd5bf9afe1fdb2d6d7e22d610eaf863063d751a68c76bc1cf9e3c2896ba6b4c44a15e5d2aebb5e0881553d2031e378e9026bb517921cef677e917066
 EBUILD awscli-1.27.5.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
+EBUILD awscli-1.27.7.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.27.7.ebuild b/app-admin/awscli/awscli-1.27.7.ebuild
new file mode 100644
index 000000000000..9bcb01ac11e2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.7.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 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 ~arm64 ~riscv ~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-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 32244aaf672c..8130c8cc4cc7 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/chntpw/Manifest b/app-crypt/chntpw/Manifest
index 06ab562f1449..7efc09e8be2f 100644
--- a/app-crypt/chntpw/Manifest
+++ b/app-crypt/chntpw/Manifest
@@ -1,5 +1,5 @@
 AUX chntpw-140201-missing-stdint.patch 596 BLAKE2B 093eb3d96bd34d6d436e69dcdbee64433af52e9f5db3fb92bbe110864040694db3b41ce53e29a4671649a870150bb90fee8c7e1211023cc8d153b76f456df8de SHA512 ab88107c1df99e7fd544a5779f1a9526a3e6d9c93b121f9076dc668e3823e63056df284bed60dd48f60ab2eccb198beee3a26292820805f1be1451776cc46531
 DIST chntpw-source-140201.zip 1404098 BLAKE2B 86c93861983613496fcd82879a5b000537d4a7ee2add466aa26c67feabefdb5363f610234f99615139997a04aedb448468ef8b29cc6c4bf49b2e295f41308644 SHA512 a26d747f6e077d1bb3e9b8077781f8c37dd978e07b7426495862f15c9004572b706c34736fc4d1ed8856b1a43335d726b4d87c688f7f9a11fd6cc3a74d71a7fa
-EBUILD chntpw-140201-r1.ebuild 1078 BLAKE2B 27f7eb5f894c7e7dbdd8b3367facda8bc2c9fb3405f049c278297e17bbcaf05551675f620995b78de36cf20ce7daabf7c6d25e7f38c5bd5308e22aa1f8868393 SHA512 f6d226d29c61f2a51560aa76a849589e452f50ec0622e67ac20683c418d4d3e4dd2d4e205e87716478b24a2768d9b45893752f7efdfa5efc645fb379644585b8
+EBUILD chntpw-140201-r1.ebuild 1076 BLAKE2B 4121569dbf98b0f80d1ac9503e972dcdcbb53208776fd26d8d4b614b8bdc3fbc1b5a06d6e2437938e7cf64644872f84659391d009bd22b75388be2f2c3b857de SHA512 f315bc2074aba9b9cd9cc402c338ec7a5dc612965ee75f5cdb4d13564a457e5cfbc799be1aead5fa57a039f0df66c52c5a413030b5a72e7586096a3ad54af9d5
 EBUILD chntpw-140201.ebuild 1036 BLAKE2B 806bedd22b457eb6d7d1c442b6e08088c1790919229f722238f74376de452ff7691e8a6beafe468c2e2367b916fc184b03489b6206ccf446f8078e5b3f5f78bd SHA512 6905f1d416eb5466cb7fb1b7c5d3151fbbaea17433445b7ffbab48120dd00798389d4574e357a86ec6ae96adfdeef07c1ebef8dac772a399c2159f5b8f4e64af
 MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/app-crypt/chntpw/chntpw-140201-r1.ebuild b/app-crypt/chntpw/chntpw-140201-r1.ebuild
index c68238d8993a..2aeae846a75b 100644
--- a/app-crypt/chntpw/chntpw-140201-r1.ebuild
+++ b/app-crypt/chntpw/chntpw-140201-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://pogostick.net/~pnh/ntpasswd/${PN}-source-${PV}.zip"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="static"
 
 RDEPEND="dev-libs/openssl:0="
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 0e3aa56d3cc3..82590246270c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index d38ae4202f58..7183e74cf526 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -8,6 +8,10 @@ DIST vscodium-1.72.2.22289-arm64.tar.gz 112762927 BLAKE2B 0e1eee14f65eb438f0ecbc
 DIST vscodium-1.73.0.22306-amd64.tar.gz 119821329 BLAKE2B 89da99e0d2f7484d24a0606d80f3208b4ae44db726e094a4db25029e3dc2ad8ccb5c6bb12366ff6bd82b9621926ed8cf1b30d3177a677fa5981e47f8a4f73f45 SHA512 b2064d77055ea18b4cfe9cd445c6c4423b82e453b6e479ed6f3c00855c6690bb3b1796b046c7c59ea838c29e2141e3fcdbb83f3f7465342bce2bba84a9880247
 DIST vscodium-1.73.0.22306-arm.tar.gz 101863338 BLAKE2B a635be308af59f567a699a606511d75454605caa9e299b5d854998b8ae537669cdaf79888447484e223fb6d4e56a30ef8f0cddba605f96961eddde1383418fb2 SHA512 882c770fef8940f33de387ebb70de03ba2569e5d89f19ffca4bd079ca9a953bce957ec5650337b9c4b7f30b7fb656b41e69061a147f531244acfa5ba76e3197c
 DIST vscodium-1.73.0.22306-arm64.tar.gz 112892547 BLAKE2B 81cbaa37d557d2e67eab2857afb08ebdde3a8ffee6814000994fe4c7d9871fbff5d4c57e8f46d70b7b45c70d9910a49f9c45af157f499031a1f6fe0254fbc75c SHA512 b4467bb2d8254f8c7fa51c2ed299a2d38e5c1a92aa6d19a3d268e0ca0c029f48b982ff1aa652a5336e42ebbb6f88bc611bf69bb143112520b1846e6f9a2064ff
+DIST vscodium-1.73.1.22314-amd64.tar.gz 119819615 BLAKE2B 5937f0cdb22098eef709c84ca1f9efd9a7af094e8d1a236385d79ccba7499224b7097429b8ecdbb17ee7b879790557fd069bda1094c9dd3a5cd3ae34b92b6e73 SHA512 ab92cdceebbf6352b9c0f882f79d2c3d4c2d7ee301b7942dd703ad02406b9fcec9bdac3eb2c46cc921b21d5170780404f72b961a33a91fcbfa630daa29da7262
+DIST vscodium-1.73.1.22314-arm.tar.gz 101865243 BLAKE2B b414e5a07b8dd1b64e260227abc6771a864c7604161e7df6a7c4ed865fbda8f500f4d0734d0b87e13e6f0a9ea5a5a93ece551c0ce1cc7a320c71b9a12ebc7dfc SHA512 4f1c03941922b6e5e0c8c846a2f9a7435ed697b83006841492d9622901e83b5b39812a6c8c053fc856ec92060bbb0fab3509f34c5dc147cd4a35f651efa79fa0
+DIST vscodium-1.73.1.22314-arm64.tar.gz 112895655 BLAKE2B 78889f118f2c6eccd14a365c7224775ba1e078eb9c65feffc8919493d06e36f4abf007b5596b354eebd1c0ae94cdaa4e11acf0add494d38d82bf334adfc5ec36 SHA512 c7bd117dcbbe03117befe73e112fffd3c754ca921e3b37b3b4fd78b0e1689201c5e7cd39ad206a7dd157565664536d493701bc583d870b28d01d9abd18016e96
 EBUILD vscodium-1.72.2.22289.ebuild 3141 BLAKE2B f8f5b25c497036a9c6a9ad5036a0d9fc2aa023999f744fad1031e0f5f337e34018170fe3cc9a8e19f9180dcee7e641b10ef96bc91dc5e86d7e2cfb0fe6e3a8fc SHA512 465df4a73d9f6d1777bf274bd297210237b9ae2b87346f5da03f19104a76a4be38e4cbf669427fb4ccbeaab085daf8c4d3151e899618fb84bf6385f731ead18e
 EBUILD vscodium-1.73.0.22306.ebuild 3170 BLAKE2B 229d10766c369e33955575a4edcf76cd8c1877c29a1fb6987031324ee18c1bb0085b5fd613f65cec059475ad711612201fcc77136a92609a4f52c73c4726b4ed SHA512 c9910eacdaa82d10856f9dd180df883cb3a5a0ca57643f56424180ad256da46c3578184d180d36da15381842852c2f0f91cc48fc894e74e4bd17bf503647f5e3
+EBUILD vscodium-1.73.1.22314.ebuild 3170 BLAKE2B 229d10766c369e33955575a4edcf76cd8c1877c29a1fb6987031324ee18c1bb0085b5fd613f65cec059475ad711612201fcc77136a92609a4f52c73c4726b4ed SHA512 c9910eacdaa82d10856f9dd180df883cb3a5a0ca57643f56424180ad256da46c3578184d180d36da15381842852c2f0f91cc48fc894e74e4bd17bf503647f5e3
 MISC metadata.xml 1302 BLAKE2B ff0c1f72c2394f21e13b89831493df562ca15114fa5006262f794d3f2580deaad01d7e01f87481dcc75cc5044c8b4950955dcc3dbecbc8cfc7a6ceafaf078fb6 SHA512 8ec965d8544c2ab31e3c2f2f3c879b084126880603681fef5e5158af1bc1f2f79351b68284f6a101d486893f968594e1537df1eedeacdebffdf51de7a38ccb25
diff --git a/app-editors/vscodium/vscodium-1.73.1.22314.ebuild b/app-editors/vscodium/vscodium-1.73.1.22314.ebuild
new file mode 100644
index 000000000000..64ee4a6f829e
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.73.1.22314.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
+HOMEPAGE="https://vscodium.com/"
+SRC_URI="
+	amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
+	arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
+	arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
+"
+
+RESTRICT="strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE=""
+
+RDEPEND="
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		( app-accessibility/at-spi2-atk dev-libs/atk )
+	)
+	app-crypt/libsecret[crypt]
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/util-linux
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscode/bin/code-tunnel
+	/opt/vscodium/chrome_crashpad_handler
+	/opt/vscodium/chrome-sandbox
+	/opt/vscodium/codium
+	/opt/vscodium/libEGL.so
+	/opt/vscodium/libffmpeg.so
+	/opt/vscodium/libGLESv2.so
+	/opt/vscodium/libvk_swiftshader.so
+	/opt/vscodium/libvulkan.so*
+	/opt/vscodium/resources/app/extensions/*
+	/opt/vscodium/resources/app/node_modules.asar.unpacked/*
+	/opt/vscodium/swiftshader/libEGL.so
+	/opt/vscodium/swiftshader/libGLESv2.so
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	# Cleanup
+	rm "${S}/resources/app/LICENSE.txt" || die
+
+	# Disable update server
+	sed -i "/updateUrl/d" "${S}"/resources/app/product.json || die
+
+	# Install
+	pax-mark m codium
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}codium
+	fperms +x /opt/${PN}/chrome_crashpad_handler
+	fperms 4711 /opt/${PN}/chrome-sandbox
+	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh
+	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
+	dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
+	dosym "../../opt/${PN}/bin/codium" "usr/bin/codium"
+	domenu "${FILESDIR}/vscodium.desktop"
+	domenu "${FILESDIR}/vscodium-url-handler.desktop"
+	domenu "${FILESDIR}/vscodium-wayland.desktop"
+	domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscodium.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "When compared to the regular VSCode, VSCodium has a few quirks"
+	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index dd791e67cf31..472d9395a130 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index 3f72586c39a2..21a19f855efa 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,7 +1,4 @@
-AUX asciinema-2.1.0-setuptools.patch 518 BLAKE2B 5d25d52cc9877744fd58be2d5f5b4ce0667652e4911d63ed64cd80911b9f84cf99e2b5c30f097ee18ac4adf8c36e69cbc9438ecdfa5588356636ed8de703a1e9 SHA512 e52d3c21318624a2a5abed08cdd485a6006e3e1278e59e757261b4f6f72224b51e8e171fa4fa5b010d1f7f354856848cef3f0fd1c14dca134cdc6b875d62c560
 AUX asciinema-2.2.0-setup.patch 543 BLAKE2B 8b874ea6d4d46355a36367c7630084303da745e1eda7dd6ac01fea79392a4e323827daef7eeb6a77f1dc33841e42ee5c1d6fddb082b2942363706dd1ad6df195 SHA512 302527fc492416495ce96d315e9398a24c2098338fdc33b7df15d2b9fece084c21b2a7d446a9d3cc92aad9dd523aed72c4e8d53b897338d6dd273e0697acf0c4
-DIST asciinema-2.1.0.tar.gz 82022 BLAKE2B 2f7c68caef228a6cb98f3503212edc393bd8f7a3653a369b0509d45a6e19b8373630fac88498a771c0eaa2a322a95ab816b268660b8b2384d1ec25c617b06a5a SHA512 df77ccea13e06e9c5feda22be2366aa702acf510fdc6cbc9a09b20d67ae43a47214891fbb5ef080ff9af9c3ee2f450694c306ee1dbdbdef3f9862dc6dee60750
 DIST asciinema-2.2.0.gh.tar.gz 88566 BLAKE2B c96eac56714a4519d462bdf24f3fcc0ec367af94182e6710d4744113c5ac3ec9304fbda30f3489b84bc4b645e43ea44d633230128d79a576d4bcbe7dad528ba8 SHA512 bed0b6a3228b973dddb2f03d0b0e16af0afd6e1c4c8c1379999d49b22ed658fed325f902f462156745631f98b51675565b7ea0011512c95c8b0b3bb09552bddc
-EBUILD asciinema-2.1.0.ebuild 655 BLAKE2B 74ffa5769978b5d2cccb0b77ee7fe59a485ce61c20cbe5c464eb44e5daaf19ce0e22216ef8312455bc91704ca5bb091529f4fa256f6ebb2a3409da51e038a33c SHA512 3757c086c5aaeff116317e1bf529a4bd029a5a85af5d372068dfca8979bdf8e18fa52021149a539ea379d7a971ed8f7b0f57992fd895a87a38892e449d0a29a8
 EBUILD asciinema-2.2.0-r1.ebuild 685 BLAKE2B ff9278d91cf43298a0ff7e6a90dd02a2fe38b8ab3e480532566d9a9140be3c676be885aec37e0d12553de67e25cdf4ce5954a7b939536345b3b1a8701f8e5a20 SHA512 ea741486cb354603a553915daefb8208a7a9d5054e9a48885ac892f68c086b306eaec111ea7769aa716b045e2b382404864d2448839ee5635119f33e718a1841
 MISC metadata.xml 385 BLAKE2B f2b8a62b093eecc73e9fcaffad696b04b8d99d7123999afb566b55505a035765c11b8f8b7ad4a91fb346e474741d94a96e9cc9936a5040c15bf2582ed0fbeba9 SHA512 13c0a69cf14f3bcf6adc6ba333231f5e73df0674845280ed701f472e9aebbdb1181353aff7da6f95476e6c64eb5ec40d9b2ecc2e195be9476d021b55e205076f
diff --git a/app-misc/asciinema/asciinema-2.1.0.ebuild b/app-misc/asciinema/asciinema-2.1.0.ebuild
deleted file mode 100644
index ad5693a07806..000000000000
--- a/app-misc/asciinema/asciinema-2.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
-
-PATCHES=( "${FILESDIR}/${P}-setuptools.patch" )
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i -e "s|data_files=\[('share/doc/asciinema|&-${PVR}|" setup.py || die
-}
diff --git a/app-misc/asciinema/files/asciinema-2.1.0-setuptools.patch b/app-misc/asciinema/files/asciinema-2.1.0-setuptools.patch
deleted file mode 100644
index 5180f2760128..000000000000
--- a/app-misc/asciinema/files/asciinema-2.1.0-setuptools.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 014b1fead4c0130e14c99f54ed521d5d0535365a Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Tue, 26 Oct 2021 19:13:33 +1100
-Subject: [PATCH] setup.cfg: fix deprecated key usage
-
----
- setup.cfg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.cfg b/setup.cfg
-index bbd4d8d..17afd12 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,5 +1,5 @@
- [metadata]
--description-file = README.md
-+description_file = README.md
- license_file = LICENSE
- 
- [pycodestyle]
--- 
-2.32.0
-
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index e7165ae6589f..d7b3fd0373e2 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
index d1c5307876e8..6005b2487db9 100644
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@@ -2,7 +2,7 @@ AUX sqlmap.bash-completion 5757 BLAKE2B f602d99b6b0a30cf405b390eaef355f7a4b4fa42
 DIST sqlmap-1.6.10.gh.tar.gz 7206382 BLAKE2B 2beaf7d49599f7e8072d0725bc58d00c4fd1096316080013f0892cd1c25a2b05c5682191bc87aa9210b21393142aafb43c8ecb5855699716f287e01be2b6ffff SHA512 a2d08f62a4e78fee6761a17b45913dc8794ec07ae466042f41bb5ba524221d670ae6c8f0cde92590d45f0919cb52c1fb98b83e58099eba1b0fd8e833d68d12ad
 DIST sqlmap-1.6.8.gh.tar.gz 7205751 BLAKE2B 49fddc4b7c62c9baa5d6732bb9150bd2b3e48a671f9a3601ffc0821d5784fa02fbba37bc057ecd43888c2678ae477cca46b279e59b8a672310836218700df241 SHA512 e8849bb727ca84540fa9e44e580470aa6d853f7fcd1bddc2a51a5e4366a7eceedde80b3bd334f16753d5390ee0ac15fbd81551e79ada817bb11b6964dd439c9b
 DIST sqlmap-1.6.9.gh.tar.gz 7205911 BLAKE2B 7da1ae0201d0194c67bfc02b5f2e4e0319eb5820129da7c2708ec8012a7e9474a798767331c541ecea4e078a21d7117a2416ce7e2d135151512019e0ddc543d2 SHA512 ae1b78a75b591162898aaf273d476bd0d4a414820169c463e0694105e774c487bc546c6eb134d8200a51ddb152f5204134032e60f51484ba1a15af7040211d4d
-EBUILD sqlmap-1.6.10.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
+EBUILD sqlmap-1.6.10.ebuild 1332 BLAKE2B de701fae22dc510d882186d9ccb2b38ffd9159e1ad52408b6bf08994f9a26a83fa335d0a24ca884c3e4f85f54a46f600c7dd39163d63fdba52b14e3a49422431 SHA512 1b6efa626e7c37cfedec7c33bdb48f6c66825c6bf4e41bb61053959753654c6811f424dae6d9750c951bfdbab0f83ae2d798bca731cc771334c781089360184d
 EBUILD sqlmap-1.6.8.ebuild 1332 BLAKE2B de701fae22dc510d882186d9ccb2b38ffd9159e1ad52408b6bf08994f9a26a83fa335d0a24ca884c3e4f85f54a46f600c7dd39163d63fdba52b14e3a49422431 SHA512 1b6efa626e7c37cfedec7c33bdb48f6c66825c6bf4e41bb61053959753654c6811f424dae6d9750c951bfdbab0f83ae2d798bca731cc771334c781089360184d
 EBUILD sqlmap-1.6.9.ebuild 1332 BLAKE2B de701fae22dc510d882186d9ccb2b38ffd9159e1ad52408b6bf08994f9a26a83fa335d0a24ca884c3e4f85f54a46f600c7dd39163d63fdba52b14e3a49422431 SHA512 1b6efa626e7c37cfedec7c33bdb48f6c66825c6bf4e41bb61053959753654c6811f424dae6d9750c951bfdbab0f83ae2d798bca731cc771334c781089360184d
 EBUILD sqlmap-9999.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
diff --git a/dev-db/sqlmap/sqlmap-1.6.10.ebuild b/dev-db/sqlmap/sqlmap-1.6.10.ebuild
index 6b74d8864800..6f14fb2bc59f 100644
--- a/dev-db/sqlmap/sqlmap-1.6.10.ebuild
+++ b/dev-db/sqlmap/sqlmap-1.6.10.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
 else
 	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # sqlmap (GPL-2+)
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e7cea2ae72cb..617372335645 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jaxws-api/Manifest b/dev-java/jaxws-api/Manifest
index 96fcc5871172..869b4e10f77e 100644
--- a/dev-java/jaxws-api/Manifest
+++ b/dev-java/jaxws-api/Manifest
@@ -1,3 +1,3 @@
 DIST jaxws-api-2.3.3.tar.gz 173806 BLAKE2B 416294f78f4fdb00e8ac6a285b0820d5e7c5938b700d9efffdbac76dd37c4940bb6f4a88a1bce9f3da8ef156e56ea1f858bcba041763f0397c5f7a8b08297b2a SHA512 7663dd7a9169dbe9b7d869e318add1b3a41ea5246500afb4f1d1374f4b89a71de6a68af413b8037374c4e6fb4fa4acb8524d197eebdef6bceeee8339818905b7
-EBUILD jaxws-api-2.3.3.ebuild 834 BLAKE2B 65a4c81b5d640544912f01bcb6c21bf319165bb49a3855ae1f739cb22b875dccdf0c26045a9933fa15f6732992ed604f62a7fe89a933892f79c170ae4c0b1040 SHA512 ec36e11c36943c0bd7991dd8a0112b01753624462b6f4772ea551e346c54a369ce8c9510649fa191ce1ade209169a24ae0d677a56e1f70d7cbe8f58c9fde6cae
+EBUILD jaxws-api-2.3.3.ebuild 838 BLAKE2B aabc17e0a86fa2c2b6b287b1104805f6f089931a4e2013a4a3038424c11fdb74234fb72721d490dfbf067302cea40069d4419bbdc46cfcdd236c461d47ba4bba SHA512 220253b737353ffdde39e4d6cdb542e9242248fc40a4887e02ceb35b64d4433d9f7cd0719ce69712b72976b5498f1afca76f3ef8741967d608e3c0e70bfea63f
 MISC metadata.xml 370 BLAKE2B e86939098ed46b852efc0f844950e57b7a400e08033714fb630d4e4a8464a760b473ff58ad80fb8e729b43c2dc004505f4e944c793c81f0d0d63e4d92b978f31 SHA512 3692c24526b7343fcdaa55968be2fe74eb0e323cb0a9a5bb999dfa66d71818da5c4984057510900656a87aa63cda74822da0110b0053a111ef797868672e2305
diff --git a/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
index 5705c7a8f2f5..f9b7430e6ad9 100644
--- a/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
+++ b/dev-java/jaxws-api/jaxws-api-2.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jax-ws-api/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD" # "BSD-3 Clause"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND="
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index d637420174de..67f1a47a3300 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,8 +1,6 @@
 AUX jmock-1.2.0-AbstractMo.patch 1193 BLAKE2B b822ccada923c92a421294549ffb9f02fffeffbd7a57bdc79e0749147a361ad2cd0fed6b5b63166d21078684b235312393fb7af63a3b293d0e8a7a1f18fa70eb SHA512 53ac2c2f603aa8685aa18737b96a05fa590ed9bda8208dc06ceca159eed7dcb609a01cfb113597fad335f5ceed89d796e448c4deaffd3076a29d57c6ed8f15ed
 DIST jmock-1.2.0-jars.zip 153214 BLAKE2B 2c40696229018406f3b60559013b73b5331c223da6e2743830c4c9b8b728484b1ebed8fb347c240f50f6936c2fd1e4ee85b754315682047a87a14414effc3a48 SHA512 5290f1d14cbc3d0f223bdaf59716b037dbc021c8f39a3784d13af8d8be3edbddc5e2eb4754b80e78ae954daf12889210183e7e11c110012b4d9320344efe19da
 DIST jmock-2.12.0.tar.gz 111963 BLAKE2B d4b8c8c4ca68ed8dae3b4906e3163fa5e8e8ea8f4b993386d7fa605e0188dd43462550ae4833ab9dbfe68c24e15cf6d19a6f444ca57f666fdfe8b29734fd32f7 SHA512 b1ba12981e7379f5b07a29749c7640906c02f72f52158921d0ac02abf69c9c8c2dc753f4462ff0afa5807852a06f59a6da9ed9357ae7dc0303b0377a0e3da854
-DIST jmock-2.6.1-jars.zip 1249841 BLAKE2B 87861dad7151000e1397a54d0ded7e49c3fd81fca64afd74d6176436f336be5b5e89f73be8c124cf086798f74aef4972303137529113e3c85ba93353f95e3a42 SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e
 EBUILD jmock-1.2.0-r2.ebuild 961 BLAKE2B 66253c0e57e4a2d44378f457e41a613fe8ea76c6c7f8760178ed706bc9b29ff2be3392d52997da22b3cdcef3d845ea4e606a639a9660ba64dc45a91edff9811c SHA512 37f94cfa6c76d6eb5a5053959c68a0e38e9acf6d1f8ada58f022fb79cd84d4c11a7e91acf09950dd86978395ccfad536b28efaf8f9ab923501edf3549ccd8c39
-EBUILD jmock-2.12.0.ebuild 2624 BLAKE2B 5ada29c6bcee045669e4e2be0649354a5ffd82426ea1bcd3b9dce7414f2be777ae0ec7a4c45267197f05d9b84b926a1bf039a11359cac5fc45a3dcc0c70f20f6 SHA512 4abb6d0886be9c8f3df531f6ce3bfb0606c6d85b56dc980f371c21caef3cffd9b7737731f9f0cdd0bd72ade5f3bbf91d4e7ad173df40f2e6edca97d22a63a608
-EBUILD jmock-2.6.1-r1.ebuild 825 BLAKE2B 5e066e2552eceb12ce383abf78f52573636db5c22ef94c2769fdeb48493d5256d68d5183313faa5fc9ef01b91415df0747c2f2ab4479342a949f83467f80dab7 SHA512 52e29c763963f8afce59474aeb77a06aa67695d4cbfb12b08e064813f216445a402b520b497305d7554f00386973c3313a6b00b926d991bf481a7fd15d620c18
+EBUILD jmock-2.12.0.ebuild 2623 BLAKE2B 0cce2974a9f6e5fc8ae098da6f4d92f0a41631a09b94bfa2711af0c39adbe3823e02d874473ea42fad6d33df93460254bd7100c79f049c761d632313afe0cf0a SHA512 062470a99840ceac65148e8263d3e736db8fa46941f039e5ddbd9ac7e98d14ef0d4fc72b511324c1535ecffdaba97afd5423d2001f77b982b26782d961c1caae
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jmock/jmock-2.12.0.ebuild b/dev-java/jmock/jmock-2.12.0.ebuild
index d426c13de2eb..a258ba6eeffd 100644
--- a/dev-java/jmock/jmock-2.12.0.ebuild
+++ b/dev-java/jmock/jmock-2.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}-developers/${PN}-library/archive/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	dev-java/asm:9
diff --git a/dev-java/jmock/jmock-2.6.1-r1.ebuild b/dev-java/jmock/jmock-2.6.1-r1.ebuild
deleted file mode 100644
index a61fb1719ea3..000000000000
--- a/dev-java/jmock/jmock-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Library for testing Java code using mock objects"
-HOMEPAGE="http://jmock.org"
-SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-CDEPEND="dev-java/hamcrest-core:1.3
-	dev-java/hamcrest-library:1.3
-	dev-java/junit:4"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.8:*
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3,junit-4"
-
-S="${WORKDIR}/${P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unzip ${P}.jar -d src || die
-	rm *.jar || die
-}
-
-src_prepare() {
-	default
-	find -name "*.class" -delete || die
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f6e685ff7b91..01d5cd9f7e91 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 2393d5f55c84..77f45edae9b2 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -66,5 +66,5 @@ DIST rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 054f1b773518a9
 DIST rust-src-1.64.0.tar.xz 2437612 BLAKE2B 9bd5cb64c4ac98ffe60f15bf62517f3ba214ec788d939a27135bca4b770a7a760299ffa43090846e9a83c734a6b2d97102e51f9760f655cb596bda91214012a0 SHA512 a1867ea7a36f669fcde149578dceb8bc7503435d9c740594cd6181e0ea0e4be9d3c8b79f755c0f457bdbc3200149cd94eba17922d00610c5ff6be5fe1f8bd862
 DIST rust-src-1.65.0.tar.xz 2488012 BLAKE2B d48f5591e72e14084f2fb0d66c1365f1648060d514af23c0498e02adfd7223b1a79bd1f512859b058f9cabc4b88b9230d15960df7c30762a5263d1785b877a68 SHA512 247f822a9c2f16d1de29d1cf6fa7ff393b7c7fe01da66a7c0b4add6259d72403922b8b1bd1b511ed8a9cc0b2c12ff574945aa7fc76c731fba620b466bcdc2eac
 EBUILD rust-bin-1.64.0-r1.ebuild 6874 BLAKE2B 712d0b0046332418063598f64fc8bd0c024397e27d846e3c11aebdae6c4d29d7fc3da892b64d2d5fdc31f319b19fb380dfb5f96718cdd3cf7da6c4ee8add2fa6 SHA512 1418917f21689335fdd10249a4c7703b4271d89a103b2fd4762a28a98935944daf2e0f9da9456c8e16ab11c123d34d82cd3d0893393d2492f6e076b5ddf453ab
-EBUILD rust-bin-1.65.0.ebuild 6876 BLAKE2B a2c2e6e32d595eb450e77592fef9251e45b1066d551e2f27b8eea09f79f8f0ba46b98e5f1d814c068635d0ba175d0ad788450d525f8fd6c3abca4ce4c1296676 SHA512 89fa1f940bb4cb7066e250792e5aff914b60fdce6ce76965fcbec2203bb5fcf4dcea1a1ddf4b53a55d6625e52fff16522737c0f3cf7ce141be68554baea2b783
+EBUILD rust-bin-1.65.0.ebuild 6875 BLAKE2B e220f33cbf4c827f0dde97cfd9e24932ab0573366c87e40b4bdaf0c97589b1f37ab6dad112ea16eb835712a7a53bf9cca7e9ad441e0be570aaf4912d17067ed0 SHA512 60482400c33fc927ff613c08223a8945a2b1d8ee424d24410e572f29a0e1e6f31cd67ec56e18eab3b55f8dd9c9099e1fa7cfdc5d7572fd081f45a33bd13f9fe2
 MISC metadata.xml 696 BLAKE2B d6c2665e1859a18e6b1bf7c04a0de5adda80e34b759994e158a137219e314ed0e4890a8a7f680e1b7bfb940c04e3c0b49eb3518f2fc08dcc9e19cd5fb867d02e SHA512 b93c2ab79c454d8897948e810150cb2512ca606083a2aa2135425a69ac7b7077f64e3d86f8f8b13734640a05e668a870d70003d6dc9fd3d151ca7ffcf2fb3c44
diff --git a/dev-lang/rust-bin/rust-bin-1.65.0.ebuild b/dev-lang/rust-bin/rust-bin-1.65.0.ebuild
index 80ac71badeff..c1eaa22696c7 100644
--- a/dev-lang/rust-bin/rust-bin-1.65.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.65.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-#KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-analyzer rust-src rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 97e04e6b018f..b6309f5733a4 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -109,5 +109,5 @@ DIST rustc-1.65.0-src.tar.xz 139674928 BLAKE2B a218263fb67e306b153f5a6dae95b5ec6
 DIST rustc-1.65.0-src.tar.xz.asc 801 BLAKE2B 43ff92011cd6f7f34ce0495fa341379e5907d032ea90f91e533e5edaec6ad518aad50a9d8b2694074d6909ee96aa779403b16e95792e962e79c1b967542ae26f SHA512 75b9be53363022c81333117876cbcc573bbd4733edf767cbb164218644efb1a9c4bfc2aa73aaa1e39f248a84f1adacb1930a94a6e63f60093ff760fb9ae02efc
 EBUILD rust-1.63.0-r1.ebuild 23703 BLAKE2B c49c010a8b6b947148cad4df27ada9b52b045826238568d298fae2ef74be466ba3a8b8cce1c8d727b74727c888c3c8d3be7afa908ee8dc567c467b0f0cfd329e SHA512 b5c88034b71d09b227a725521e84247c89594b56df5871c93a35543b5440ba700e2553cc07a98467bc6b9664159e2cf273417ab88a6eb3039780dbc8c8ebdb2b
 EBUILD rust-1.64.0-r1.ebuild 23867 BLAKE2B b9d8aa35b84e668fb038fb813bfc6bc2bae4dce945e381cff0645a1fa9463a8cd30aa92e0018a407263929bd0da169191de136e634c9edacccd1ac0ffb69337b SHA512 4a174b1d34e6f7bfd860629d0bc06e99a7accf9eb7c7bf51f10db8b255237c63b3a5aee1291dd2ceb404676a67f5e507a7414ecc132c5926ee292cc047b0ced4
-EBUILD rust-1.65.0.ebuild 23874 BLAKE2B d711bf4d747cf4c9e5b69ac1e58360e9268fbb2fe15bac8f9f5dc2c2ff4af68a59339cd85192ef73a8004d438be409e16101baa32317b9cba618b441ee50d6cc SHA512 949541fbb80020a99e21d5fe70e22a9ec5dcc89b71cc95222a358dd0d08cbd52c088f6e1f3510766bdad5b558c5360270d1a595e1076f5d14c7e3d7665099704
+EBUILD rust-1.65.0.ebuild 23994 BLAKE2B cd4ca0a5ac1ffab3eb82559b6e41c97387fbac43b5a2c693880bf60b05272f4b1cc684989754d2bfbc02a982edc00a52b553bb87f839784f25ffe09c866a50a8 SHA512 76f6390bc1ce84cd3c92b30932451437cfb2e4093877e63bc424dedf7b283c0aa5ae531a3c2e9ebe91486ed8721abc72cf6cfc5bd2b4bae05f48a7f6ae1e5f22
 MISC metadata.xml 1770 BLAKE2B d5881dc5ea39a5bfff7c74fa883dc1a6370db572568e10fce81467c2f2a17018de48123dfa7993d6d9644305bfc5ef5b0f445ef40362065fce943efb4af2e761 SHA512 c914e1a0cee95fa5cb332240f3eb6fbee73e5d8baabfa6bdcdc3e852c9480fea0686e435b969e14f45d8c791655edc6e6a7df2259ac99b6a6e63af65b09fa57e
diff --git a/dev-lang/rust/rust-1.65.0.ebuild b/dev-lang/rust/rust-1.65.0.ebuild
index eed4becde219..6acf8d38fb67 100644
--- a/dev-lang/rust/rust-1.65.0.ebuild
+++ b/dev-lang/rust/rust-1.65.0.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-#	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~sparc ~x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
@@ -121,10 +121,13 @@ RDEPEND="${DEPEND}
 	sys-apps/lsb-release
 "
 
+# FIXME: https://bugs.gentoo.org/874885
+# rust-analyzer should work with wasm, but currently does not
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
 	miri? ( nightly )
 	parallel-compiler? ( nightly )
 	rls? ( rust-src )
+	rust-analyzer? ( !wasm )
 	test? ( ${ALL_LLVM_TARGETS[*]} )
 	wasm? ( llvm_targets_WebAssembly )
 	x86? ( cpu_flags_x86_sse2 )
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8fa88b9273e0..9ab62e87b861 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index bbb464765bc9..347adfe4f88b 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -5,6 +5,6 @@ DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563
 DIST capstone-5.0_rc2.tar.gz 5761725 BLAKE2B 2f5074fe1881309ee2d36cdfeba10bacefbac5c994d42dd3b08c07fe8b70e298d9d18e9c061dad1a54c6368bdc296fd02f30d77f78b1ae05074764e7041aef2c SHA512 fdc4992399a2add960b12ff2495087a97fa66dce85e87375ba9d19e02b7ea5fb16a7efa93d839c2693378f6367efc9df68f192584ba624443d3b0b197d4dcd9a
 EBUILD capstone-4.0.2-r2.ebuild 1535 BLAKE2B 15f3ca620f06cf18d35a0c18324dc0b61297e5479e408a7f38d42eb1b69ce7f97357057d18a9dcb970bf4b61a73c4564e4d90f5a07d22462ee1860d476b1139c SHA512 6a2cd3383a7f58183bb1fc621c756e4b78f4c3f70bb355e98339b4ffc7dd03c7ac7850be8db376fd00707403bfe4a27241d7c7d4a21eaca33be9e7f0df02de30
 EBUILD capstone-5.0_rc2-r1.ebuild 1469 BLAKE2B c5279bc3457e8ea39fbda2e65f1e3a1d6f804b3bc2b05ce233bd18096de5c9b57342af01d0e36feddad9a6034138402d70e827242db4375941d97fb51bd6c0a0 SHA512 46395d96c6d311721bbcb8e1cc600bf095d72ad554c2e324a51b801c0849bff621f6a4ac8eaa1fb1a853ecf6e9ec05fbb557186fa021ebf9c197556f51f2a8ee
-EBUILD capstone-5.0_rc2-r2.ebuild 1512 BLAKE2B 8e55a682151cff0ad4466a72ecad38a42d5ea916082602740534f7abb6f6fa8004eb9b589e3c66dab06ba403a8239c3550791c06aaad42cba808f29fb9e6bb6e SHA512 421f3fad8d2d33192c07c698eef9e456f7580969617ea8762a7107e80b306140f82a077af691f6b7ae65a26e6fd5d8bdffc6d260a4457bb84aad015984206e81
+EBUILD capstone-5.0_rc2-r2.ebuild 1510 BLAKE2B 5212e30ba7371e2d2630f3f2bccecb506dad8c6f03a6f4e7136031661a0a33fcc7eb5e24af60e06f31c995a48bc8e3bca147484e8bda139bd9e8874bf6215ad0 SHA512 52d71b2a9f4645669d48f929ecad0764458e2d0961afad664045f48347caa025c1c8bb1be6842b9b07815aa2ab725ea7431634fc725b918b1cf81e855a65cfe4
 EBUILD capstone-9999.ebuild 1568 BLAKE2B f5dde9abc087427f4462f82075651dedc26931d16864bec80830c70d7423663b9b9abbbc9f67980b1b08555fb61b877b05c9612d200112b32ace2857ba6f9066 SHA512 da214669d779c3500d7eccbef4cab3c23757ce6cc155d9e45dbc644474677c9cd5946adde6b03306be7872f9037d45489e0130e0c92b40db5ed14f86ec77612b
 MISC metadata.xml 484 BLAKE2B 32c39bf06443ce4ca18191a4c9626cf517d5bd4f837c179e6186a68a0053217bf41d61d2c4d46c9792b1974879d22b36e4a02fa461a1b085acf5c4406bde4891 SHA512 f06dcd3133982f72cf21c5bb3d9a34207d7083233b5e70856f6a1dab60ef361cf1432659af30ea6b90fcb38cfdaec49f0792623ef841e136bc33cb5e1c40d1cf
diff --git a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
index 854077b25d6a..0d7962784225 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.g
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 IUSE="python test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 97d25df61e36..d61b228e42bc 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -5,7 +5,9 @@ AUX nss-3.79-fix-client-cert-crash.patch 912 BLAKE2B e05e061c7a0d82af6f00bf9ff68
 AUX nss-3.79-gcc-13.patch 1058 BLAKE2B d0249304f09fdea7e391732e7da63344c3e29c1856cb5ddb9e55a27305ab050077d138d9a8fdfbd6573bd7e7a345ed39f506e534464c3caaae925d1717b75edb SHA512 24dd41401b44ce86498a9b42f96068dbf58c6814ab18453db0615d49bdf327610a1ee2b0e32a2905a1c34364abd8d4c162a179f6b57cac19068babebbed229b4
 DIST nss-3.79.2.tar.gz 84825187 BLAKE2B 9589095a0f3af5201662fe96ba4dac73c661db3abde534941ea61d597dce1016dc06f8559e26fafc940f2b123987381e1faa22ff6a995ef3cc0a9dc4ebe7a4ad SHA512 52ca7574d2bb6e2fd874ac40f3e75d58135b103d8bd4b964a9262b5c302b4668ff7c8f5dabbef46e413fd72faeddc44057bc7b489946813331cc9a481d078181
 DIST nss-3.84.tar.gz 84851235 BLAKE2B 5dead5ae336998db97acc6dc2a59b387aac9baeba0f2fad6eaf921bdc894867f6177179545378091d9b50b295b71409781b5ef5044222afe7a1cd2f920a7d15f SHA512 b4ed4b2e44d9f896a4a4c33f92813a84825dc4502f4e14e047f3583666c453138515e6edbcd71144c4b02a8ee16b3443803f1ff12458fd82c338ee1dd911b175
+DIST nss-3.85.tar.gz 84717969 BLAKE2B 644a51cd747078688233850bee6884b7ee30076411d783a4fb2982ffc35883f51784440d8c1c727251f664c4e5b5071be9881abc8315e0294d7da0cb8727e897 SHA512 97cfffa2beed1dba5d31e0c6e450553e5a8c78b427521640adb00c05d9d63cd64dc08388f0dbf96c93efb79f5daf4ba8db8d026b0b43d2e5c865a9b833fc77a1
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.79.2.ebuild 10529 BLAKE2B f6396c9e295c46ffc0f9f811251f459b42515212c4ed8c5c21db1b6df1a1aa84b8da4385749d8067ce1f0d95633dd9de6eba146e599c3da4a4190b4906e9f878 SHA512 1b4c4b0471816d4ab89745bd3e34b232adafc93537ff631413e7e4cee460167504d1b972a1c48b0b3c6bb324a8b2e564b162b1bb63f73ac5413599239b15ec30
 EBUILD nss-3.84-r1.ebuild 10544 BLAKE2B acf4bd7fe95e7641da05291d12c07b8bce7b9414bbf7d6ea09bde49680a0e76ca89329347a86ebefdfccb4d6d407e3c8ce3fa6188f676c871f5276aa76c98ca7 SHA512 e4898c72a3a12e3fbd1d07d312542799be191ec5cd15b851915bf1b5dbfd312cbe5a3a8f3ab85af1d2b8a115ab0531b07e52aef17aa886e6eb64b1bb619eac62
+EBUILD nss-3.85.ebuild 10544 BLAKE2B acf4bd7fe95e7641da05291d12c07b8bce7b9414bbf7d6ea09bde49680a0e76ca89329347a86ebefdfccb4d6d407e3c8ce3fa6188f676c871f5276aa76c98ca7 SHA512 e4898c72a3a12e3fbd1d07d312542799be191ec5cd15b851915bf1b5dbfd312cbe5a3a8f3ab85af1d2b8a115ab0531b07e52aef17aa886e6eb64b1bb619eac62
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/nss-3.85.ebuild b/dev-libs/nss/nss-3.85.ebuild
new file mode 100644
index 000000000000..33bd21cf6e8c
--- /dev/null
+++ b/dev-libs/nss/nss-3.85.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.35"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+	"${FILESDIR}/${PN}-3.79-fix-client-cert-crash.patch"
+)
+
+QA_PKGCONFIG_VERSION="${PV}.0"
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+		disable_ckbi=0
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+multilib_src_test() {
+	einfo "Tests can take a *long* time, especially on a multilib system."
+	einfo "30-45+ minutes per lib configuration. Bug #852755"
+
+	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
+	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
+	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
+	export BUILD_OPT=1
+	export HOST="localhost"
+	export DOMSUF="localdomain"
+	export USE_IP=TRUE
+	export IP_ADDRESS="127.0.0.1"
+
+	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
+
+	cd "${BUILD_DIR}"/tests || die
+	# Hack to get current objdir (prefixed dir where built binaries are)
+	# Without this, at least multilib tests go wrong when building the amd64 variant
+	# after x86.
+	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
+
+	# Can tweak to a subset of tests in future if we need to, but would prefer not
+	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 3aa74ff04bcc..c2dba275170e 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 94117aa28de7..c8bb0b92ddba 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -24,5 +24,5 @@ DIST sbcl-2.2.9-source.tar.bz2 7258148 BLAKE2B ed7c220644120c467bcf2ef0a254b5065
 DIST sbcl-2.2.9-x86-64-linux-binary.tar.bz2 11641067 BLAKE2B 4afeb6c3dee6d0b13790b005882d0702978f039feb3dd85fc483282b04b40ee797f8506f2db1611abf148589215583640f02022a11d4e01e854bd4a566fdd48e SHA512 53f9da74dd18056cf086e2f2258949eb53cdaabe9b3f24b004378e65c7a3ae5821a8501868415d662fc24d59bd0edb2c3b67419ebe48d459e8546e17fb692400
 EBUILD sbcl-2.2.0.ebuild 8344 BLAKE2B 1baa54b857fd84c98ca24cde84b6595a9b4d58df52205e41620b2bf028b40af77d3f50ba43b82949fd9c86c4e75653c080ee031b1be29bb3c50543b0b49fef72 SHA512 644db987685fbeb15e5eac754ac15138958c09fe657be8838ab18f9df336f3b86b0f34003a74c43a3d32248bf7dfed1752cdb302abf85fa882fefc46bbf92a07
 EBUILD sbcl-2.2.10.ebuild 8402 BLAKE2B d90f2214836876409168a845191e0191892268ce5d3738268b5267bdcbe9e6572876361cb9b9c0a4f63d65bd7b1daa7fb8715967f561743d30bb5b058b3c7768 SHA512 dc0aba7a8a22db78238384a9940f39e8e89b066a478c7aae2e0ec5c70c16d1fe832948f245e7cd14f62ba59e0fa016e11e630dd8ac49f041ad28e8218dcdecc3
-EBUILD sbcl-2.2.9.ebuild 8492 BLAKE2B a702e452779c88ac3384ded0eaa75ce46a67f231c3f5b814982a93f6f40f5e9ea3f375480c600470d3b2e6a1982d5f9b862cee718eb85e3ea144285208234853 SHA512 616ee075c1f7e64a91af60032f6ce935b9a734de12d08dd6e5a7f2d0d9ccdede211f7c19f5a4b7219ce4678d43b1228e99fbf0ca7c4b3ce3c00c66cc6ace028b
+EBUILD sbcl-2.2.9.ebuild 8490 BLAKE2B aacb9179bbdd961b5575e4a704a8d9ab88a935daa07b151f0fa06de8e72ee80ba80b3e0699af75d6e55fcb1693def51480bc617d7890c953e52a9c822c2bc2bc SHA512 0583c30d496ffe54ad3aeceab39652c473ef91d2b98d36f781bcdeab023ae40df79fff9ba33eb18d51a2499bb17f9e56905e028a529afb945503dc4be6bf0d98
 MISC metadata.xml 1400 BLAKE2B f8ed0f7714ec54e42a3e17162a560d8cfb68ac2d981be02a31e5e64820d8e6cf1dbbc2774b52680d265042a48dfb497497a8d84289cfbe7da7a919ead68eadfc SHA512 22f3ff1dcd58a222319d6e4d46fee3b863ac3dbd997ec9a167e0038e28483d12f0f106332b2cb610cce0749f12828e68d71675ef43aa4dcd54441def6f9cb955
diff --git a/dev-lisp/sbcl/sbcl-2.2.9.ebuild b/dev-lisp/sbcl/sbcl-2.2.9.ebuild
index ccbdd2a533cf..a18941194f16 100644
--- a/dev-lisp/sbcl/sbcl-2.2.9.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.2.9.ebuild
@@ -39,7 +39,7 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="-* ~amd64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="capstone debug doc source +threads +unicode +zstd"
 
 CDEPEND=">=dev-lisp/asdf-3.3:=
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f59d3b1b69d7..8857b3cde046 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 984fd24c79ac..39d4d4bca0df 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,6 +1,8 @@
 AUX aesara-2.6.5-compiledir-tid.patch 1707 BLAKE2B 77f8fa3618f930dddad8e864dee3e73fc0b965018d508be5877d5bcae4430024c4e4f90e905ac912da22a4d4934d6fc71acf4ebd49b7e8efb12c90dfaa072ed2 SHA512 9b6bbd8bc56f61c89dfd85cb18251ff8d73d717d91178efa9309e6b897dbda28937dea84f1d7d1a917c285219d51c0adcee1233112f2dcdb9f8c7b714a6c6c12
 DIST aesara-rel-2.8.7.gh.tar.gz 7944368 BLAKE2B 6772a8f88d9480044f0da275925577f85d86ef77a1f500f079478a5843ddd4afe2344e00664c5be06a8098587754d3fe7aeb71b8fbc4f12160263b5b98a56de4 SHA512 5f0646af9d9525ab81365fb1e8a6e3ff783bf8fe710ea6fafa91101903aef592d3db42cff47b0620132431198c5d7d16cad65d5668dccdd6b42a7ee62aa12ac6
 DIST aesara-rel-2.8.8.gh.tar.gz 4350570 BLAKE2B 27bcebacef4a4b7a9d38371f25ddd41c4183fea1ce1824a36298311e66d86dc11ef2e0af10e7e0b0cbb0f007aeb22d65b2f745d645c4e393deb44634c146a101 SHA512 42e0a2f9372b4a9df5351b1459930758589a30b7c59f46d5d97c567de353499d16c47f55713dd374d5ac258f56b3484c370fd4d1ad1437cb01ca2eff6f056e71
+DIST aesara-rel-2.8.9.gh.tar.gz 4351952 BLAKE2B ffdc3d33caba5cf5edd3dd15e62cd295dd23f944ac6d76461e9e43717a4126669391dadfee51c6117911dc4236e8787d3e9ab712a0fcbd1dcb137e64f9f994c4 SHA512 3fb4374899ab71366961a07c750f594505467cdab01b6851b36d1dd924b816117ebe488a6cae548650df393c8447de69e21ce2cf6eafe34e951b98f27c3a4f6c
 EBUILD aesara-2.8.7-r1.ebuild 2921 BLAKE2B d3e76a3c595760fc8dcea714ace28ea76495a96f6ea09081fa7cc81f13667ef2ac1bc66e61aa9fb7ea188ad0b2e347960780e17b23a33b9db46464e36e98fdb3 SHA512 0402a637a519d2da7d66292e582348651d1c20cd2e32e9fe9b2c1093600086897a5b4b3100c0ed9452b71c0128d973afdc058e477067d45d875fa8ed9be64dee
 EBUILD aesara-2.8.8.ebuild 2914 BLAKE2B ddf789d71bc4132a37976153096b8ebbb9cf8e5ee7fa0357a3d7b03cea24826d0cd112f4bf92341873ab95a80813086082b8583ce1e74d15a6fb196cb1261c6d SHA512 4ecbe1c2768affa5c9413eb86fee5e9f7e8ca71d21e3c832e08edc22fa58b10f0feca8888435b6ef4b08076118a4d7fca76fa0ad3d811c69e668aa69cee2a619
+EBUILD aesara-2.8.9.ebuild 2914 BLAKE2B ddf789d71bc4132a37976153096b8ebbb9cf8e5ee7fa0357a3d7b03cea24826d0cd112f4bf92341873ab95a80813086082b8583ce1e74d15a6fb196cb1261c6d SHA512 4ecbe1c2768affa5c9413eb86fee5e9f7e8ca71d21e3c832e08edc22fa58b10f0feca8888435b6ef4b08076118a4d7fca76fa0ad3d811c69e668aa69cee2a619
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.8.9.ebuild b/dev-python/aesara/aesara-2.8.9.ebuild
new file mode 100644
index 000000000000..50d3e3cb6fd9
--- /dev/null
+++ b/dev-python/aesara/aesara-2.8.9.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-48.0.0[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
+)
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not claim "bin" package (sic!)
+	rm bin/__init__.py || die
+	sed -e 's/find:/find_namespace:/' \
+		-e '/exclude =/a\    doc*' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+
+		# dunno
+		tests/tensor/test_elemwise.py::TestDimShuffle::test_memory_leak
+
+		# TODO
+		tests/link/c/test_op.py::test_ExternalCOp_c_code_cache_version
+		tests/sparse/sandbox/test_sp.py::TestSP::test_multilayer_conv
+		tests/sparse/sandbox/test_sp.py::TestSP::test_maxpool
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package jax or numba
+		tests/link/jax
+		tests/link/numba
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AESARA_FLAGS="cxx=${CXX}"
+	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
+	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
+
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+	# clean up the compiledir, as it can grow pretty large
+	rm -r "${HOME}"/.aesara || die
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index d94289ff80b8..2366b4ac4cd9 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -61,5 +61,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST zeroize-1.5.7.crate 18861 BLAKE2B 5f203d91aae732b928e2acd02656a486f0f930b8daea96b927552f5790862489d83c7bd48b0c7c62a3273e7a04833a16149ce489847f17fbb037e88922d359a2 SHA512 e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9
 EBUILD bcrypt-4.0.0.ebuild 1700 BLAKE2B 40bb112ef6e82a46b77af5c20b3f51c77206ab9dfcd3476dc09d4d0e7ac26f1f29510ac7d8bba445939600469e5d16d1c90f16d434206d6b7c1d99a40cd840a8 SHA512 2537e89d1f9e8e8380483440c84f32a4d1b057c2bb1767508ab784f6228b4d412666ce56c871f1ba0882b9098f7dbb0e4ff294b211d16d5824ad6963c1af2c3d
-EBUILD bcrypt-4.0.1.ebuild 1706 BLAKE2B c3353d43ea9fcada84c3cd39b3a99d305f82497a83d99981e3ec5c66b5792eb13586904d1b642b265ef195ff449c232ca73fe1eaae91e7198ddb21f1b675a181 SHA512 7874a335c63209d79e29c715d2a59da60350fd3c02d08c68052393def6790ad622fefbd083368d231308cc16209c60e657dd728a7b35ce9c6cdfddf7f28bf6ef
+EBUILD bcrypt-4.0.1.ebuild 1703 BLAKE2B 6182772fa8b98ab0f94b389770b8d8a9363ce841a513409063b7dea495bccfd7193d3f303d7fab7159c904f531ba4b0f3493d4e50916f6ba620b820024c89fd6 SHA512 10c32d90ff4b328d6c1e43d3561814a9f15d5fd3fed4eefde330f139f577b3fd3890aeaefcedb27e44855c49342607f78d5afb8378c6b1f82dee4e58b389acaa
 MISC metadata.xml 486 BLAKE2B 874ef427438f2a2adc0529010628dd40505fd2597e267b8e51641d95b4c3bd8dab28d0fcd86c23f24c3abc866bd049d5e44438b282a5a13b023320491303a5b5 SHA512 de2e0a2a60b83a660a7c51315816a2762d9ebdb031656b8968da641d4e3897e4f5eb7a3432f828182f733ee4ffd17f11e8fb97d9a72f1a7eec56bb2f46978293
diff --git a/dev-python/bcrypt/bcrypt-4.0.1.ebuild b/dev-python/bcrypt/bcrypt-4.0.1.ebuild
index 3392d086e3ae..6ba0dd8ae7bf 100644
--- a/dev-python/bcrypt/bcrypt-4.0.1.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.0.1.ebuild
@@ -74,7 +74,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016"
 LICENSE+=" Unlicense"
-KEYWORDS="~amd64 arm ~arm64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	dev-python/setuptools-rust[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 26648e55ab0b..e2a9693a6d33 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,9 +2,11 @@ DIST boto3-1.24.96.gh.tar.gz 547933 BLAKE2B 63c347b3abb383f36e4109b2695014dda6b4
 DIST boto3-1.25.5.gh.tar.gz 550814 BLAKE2B 85f345b635fe16a978853d21192f49804837b050539aba650195bf788c7912f8713aa3a826de6f5ae4c28c4c3795e7053a2105622757f3087579e827eda3487f SHA512 6f4cd909b7a6670f74df6c7cac4a140114a0e05f736ed23c5a53351c5c6505f02d40e81ad1314db86db67d16429b38f78708e9cc8ce2cb08f28742ec209c2755
 DIST boto3-1.26.4.gh.tar.gz 553689 BLAKE2B 0da69cfa0b05ab789fc59938562efb49c3c0a46ae0dd5ca84d5e5782f7ed78f4fae45fa38cfea27c2dbb59bff2604b7f09064d2f4f35578500d379ff9f34513e SHA512 2f7058c405145d66b92412f0941ec705c111132e87121cae3f4be9fd6db4cfee3c1bedc3d952badd5ead13e2e1a4e10d4a1a7bf73b7869225a7615d5038a9086
 DIST boto3-1.26.5.gh.tar.gz 555039 BLAKE2B 0f1ca94e7a2c04a760d3452e1e51f883307f82ce9a6cde733a69b0c113d002fd3e757ca7e185b412506af9290c2d70ec78a6987a1b2f7552af95f7eaddd5980e SHA512 862ca971589a5ebe2508a9545eb5de29d3ba0f8d431b334c55770be26d1f03c2b9d250dc5b865faa72d0aaaef3f0fff01274b6c64c7506891d708da9238b7896
+DIST boto3-1.26.7.gh.tar.gz 556096 BLAKE2B 3c3b68970b707639dc0d61d04c0d05b01535a01cd8e164d202e726d9225b3a17559e0589fa40601f1a37443986ed370dc40fc4d198d0ce8da1b9ea2eb1582955 SHA512 9a6faa7942ff87827ab47885bc11d2b7f508434b879dfd1ec456ad39f0df4d9a9b0029c9eddda00dae8aad3b2bd13730d42fc2bf2e06de370d60fd28cd0d4ac7
 EBUILD boto3-1.24.96.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.25.5.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.4.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.5.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.26.7.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.7.ebuild b/dev-python/boto3/boto3-1.26.7.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+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 09cc63585db7..e69d859c0d8e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,9 +2,11 @@ DIST botocore-1.27.96.gh.tar.gz 9792299 BLAKE2B 7d4b388e0dd45a41c794ad8527287fb3
 DIST botocore-1.28.5.gh.tar.gz 9842427 BLAKE2B ed185346c21eeb0d05b39b55e99e065d9a5448fbe8206de49b3c128d12f4aabe1f6258153710350783846d10e5e10a22ccf77f6d27345297ec64e7ce74e51b87 SHA512 8b41b79826a71ed31c27534129e959e0896d9f4cb1769b4f14f1760d173500563a579aa0e00aaff5058275d5b5e8b921fed34b12825cf16ba4e216b174e4bba5
 DIST botocore-1.29.4.gh.tar.gz 10587870 BLAKE2B e8007cc2e6aa82bd3223f13c5df0e94dcd6f90cfd86d6137723209191d95b7f1be8df3755eae9190aee44312b9980eb81a5a4ede4d326f4cdf3d4b43febb4486 SHA512 f164b1ab95ea34127d2cdaa6e0ec626e7f8849ac1d112e28384e5e1b105b7e482f386999da52d968023d0f35bff5c6b433b4117f98b85eb060887205fc2f55a4
 DIST botocore-1.29.5.gh.tar.gz 10609519 BLAKE2B 814b9409d59e799f47ae536a35fc3677f7eb78f7d4233f846fa66e4bf68b3724dd2bf3ecec777ddc80baf6e7c8201a7649218553db9ad87d1350a2c53a89771d SHA512 6d3d337d9b8f6b3042856df33b016db943059e57a34b3124ea5aca4fb3b6551d476e9cf08e8b6d36caac6db46703b6785fc03f505aa860f029d45f06f254706e
+DIST botocore-1.29.7.gh.tar.gz 10629818 BLAKE2B 9c74df449411d444d87f43a612741e0a9378214e1382d94e07e557c258808ae2de9d1216e743075b0b63611c1b855ac5c6102733db2320c83213e0b1cbe2888a SHA512 cb7b8ad2661dae376d300ec3d757ec3e9b6702a5064d0aab63af5d81eccb2530a12875568fa9a29d0a83bb7babe165c1d18f10cadeeaf9d57cca9cfceaf2761f
 EBUILD botocore-1.27.96.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-1.28.5.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.29.4.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.29.5.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.29.7.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.7.ebuild b/dev-python/botocore/botocore-1.29.7.ebuild
new file mode 100644
index 000000000000..d1a6948e70e5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index bed4e76ca8f5..188f611374a6 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1,5 +1,3 @@
-DIST contourpy-1.0.5.gh.tar.gz 12153420 BLAKE2B 1b3899831938c114480606f0c2ef2962248721884cd2be727f2bd11d12d322e7652c7b63860f4c5d8bd039a7e838f3f360dd1af017219caa97dfc63d69ef7e19 SHA512 47dc08f02920cb0ffc081f313dd041fa36e2fd0a81530374ae77adc288af13cf2c526fc1f45d06ef1c256c4c8fe243e0b36b54d3fff7d4f8bd6f9f4938d3c805
 DIST contourpy-1.0.6.gh.tar.gz 12154065 BLAKE2B d0a621e10bc465a0ed4a20136e813435bb4d79bdd39b64d60676bb794430f2ce15b247e13e163e8e2f89c69ea6a5880dc8f3c8a49750c15e7bcb554aeefcbac1 SHA512 3b6301b414758d588015b745be723642554459df14277aa2eb2def7b5194e0a2b73b73ce8409bc40cda34095e13984d7a2dbc1f3a1dcf272766df92d1de1b5ef
-EBUILD contourpy-1.0.5.ebuild 1057 BLAKE2B 062f767b633399ea1063b78ae410b91bb0477be467dbabe020ec19128d513af79113c6bcf9d907435697b5d78b2962907f7d439061d55e25343185272f01dc29 SHA512 2f2776062ce857043dbdecfd4ac3590ff3bcab65a8a866a816fabdb69502a8cc739b82b72d3860e9cf137f0269ac7736d04886de4fe5e5526aba3c84bce3db15
 EBUILD contourpy-1.0.6.ebuild 1057 BLAKE2B 062f767b633399ea1063b78ae410b91bb0477be467dbabe020ec19128d513af79113c6bcf9d907435697b5d78b2962907f7d439061d55e25343185272f01dc29 SHA512 2f2776062ce857043dbdecfd4ac3590ff3bcab65a8a866a816fabdb69502a8cc739b82b72d3860e9cf137f0269ac7736d04886de4fe5e5526aba3c84bce3db15
 MISC metadata.xml 372 BLAKE2B de3d6cc9d8727bf43be63fdbb8aa2ad375667d189019e189be262e39d028acab98a21e200798c2d5c5c72521aa7d38202e3e235dd44de9b43a7dc9e045d50c47 SHA512 e692f94d805d7f56fc895a4c76dfbacf2f068d687b9191482b946445baa3bd0a685eda7a1b0aec2aaf9a02e6f23d87f0bf22d90f42e3c21d930724c635ff859a
diff --git a/dev-python/contourpy/contourpy-1.0.5.ebuild b/dev-python/contourpy/contourpy-1.0.5.ebuild
deleted file mode 100644
index 972f9f2d56d9..000000000000
--- a/dev-python/contourpy/contourpy-1.0.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for calculating contours in 2D quadrilateral grids"
-HOMEPAGE="
-	https://pypi.org/project/contourpy/
-	https://github.com/contourpy/contourpy/
-"
-SRC_URI="
-	https://github.com/contourpy/contourpy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# linters
-		tests/test_codebase.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# threaded algorithms are known to be broken
-	# https://github.com/contourpy/contourpy/issues/163
-	epytest -k "not threaded and not threads"
-}
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 3839ceaf82dd..19d71591a213 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,5 +1,7 @@
 DIST filesystem_spec-2022.10.0.gh.tar.gz 338829 BLAKE2B 93d0f878218d750f605d0f6cb7011504d3b5325ec9d80bad3e4d0f2c51e7494c751478958131bb6522ad5c3144a129a508b948a114f3a6c55d43b9a206b46a2b SHA512 ac8d9118df9b69c082e0707990ff29bdd7576534622be8fc1a10e8cc14d1d3a328fc8e022dc9f316af3da4afb4d38fe3fb533222aa89c47d4d49a296c6b9bf6b
+DIST filesystem_spec-2022.11.0.gh.tar.gz 341250 BLAKE2B 690528af9882cc8a23f78d215efbeb4f9c9f6f0a04f6a0a6f75d55a5ed8f84f92f988824921f2b26cc4cc0e7a6406d322affe65c9cd99cba7bbe4a6c01ed3382 SHA512 b52af1da0afbc686d288954ac596d9dae23c393c457fcc5ab6a11c7bd8d6a20fa1f631e1837f1d0054534a9a1231afb0cb6f8f899cf169789146309f03699e75
 DIST filesystem_spec-2022.8.2.gh.tar.gz 338446 BLAKE2B 0f3b78794271b367d8e5d26ff889e7d72df7148baa7ca2e7dca3884cbeff74b41f5ce1a532fa768523f29d230f574e630fb3de43b767ace874f831a4d2a47e1f SHA512 696f726000c413ba78380b5e17e312ecca30b51093ebf8d7c3658fb7b82ace57223d3aac471e3a772d350523142bdf983b547277838cca0b182ecb4e0a4b3924
 EBUILD fsspec-2022.10.0.ebuild 1370 BLAKE2B e0b00d994b41327f60e7a8fb8f89a751f7a699eaa01c9169c23b46b82833e05a3bca1933ccdca18527abedefbcecb4514771416e49f9002f9bb9dc36f9248f6d SHA512 0c26a6736d1598fd4305a82408031b1af5251d10b59c6c87f8464d1af88723537f05af1dac4fb71ca76cfe1710828c360d65642a6ebae5e56ac57b433d08e636
+EBUILD fsspec-2022.11.0.ebuild 1370 BLAKE2B e0b00d994b41327f60e7a8fb8f89a751f7a699eaa01c9169c23b46b82833e05a3bca1933ccdca18527abedefbcecb4514771416e49f9002f9bb9dc36f9248f6d SHA512 0c26a6736d1598fd4305a82408031b1af5251d10b59c6c87f8464d1af88723537f05af1dac4fb71ca76cfe1710828c360d65642a6ebae5e56ac57b433d08e636
 EBUILD fsspec-2022.8.2-r1.ebuild 1368 BLAKE2B 2ebce7153de30d870b270b903ca1b837bf437f97c804b0f69d104d920026de5a986ce9e8a62e4c33acc090d632c5da1d0d394c8555cc303bc87d6476d9690571 SHA512 e2f20c7c1eab0e5286f57f16654636b68599e7011caea8ce38a8152617bdcaac20220e9240cde7a266b6f5ee5968beb60998117c785aa97731e013e84a88e869
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2022.11.0.ebuild b/dev-python/fsspec/fsspec-2022.11.0.ebuild
new file mode 100644
index 000000000000..dba46d7fc2e2
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2022.11.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="
+	https://github.com/fsspec/filesystem_spec/
+	https://pypi.org/project/fsspec/
+"
+SRC_URI="
+	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+EPYTEST_DESELECT=(
+	fsspec/tests/test_spec.py::test_find
+)
+
+EPYTEST_IGNORE=(
+	# sftp and smb require server started via docker
+	fsspec/implementations/tests/test_dbfs.py
+	fsspec/implementations/tests/test_sftp.py
+	fsspec/implementations/tests/test_smb.py
+	# unhappy about dev-python/fuse-python (?)
+	fsspec/tests/test_fuse.py
+)
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index 34fdc6318d01..d07aaf07c269 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -2,6 +2,6 @@ DIST lark-1.1.2.tar.gz 243201 BLAKE2B 0f1b51b0276ad893f29d0afa6c3e18211b0b92832c
 DIST lark-1.1.3.tar.gz 245913 BLAKE2B 4c7b53d123aa7cdffcb16027921fced2f94dc0e5b9b816825f297629a9ff446758d9a700dc0f243f3d4c478fc992bbf5bfb38c51c2be3c8379df06b41044c624 SHA512 5359a29852554049ecee77a4151a2c64c5af72eccf5c2bb07926b0c131caac15cc51777c2df1d2c736e9e2b45d59543aa8a6d16ef2cb92ea7f8564c7ac06edb2
 DIST lark-1.1.4.tar.gz 246520 BLAKE2B 08073f89a3403d5e722b3af4d9226ea4ca890a7ad9978fb69f023f1219bb2d148533a68810188d3af35770cc36d29629a1c57a3fbab4098e9ec3d4e73f68ffe8 SHA512 32498f8c387320dce89ebab66e9eed49dc83b855060a8fb9459e6323d0d783ff7184ac997ff095fead09766c00f28c12ccbcd614effb8344ba49df51f7b5a566
 EBUILD lark-1.1.2.ebuild 1044 BLAKE2B 37651f4ac118748c27f1ba76db1cf0400957dcd8e348023295306f86b88c7e864dfebf80a273a0fbc515c6a536f9fa3d1010172df4682c35a7097254ec75b841 SHA512 e5b8c6d42e4af12bf07d2c6efe3d330f99da1f5cdac46a0ead309707f812489ef43a91cd54d61249e6c13cc21a4fff3352a0ea2987182af60b73f658801462df
-EBUILD lark-1.1.3.ebuild 817 BLAKE2B 0f10270ee2275f9d79a8c0c6840b3f863c303f6ceee894a9a88a7a686220de4fa01d180ca79b920a88db9bba083a34860d4cd6a84100d7ecff21af8b37275409 SHA512 b14a7b548de40cd32d498e71e14361c89cff2a4416dcfcf1ffcee16dada031e6f8ad8149da442a183e43c6a53ee9a61798e875d23fca654925204ad37f0a3d80
+EBUILD lark-1.1.3.ebuild 814 BLAKE2B 0d57513dc5d49136a6bae3673f595476f0fe99b03f8dfcd2783fc4df15aa2de13f2bf2e26660ec8081541fbb761394abfd23c1feb30e822b2538e07d45acfd6d SHA512 b8c8d78ca8ec40e705844311ce8ae895126709e60a9933978ce46902ebc4d46bd96b301e57c626fc1be7a8dc53449ca1dcab3a37cf8f451db0dd56905139880a
 EBUILD lark-1.1.4.ebuild 1005 BLAKE2B c4d432174b37224592542a9572fedef407b10f3ecda1fe23a50e5de62634e52cee2e966335a37799566f5b62a67b43902ae72777910ab015091fa1aff0828733 SHA512 29ae2054e1cb3434313b8a0730e5f147b7b2948ac24ec84b04b93dbd0730c6f3cf6a489cb893ee549b09c23492c9e49bf916608e46a3161d34e4b594a652fdb9
 MISC metadata.xml 364 BLAKE2B 8a1409bfc4f242907355a931f5ca7308c96b424cc06cfbc82f281abbaea32a0aaa5257d04f4fbd6131e9056dc08ec2f5834d80608d68d5e9efd32314d0a5cd47 SHA512 ed2ecc7da195e14e5a8071f3c5d277ead1dbbb811c1b7b1163c53d0b5e01ab299a7547de82782c9211aeb8fb6d97d3cd6bc0c4f258c533e884c4e096e7ff20b1
diff --git a/dev-python/lark/lark-1.1.3.ebuild b/dev-python/lark/lark-1.1.3.ebuild
index f17a2e7e881b..ef9bba1aa9dd 100644
--- a/dev-python/lark/lark-1.1.3.ebuild
+++ b/dev-python/lark/lark-1.1.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/lark/${P}.tar.gz"
 
 LICENSE="MIT"
 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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 305435d960ea..5067df8004ae 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,5 +1,3 @@
-DIST apache-libcloud-3.6.0.tar.bz2 1873596 BLAKE2B 7ca67d0a84d1af9a216882efb35ff48f4a795eacf34132b78429e0158b1093b3eec316541a52673e61edfc5bfcb326052ee874fe59b1e4a65b407bdaccf38774 SHA512 3a4b4ecf35194e70b6cb70f0619238e1c0140891c08438d4b1ef308fffc9dfb973a5c1534b6ee7864797925b7f7be77eb79a2c4d621627d8042da3927b3f2ff4
 DIST apache-libcloud-3.6.1.tar.bz2 1944060 BLAKE2B 61e1481cc8e4e3e017c262d20666ee33a79ccb78bbc0d682dfe6f63df26f21c06897ec98b0df56a27ac6ee92922a08ecb98451c1680c323f042a497379f91090 SHA512 292166aa1eda4b31eb1552c91d9acd54001c363471f1fdd5310e3e25519d7e1f599d9566f55a0c10ece08d544774e1abca3043283b1e7dd93bfadb7e36b02e22
-EBUILD libcloud-3.6.0.ebuild 1527 BLAKE2B b42b5f55fc210428a08b42afcef047c7da46895ca671c7650719ea450d63571d249a8dd0590c2dfad22691673e1dd5da6cbd6ea50786c6e2b2a5fb62eae2aef5 SHA512 4103a7ba8e147797e6f21b5ae6bac1dcbd8a5b4c1d753b378f20aaac58ba039d7fb7017f3c0acee5477d9bb1d21659bfb592000f59681d494c370e6684d0dec2
-EBUILD libcloud-3.6.1.ebuild 1529 BLAKE2B 8194e5b9e86361f23b7e19ed35cf98279fe6787b012a89bee669c86a9ec504ca823c0ef48b7bff54dbfdd6de259108dbf0416acea8ba460d2e18af11de321394 SHA512 87bd8111bfc5679b2e3c71556235604417a09b59fe0f921f6cc2559d2148aae4ea30dc5501b24ac2630fbfe098811c85c0fe42887342704106454ad3e5b0cf34
+EBUILD libcloud-3.6.1.ebuild 1527 BLAKE2B b42b5f55fc210428a08b42afcef047c7da46895ca671c7650719ea450d63571d249a8dd0590c2dfad22691673e1dd5da6cbd6ea50786c6e2b2a5fb62eae2aef5 SHA512 4103a7ba8e147797e6f21b5ae6bac1dcbd8a5b4c1d753b378f20aaac58ba039d7fb7017f3c0acee5477d9bb1d21659bfb592000f59681d494c370e6684d0dec2
 MISC metadata.xml 398 BLAKE2B 5623f486a289eea0196b22b2f88ff377589bbcea13e341efd85d31dee07f8638bc985e6a1c03ac7982da08c879b5b09a46e5679fda8666f93366a8561777da7c SHA512 bc6e38c949ed0513f4e562406fd84031cd80f01a881844202e033fe5225490d42b27855413cd7d2fec216b002c38e1832fa8f841112c68628c906189ebf1e937
diff --git a/dev-python/libcloud/libcloud-3.6.0.ebuild b/dev-python/libcloud/libcloud-3.6.0.ebuild
deleted file mode 100644
index 07010b5ebe29..000000000000
--- a/dev-python/libcloud/libcloud-3.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unified Interface to the Cloud - python support libs"
-HOMEPAGE="https://libcloud.apache.org/"
-SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
-S="${WORKDIR}/apache-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	libcloud/test/compute/test_ovh.py::OvhTests::test_list_nodes_invalid_region
-	libcloud/test/test_connection.py::BaseConnectionClassTestCase::test_connection_timeout_raised
-	libcloud/test/test_connection.py::ConnectionClassTestCase::test_retry_on_all_default_retry_exception_classes
-	# TODO
-	libcloud/test/compute/test_ssh_client.py::ParamikoSSHClientTests::test_key_file_non_pem_format_error
-)
-
-src_prepare() {
-	if use examples; then
-		mkdir examples || die
-		mv example_*.py examples || die
-	fi
-
-	# needed for tests
-	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	use examples && dodoc -r examples
-	distutils-r1_src_install
-}
diff --git a/dev-python/libcloud/libcloud-3.6.1.ebuild b/dev-python/libcloud/libcloud-3.6.1.ebuild
index 03f2ad22fa9d..07010b5ebe29 100644
--- a/dev-python/libcloud/libcloud-3.6.1.ebuild
+++ b/dev-python/libcloud/libcloud-3.6.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index bec1788c0409..3a7ef4b1c6c5 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,6 +1,6 @@
 DIST patsy-0.5.2.tar.gz 397275 BLAKE2B 3aa5dc310729bd979c78004d5f1badb83b75b08d290cf8258191c87d61401f0b6ecd9490f1c4b932269e545c50a16694e44de9c076ca80648717c5f1af62fb69 SHA512 898df5536b0ff3a4d299e69c5f73a3d754cfbe78fe463fb4c4726cfd67d4e30c77cd3d7093131737207cb9f29c1374ab20a68ec5978007ea51878ec7c395f48d
 DIST patsy-0.5.3.tar.gz 397680 BLAKE2B 43696f9e95c124cab5bf907723596d8b2b15f0539fbd2b9c2a2fcc76591e935020929ba31fd5378114fe58d22a9931508d89edf21f24b00c916a6e78dc4ee58f SHA512 9a6ea2382287208013e02bab7cba9378311a8e18fe059593aa99090bb6191efa74badff011424a7f6b3c8ec72c1b8650637322b71617f23357bb4b38ac6a79a0
 EBUILD patsy-0.5.2.ebuild 643 BLAKE2B 178669501e3bc257c62e061463dd0e7157da8147b9551a35c1c5fd0779957bcef28525027f4c80c02ba164705b7de1838d7744aafe0facbe081d674cdd26af26 SHA512 5a5d675a8c17e6f1c2687a3e64baa55c6fed6e0d5b686e9be22398b5cbcfffa6da5191f7d689bf86a1f4097d3b32afa2c0ed7a17c2a9a0a5639d1c2ed9c09fd7
-EBUILD patsy-0.5.3-r1.ebuild 665 BLAKE2B a5a56282df9fd8708d095afa1574815687146f8bdd9545544d9508e976a676daf40ce090d3f8a23e3e76e43d1d28e34401826a984ad92823b73426dd5a27fb36 SHA512 060ba5db6d445edc94593eb474961274a9cd7c851253a7e83a7e5b939d7147aa26804d9bbad6fa678886ffb4b9097ebc7a5ccf4f4390ad61b987c3fc8ba4e758
+EBUILD patsy-0.5.3-r1.ebuild 662 BLAKE2B 980b2226158a6afa80b81595372e4828148c313dd8ff2c3c9dd5a2dcb5cfbfa59af71144af1bf7cd72f0e6f102221c9687f93df152ed69bf7b9931bb0fd972dc SHA512 5a855f9531f56272b718ddb0a43ac80d28d4611d122fe904abfb0ff88be18e534f0ccef47724f582192c817c9a9b3dd8c3aa482c0d5f9e0addc3da4ee99e7a42
 EBUILD patsy-0.5.3.ebuild 649 BLAKE2B 5b6a69a576c29112c8421da889e31c04a9c7cee36eb42820761bcf750c6f2d2130a291df1bd25d935820bca0851683fcf040fe1438c77b79020d377c9697da3f SHA512 880aba647c2f8a51e64b624974b745ae30d168762065451ce97a61eefaabefc7414fcd72a9694a6d3e6cbceb528a2648bc69c5bc0aacf8f22e61b05ade6a7d41
 MISC metadata.xml 732 BLAKE2B cf0e18d97605d69bae87a3553b89d551c03b908ec5a41da2ca11490cce6abd9aa6533d9155b7c19e3e12e5996aa8d5c3ea1f4cfb15e6c70916a4e2119fa54399 SHA512 f68d1e8645fee5af27d72062cc36b3700bff6c9f9eb6cb38a3b6c085211fb1b8502257d5d09edbd858e10ff4ef9f6661c577e336c3881e3c88e54d0db889a2b4
diff --git a/dev-python/patsy/patsy-0.5.3-r1.ebuild b/dev-python/patsy/patsy-0.5.3-r1.ebuild
index 3e611de39162..0987fc447fa1 100644
--- a/dev-python/patsy/patsy-0.5.3-r1.ebuild
+++ b/dev-python/patsy/patsy-0.5.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 77033855feb5..ed394d3645a3 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,9 +1,5 @@
-DIST pymdown-extensions-9.5.gh.tar.gz 1004601 BLAKE2B 8950ca104edf476e5557eab1effd9ad4e879f2ef58823e1385b5ee000e704b260b20f758578021d4c03492e675027f079363da49429938221fb1c109c9e1fe2d SHA512 b640947b97be4f7592b86125c7de0f36c34052e77103f7d16818b8fc2794cc28d3b7baef84d99434ca1b2810fbe19bc2fc0d2430b8504425cca71677d9c8753c
-DIST pymdown-extensions-9.6.gh.tar.gz 1011446 BLAKE2B 8e334896738de592d8d852f05f165c70d65b6541915bc4d66472b2e2e08a4921e5ed3e0d5873b03e3bbc31179cd2edb367ca0eb3734f1b437b8eff0dc4f9defb SHA512 b806eac4656b1e541753e9e3f4d29bd49dfdfb24ea67633ea232d40833e4ce438b76c71c013d7bc5c3ebfa790b2e314e6f0f76cc3a76f42d5c2b020c32f8dba7
 DIST pymdown-extensions-9.7.gh.tar.gz 1015024 BLAKE2B 6b2b1a86e693a2e4bca889c66bd97c099976e9e9e56291c35b25d8a99554dbae8e4e7b913b774ed9de6406fcaa8850009e000ee97bc97b1dfd09bbc514f4bd6e SHA512 0e6a28ac991ec02821abc1525de30007ded891d8437a8e4f9eb349e26c18702f9477fac0ca6728d5c3fdb5f0fdea451a3f00db3ea354115f20a69bb0f4a114f2
 DIST pymdown-extensions-9.8.gh.tar.gz 1012711 BLAKE2B 451dba60e42d8ad5e1368ac02c89a99a086d99b24402a2570f1fc51c73416163c200d2056a0667f03f6a7c5611cd3b3b870d8dd9ae934ca1d867c9ed9f3a985b SHA512 f9937625984dee09ba2dfdf9e706bdc382017f906f89c42080db38af63b17c1475cc7ffaf94c967ea116c735419168eb35d9dc272d971fe7d92a5950f67673cd
-EBUILD pymdown-extensions-9.5.ebuild 1244 BLAKE2B 4527630ef9f66cd2c708ee3e32ab8cbc8909575271cd0260dc15442cd168bf7e666124c0e39e841a27034d2481d2306a14a507ad560d96b0b58913832640f138 SHA512 048ec6f01d2d2ec9152dde5badbd50d86624a999777aee58ab53b9ad2fea041b3090404be8ca02c2410275577344e1b905cc87b382f88072bd8a0635c702751f
-EBUILD pymdown-extensions-9.6.ebuild 1627 BLAKE2B 167a6c0187697bf5ea751fb3cf30d061c5d411ad7e922b35738e16a69459011610eec0ea193ce990ae745e8b967142d69b58eca5d3f043dcc4d2fd69c7f1b1f2 SHA512 2e2a85177a139eac580c6554d9fd2c560a8d18ea92612a7dd824e58692f9924b67f64018ca233401fa92df224dd73b1e19abd6cc03ac4311c8d22b01f52153d0
-EBUILD pymdown-extensions-9.7.ebuild 1627 BLAKE2B 167a6c0187697bf5ea751fb3cf30d061c5d411ad7e922b35738e16a69459011610eec0ea193ce990ae745e8b967142d69b58eca5d3f043dcc4d2fd69c7f1b1f2 SHA512 2e2a85177a139eac580c6554d9fd2c560a8d18ea92612a7dd824e58692f9924b67f64018ca233401fa92df224dd73b1e19abd6cc03ac4311c8d22b01f52153d0
+EBUILD pymdown-extensions-9.7.ebuild 1625 BLAKE2B 8be05c03d6225736fc63ad37197220a3c0f4a953895ce36c0064997d1deefe32dccb4e56ac6905367a86a019495afbd3a7de0a3c023e6bbb8401b7a04059797b SHA512 0114c035128fd883d42a0e2ba8403e86bbf56c42156063df59647f42d5b0a71b16d6621cc1e6172fff3894de80a222a9d0b19de84b5b973498e242da492cb7a9
 EBUILD pymdown-extensions-9.8.ebuild 1627 BLAKE2B 167a6c0187697bf5ea751fb3cf30d061c5d411ad7e922b35738e16a69459011610eec0ea193ce990ae745e8b967142d69b58eca5d3f043dcc4d2fd69c7f1b1f2 SHA512 2e2a85177a139eac580c6554d9fd2c560a8d18ea92612a7dd824e58692f9924b67f64018ca233401fa92df224dd73b1e19abd6cc03ac4311c8d22b01f52153d0
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.5.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.5.ebuild
deleted file mode 100644
index b8b9a0961375..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.6.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.6.ebuild
deleted file mode 100644
index c5e7c800284c..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	# We need to do this manually instead of relying on docs_compile
-	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
-	# https://bugs.gentoo.org/859637
-	if use doc; then
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.7.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.7.ebuild
index c5e7c800284c..c5ff8b25ca2c 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.7.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.7.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index ad0a72c29fed..2f5e4385bf82 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -15,5 +15,5 @@ DIST pypy-exe-7.3.9-2.x86.xpak 10199358 BLAKE2B 502748c1c90db9ee1d626c33ead656d4
 DIST pypy-exe-7.3.9-3.amd64.gpkg.tar 13701120 BLAKE2B 1c0b10906adcbdfb9893a097577193b89ecaf54c8c3ab5f5907cd51b75d6f26ab31afa0369015db007ef25e0aee7669015e870a554940177b9332a79d7b8ff0b SHA512 8cd53261f035ad0d6ad3dc7f13f29d54304ed02a339bbbc565a541b4e3b9ce0ff4734f3877e286e018da2b77468287fb11e499cc5fff4fc73f6a7bc1a602daf6
 DIST pypy-exe-7.3.9-3.x86.gpkg.tar 10147840 BLAKE2B 8cb0c136c95b89178dcab3684e76fd3399ec9af2ff314ac39927bc3431b46a330746331ee142590239f44fcfd943f0d0766d462d91cf47886d7badeec429a786 SHA512 0df2f09c1934b44561c12e514ac84377b3718c2f0e5912c0f36a95100911abb692a659b384c6ea9746e11494dff6f780996725b7783f6d0dc875e8e6652051fc
 EBUILD pypy-exe-bin-7.3.9-r3.ebuild 2119 BLAKE2B 78cdc93d9f5b5f117c796de542653f1e6281c1725c3cd9158f3d67b12c9581f80eabadeb89e557c360eeda3aaa9799b7e7185e165c07543c81a4830d5eeae13e SHA512 89ae7ffc7027caccec44d0050233f450ea4a8f1842faf38d98bae24de41f1ef028e83de654e3e395df36265f5bc16df5b5443c7f144e5468f60244cbd49db67b
-EBUILD pypy-exe-bin-7.3.9-r4.ebuild 1979 BLAKE2B d6d9cde063e07c64739822c0a22c21965125eb9481b9b094c2a3ee2156b49ecc9ff6d628b8b8193e7d573f7bbdb1765632760c528b0168dd7b0013ebd350bc7c SHA512 67ef4bd53fc18b5e34a0e357434bf678cb7a65929e02eb42156a5fa6dc74270432df9b2a025920853529ed3ebd964bd222a52208eab2354ec2fc7e74e33aa7dd
+EBUILD pypy-exe-bin-7.3.9-r4.ebuild 1977 BLAKE2B 91ce17e7e4699fa83a4a004d28c5bd9f3bb0ae314bf868b5079b9794f4ff620462dada6e6749cff352cdaeedbfda3fd9d61a76d1ad85f61eb8928d7130c2d60a SHA512 6540a562f4bc696f2dde67aec97dc2ec5acfb14cae44fdde84190a883d3b8739b3aec40c61d3e82c141fdaa0c085adaafd52eb61e9bba0ad7c53aa18f5e84c27
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r4.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r4.ebuild
index f3fec7925db4..1b4b3b17740b 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r4.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r4.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 302ce17df3de..c52e4227046a 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,11 +1,3 @@
-DIST pypy3-exe-7.3.9_p3-1.amd64-musl.xpak 12452882 BLAKE2B 73be01098cc4295e63b76fd7f542e9002ff6929220f02d86f99f051c76edabec68e0ed97695fe68d56a082e5bd915d9e68e04ee1dc7e1a3d8120a76ccf5f6e3f SHA512 9c6eb74844ed021dabf11998690e3099d6c37930378c1869726d96451a3847fc2bd60df06a3d7234b2fa182e4294328f292f4c24bdc49a4e5baa7ae3a0704805
-DIST pypy3-exe-7.3.9_p3-1.amd64.xpak 12394274 BLAKE2B 8f7a041839fdd1dd55fd0293660369310aaa1f118e34a730e066899c09ced71fa37d70d59952fb68d932f63e907b903c41c91b5ba4d646637fcfe628a20861b2 SHA512 166722fec0288b8c69645e0c8e630aa4c0b74f8d41817148147556ce6f0491e7251cbc202b62f7a1dec6b1da3e2f2c6313f02952b11220f35be2c1ad6276f89a
-DIST pypy3-exe-7.3.9_p3-1.arm64-musl.xpak 10473390 BLAKE2B 0d791a39850c51ff914885e5bff4a3f44164b77df4771db968b90e144857c8a045df3a61ebe0e386c3aeb3c63b45ccfbb58d5b4811a0a1aeadb75335a6bb586c SHA512 9f3c871d0b624d1f2f65933f85fad9d177046ad96a206e9ef1bd40c5fbac09144f1d87685cac9f31a19b4f1ec25b62477675cce9a99d4fb2cc5eef86578d4655
-DIST pypy3-exe-7.3.9_p3-1.arm64.xpak 10482599 BLAKE2B c48c9a19db30315be223bfc1121bc9a0300c91c511678a1d11bcf3a1601a3d1fd7d7852cc196d22650ec4ab4234d68f7a9046b01bf2f4f1f7104ae2d31797e9e SHA512 3200f7faf3b9c2211d828f6c434775138a1543a75b2ff4403c896f4941682ff40e16242045ec65908540b6537711c459ce7b0fdcdc201bc9768b2521bbe4cedb
-DIST pypy3-exe-7.3.9_p3-1.ppc64le-musl.xpak 6663514 BLAKE2B c8778a594f9999be4efe398901c5deab7fa22475faad55d047b995933708d861c0adf435d26c691f63ff49d8bf561081f96b64287846065bbcf8845c476ef909 SHA512 1feda175f90274fc214f9b018dddefdc40234ff398262a55523849c5f48bf543ab12fe86ac56e973900c39169e0d45d1150217a9b3597381f7e087af285f4811
-DIST pypy3-exe-7.3.9_p3-1.ppc64le.xpak 10930518 BLAKE2B fca375a3466ee51c9436587104d5f13cb4642a8efb347124fcc2880c2382bf56921889b2c3aa96f26d22fb734cbd27adcf5f0c8feeff92c2d625df1daaa38ade SHA512 ee33067b964c33701b687ace463cfc11795af37bf3302c8e3e2d1e0610728945d370f88d97d1ba3fd66ac9bbf905930857e78e5bc96c911d3a663c2e9c74a5cc
-DIST pypy3-exe-7.3.9_p3-1.x86-musl.xpak 9246639 BLAKE2B 7475f9a273157b55d1568e5d9f36a045969bb629047a8b8f478e6cd0e27bf2f46b0a141197047bd2779332acb5b36b069ad1bd371030a6a5d75b4dd0aadbb808 SHA512 783260846ec8057479808a7d7aab3c712ee6822293232099cfbe970cb3e8e5e3cf07ec08bb5ecd703c084c6a798dab70de5073146f8698430472196b351d19fb
-DIST pypy3-exe-7.3.9_p3-1.x86.xpak 9210827 BLAKE2B a740ef7e1d4559308c129399cda498b7c0fe8e654e4d36830ded5197a7788168dbc8b4f83908a41869cd51343dd9b371ba53de8e88655b2728b8f6351f502ef2 SHA512 bd2ef07e980bd37b7ecfb052a9304a80ee527c61f8a60344e8e9b1bfcdf1f50038e7b281257194c388e0452aa968f984f5b6bc7d9f7c89bf08279e9a169ed8e6
 DIST pypy3-exe-7.3.9_p3-2.amd64-musl.gpkg.tar 12472320 BLAKE2B dc59db0948774f3776d891dc1afbf457005928db8f3ec949e71538f29929f6dcbdd30af0e4f72ae050bc562864ada7a6f7603d85d92f622ff1830b2c4a009d46 SHA512 3f021c0db1c7c8eab50ee9029530aee41d490f467b626a7b22efabc19a0cc6220039134040b01a670352a977925b6ad31071dc30b5f6795c7128e1d889b0a6ff
 DIST pypy3-exe-7.3.9_p3-2.amd64.gpkg.tar 12451840 BLAKE2B 1c5d0c1698ee4b7051aea5bbd1a7430b2a120d58e65aba70897e00afd5965313bff5b8a4477924a94077660c6f28aac176a09d27f4f8c97a1cdfc80a454e8319 SHA512 e0fe433c026bdd0faca135f3f32e3f7754bc4d2d150deb775171c9de4fa493d3f5842c5c66a02acef7ca0ceb7907231f0070cd50db801d1b417523b438fa77fd
 DIST pypy3-exe-7.3.9_p3-2.arm64-musl.gpkg.tar 10547200 BLAKE2B 300371635148ef2af0746d7c1c4e896cfb4dc55967e1aa82dfa2081acd8e08c07b614b196ee8e34a0fb1f7407ef9cc556c58b8222bffba47780a277a8506cab5 SHA512 1d9e1b1714f16161c0d2dde26cd60d15c052e5c2426ae4a0073fb2dd7d795d75078cd1ac73e5943118ed7e44e4757b73e8737e5c6d12d78583644747dd253863
@@ -14,6 +6,5 @@ DIST pypy3-exe-7.3.9_p3-2.ppc64le-musl.gpkg.tar 6686720 BLAKE2B 5fa9a09765270494
 DIST pypy3-exe-7.3.9_p3-2.ppc64le.gpkg.tar 10946560 BLAKE2B 0b63a9941cfac0d138e8e7781f13a184e03e0dbed45df812177f7a786dc59aee309bc1de5b20b83f6576005380a1a7af752b3de858e0c116eb8c8474b30442de SHA512 df8a4749135f44fe338945df1d867961af39ea8c08f0057c85fdca12f18bb1725c04ee78e3701d7982465ca0092b7640e376a9031bdd5ad50c326e8b86c5bf1b
 DIST pypy3-exe-7.3.9_p3-2.x86-musl.gpkg.tar 9236480 BLAKE2B 6e319fd0377192c147d4cc16fa5488e938e69c6c04180a9aa873cb9cd772e8f9deadc69fc6309df82a80b8cd58eaccf8b97c69442fbd96c656c907e78882348b SHA512 1c3b3a6cadb8f003172a98334abe24c7732d089c00c3b7c5bbcf1ddbaa908e75d74463fe98ee3f4c76d570860c7c98ff935d462595ae6456702eb10649744a5e
 DIST pypy3-exe-7.3.9_p3-2.x86.gpkg.tar 9216000 BLAKE2B 03fcb639ce59260a82a249bf60388a67ace5cab51a3d1d9d8c148d0350b483fbc12f3ecaa9d2582e7a31b84c5eea44068dbe589342376413e21ce315419f98a5 SHA512 a3964b1f364dcc0540d72e1364ccf1ed5cf3e5e053a2cfe69697de15586820646c404e931f0a6c08f49de45474ef007ec696484b515b857c29436d4196ec2e81
-EBUILD pypy3-exe-bin-7.3.9_p3-r3.ebuild 2116 BLAKE2B 02d51678563325cd8a99a6f42f5164198b574e204cc200aec354a4a1af4bcbe2ec2e9f8e23e9d0660da5b7bf497244d61b81fb0246f6163a3aa648d3375f31fe SHA512 6b52470511fe28dc79c8166141cb99a8185c6d8f9c315e2bd43ebfa5c4f29247a82855a92bbe5970bff849003ecec05cb7e8577bdfb2e869bea6a9246a13cfc4
-EBUILD pypy3-exe-bin-7.3.9_p3-r4.ebuild 1980 BLAKE2B b8015895093d86828f7a817685477805f86ec372e912e121ef824af0082b9c302e7fe2cefa125219572d2ffb74cc30a53b3b5503fb7fc81392b3077a215bc1fe SHA512 6bc28509596f15621c5b72f4d79efb03d459dfb321a975069fdd4d663dedfdee3c221bf4358c3819face6c470ddfe2f5fc80e4b62638413d683b5e0f8f7d2751
+EBUILD pypy3-exe-bin-7.3.9_p3-r4.ebuild 1978 BLAKE2B f5ef3c09d4b6d67f560a4321f1bd9378f29282725d0e914edbe3cea38bcdc3aa811dd53ea2818a81744266fd5dc68fc0c6ac90f44eea0a4f35083458f75bf291 SHA512 ab7ac54070cfe77085a02fda09cef2e3953bd41480b29abe2dab696f5c4b64e73f48ad301c1fc76fcbdd1849c4719c9b6a4c5d2622d6ff9d2bf3cdb4383cc56c
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r3.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r3.ebuild
deleted file mode 100644
index 36342b29c1b9..000000000000
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-MY_P=pypy3-exe-${PV}-1
-DESCRIPTION="PyPy3 executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	elibc_glibc? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.amd64.xpak
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.arm64.xpak
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.ppc64le.xpak
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.x86.xpak
-		)
-	)
-	elibc_musl? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.amd64-musl.xpak
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.arm64-musl.xpak
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.ppc64le-musl.xpak
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.x86-musl.xpak
-		)
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="3.9-${PV%_p*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-# sys-devel/gcc for libgcc_s.so
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/8
-	sys-devel/gcc
-	sys-libs/ncurses:0/6
-	>=sys-libs/zlib-1.1.3:0/1
-	virtual/libintl:0/0
-	elibc_glibc? ( >=sys-libs/glibc-2.35 )
-	!dev-python/pypy3-exe:${SLOT}
-"
-
-PYPY_PV=${PV%_p*}
-QA_PREBUILT="
-	usr/bin/pypy3.9-c-${PYPY_PV}
-"
-
-src_unpack() {
-	if [[ -z ${A} ]]; then
-		die "No binary package available for ${ARCH}/${ELIBC}"
-	fi
-
-	ebegin "Unpacking ${A}"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${A}")
-	eend ${?} || die "Unpacking ${A} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/bin/pypy3.9-c-${PYPY_PV}"
-	pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r4.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r4.ebuild
index e9dfc418d6b1..9f0b76a5e72d 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r4.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r4.ebuild
@@ -50,7 +50,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="3.9-${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index b84774bdc9da..473002603058 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -2,8 +2,10 @@ DIST stevedore-4.0.0.tar.gz 513561 BLAKE2B 7d82b001546c49d4a9fd7891751b2ed35f6b7
 DIST stevedore-4.0.1.tar.gz 514044 BLAKE2B 843af8c8e393932e3db40e467c3957a839e0416c12bfb23c353075b838489a4b58a0a896ee269beeed108370054f0f93724a020f0f2102ae6e758a771a6aeaf0 SHA512 2c1c95a023c598a228d3786b681db2e803dc0c39884fdc910ab4bba75e7237081bfbe0ce1bbc847aecdda7b5e43bf165f0c03599717153bda37a52d0e35b7bac
 DIST stevedore-4.0.2.tar.gz 514088 BLAKE2B a07d48129fec62838af5ce920ef1eeb0cacb09ca4ee20bb5e44ba24a475957a771c72fdec6893f9b26df54e88387ec2f27b1dceaa8d8f41c291e68b1d9bfd059 SHA512 1cb14220e8bf8520af412670982b180bfbf1be3147cbd0359fc543bb6cb6113e292c87f492eb08756d29f16bdc49a48a03b280a8343bb620c78ae882efe6407b
 DIST stevedore-4.1.0.tar.gz 514078 BLAKE2B 503b79324fcbbf5d9b911eb999ac6e52eb76f0b0704e60c76a02a3843259bff082d9eaebc7e559d800c1011d18c2ef1f3cfb78501fddd38e4246cf2f86109650 SHA512 048360265539b880fe77af5214d4e27661ab0e9972317a7e4fa51e599aa67f525ad5227c921e4c3410c8a39baa80259a42417b8772def0e3b8b58d618a0adbeb
+DIST stevedore-4.1.1.tar.gz 514168 BLAKE2B b3b37bfae408adb1664562b99c9951ac035196babec8424068bcffa8226fed8da54044e6efe5b1b739b1caeb49bdaf1b65eca38ec6b4e200b837714d926e2dfb SHA512 9f75af586e4fff1bebb88351a242b171d6cce795d86cfffd021c47bafd9ced84a78a838a589d8828fa7bb0f183e767fe888b0780aeda9129895182bf4e0ff717
 EBUILD stevedore-4.0.0.ebuild 1363 BLAKE2B 0cb8470e708b39241344715f9b94b748db6d9f2db043c6c547fce4fad8abb8a47cf46f4a298bff41ddeaf9c7ab5b37de45731dc742ea20ab6e30741c1955c37b SHA512 dfd1ab0f730270f83e50293092e6a5be1aafa01273694c40b34d42409fddf919545e1a032b7a36a9b785b00836204ecbcbcfd134783550c80059365806a48d97
 EBUILD stevedore-4.0.1.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
 EBUILD stevedore-4.0.2.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
 EBUILD stevedore-4.1.0.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
+EBUILD stevedore-4.1.1.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
 MISC metadata.xml 522 BLAKE2B 3ed51cb439d8350ff3df20a20a803c14bb11c9e0e5b15bd661f5780513f88a38f8a4d80703f6a7764488aa721f0fbbbf9a25d4fccb0f9916423198daa539bb69 SHA512 d08e11153dbb878de8f93d7a8293ddf2469adad8a2c436ef652f5c7cda7696a91f914260b841b3e64b3aab37d70dc76b1c369a08b9ef4bbd4f7c33c6a0ece690
diff --git a/dev-python/stevedore/stevedore-4.1.1.ebuild b/dev-python/stevedore/stevedore-4.1.1.ebuild
new file mode 100644
index 000000000000..1f1a1237233b
--- /dev/null
+++ b/dev-python/stevedore/stevedore-4.1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="
+	https://opendev.org/openstack/stevedore/
+	https://github.com/openstack/stevedore/
+	https://pypi.org/project/stevedore/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+
+	# Also known problem, inside venv
+	sed -i -e 's:test_disable_caching_file:_&:' \
+		stevedore/tests/test_cache.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 10f3c17c2fa8..8f3f2379720b 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -2,8 +2,10 @@ DIST trimesh-3.15.5.gh.tar.gz 11956403 BLAKE2B 5e36a7fd57689f5151ee710a707bf44ff
 DIST trimesh-3.15.7.gh.tar.gz 11972453 BLAKE2B 0f1c10d096289122bb1cc853f4879718f3e03dd9b4297a25be4db2a232a08b0e8d496ec5cc98b2d4c4214ba296666291fe24b7dcc5d2e430105ba46cb4fb5838 SHA512 c09862de650829e853d7d4f2b53b72ddeac48ad313975dc2919c0bbb11d16d0fe5aa69810d488291b187e827b63caeb03847c143cd6812ae09c2d98d51e42270
 DIST trimesh-3.15.8.gh.tar.gz 11972365 BLAKE2B 2dd76c5f3c6949b79992dc23a4a80f3fc80c63c08ac7f8c6c11d6b1209b7b23f4843fe0da74528fbec0738bf83d2791260183cca710d2fe046c1bb8ef747c82b SHA512 806a8a10ff86a5198f7dc134f07fa3fd3f84d8e1b10f2d1f8dbc4a5783d2d24474d7c32f0427fd740f2af63d544fc4f3e710f1904cca0412390e6913092b1741
 DIST trimesh-3.16.0.gh.tar.gz 11970053 BLAKE2B 3898dd2fd12fd070bc9a3a10e21bd255b75f7758deb38e0d36314524b4e24b7ada6514865c06677a1db39b1723b918e5ec6dcf491bf0c946c3e22495cf7dcd01 SHA512 7b56a5007614eae8a7cef1a69334ef3b21499572b5bfaa414bd29097a431266e1ec4d7dda540dbf502a57f5b0ce9d3fb3763675821714ac25d924e0d15e22c71
+DIST trimesh-3.16.2.gh.tar.gz 11985642 BLAKE2B 453f7daad4d75b114d5747b3251732d0576ff2606c4a93b5a2d0d12943aaefa1dc40d6d3db6e40448ff1ad610425680b75dbeba0d6cabd0fb6814215d00e7848 SHA512 4703e742a385b32bec4871df42aefe4fc8d83cc3e14247f3c92bbbafa03e8fc4e26d96afb26f06319571d18447318fc45f1ffa8ab5385934c34507774ef0cd12
 EBUILD trimesh-3.15.5.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
 EBUILD trimesh-3.15.7.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.15.8.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.16.0.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
+EBUILD trimesh-3.16.2.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.16.2.ebuild b/dev-python/trimesh/trimesh-3.16.2.ebuild
new file mode 100644
index 000000000000..11e1a73dfac5
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.16.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 1beb6f47c581..5d6be8ff096c 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -2,8 +2,10 @@ DIST wheel-0.37.1.gh.tar.gz 68751 BLAKE2B 55919649f82668565d3b5907d14d0758984bb7
 DIST wheel-0.38.0.gh.tar.gz 68696 BLAKE2B 38dbc8ba7cf67d202c6c98b277e590b3b31b46b698f59f988af1710e9fa6e5d2125378029475060cf3142cd9666bb318005619d085ea2e8b501bb10cd9694fe3 SHA512 0ffdf531c03d1f0866632002b163fdf8642b613604e74d1cfa5844e8c327946baf303bc0410fc7ec034f8a79cb4ad59536dfdaaa5cc8fa23a3b7d21faf5e6161
 DIST wheel-0.38.2.gh.tar.gz 69346 BLAKE2B 619da7f17d82837d70cb86bf6481738a4959c70f1be56ad68f87380f4f03efc588ada7af1b6892079833df50e4aa57f7453b811b616b8440e388bad701726572 SHA512 59a55e35f641dc6e97bcd58755ef39dd771f8ed442843321878054db3c54234befde368ae500a93fffde6ea1bbcb0e3981975b2c7574fc5a58693a70430e474b
 DIST wheel-0.38.3.gh.tar.gz 69385 BLAKE2B ff1c9681a361643877b1838d7fb2679f7b542152fa8f6268050bd1d7aefe75854e878036f4051e7e562f24973c4769948975060caa969ed8c13fd5259668da78 SHA512 e7a9b922fad3552b60d86123b002762e6a672253fdad8580c93ccea8c57619d450345c948b5e36857b264b7214860ee7f77650f7a269f455c2aa952116023798
+DIST wheel-0.38.4.gh.tar.gz 69770 BLAKE2B a6077e38c21626169d68a3256fbe6457de3d4fde5d0a582859fe7b9ec5d73c142538f7fbfe762ddd436473c682e7810407a08730f66ec2a7844084d349e0779f SHA512 2ff7c6175201f8145f2c1f9937c6955a1dd22eeedab1e456f65c4edae9186610d9e7702c35773b49026c56c9cc201672025e7d42fcc7f782153c65c28e6b90d0
 EBUILD wheel-0.37.1-r1.ebuild 1580 BLAKE2B 72328d5044bdfb5ba5bf171cba5e783a6bf3bd08adcd01cef117122849fa035f7cbf1220852a639799cc2b1f25ff8487ec3bd3bd714ba4249c0aad2f1e89cf73 SHA512 4e0c40b131019be19d6cd47cef04181745abfeea461fcdc6e698b7724f3cd0159ac877acfe81f715ef95c0dd3d6b475cc24c5377e86070a362aeb9e2aa3dd3d3
 EBUILD wheel-0.38.0.ebuild 1468 BLAKE2B 7246978d927b63a37167e815bfd1d88124b927bb905114d2a3a94894d120253170844c2a911e41a9e93ebbc60b33b3b0614be1d9917cd4b7c8926c420e11f037 SHA512 7c83a56754208a125cb43b312b7a6e0298b875ecb2edf1f64d31032b100fefba8db8d458cc6cd464333430189b9c97bdf367641d4514f5bd77069e6282c16477
 EBUILD wheel-0.38.2.ebuild 1521 BLAKE2B 8a7d51d4045bfa65549b1fe3a60ef464634e3a849e25853756b020b24e1a0ec042415b0fcf9182d8a02dbfcbbfdfcf1e691586b46576d7601be750ac927a1ff6 SHA512 5df9e0320c3a3e526854aeda7ba22fb55cad24ce8cc63261253047af806128652a2492d3dab7f351f529d5659dc6432ab920ac09be7bd6aa66c1e8d83cc92c3c
 EBUILD wheel-0.38.3.ebuild 1521 BLAKE2B 8a7d51d4045bfa65549b1fe3a60ef464634e3a849e25853756b020b24e1a0ec042415b0fcf9182d8a02dbfcbbfdfcf1e691586b46576d7601be750ac927a1ff6 SHA512 5df9e0320c3a3e526854aeda7ba22fb55cad24ce8cc63261253047af806128652a2492d3dab7f351f529d5659dc6432ab920ac09be7bd6aa66c1e8d83cc92c3c
+EBUILD wheel-0.38.4.ebuild 1521 BLAKE2B 8a7d51d4045bfa65549b1fe3a60ef464634e3a849e25853756b020b24e1a0ec042415b0fcf9182d8a02dbfcbbfdfcf1e691586b46576d7601be750ac927a1ff6 SHA512 5df9e0320c3a3e526854aeda7ba22fb55cad24ce8cc63261253047af806128652a2492d3dab7f351f529d5659dc6432ab920ac09be7bd6aa66c1e8d83cc92c3c
 MISC metadata.xml 383 BLAKE2B 352e8b44b3c4f7008c6ac73b8d4454602785ea86ad52ba4601b1c598a0da4831ecdf1b36cfbeaaa1635e52a924a3317d6abff9dc1b26d3f77f04c681208265d3 SHA512 a810c2c7bdff95154a907ce2a00ed2ccc63174e0ba7dea21c6faf62624aac12c2f772557f4f26406693b8963d3bfa77b95dc9e4156493ee991d64021ad8f6c44
diff --git a/dev-python/wheel/wheel-0.38.4.ebuild b/dev-python/wheel/wheel-0.38.4.ebuild
new file mode 100644
index 000000000000..24e78cab73d7
--- /dev/null
+++ b/dev-python/wheel/wheel-0.38.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="
+	https://github.com/pypa/wheel/
+	https://pypi.org/project/wheel/
+"
+SRC_URI="
+	https://github.com/pypa/wheel/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unbundle packaging
+	rm -r src/wheel/vendored || die
+	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
+	sed -i -e 's:wheel\.vendored\.::' tests/*.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	[[ -e pyproject.toml ]] &&
+		die "Upstream added pyproject.toml, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "wheel"
+		description = "A built-package format for Python"
+		dynamic = ["version"]
+
+		[project.scripts]
+		wheel = "wheel.cli:main"
+
+		[project.entry-points."distutils.commands"]
+		bdist_wheel = "wheel.bdist_wheel:bdist_wheel"
+	EOF
+}
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index 01de39a4dc32..d5b1492e5fd3 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,3 +1,5 @@
 DIST zope.exceptions-4.5.tar.gz 29609 BLAKE2B 63c853105d3a588418f79e877aeedf0b001bbe52eb3e6c82687127a8cc0b8e424143e75c7a77b224ede31c5db0efb1bbc126e851dbc8bef5b856615b0717f6ea SHA512 f3f75b2f9ecfe74d3bb081904750769bf331fb594d266907782b7ce7f9d062c261b2f95a50ce21cf8917c56a25899274dae466a5b59afa5ec66480182df55bd2
+DIST zope.exceptions-4.6.tar.gz 30876 BLAKE2B 9cc9a040269aa2f813018670e3692c9897fbea3a346b37e72fc54e72fb33dbaf0f14c192a76a7c40f57674caee4e17e86aec5f1d60e1c0e6a801d859d9629189 SHA512 d28a4434b27f6611040b290dcece26c1880982853092c89d5a8d74093cb9339a62834d7c3949d5ea28c4d3fc01c6f36180df22031cded6e4c963acfff65c2ec4
 EBUILD zope-exceptions-4.5-r1.ebuild 1000 BLAKE2B f2f963066cf263d5507b60e3236d55547cc99828db939cc1d9f12ffba8c4b1b960a437f060a1907895d25ba516175df748953cc2eafa60bb3cb4aad74bffa64c SHA512 7eb7d181f2a5ea2ce1c88921f0eff08502d026e67f5f889caa75f829e4ed849fdfcd0f38bf52b1e85c8158d96e7372115b1ef724036c5cf6dac0f59382a50427
+EBUILD zope-exceptions-4.6.ebuild 1000 BLAKE2B 35f71caa16ae4bd7e2e83daaa490ec789c166784f2aa8b38a80b7472d19c0981d4b39011567207c4169bbaabcb824c9663c12914599212f95264c49b11a9b7fb SHA512 f435463f58ae2b7c6ffd57abd801f78d290193ca2d4dd04378f45e2eacad0879851bf8e95f9869971f2ad9691edefc5bddace45673bcc3b407621c74e96b919d
 MISC metadata.xml 413 BLAKE2B 3bed6e3e8732f8e04efffe7ea279eaedbfef2fa2d011f1881fdfa814406b0ed5e5a926eeb1a0e66858c1f0524d5c1d1948313c50c53d9fce6cc4596ddea9f87f SHA512 ec4b63a6791605b6c66649026a10d0bc445849b801e9e6350c1bb06b7a244c86aa558830ba39dc1a3d35b3dc2d650d1a52cbe7f84c912f5f7711fe6ec6bf55c4
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.6.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.6.ebuild
new file mode 100644
index 000000000000..93aaa4ca6baa
--- /dev/null
+++ b/dev-python/zope-exceptions/zope-exceptions-4.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="General purpose exceptions for Zope packages"
+HOMEPAGE="
+	https://pypi.org/project/zope.exceptions/
+	https://github.com/zopefoundation/zope.exceptions/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	!dev-python/namespace-zope
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 91b054d4f8fa..819bb169900c 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -3,6 +3,6 @@ DIST zope.interface-5.4.0.tar.gz 249329 BLAKE2B 3a35ce6ff2a9984ed865cfb3bc3371e8
 DIST zope.interface-5.5.0.tar.gz 253292 BLAKE2B 2c3e48aeff7124a50b834792774596bd3ed793146be7335a0b3abbaf0e1861d84668421b9098cf4f8986d17f8f148a7b30b929ea73b5d344e5d63d44270b2a99 SHA512 ab74a55a90c17b1aed55f1d6e24365321ebbca5943557be7731af99d7436f18f4d0a4c53c0c26c29c0379ce72ef0c2babccaa9cad5aec843bc533ff19fdbe6d9
 DIST zope.interface-5.5.1.tar.gz 300064 BLAKE2B a40de949efc269e3b942eaa6bd5006afc253487149ef22fd1d070eb15535ad755a34cd3e3ab053652cbd1117aef92fe79e8de683491c8e8eaa41e4da8b9b12bd SHA512 e5d73a78a8d9960cf8f24a7603175b0ebe0f2a3695536cdcecb5f78a6ee118aaa8fdf26c70d08a9d17f70e9b89024c260c732e2f9c9153ab960f3175fc10b9df
 EBUILD zope-interface-5.4.0-r2.ebuild 1272 BLAKE2B e8c6f9ce1a645d2b8e349bfcc98b93b324f6bc3346db0901f85db16159d819e53cce0a4a6b02b28b404cfe99e53ee0a002698da4e2c4cc7ca4a18045aae34a62 SHA512 cba7ae17d9a8cfda3b1479d58b3d0e2e5eaa7f513020f005be58bb1333b2c8fcdf3496de742eba0560201f0421b02a1eaa256ebca128b3321b865bcb3587407b
-EBUILD zope-interface-5.5.0.ebuild 1282 BLAKE2B cb0281d2784f7e35c00d68df496532ec119a3b26b25384daaac15807a780ac384b6cbfc1921edc372272584cff753f619fe7ffc164018da017a60242e0747778 SHA512 fad0897bdd3a245be8da16eb2720d53375e728d3b5025093f16e5ffaabcc7fb56377cf8a65fc0b37d689674fa2bcd979c3f7b519d922feb2742d92c42b1a1e4e
+EBUILD zope-interface-5.5.0.ebuild 1278 BLAKE2B 217c267a7303db03e693efaa659d329967f33e7b6f9ae8966e690e4b0c27ace7013ff334e8756493dae43292d1e0d84a41072d1e2f8ef2ddb0c24baf07ac76a1 SHA512 1220c7988d12b2e771544124ddc692052170551714343b8b12d4800d785457b20a10caa057c7017293e08b63eaefc73cc15e35f2f9b7f74d80ea401b53dcc4a7
 EBUILD zope-interface-5.5.1.ebuild 1285 BLAKE2B 494bd885a8482163486f792389daddf7399f33c341740346cc5a26c6ed641a3e115f709d2103ff1b2de65055cb73202230590f9392d4b3dc92642e0f0dfdd7b7 SHA512 d4c853a2fb8372720ab87925d35885b47112d687e65ca96ec0e10a229414260872f60747ea10aa66ad1684a587266ef6106a9637ca0c81867625bc9f805e2d81
 MISC metadata.xml 387 BLAKE2B 1d5e2a8f2fcd2c8fcb423f8a123d2d17a0456cd4003489358abd8baf74d3ea9ddfa04af94b9ef67b329520b5ee9bc3084343e824f3fbf7420f14372d43581dbc SHA512 258f0bd291cd42f6374bd331c3b906f149ff455dd264716eefc63487710d95f8b388ecb34be5733dbd7a0e185f449cc18fce04b46521a2d19fd9766e7dc0ed82
diff --git a/dev-python/zope-interface/zope-interface-5.5.0.ebuild b/dev-python/zope-interface/zope-interface-5.5.0.ebuild
index 9b8cc65cd440..f2d123638e1b 100644
--- a/dev-python/zope-interface/zope-interface-5.5.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.5.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!dev-python/namespace-zope
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 51720d471eff..619354ab3bf2 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/jquery-rails/Manifest b/dev-ruby/jquery-rails/Manifest
index 0fcb0d7d0090..f0a3ec6811df 100644
--- a/dev-ruby/jquery-rails/Manifest
+++ b/dev-ruby/jquery-rails/Manifest
@@ -1,5 +1,7 @@
 DIST jquery-rails-4.4.0.gem 526336 BLAKE2B d6a498424fd89ed575fe778a91ba199eb81fe7c98ac042df8602d0fd680305543d8bb1c1a663d12cf696ec50e1196c59b068051c4bf34b0e3b321cc3ea898bdf SHA512 af363fe81f9689ccb7effd8a755368245b14fdbc67e14698c7dc48e69e18b731e1c65ceefedf86638d6dca6378d21c3175b02f16f6c03bd76c45494c1d0e5eab
 DIST jquery-rails-4.5.0.gem 526848 BLAKE2B 2770db2e195932f5b53cf1f7145fb66f436b3c32a8691793b1e69caa4b6671ca8f9bb7ef98065805a12309aede123973ef7496fd787a24771c77edd57b9bb840 SHA512 1f1c679013110815c9383458839e82ff07c0980a2a068231ebc8d657cdfa6d8af792aed11b7ccbaba56d557ae302ed38fdc12c58599a5b5abeda3ca67f404516
+DIST jquery-rails-4.5.1.gem 527360 BLAKE2B fffd91adabd7e24a23fb65e94b02f6484d53afa5b63902ed7ae487f97a13289b2d884508b45744aacf2d5e7ab47dfab6a37ed94e8cf0bb8e56271692762facf2 SHA512 7921de900d1678e0af9adb1a83bf0ceebc75666a991d0babdc47465c45d08df0de959650eef750670b225354c942a2795fb08cb67694ce05d33af90fa1de5917
 EBUILD jquery-rails-4.4.0-r1.ebuild 738 BLAKE2B c6d73a8b0b762225af4ee9676a03019fd846a0947ab86498db8c650e1b4ac1ed620a8414d3b048d238f38d4664b6ae53f263c127d6c6c54bcbc6599288aa6da2 SHA512 f7de27c9d4400ba0f8e476937d56601feb6b39c712c0320ab2b96817b946bb76db32091c3dfa301f75a615799232ac0cdb84e7d1a80542fa54b74783c0987d8f
 EBUILD jquery-rails-4.5.0.ebuild 738 BLAKE2B c6d73a8b0b762225af4ee9676a03019fd846a0947ab86498db8c650e1b4ac1ed620a8414d3b048d238f38d4664b6ae53f263c127d6c6c54bcbc6599288aa6da2 SHA512 f7de27c9d4400ba0f8e476937d56601feb6b39c712c0320ab2b96817b946bb76db32091c3dfa301f75a615799232ac0cdb84e7d1a80542fa54b74783c0987d8f
+EBUILD jquery-rails-4.5.1.ebuild 738 BLAKE2B 9e8df95195d91a616afbe018a377dfb6543b814b848ace5f7803205dfb206922b652ac28b9ebc3b808c06305401aaf9ad334fb8097453d7b68e04895a9104a59 SHA512 9e090271258951ecab57e7048406e8eecd45a297df30bb1b635dcc482b0bc4ea584a6eba9e729666a2e7a988310150f596c8b46d408e7c4a7d930014110660e9
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.5.1.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.5.1.ebuild
new file mode 100644
index 000000000000..931ead3aadc7
--- /dev/null
+++ b/dev-ruby/jquery-rails/jquery-rails-4.5.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md VERSIONS.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="jquery-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="jQuery! For Rails! So great"
+HOMEPAGE="https://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/railties-4.2.0:*
+	>=dev-ruby/thor-0.14:* <dev-ruby/thor-2:*
+	dev-ruby/rails-dom-testing:2"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9a6d424dab78..5be56971e7b8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index dd6801ce1354..b6d15196e9da 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,7 +1,3 @@
-DIST gource-0.51.tar.gz 882783 BLAKE2B 86a95a55ef9e1ec50e19a4859163d7cdc2733b7c55a68e4d2db493e4c6587682b900b2c73525131972da4dde9fc4d9fa41ba728bdc56fd46fc6a559cb4d837f0 SHA512 f29326ffb2aa6f645fb941e08e41f0cbf8dd894d5a4d607b782caeb12a24e6446198027060b880e0ad14a36efbed19023620dd8c890cfc0c027fc90ac2d5be24
-DIST gource-0.52.tar.gz 899916 BLAKE2B 84cd4e21402157228f2eaa2c168a7cebf5176e98efe19f04927abc08602e58896a15e6888b5223b977105f2a5b124ed571f30445e6802cf30217e6a91d885520 SHA512 246e8b196f52f4a224e1f81c05ca0970002d15b26e2bb454826c5373bb3a53894abb5c7e6c940a5a540f5e29795093ca7c14dd003708f44df1bbd88faed1433c
 DIST gource-0.53.tar.gz 900932 BLAKE2B 7f2822b11b5eaeb5345ade1326702109dff120d3ef8c523a2425a84b54d357a29cfe23a9c4a253b287d570e74943cb67bb80753c6c698f9f60739735cb41769b SHA512 e4190eb581d9998808d1bb4f18ba5a3ae22bacf643b9a150c7d1607e97fca2eab720592aefdcc6a47f92adb4a8df17db48bb941a67ee3d23a10f300754f473be
-EBUILD gource-0.51.ebuild 1054 BLAKE2B a4ea009908b346853811498a091141c944c246ce71e6c06c4d079ab2098a8d7603263107d2e05a0396c536679d95d841822f7c9e2872b36a9d91007062409d81 SHA512 451ce5cb9e4877005a6c505a501ddb272312c71ebb5e5978567291bcde808a060fddbe5bd83fe54ac56e9948acaa61b715fc5e6d8311a6dfd967e84121baf59e
-EBUILD gource-0.52.ebuild 1217 BLAKE2B aff703287e869f866e55cb79e775dc23f604861f81a04e67ba14e7cf6345f327b2343265caa2e0ce815039a4e6b53775c13d3f01c01e03d9caa78540484573e6 SHA512 021c5050905ef14bf240b122beadab813f9d27b44ec09fb659cbfb32cd683924feb7389806bd536f98ad53026a12f36083f4bf090cc3f5806c06078b6db6f632
 EBUILD gource-0.53.ebuild 1215 BLAKE2B 8dcd9bfdd19ebd55427df717638db5002671950515dc5c9c2540da8f93a0ee1de76f9fcbc1893b7029c6522c69712137ff6c81f10cde03fd929433c30db1d03b SHA512 6fab07354213e49a12d6aa214bbb1c4b534cea995ea62dcec8f9ab7f725c826e1c9f7033d05319dbef780659c9ffaf032d80968cb4fb69378410c85283502747
 MISC metadata.xml 386 BLAKE2B f163d4c1807ee502bfcb21f1a0f5b22d979259629e54d71fbaf7b54806f58090c78260a7ad8c24fe8349f01fa7502ec4c0b45129a94ac2a4e64b35e6b98032d1 SHA512 67743f4d934bfb15512fadbcfccb95a2a3e29b74d2bfd0fed8e4ff3e0c9779750df190f8dd61ac47397401caad5ce66d6a75ce1269b0d69d93304987740c73c1
diff --git a/dev-util/gource/gource-0.51.ebuild b/dev-util/gource/gource-0.51.ebuild
deleted file mode 100644
index f88a0e06699b..000000000000
--- a/dev-util/gource/gource-0.51.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="https://gource.io/"
-SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/boost:=
-	>=media-libs/glew-1.5:0=
-	>=media-libs/libpng-1.2:0=
-	media-libs/libsdl2[video,opengl,X]
-	media-libs/sdl2-image[jpeg,png]
-	dev-libs/libpcre:3
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/mesa[X(+)]
-	virtual/glu:0
-"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/freefont
-"
-DEPEND="${COMMON_DEPEND}
-	>=media-libs/glm-0.9.3
-"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README ChangeLog THANKS )
-
-src_configure() {
-	# fix bug #386525
-	# this enables gource to be compiled against dev-libs/tinyxml[stl]
-	if has_version dev-libs/tinyxml[stl]; then
-		append-cppflags -DTIXML_USE_STL;
-	fi
-
-	econf \
-		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
-		--with-tinyxml
-}
diff --git a/dev-util/gource/gource-0.52.ebuild b/dev-util/gource/gource-0.52.ebuild
deleted file mode 100644
index 6cfdce5e21cc..000000000000
--- a/dev-util/gource/gource-0.52.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="https://gource.io/"
-SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/boost:=
-	>=media-libs/glew-1.5:0=
-	>=media-libs/libpng-1.2:0=
-	media-libs/libsdl2[video,opengl,X]
-	media-libs/sdl2-image[jpeg,png]
-	dev-libs/libpcre2:=
-	dev-libs/tinyxml
-	media-libs/libglvnd[X]
-	media-libs/freetype:2
-	virtual/glu:0
-"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/freefont
-"
-DEPEND="${COMMON_DEPEND}
-	>=media-libs/glm-0.9.3
-"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README.md ChangeLog THANKS )
-
-src_prepare() {
-	default
-
-	sed -e "/data\/gource.1/s/^/#/" -i Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	# fix bug #386525
-	# this enables gource to be compiled against dev-libs/tinyxml[stl]
-	if has_version dev-libs/tinyxml[stl]; then
-		append-cppflags -DTIXML_USE_STL;
-	fi
-
-	econf \
-		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
-		--with-tinyxml
-}
-
-src_install() {
-	default
-	doman data/gource.1
-}
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index fffb8758dc4e..917bd026c542 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -4,5 +4,5 @@ DIST spirv-llvm-translator-14.0.0.tar.gz 1482704 BLAKE2B f88eb8f4cd652c448e46560
 DIST spirv-llvm-translator-15.0.0.tar.gz 1515145 BLAKE2B 1f93b55f8934ce7dbc9416b82f7bd544d16e95be795047e914d0c303ec90965eae03ab3522b3c92d6cffb1fe00bed78a4bb74085d3da21c14b68ad3fbe53113c SHA512 8a6ddddf326dad96c1c5749ebf03e63e6be60592dccd307f7a35be668cec2b4f58c2f089854aeefa37398c3a97dad6bf92a6ceb892da27b5cf9d4ae1aa41dd06
 EBUILD spirv-llvm-translator-13.0.0-r2.ebuild 1393 BLAKE2B 05cd645ace5d0e889e8199f74d2ff6f342cfc7c60091fcd339f99ace5c80f78a2be38db366ebc46dffb4527f25415e322df5e4ba175a622d39feb6431828c1fe SHA512 1275e9bcece435865e6ac9050426470f7f7c934023cabc30b1b0065e6401294943201f0df7b70553f6a3f3cd3039d7c8c39776bab15b936e3d9dca8f4eefc804
 EBUILD spirv-llvm-translator-14.0.0-r1.ebuild 1203 BLAKE2B 0bf581cbfcda0ae078bbcbb4792a19415b326d3bc14cac4c2e616ff2a16f8d15f3b98d852a6d40df4ce0121ae4a331ee49733c676eff862ef0fea270d1fa3b43 SHA512 db59082eb283cf789cbb9ed9604890bc4079932e45e4f3dcb98fd106dc9757b7f496eac1c2c0aaba7184bef2900efd12ce4c4d3609ce84b3c792c5174d6ae8d5
-EBUILD spirv-llvm-translator-15.0.0.ebuild 1204 BLAKE2B 56f1e6f1e5feb1940cc0f3ef0da1aacca9ffa4131a91492e4b0add2b45660441585fadefa67ad9aabd9d6939730ce7eaa0122247dc5b453ddb8e6240e01838bf SHA512 46f61d6e52ef057e29e6b3b8ad04c121740fb4f98ffd7dad71bc8c675ed3bf4ecf3f580f47b25766c2a5b76fd216b1ca915cc368e44e48f041a16590c5b1d277
+EBUILD spirv-llvm-translator-15.0.0.ebuild 1203 BLAKE2B 02f0648703d683c2514ab92c57da4ddc479b4bc12c23f4293320dc50d9fbc8fb25479e2b5dbfe5a7740a4a375354f6a3e84c2bdc2a500fa991a1fde806d698b6 SHA512 fe2f5ad1480597fbdda293b7c650571039dbfee896f4d97e948669a69d8faee82729f6360a6ea578360792ab72a5a0a27de8b16560f23a2485fbe3d3124d740a
 MISC metadata.xml 696 BLAKE2B 8d5fd20aa6ce0ed9c7660ac356f9c2274c8262680faf04aa647890044e8c48703366aa59a6c9b638105a5269ae2bcc7d1ccdb01fbb268b2054d6dce7a9cb875b SHA512 c0ce5f3a5eefced8c2a3fe8988009f4ae2dab5c1a93d5f908d24e2445696799dc937cde7f1ec29237ce44a653d496a74b246ac9d65ab132c33c5334990a6238e
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild
index d46120e8f99d..ab5c882049c9 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test +tools"
 REQUIRED_USE="test? ( tools )"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/yamllint/Manifest b/dev-util/yamllint/Manifest
index 54074ed6ba1c..d98d6b655939 100644
--- a/dev-util/yamllint/Manifest
+++ b/dev-util/yamllint/Manifest
@@ -1,5 +1,5 @@
 DIST yamllint-1.27.1.tar.gz 129052 BLAKE2B 37021bd577384821b75ddd747f1dd3c4261317582d42179e0731214cb67f79bf9302c34acaa721440edb118ef8900cc2952d1f8e441def9e3143b57e03af87bd SHA512 c00fcb5da35f79b0f877f1b8c3e5f1ff8c5d161dd795d3a2657e44e27d8b943961984bf15c294be263e00bf9dfcaf3dbf16ef8fd7354bedc8ed92e3e24ce4baf
 DIST yamllint-1.28.0.tar.gz 121934 BLAKE2B 6c93b7f45cab49159f6a36aa24ac303455432734fcb90f75cf80551eb2c5a78c9695e76f968aa7e22ad976accd0257567d85d7ac24474695dbe3e4dcf7f6eea3 SHA512 9d811616f5a2c8c9574ef74afd2548c415881386932e4ee9b29311c3ef32150ed868943bcef19b31226d9a31f0be384e0ee3b3ec86cebf0d7c4216696a6b0161
 EBUILD yamllint-1.27.1.ebuild 612 BLAKE2B 5e441c366ff621f05e27940e382b9912dd4adfaf7eec3bdc883c9e71cd6c5130e5ba2712ff3028326ff6a5ec2df1a88fc14405b747df514c4e0d6b09fe88cf1c SHA512 d169033f5da10947c7dfa768af65929f035b6551a99c146f7c03774563465515735fb806fd43d10e7a74c5c92a72b76a601bcec19f5a31844a6529c8ab3c9bb9
-EBUILD yamllint-1.28.0.ebuild 613 BLAKE2B 333eb7ba0465e57f53bfa953df0f00dfdf998588711f04c7fc2989f09dff7f28c0968b647f5d540e82bc5193ff7d8848f18f66a0947710a8b2aca693f2f1803e SHA512 3f8e25365c8ac2cc394c42eee666eab1ef399a99dff7ecb62fc2bb4b0b174dbaed29b2003d856f1a3046166281711c13c488bfd6181e5504f0e524ece65c894e
+EBUILD yamllint-1.28.0.ebuild 612 BLAKE2B 5e441c366ff621f05e27940e382b9912dd4adfaf7eec3bdc883c9e71cd6c5130e5ba2712ff3028326ff6a5ec2df1a88fc14405b747df514c4e0d6b09fe88cf1c SHA512 d169033f5da10947c7dfa768af65929f035b6551a99c146f7c03774563465515735fb806fd43d10e7a74c5c92a72b76a601bcec19f5a31844a6529c8ab3c9bb9
 MISC metadata.xml 401 BLAKE2B a521c886cfd44743e875bcb3a5901f555bf13829b1697a4673c99d728559959460a150b717b6568a3fdcf82c73a8425997bafae1f5f8afaa30a0d43862e7a730 SHA512 52b259b62b147104c3150477c41b37697ad55ac5ce074be70568d001c15c1da099a1f2877a193164ccb9871d7fb6275bef12aba110cf83d5f04c4dfb30e156c9
diff --git a/dev-util/yamllint/yamllint-1.28.0.ebuild b/dev-util/yamllint/yamllint-1.28.0.ebuild
index 69cc6355b3e2..1801d77956ff 100644
--- a/dev-util/yamllint/yamllint-1.28.0.ebuild
+++ b/dev-util/yamllint/yamllint-1.28.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND=">=dev-python/pathspec-0.5.3[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 09c8a52537ab..f84ace382421 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/gweled/Manifest b/games-puzzle/gweled/Manifest
index f738e46a2933..905718376eeb 100644
--- a/games-puzzle/gweled/Manifest
+++ b/games-puzzle/gweled/Manifest
@@ -1,4 +1,5 @@
-AUX gweled-0.9.1-gentoo.patch 360 BLAKE2B a1e618e443d08693fe9cce4d263f1ba7095606f0af5a8504fef8eccbb5d46d3fc42792468263c36e26b448cafc487b92258422c2eb3d46c5ac3c83e7bd9b3a15 SHA512 38efa262f9144d64363d0724291d786545875c0e81fe2e537be456b9fbade2d3a29210e70c4680f28009f317dce9c907745259bc4bc6ded22b0acffb19cb4db4
+AUX gweled-0.9.1-implicit-decl.patch 265 BLAKE2B 9793d3ee7358dd32464efec757357f6db7f272a49565c307785898b35d0474e23fee341616fc20eb0e186b783f7722c5036504bfdeca05bba28bc0d41196c6d1 SHA512 424d044b96e4125b07aed308c9dfe687952aa737a7705c13ec208d3a1f7d042275ebbbe6f039f29e84b934b7891fd615ef82a7f03336eeeacc009e79e1ba16e5
+AUX gweled-0.9.1-librsvg.patch 1161 BLAKE2B 883e7996937572a5ae48bd184395706cff928c61f5004ef2d418b066cb12e5d752364e0348095b83cff25ddd48c2459157ccd3fe63e3bf36b8480505c2aba4f0 SHA512 629ef535dfe8ea24a973b2fa0f6190bf8ffdb1113129eb6817bceda86c853d7815415ed40496041d0ce304b1d2561302c1d4662b13ddfc9a5c3c0723c728bf9e
 DIST gweled-0.9.1.tar.gz 403252 BLAKE2B 6a80e10fecc858a94d79deb7ad1a9dce0f5af36649bcb61c819816218fbcd72e70cdbfaa8915db13082a6274b75bd4c585c5f583f9f290bb95c2cb4468c4d2dd SHA512 12ac6f0033e9af037febca3ecc86f7531491498a38cdc36d7baf113fecece75da4a5b83f6c6e8f4fc6beebb24d479eac10087baa9effec4966cfcfb6c42df75a
-EBUILD gweled-0.9.1-r2.ebuild 696 BLAKE2B ce6a0c0215106eba80d0188bfc4e419cd0358f4ef44aef4bae606ea42e518d70690ff162d04523955f16458850eeae574c4625ce5934d1e28eeb832418052781 SHA512 538a19c85daf8808cee07785c427c272ed334ec85df64f63d023f2b13e4a79e3df8a7d61e42a37851bbcfbdf081519b17f8713b5c294f5952c6360ed7017c804
+EBUILD gweled-0.9.1-r3.ebuild 913 BLAKE2B 5ed38592ddf0d7ae68fa261630d031d46d511f0b9b8405b1d55867797ee50ad83524f0ff8c1b6ce6f6c1df19aaaf2b629ce4918b81a1baea73f66bae80f42c19 SHA512 f290aec61fccee97269e5d5c5c2fa6e612e6dcf04a1f61d46b462c211bb1e5d1a7baa69a148ac36951e64effe626dc2d2219e9878f743c5981b1dc98b83a06ef
 MISC metadata.xml 328 BLAKE2B 9c2fccc813e00164ddee2c71c4bdddc44bc325f2e5545cffd092168a5ffbecd600410211f50b53f75c0a43303ba9ba7d3ec4be3c9b2454f8d858a3d7995ea72f SHA512 3b29466b5d91ebed14c24eb6e575f0830880b67c63cd3624991f249618f77f8db121be699726d1548e7720cb0c29cf1465b0abf8dad4c37350557c8f5ec5bfbb
diff --git a/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch b/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
deleted file mode 100644
index fa5857492da3..000000000000
--- a/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in.old	2014-06-03 09:21:52.868225743 +0200
-+++ b/configure.in	2014-06-03 09:22:06.604614448 +0200
-@@ -66,7 +66,7 @@
-     *) AC_MSG_ERROR([bad value ${enableval} for --disable-setgid]) ;;
-    esac],[setgid=true;enable_setgid=yes])
- 
--scoredir='${localstatedir}/games'
-+scoredir='${localstatedir}/gweled'
- scores_group=games
- scores_user=games
- 
diff --git a/games-puzzle/gweled/files/gweled-0.9.1-implicit-decl.patch b/games-puzzle/gweled/files/gweled-0.9.1-implicit-decl.patch
new file mode 100644
index 000000000000..fc4f75f260ce
--- /dev/null
+++ b/games-puzzle/gweled/files/gweled-0.9.1-implicit-decl.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/874738
+--- a/src/main.c
++++ b/src/main.c
+@@ -34,2 +34,3 @@
+ #include "games-scores-dialog.h"
++#include "games-setgid-io.h"
+ 
+--- a/src/main.h
++++ b/src/main.h
+@@ -26,2 +26,5 @@
+ void
++init_pref_window(void);
++
++void
+ save_preferences(void);
diff --git a/games-puzzle/gweled/files/gweled-0.9.1-librsvg.patch b/games-puzzle/gweled/files/gweled-0.9.1-librsvg.patch
new file mode 100644
index 000000000000..96d8a5571e34
--- /dev/null
+++ b/games-puzzle/gweled/files/gweled-0.9.1-librsvg.patch
@@ -0,0 +1,45 @@
+Fix startup issues with >=librsvg-2.42.3
+https://bugs.gentoo.org/697514
+https://bugs.launchpad.net/gweled/+bug/1869038
+--- a/src/sge_utils.c
++++ b/src/sge_utils.c
+@@ -19,4 +19,5 @@
+  */
+ 
++#include <gio/gio.h>
+ #include <gtk/gtk.h>
+ #include <librsvg/rsvg.h>
+@@ -30,5 +31,6 @@
+ 	gchar *full_pathname;
+ 	GdkPixbuf *pixbuf = NULL;
+-	GError *error;
++	GError *error = NULL;
++	GFile *file;
+ 
+ 	full_pathname = g_strconcat(DATADIR "/pixmaps/",
+@@ -38,11 +40,23 @@
+ 		pixbuf = rsvg_pixbuf_from_file_at_size (full_pathname, width,
+ 						   height, &error);
+-		g_free (full_pathname);
++		if (pixbuf == NULL) {
++			// Some versions of librsvg need URI instead of path.
++			// https://gitlab.gnome.org/GNOME/librsvg/issues/198
++			g_clear_error (&error);
++			file = g_file_new_for_path (full_pathname);
++			g_free (full_pathname);
++			full_pathname = g_file_get_uri (file);
++			g_object_unref (file);
++			pixbuf = rsvg_pixbuf_from_file_at_size (full_pathname, width,
++							   height, &error);
++		}
+ 		if (pixbuf == NULL)
+-			g_free (error);
++			g_error_free (error);
+ 
+ 	} else
+ 		g_warning ("%s not found", filename);
+ 
++	g_free (full_pathname);
++
+ 	return pixbuf;
+ }
diff --git a/games-puzzle/gweled/gweled-0.9.1-r2.ebuild b/games-puzzle/gweled/gweled-0.9.1-r2.ebuild
deleted file mode 100644
index 0f88623656e1..000000000000
--- a/games-puzzle/gweled/gweled-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="Bejeweled clone game"
-HOMEPAGE="http://www.gweled.org/"
-SRC_URI="https://launchpad.net/gweled/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/gtk+:2
-	media-libs/libmikmod
-	gnome-base/librsvg:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	append-ldflags -Wl,--export-dynamic
-
-	econf --disable-setgid
-}
diff --git a/games-puzzle/gweled/gweled-0.9.1-r3.ebuild b/games-puzzle/gweled/gweled-0.9.1-r3.ebuild
new file mode 100644
index 000000000000..6c928fd0167e
--- /dev/null
+++ b/games-puzzle/gweled/gweled-0.9.1-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Bejeweled clone game"
+HOMEPAGE="https://launchpad.net/gweled/"
+SRC_URI="https://launchpad.net/gweled/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/libmikmod
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-librsvg.patch
+	"${FILESDIR}"/${P}-implicit-decl.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--with-scores-user=
+		--with-scores-group=gamestat
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+
+	fperms 2751 /usr/bin/${PN}
+	fperms 660 /var/games/*.scores
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 9daa99aed0e0..9a4ea0bcac72 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 996af0a880da..5c4c80117950 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -6,7 +6,7 @@ DIST harfbuzz-5.3.1.tar.xz 17874260 BLAKE2B e4d3926daca4f5c95441a9b99e10acd4b95b
 EBUILD harfbuzz-4.4.1.ebuild 2568 BLAKE2B 7e139034f21f106e2d3df102161487d788b49e6f52d2d109a922c0d38a9821fe090f71f5d844e04f495e16c69328b5b75c37dfd2faa05d1e120b19f4ccca66dd SHA512 0548def0efedc11cf90c9b57090e835a2f83a9e7f5b679166c04c16fc011dcf7919d5399c0ccbff1c7c8371c2480771d7a92da60573c3aa530e451cf5c2726c3
 EBUILD harfbuzz-5.1.0.ebuild 2574 BLAKE2B 2793ad1bf84ab388d2d5efddb74cd1431e2d4db4789273314e1824fd8c9fff9ea3f1489253b15703295fb46fd8509712cdd3cafe1a9e3aa07d2d9d9170bdd022 SHA512 80cd15636bc586ff84796bd0fb2d4b4b607e94335ad7eb83f6901164f4236c1cbb5db0533532b500638f25eb615da725ffd82aab5dc2cfdef50432597c1cf62d
 EBUILD harfbuzz-5.3.0.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
-EBUILD harfbuzz-5.3.1-r1.ebuild 2642 BLAKE2B 4feaed7d2b89312e44224947e5a308973896e2f56871a55883a2bbf7a1d9ed5060520a71158c0acdf5ef00cbf02d6ea54fe933b1d3133b9e92bc16a029ab8fed SHA512 050dab0a6755eeb0bae7b0ce8d4a276b42a30fc5fc5f0271ccc115da115c1ace4b23c636e5bf656753024b3ebfbfa4500f08bb5efaa51709cf9a7c9ddeb71a0f
+EBUILD harfbuzz-5.3.1-r1.ebuild 2640 BLAKE2B bba3f8d27b4b67cf77afe025793ab7b527921996094ae58c860a48235a2f6652b9ffcbba8f323bc58c54edd10ccc83abcdc2bce7d559285564010334ff13ace4 SHA512 0e311597abb38ac5790d749ec56cfebea4f08232917b90a2cb67d65d5fce52d67d874d1b55132277712410f14061caa253a9d1731d9e1e5df93eb721cd1601f2
 EBUILD harfbuzz-5.3.1.ebuild 2582 BLAKE2B 578a1f1d8d3e252587ec45d6b7bc07a78bb0284647226d3160ebb1a38f0e276579bc333038c7cd3bffb3bc9eae1aa5b1c6308ce1a51678bf2966bb7e3aa1a29c SHA512 d799301c05dfdaa20a10cc8c179240feec5bface78d3aec751cfe27e4066ddfb5b0d1ff1575928fde7f53599312d7ab35b4d04d3c90a23643a237bebfe9ea6d7
 EBUILD harfbuzz-9999.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
 MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70
diff --git a/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild b/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild
index 3d18d04660a9..aa0f3ea90635 100644
--- a/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/libva-intel-driver/Manifest b/media-libs/libva-intel-driver/Manifest
index 980af2e655ec..d250a8cdb725 100644
--- a/media-libs/libva-intel-driver/Manifest
+++ b/media-libs/libva-intel-driver/Manifest
@@ -1,5 +1,5 @@
 DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
 EBUILD libva-intel-driver-2.4.1-r3.ebuild 1313 BLAKE2B 6fadfb7331f0dbc3da6fde1e123d8e72512dc4bd3ac2be46c7bd88153bb38549b671b298eb4670b1afeb7a9fc434c34eb74bb3cf8200577f08b8194f61b52a0d SHA512 46198b827580c4d98e3da4689dcf695872b5cd44e45e5f8432a2e885c1d6189bef6bee632bc36dc3f1605cb74a7cc240c5db8b588f8aeafe01dbb1fb078076d0
-EBUILD libva-intel-driver-2.4.1-r4.ebuild 1434 BLAKE2B 4a105d08cdd57841ef15297f71bbc0988f9bf4e59008f2d1ccfba7df987a3ce36c4f6909b908dab12e4c4b1668c9f6b15fb6a253cb8651761aa5843135e4f7ec SHA512 f4e4250b7f02535728a3e5e00c99a200b6b30d725469ee2bf2db9f8f6a4b1e1120d73a5dc3db360607343f8ef97e408a6d734882db96d9243de27a45150019f7
+EBUILD libva-intel-driver-2.4.1-r4.ebuild 1433 BLAKE2B aa9760bd67061461e342ff7abe6fc655ce72b1e09c9e31c0e84a2b4cf1a5ca690ae0b4f4af5590bb69020b53c167faa757e12d52e9ad0254658b56c3db6317bf SHA512 66eb6650cb8ae5ab2cff72265a4a91715c55d4a9b446652a1392ec112d30232b14aed99ab159e458586671c8390310cb8888e9a72366e8859bbdf9185ab38be3
 EBUILD libva-intel-driver-9999.ebuild 1315 BLAKE2B 43f74385af30eaa60e053cd4ac6342fb71f4face46c0d019a2cf5d2330ca57b7c5903d113d188622803d30782c5e4d2902b7c3365ae6e3b76e188da1176a3674 SHA512 c9a8eb771580bcb66e65172a23feb6c03bfba03ac505003883479d6efe3a9df92b8595135e0e2db0ee6b6e7326e0613494e57b916f72af5fc76086de40067cf5
 MISC metadata.xml 490 BLAKE2B 1a66bd19f05f0c21849b8fe57ffc8f8e153af9a963e045b0c23050734a4aa506b920b91fb4606306f0850514df4465ef6f448042c0c339b61f75d7d6904e0ce7 SHA512 5bf8d70288c3b63678f6adafbf0a3284385e9122e4acf50455741e0472dd8fe1b8eb6d41ea92056cb2da462c31aa812b061297427dc9de1853539dbf762d7cef
diff --git a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
index a7d5e4df2625..0f26cafe184a 100644
--- a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
+++ b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
 if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
 	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index bf27674cb30c..37d8891a8fb0 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -3,6 +3,6 @@ DIST libva-2.15.0.tar.gz 264429 BLAKE2B c1bd8c3de25a266b8cc35400db464ea8b0dc81f0
 DIST libva-2.16.0.tar.gz 267735 BLAKE2B 59c5dc39e1c40c2f24455ec7b0588eb4898b3cab7c49ffbca997882c634ca7be6334fdb820afada8e2ebf39eb2166c95610df190d90c2a98c4fc25d25c733b32 SHA512 08a1481ac693ee9de639f2abd483e1fabfee87f9c04ead066dfce5c24cc7f1d1a29d8664707bb534ce4cc25e52086c5e4a0ecfe704ca59590ce41353fda31c2a
 EBUILD libva-2.14.0.ebuild 1656 BLAKE2B a65bcc2119e25a2a27e9324e83a2c9b11c6a646f09f6f592428d9ec445e08a63dfac192af1d7a4c8dc380c2e2172b1ee1bf0d399bf1384a5946c627efce047ca SHA512 31fba31b1464337f4b3a3f7005a6b3c2a1adee458e30c1e4ef55961c5494117bd084a7b0d71595d5bc07691dbe4a30b8b272c3aeef9fab8944695d410f95c83f
 EBUILD libva-2.15.0.ebuild 1656 BLAKE2B 170afb6271dc2b2ae47408ce47f2ab67ce800c0c5ab3f8444b85fc75aab49fe3ee07213f7b7a5bedb99fbaa3294d09cb80487ed63bacebb1711e568317faf2fe SHA512 c0dc31f442b0b81d066fb0e74cadcc2c763ac3b4706b680421d62dbc51689ead27282ecffebe08681429f84536470940df9afcef733fec66545ba223c7157ff1
-EBUILD libva-2.16.0.ebuild 1655 BLAKE2B 953f825e9e86522f3a0241667e313940031a7c7818dfc11e89b65d55a20462dd450d248fcab53616f97ffbc87e2c43805e1c5f13b1cd5c9a1dbc0818c56737d1 SHA512 6db97d1c9968b7a543fffc133b40445c212ec191d825de864be29e706553e4d0f6809d5338b188ebafde731bdd542944694f6f6865686dba48f338c2a5b3f014
+EBUILD libva-2.16.0.ebuild 1653 BLAKE2B f45e1021ec88c437b04b14d53217e560339e1d69787b6e3a2179d2b9c2a107c3899c852cc401186045c8e36a86b26d8e0bd36879fe4a06d18bac6e40dfc36896 SHA512 d014c7a39aca3cf80dd59863d523beafac978dcf81ae19b4bbb99195019bac9ce0c27f1954792b83366be659bea0e918675d14789aec51e8e46d8354f4c6d6e5
 EBUILD libva-9999.ebuild 1660 BLAKE2B e5a30d7b64db02bfa6b757adbbd673879ef7d790335459cc59755be541e002ebd827866dfd89a64d7aa7730456bf5516d5d8e1988c7c524b22a7aead81a189f8 SHA512 ec9d7e043fca8b048e4eeea549bec74c295fedd4f0cbda8f5f14674502a4715b89db81c66deb6454d1b4456f4410df7f0e0eb7beae79cc4af6943c47a0fce240
 MISC metadata.xml 405 BLAKE2B 02edd18ab96b6b2b45930e7c623275758bb763f2bd291459a587e020ec34f6a56d0152dcbaf662bff9573fc9e51c69def9ea1caf85f28dbfb6d2fe7be7a80879 SHA512 3ec8eeca943e313e32a5aaf77e5cb3ff277ab976ce2adc7a018d697ba1a45ee19b9555c29f304ade4132c70b2181ab67c04dedb8356d5a93a7a236b9221e3c8b
diff --git a/media-libs/libva/libva-2.16.0.ebuild b/media-libs/libva/libva-2.16.0.ebuild
index 9955f34cf5a4..6bd2f145f00e 100644
--- a/media-libs/libva/libva-2.16.0.ebuild
+++ b/media-libs/libva/libva-2.16.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
 	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index cb55e205dde2..ffeb1717c343 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,5 @@
 DIST SDL_image-1.2.12_p20210314.tar.gz 10890897 BLAKE2B ddc3e0a49e4ce8fc3c46c5dabe277f9bd2db81f43880aadc8fbd3b6fa09254669fdac90ee4c3c7b92d5c7ec97747944c3953ea2dca065e646416391730cb22dd SHA512 f087472593cbaa9e65c5d643d7801e2ff5e49bee66502d8c094ea18bcd5f66e6da153d39bff7bc81ed20556c909fc4cce279275ff55ee00aebf07d39c27fd543
-EBUILD sdl-image-1.2.12_p20210314.ebuild 1853 BLAKE2B 5bc24961cf0fc3761bc2b46063efab70291846113d8df52b7e0b06ac75439bb69be7d615a823b7e6f931ea294e9a596c91830a9e33e0a66b081aa983d33797d1 SHA512 9732a99c744d03622e1b4ceb908514d97ac3cf4e8f19a31bd9900ded8a7713e301ff028bf423914e3787e4dd4778e188c9faf43b2b45a5c74758c2ffb42a09fe
+DIST sdl-image-1.2.12_p20220527.tar.gz 10888198 BLAKE2B 413e130794ca3c59226e18f4380bc34fb497aadbe01da67ce2c9c76ebbaa5d3e47bad31043d823510ff62ef4bfaa4834d57799b7ea733f11ab66e58b37007583 SHA512 e0a091e1f1a646409c2f636b6e913b6532f31fa498a234fc669dd56b75dda34234818a22d7c3b5385cb50eb3af53316fa2f658a6739b40e4dd5d9513118143c6
+EBUILD sdl-image-1.2.12_p20210314.ebuild 1834 BLAKE2B 1e72f9c8325bf61eb0852bc4f81685cb19b35372a41015527e3fd6d126fcd477934f4e830734009b070110db8e3167e65ba6c2899d489ac05c0d96bdd9db56cf SHA512 3188b78295cb2a99565f8ef5299f406ced211c91d3fd71556c75f873a4552a1a8b74debb230891d67f1f18a49ab93d52ea9c074343bcc08f29626c6e621adfa2
+EBUILD sdl-image-1.2.12_p20220527.ebuild 1878 BLAKE2B 6f01499f9e3da2989627e1edc3bbfa8fa32b672884d5d4c0630bbdafb0360fbadfe86811c2a19d7b7c05da759f95b948eccb459da4ef7f47f7e9cd9490e69cb1 SHA512 d77c4ce0ddf2a5c531857ab029c53b665c60c851f85f4e689247efbaf33bdea10a53aeba2433efdf1dded4e0bf89e761d3470c8e0fedd265c58c791d665449e5
 MISC metadata.xml 365 BLAKE2B e7adf1771a0e52171d5ace8c77b8fb4b65019796c885f279e813b22f5a1abbefcee1fa9189a479788db4e5d1d2b96cf61f79e6881c816a19f0270fb69521e8d6 SHA512 80cc2d8d6af06bd4a43448c91747a2f04c477a59e19c9b46007b444c949e60664c26b8dc51755b67d7dfbd13a218b4126301f10fa3074d65740a8bfc7a0fe477
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
index 16f9cc515aad..7b13e4602d50 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
@@ -12,7 +12,7 @@ inherit toolchain-funcs multilib-minimal
 MY_P="${P/sdl-/SDL_}"
 MY_COMMIT="5d792dde2f764daf15dc48521774a3354330db69"
 DESCRIPTION="Image file loading library"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_image/release-1.2.html"
+HOMEPAGE="https://github.com/libsdl-org/SDL_image"
 SRC_URI="https://github.com/libsdl-org/SDL_image/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20220527.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20220527.ebuild
new file mode 100644
index 000000000000..8e95df6875f8
--- /dev/null
+++ b/media-libs/sdl-image/sdl-image-1.2.12_p20220527.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# or take new snapshots every so often as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
+inherit toolchain-funcs multilib-minimal
+
+SDL_IMAGE_COMMIT="633dc522f5114f6d473c910dace62e8ca27a1f7d"
+
+MY_PN=${PN/sdl-/SDL_}
+DESCRIPTION="Image file loading library"
+HOMEPAGE="https://github.com/libsdl-org/SDL_image"
+SRC_URI="https://github.com/libsdl-org/SDL_image/archive/${SDL_IMAGE_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${SDL_IMAGE_COMMIT}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="gif jpeg png static-libs tiff webp"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	png? ( media-libs/libpng[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-jpg-shared
+		--disable-png-shared
+		--disable-tif-shared
+		--disable-webp-shared
+		$(use_enable static-libs static)
+		$(use_enable gif)
+		$(use_enable jpeg jpg)
+		$(use_enable tiff tif)
+		$(use_enable png)
+		$(use_enable webp)
+		--enable-bmp
+		--enable-lbm
+		--enable-pcx
+		--enable-pnm
+		--enable-tga
+		--enable-xcf
+		--enable-xpm
+		--enable-xv
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake OBJC="$(tc-getCC)"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	dobin .libs/showimage
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+	use static-libs || find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 224f2e63799f..0d42bdb6052d 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -6,6 +6,8 @@ AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf9
 AUX sdl-mixer-1.2.12-parallel-build-slibtool.patch 4288 BLAKE2B 3beaeddf4e3ff97dc2778dfc79f800b3749a0b0fa511872f353587a3e01ded1cdc9c57c3a89cb3e1a6a34d6848b19aaacba5a2a81c3129906f521c2afc71e2c0 SHA512 b6e42b2ee43b57a3a4f3e8b47b96aa5d94b37f0326cbecca7128eb8b34f0ac00dded506a4d5164156ca23cf1aeaca6aa92f40ec43991fa73a97274a2262fe679
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
+DIST sdl-mixer-1.2.12_p20221010.tar.gz 5861748 BLAKE2B 95b8e59bf796aa1a1593d8895aa153d62653fc9085e65c380cef3a0394201dd6c5c0deb323d6acecd4bca0e46d11f0ec94ebab8be872654e46d2d56231a1fd12 SHA512 5b15bf81b868968a09f82b160e371355e40a29c95a3e79c3cffa49ab5cc7c3212034d12301c21c8a44aef5c981a7a8fec3cb76e9dfe55619159a613b8dec6557
 EBUILD sdl-mixer-1.2.12-r5.ebuild 3601 BLAKE2B f51bbe3d0cc2c60b47ddf3626a07b45bbfcc5334adf4f1fef0d6fd681b9fac44d47e3e879397329355539288c6d983cc31a600f9e9c4403143688c221e1df881 SHA512 dd3969be4a66304acbf4366dfd387a00ae4558ad7d595f62c7e7790d6206be5fede4ae807abec8a5baaa9484c98b158e5431f4c663306bf6f120cd4b25aefcce
 EBUILD sdl-mixer-1.2.12-r7.ebuild 3660 BLAKE2B 8b140bae4093ad4cfb2d8f69890ec72735e20037033a17fbacb889e749e61d609bb3b252cfa58edb77dbf6d0f3413e6389d70ce5a1b50096606c7cba67274c30 SHA512 570cfd9dce65dfe49f1303d89a0eeb1e6ffb6c0582fd144b1900f274068bae76a9c7e52c04e2c5e80913f862df7deebde79f46696e966641389782c722b7bc3f
+EBUILD sdl-mixer-1.2.12_p20221010.ebuild 3128 BLAKE2B 1eb1fa99ba7f50787caac2d59fb8d429b4914c0ec4219941e72f330ce7420309dc71724c8b4259d1eaf765679395e6ea01d629e469fc5b8a1835edff126fa44c SHA512 545dd4124cecf3dea1ee0e71a56a1c36fda9659cbd68add18f4113e7b5cb6b95802d4738d1e1eadbcee197114f37a0ed6e8bfca30285634899cc3ace23e58c0d
 MISC metadata.xml 787 BLAKE2B 4a9a04b0b88ec853de52f1cc7f6ad63e6bd4e5a421906daa2e0935c32d756538ef9aee8631e5be96665dd37ec6c4e47d256e30b01f7cc6ca56f29baaaa5ef27d SHA512 46520c6a56e9d6ff2137e71bf728349ed167f7ec10417345528e6da051e482b3a27158e46ae973d1bd0f348cac9e3f65e8a02eef984b8e00fbb2aced256ad2bd
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
new file mode 100644
index 000000000000..bd78de80724e
--- /dev/null
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Check SDL-1.2 branch for possible backports/new snapshots
+
+inherit multilib-minimal
+
+SDL_MIXER_COMMIT="7804621c533dddfe970e97c94c4ea72d48ed7f48"
+
+MY_PN=${PN/sdl-/SDL_}
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="https://github.com/libsdl-org/SDL_mixer/archive/${SDL_MIXER_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
+
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+	mp3? ( || ( smpeg mad ) )
+	smpeg? ( mp3 )
+	mad? ( mp3 )
+	mod? ( || ( mikmod modplug ) )
+	mikmod? ( mod )
+	modplug? ( mod )
+"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
+	midi? (
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
+		timidity? ( media-sound/timidity++ )
+	)
+	mod? (
+		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
+		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	)
+	mp3? (
+		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
+		smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
+	)
+	vorbis? (
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-music-flac-shared
+		--disable-music-fluidsynth-shared
+		--disable-music-mod-shared
+		--disable-music-mp3-shared
+		--disable-music-ogg-shared
+
+		$(use_enable wav music-wave)
+		$(use_enable vorbis music-ogg)
+		$(use_enable mikmod music-mod)
+		$(use_enable modplug music-mod-modplug)
+		$(use_enable flac music-flac)
+		$(use_enable static-libs static)
+		$(use_enable smpeg music-mp3)
+		$(use_enable mad music-mp3-mad-gpl)
+		$(use_enable timidity music-timidity-midi)
+		$(use_enable fluidsynth music-fluidsynth-midi)
+
+		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use playtools; then
+		emake DESTDIR="${D}" install-bin
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# bug 412035
+	# https://bugs.gentoo.org/show_bug.cgi?id=412035
+	if use midi ; then
+		if use fluidsynth; then
+			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+			ewarn "environment variable to the location of a SoundFont file"
+			ewarn "unless the game or application happens to do this for you."
+
+			if use timidity; then
+				ewarn "Failing to do so will result in Timidity being used instead."
+			else
+				ewarn "Failing to do so will result in silence."
+			fi
+		fi
+	fi
+}
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index f7f704b3672e..b55afb0fc313 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,3 +1,5 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
-EBUILD sdl-net-1.2.8-r2.ebuild 898 BLAKE2B fee3f7d5d3ffbadb653f5a3af448c7497a0a4d4ef30ec0dfa00800bbf305b0e5deb31b8a8fb3019451078b1560a07c580b83408605c997ff78ca95726b656dfa SHA512 1073b06c9a4c1b1b39b61e2128350b60d99ab96751ebda9a641720582bfc746c0066d7cbbf6e718615fa8bf41770afe2b10a94d019aa4a9ff477b78340b95cf8
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+DIST sdl-net-1.2.8_p20221010.tar.gz 373106 BLAKE2B 00f98a3326d5aba85acf839c4c4d02e8ac78d99bf5633ce8cdf0cf8bb281f2a730769a9ef769c834f847db74712c6715928b37520ed5c60aa06e4d828c8650e2 SHA512 643f0505252e32cca88456edcce7d41f0b37e1362bcdf26d714d2473be323ed70b43c825eb96522d9562be5f6830cb9062250de2e8b1244bbc8d31fa800d3342
+EBUILD sdl-net-1.2.8-r2.ebuild 895 BLAKE2B 751089b5fc5ae6abb7b25c07d045638110db282915bd51fd26e418ff28b0662720d9e4f6d265ad24ddb54a94b76c8fc09aa5975103e25dd72e6d204701a8aba1 SHA512 4dab254afeeff6b43e942062a85740f4b100a0ef16ed00288beaa7599e51f656032815139fda5e53b7ea67cece0c3c0bc52920d65c07448649175776858a08c6
+EBUILD sdl-net-1.2.8_p20221010.ebuild 901 BLAKE2B f0dd329f45329c9c8d462d5aa1add77cdd012e7f42c9e6105d7c8f882d490c9b7a4bd6ba2d5a8a46657cf93adfca9d3dc3a5370eff2cf2639d15be4b50954dd0 SHA512 6a2e4d042b0f90ed93077c95d0d6a062518bd4ef175fe6911c1547acfb3a501ad30ed496aabbeb145bd7062ab3d08fe9680c10ad5338b9db350c8b267936e130
+MISC metadata.xml 337 BLAKE2B 48ae83a7d75050dc1fc90dcd86e5f56d347f356af4c7d7e6bf0e7bd58a3cb56cc9a1d20391a195066f2198651e41c0af832b427490aad18c15d21250cd598f88 SHA512 9cf8aeb4bb0d72403d3c13e45bac9dbb54f791d1e783f384c5b87c014fa8b25696c29679479aa40d9ea96a2c6c71263bf1f3e3094f2930bc28fb11c32e36254a
diff --git a/media-libs/sdl-net/metadata.xml b/media-libs/sdl-net/metadata.xml
index 1c3ba213c494..56790c9e6201 100644
--- a/media-libs/sdl-net/metadata.xml
+++ b/media-libs/sdl-net/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">libsdl-org/SDL_net</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
index e03f1e258a2e..84df8fbab01b 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
@@ -12,7 +12,7 @@ inherit multilib-minimal
 MY_P="${P/sdl-/SDL_}"
 
 DESCRIPTION="Simple Direct Media Layer Network Support Library"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_net/"
+HOMEPAGE="https://github.com/libsdl-org/SDL_net"
 SRC_URI="https://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-libs/sdl-net/sdl-net-1.2.8_p20221010.ebuild b/media-libs/sdl-net/sdl-net-1.2.8_p20221010.ebuild
new file mode 100644
index 000000000000..6496f4ec0f93
--- /dev/null
+++ b/media-libs/sdl-net/sdl-net-1.2.8_p20221010.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Check SDL-1.2 branch for possible backports/new snapshots
+
+inherit multilib-minimal
+
+SDL_NET_COMMIT="091c95c031769f48d3ffaacddfdea1af999f4446"
+
+MY_PN="${PN/sdl-/SDL_}"
+DESCRIPTION="Simple Direct Media Layer Network Support Library"
+HOMEPAGE="https://github.com/libsdl-org/SDL_net"
+SRC_URI="https://github.com/libsdl-org/SDL_net/archive/${SDL_NET_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${SDL_NET_COMMIT}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="media-libs/libsdl[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --disable-gui
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index 738e678e9baf..e102a533c395 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -2,5 +2,7 @@ AUX sdl-sound-1.0.3-automake-1.13.patch 231 BLAKE2B cc17a9d7a9f8ea42f84b6a65505d
 AUX sdl-sound-1.0.3-physfs-3.0.1.patch 1574 BLAKE2B 9829f6429041322c0eaa41d547dbebfe03bf730e80d76b5b15afc66c123a87e0ab1fd9819372e37ed505c1a9e214c27583cb56e12920b3fe0c88a211177c79bc SHA512 ac228520e1c8e682b58919335ea117289087962b4b98fae23e743830709d8dca60a3d22c7171ee13bdbf84f528cfddcad70231edbba64a7cec88c7dd77295eca
 AUX sdl-sound-1.0.3-underlinking.patch 413 BLAKE2B 594339dae9a0230ddc1b821ca90d1650800610b0a7904fc00e33f1e3ff183ece1c8715b1d27b0c80cecbf5bda9e7b15255fba00fdc293f5e0841452efde447ef SHA512 1f67d72313abc44080a47b70c210bd6c03b2a204e85e2f5d1eb95f40367470bab4f14956f0404c5025fb4af7d72731dd1df3196ee316a2c5d9bb775e27d58a8c
 DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
+DIST sdl-sound-1.0.3_p20220525.tar.gz 1044804 BLAKE2B f82f7649bd411290d12ec6b6a4879e0f6a5a155b764b307b087ce2cad5b81dc0ac6fed674c666f470201e5aab5182d9e0c4b6f0d9fc94e9d4bc61d7dacd61cdd SHA512 0f4923e8234334c65697c1d9453a66b05aafd859b1586d9ed26005d93f4a27175b06a77616f09e450b586d0f21c7a1d76761de0fe5f1b144d444e6a2379055b5
 EBUILD sdl-sound-1.0.3-r3.ebuild 2134 BLAKE2B f1f5429dfb243da26936fa89ee47e50cd171defc1b470b75af1ad3666071ceba5ee1bf580d75c425370984d87a6e36507332bb8d6b6712ff72d8c8dbb506fa04 SHA512 05794ef14e799d102fc2354c4f3e02106b66c5ee8dee1c5a6a30f28a95a6294e7bc0b61b0e859d9c286b9f885a043dd361767fbbc8e532459d930c347b064d70
+EBUILD sdl-sound-1.0.3_p20220525.ebuild 1852 BLAKE2B 2a6c90c2a6e6f7696f52cac86af51f150e606509d2b31bd81f9332d299397b84b160694234daf13f2ab826616dc5e4ae774c021e42dcaf80fd5502c2a88a33f9 SHA512 a1a7ffdc683c4bc025e0a99c26f44d212b76fa7c3a95c8cff55544be09d4d8d94658b7cc974f193815b378723f57a64916603628fe07839519ed0dd7fb6766a5
 MISC metadata.xml 530 BLAKE2B 1927045e4dd57e0b2ac63cc6ef1165009aafe2a981c2d8bc0ff9ea3e3b9473fdca4945b8b7227a285a425bfd97fa4a65809e7ebe6477ac95bfa0952ea5a6190d SHA512 cc8d087914c0ab7689a7cc9ce230de1d531c4e424bed3b73c21a215a8b681314c9e0fad95039cbf4ec2e4e93911ac876821505ac7f0872c251240121d8e77b77
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild
new file mode 100644
index 000000000000..59d4ac776545
--- /dev/null
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3_p20220525.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Check stable-1.0 branch for possible backports/new snapshots
+
+inherit multilib-minimal
+
+SDL_SOUND_COMMIT="2076a4f555f95ed28dead5e28ee8e57cc74e425f"
+
+MY_PN=${PN/sdl-/SDL_}
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="https://github.com/icculus/SDL_sound"
+SRC_URI="https://github.com/icculus/SDL_sound/archive/${SDL_SOUND_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${SDL_SOUND_COMMIT}
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="flac mikmod modplug mp3 speex static-libs vorbis"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
+	mikmod? ( >=media-libs/libmikmod-3.2.0[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+	speex? (
+		>=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		# TODO: make this optional or switch unconditionally?
+		--disable-sdl2
+		--enable-aiff
+		--enable-au
+		--enable-midi
+		--enable-raw
+		--enable-shn
+		--enable-voc
+		--enable-wav
+		$(use_enable flac)
+		$(use_enable mikmod)
+		$(use_enable modplug)
+		$(use_enable mp3 mpg123)
+		$(use_enable speex)
+		$(use_enable static-libs static)
+		$(use_enable vorbis ogg)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index f4f22ee8ad07..11624331dd12 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,5 +1,7 @@
 AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
 AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc9beda72a1537d41186de0e2816b6d37486b1211ac274d72c1b369f82d2b977c173443145a4a49b9592379e667881d32 SHA512 22495819ad0972183d850496acdcae1358bd37d25191e62c293f8d5fc50c617507631a202d46bd1ec380c70d89c61d050763919d48912b9a527908e8ad1ef1ac
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1399 BLAKE2B eb11423354a01c4a258f91f6b57666ab08c7fc1235640366fb365fd21fc9a75cd39812cdfe721eee5b8ee817264f97abddf16e5403bbb4c7c165f9d4f930c3f6 SHA512 9d5a9a3f19bd5d2f7f70b59613cff3fb2c6501cd91c3930a1b2801d33735a13479b13d1e83f268a27a89981a601f8916aed0f8ceeb9ed462ad467cc1298cbd92
+DIST sdl-ttf-2.0.11_p20220525.tar.gz 5421461 BLAKE2B 93422fdc912369a503ef0bc2f474a7afd749396176a295484b9ff8b1c0b5a06c2a5a21b93c91b616816f7c1c5f3ff35c611618251e8ae7f2b2d337109a3cab56 SHA512 a371488b59b8d1d2b067ee8bb67912d11875ac202912ffd31d5fee4630dac205e2e757505ab4dba3267e4d2700c043873c3b37aa6813ece8333f1b25fa096346
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1398 BLAKE2B ea98a92174df8aa8d932c6c3e296250bd83fac8796a94e7a1c992c939b35d577813a8508a1f5df2ce5d37c7dc04a5d2bd0b07c5377a1afb7a2461c545fe00e76 SHA512 e6e4f41689ccd531dd2766d0417e787ab28d48c784f2cf7554f6cf69c91dacc98ae07ad5aa10d8b134a2703146b7cd1a945f48c677d4778a45f62bdf61b5764b
+EBUILD sdl-ttf-2.0.11_p20220525.ebuild 1245 BLAKE2B b053c6a000f60745cb6409b2220fbd9b3d60dfed3f5da7f5b52c1171553378502c20da5fc81d4b9f443c75d4ee9ec38439a55b117cec288b9add3ea6be69ad9b SHA512 a970770c6bedcda42e3efe3475b4f628bad49bb8832c77b3f0cf3bf2f3855a59d8da498c6f9c81193f6e1134d8230077620fd59ae025603fca715fbfeb98cc53
 MISC metadata.xml 604 BLAKE2B 28ad2d239df5d6096bbc586e3842b9b41739a76a740995955e08e7a324cca40566fed84a4050447cb9cb8edfbe14562f62bdfe7aa6b5b1c407104a0912dfc013 SHA512 07e5dc681f113e2657bb37307e4a28b1630e142d42685403f04af8505f9eb52dc6bae513710ca0b94170174d75455d0315dd75c784d99ae0cd1ac79fde3cf793
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 040210674b8a..217cd490b4d7 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -11,8 +11,8 @@ inherit autotools multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="library that allows you to use TrueType fonts in SDL applications"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/"
-SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/libsdl-org/SDL_ttf"
+SRC_URI="https://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
new file mode 100644
index 000000000000..414664c29897
--- /dev/null
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Check SDL-1.2 branch for possible backports/new snapshots
+
+inherit multilib-minimal
+
+SDL_TTF_COMMIT="2648c22c4f9e32d05a11b32f636b1c225a1502ac"
+
+MY_PN="${PN/sdl-/SDL_}"
+DESCRIPTION="Library that allows you to use TrueType fonts in SDL applications"
+HOMEPAGE="https://github.com/libsdl-org/SDL_ttf"
+SRC_URI="https://github.com/libsdl-org/SDL_ttf/archive/${SDL_TTF_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${SDL_TTF_COMMIT}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="static-libs X"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
+	X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_with X x)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	fi
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 903d38f484d3..53b57d8ba2b7 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index b0d80a0e82e1..18d86eb3a1bc 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,8 +1,5 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
-AUX din-52-makefile.patch 1946 BLAKE2B 46535f179ae8c12c9eeb454b82acea990688e241e01a88b8cb10e61e9bf7de4152990b079ae62f9e2f9873062bf7e9309f3cab026dce67241ec828b7d740f2d2 SHA512 91adbbf10ac46b447e21db796b40b2f4925a20144584f7649a1e55b64d47361907d95deb1468b3df1af2b344253b79330a93e4d5e8828f3bc81570f500d3f258
 AUX din-55-makefile.patch 564 BLAKE2B fb483ef0182b5bed5131a2915204c1a564ac31acef1faaa780804a46f3d23717d3af8222702b3d6846fdccf2a7370546d6f586add8a42a3fa2bff130b9c9b9f7 SHA512 e37d9bdec42df1abff6be2ffe80d4b46838d451e015a0d557f387922dddd54718733353e7f5cb198bf4d56b45754a933657a182b8420b81770fc5e2435719b6d
-DIST din-54.tar.gz 3710611 BLAKE2B 2a7540d9a413c0f83b2cfc7373b1c0fdd40012ae725f162810e4d3165e3bc669661860fd653eaed8c7f2eeed7f015ff50ce6082ce8de04bd035bf395ca018d6a SHA512 8831e6d838ba06373b13574701929f96a508f2899618509b3e79f23cb0aa11c34b347fa00b4fa765a7668c7db54733be2c9146b8e783d3fe07e3ea4ce2707bd8
 DIST din-55.tar.gz 3711327 BLAKE2B 2c6ba4a877c512a950fb7c731f20d285019da1c7cd4ab5c7ff8d75e3c25eaa4ea08ca865b37e12fa1cefc1175baaa1c7ce27a44c7fa7c0b6c59b0ccbf6ab7a39 SHA512 432a53e71d1cf96c9ed62694fb23d1264d2e80b34620ebf0f1f33f3d4787cc7358c42038b2a45aa9d3ba9f59828eaaebd521a046fd5a51919a13f1bffad16a22
-EBUILD din-54.ebuild 1087 BLAKE2B 7a67f19a58ad0555fa33921bee462e9be928e008b2cfd07c651143e5521cd2e0034ee3f738281ccbe2c327f20d6586ee75595717b962a7dca1c3c5349797d3d1 SHA512 097052995d6bc80e03e46d902ddc49d83cf8d2647ab30442b1f2391780de2876e795f41d5bd234060d35003abba4ee98e6e56c47567564ee44bedf0ba21a6fbe
-EBUILD din-55.ebuild 1085 BLAKE2B 47d21494c31e240d4aa34ac472bc5b225bb52e8b3530caaa00b03966654f78f0c232a84dc8038843734bfaaf5935ec3f407fd627e33731176d8b9bec94a3377f SHA512 1de77358914c36b81d4196f27ef7056207d6a11dacddc50d21446c5ce88adc3c65357462f5e5bd60f54e90bd6137407132003549cedf96776181bc9e439f3e1d
+EBUILD din-55.ebuild 1083 BLAKE2B 005a89e65bbcb9dfadd2cb706847700f3408741b72b19417d54d6c77876af4594994999d3a67be207231fac9362d1e68bc6d3f98a04a2325549bce3af81f6aa0 SHA512 ce85c7e29d1fa3d0d3d3fbd7e4410601faea27f7902fbe63abaf0c6983a7c1cae82b3514b17d91541d8d450a1894bbff377c9e9a3e48ecd41056d1bc504c6ca6
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-54.ebuild b/media-sound/din/din-54.ebuild
deleted file mode 100644
index a12ad9ed2cc6..000000000000
--- a/media-sound/din/din-54.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools edos2unix xdg
-
-DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="https://dinisnoise.org/"
-SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa jack"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	media-libs/libsdl:=
-	virtual/glu
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="|| ( alsa jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-52-makefile.patch"
-	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
-)
-
-src_prepare() {
-	default
-
-	edos2unix pixmaps/${PN}.desktop
-
-	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
-
-	eautoreconf
-}
-
-src_configure() {
-	# Jack takes over alsa.
-	local sound_engine
-
-	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
-
-	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
-}
diff --git a/media-sound/din/din-55.ebuild b/media-sound/din/din-55.ebuild
index a214eed23a5a..13c24db52183 100644
--- a/media-sound/din/din-55.ebuild
+++ b/media-sound/din/din-55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack"
 
 RDEPEND="
diff --git a/media-sound/din/files/din-52-makefile.patch b/media-sound/din/files/din-52-makefile.patch
deleted file mode 100644
index 3205bb973fb7..000000000000
--- a/media-sound/din/files/din-52-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 120bfa6..b3f4cd2 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,7 +1,7 @@
- #dinincludedir = $(pkgsrcdir)
- 
--AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -D__BOOST_TIME__ -DPREFIX=\"@prefix@\" 
--LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
-+AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -D__BOOST_TIME__ -DPREFIX=\"@prefix@\" 
-+LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
- 
- bin_PROGRAMS = din
- din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc autoflip.cc autorotator.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc defvelaccel.cc delay.cc din.cc din_info.cc drawrrow.cc drone.cc eval.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index d315cd6e373a..690977fd6ae8 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index 5557af1e2cf8..c49245cb947a 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -4,6 +4,6 @@ DIST libva-utils-2.15.0.tar.gz 1245559 BLAKE2B 92fe1e7dbd3c953eecb351625213c2b53
 DIST libva-utils-2.16.0.tar.gz 1245723 BLAKE2B 3ce3b54f9b8d1e5960fdb7587da9dc4fa9754f3612155e86d99f2f120e31e0e69a40482d7a4571fefc0a8079ba987303cbb433203de9ef6e203e9419b6d91b91 SHA512 d5395c1de4b95f4d0a86621b0338852250a3893b732c6fd69d0622c989bff530461a183c151f322469b1ed7e4815173dbbcf36cc390db9ebbae6fb7d7a90cb9c
 EBUILD libva-utils-2.14.0.ebuild 2012 BLAKE2B 6fb1e146a16a80d34b8ea0c8528953b3ae432a317385e54b860f2079711cf490f83a977f795d74629d78b9cd31ec751b17541258a2813c8addfb005c33a32abb SHA512 58d90d9c308385676d8776303ecd2032025f189f4b2f0de61d75126d0ca465306bdd979e0fc592cd62898eb412585659206d5b0717260e521060b02310c771c7
 EBUILD libva-utils-2.15.0.ebuild 1947 BLAKE2B f601ecb208b1ed24b57cb265e66300b1d6c8ffe6baecc232ace2e9f1591f78ef8d4a3d3fbcfc48ad828be89556a0e355ffad0be469a617ca3e5db844576cd1a0 SHA512 3125e505baa2ca44b084977fd3c01be7460b5ef93b13cf59ca872ef998af1927956390dd953684f975de14106218324155195a6509e87202084a3a87b6323a72
-EBUILD libva-utils-2.16.0.ebuild 1893 BLAKE2B 2922fd4d86e2f936b00f228662e18555404f5e888014966268326cf07935f02bc57c10534caa34dce14a65ecbde496c7da65bb5d244c326f7a21dac10fd50e75 SHA512 2c4cdc56233da136b0d4a96205ae26b3b43dc15472929b190142e838569005e3b9cec2cdd3dac378acf0510aa4fdbbc354b9846c48b90c3f4973681f8e67d696
+EBUILD libva-utils-2.16.0.ebuild 1891 BLAKE2B 145bb8219ed8cb3f95e613875702b50bdf7c5fb4ead04f8c77391a898afa3ef511ce3979953f809273a8c4759d0aaacb4a0f7e4414bcb7c7bee0c1a4120e555c SHA512 ae2f6b9257f18bcea03d2dd5decf3e13f084f2c3d25d2a020ce5d68097f621eab73aeea0fa553c445943140d7c63360f97fff33ccf8d09d7abf498a2e211d6f1
 EBUILD libva-utils-9999.ebuild 1893 BLAKE2B 2922fd4d86e2f936b00f228662e18555404f5e888014966268326cf07935f02bc57c10534caa34dce14a65ecbde496c7da65bb5d244c326f7a21dac10fd50e75 SHA512 2c4cdc56233da136b0d4a96205ae26b3b43dc15472929b190142e838569005e3b9cec2cdd3dac378acf0510aa4fdbbc354b9846c48b90c3f4973681f8e67d696
 MISC metadata.xml 596 BLAKE2B 856d27918d6cd6c983271e4f762f7b1278bd90231d33181b5381dbc425523d637c65902526ed1b48a0df6aadf41d77bd249e886dbc485edf93f5394fa458cd13 SHA512 46e6d1ef1cc966aadb696293fb1b5f86d1f3fe5d0245ca01a2d9be6d1b35f29830cee41d4e04f0c8d557dd20eb41ae927dc60a854ce24862a2b2f7fc8faee766
diff --git a/media-video/libva-utils/libva-utils-2.16.0.ebuild b/media-video/libva-utils/libva-utils-2.16.0.ebuild
index 31994ffa0a15..69bdfeaf1705 100644
--- a/media-video/libva-utils/libva-utils-2.16.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.16.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 else
 	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 27043ea5bd33..79a8e73d3c8b 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,11 +3,14 @@ AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
 AUX pipewire-0.3.56-big-endian.patch 1632 BLAKE2B b47b5ca888de71c9ee71ba35d5a490074e39219777345f4bf55252c0e9de65b97cc995c894b27c43945c8b32d70304e46610b3b641732170dc8f1ad97ea6549b SHA512 84bda8d747b91f04a40da6e55f186991b679b124e2571d64cd18368d5d4e1e2273565e3eee0a7b4b1a20a731429c240f168b970b02f88534375131b24c358cc1
 AUX pipewire-0.3.59-filter-chain-alloc-port-data-handle.patch 2771 BLAKE2B a6248de6ca263fa275938f61e504b442e06e41ef5cb650fe03c0c8a91d28567fc3e20b02626f2293a3ca1c0014c8f6692498178be38017445e167efcdf2d6e7e SHA512 46534f3fc267170090c0abdc076a1486fe4c3b964790bba19156349814b26b14b0dd637ff4aeaa0b5a3775ddebcf021e93cc4e1f85f7aa7cfda3bb4a66af6fc7
+AUX pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch 994 BLAKE2B e33d9d2c1b77264f3e14e6d0c6b04e2674758567b2604b37c25d6d08507742446478a22b84a2ae4316d2128f363b59f96493ce1a470c2cbce8f974afe9da7161 SHA512 c20e3d46b0f89077e39998617dace62147c0f3e6c6da8bf800cfeb817545ef68b8f1d9bd78c16204d1d47c0c5ac097dbf986a728262c7f4ef0a6090774d615eb
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
 DIST pipewire-0.3.56.tar.gz 1856321 BLAKE2B 62fb5d5a83b3cfc0555f09da42c8d4fbe69f34432add57f91a9c001535340a84f54572af4a5ba138251888cba9be0c038317dfe929d2e2ef36ff62f4679c6ea0 SHA512 a1ba598c56130a30e573d3ce3ac5879d800d3005a47075c45353d968c97c12f74d85802cd171b61558c06c474a03bbe4885396ca430a0af6c5672ed00f43d108
 DIST pipewire-0.3.59.tar.bz2 1443372 BLAKE2B 5e2d82c0bfdb7c030d8be525152c38115438caeb990afd7757424efcf2a7391a6a4891b0f58347ab0b7446707e8ad88baffa0c11c5acc42e086f23c9de3cb354 SHA512 f42bfab6e1bb227431119b44887af818a25eb0cdbcca917433162af87c942eb105a2b6e100de877d188941a24f1c8e2e9ae79f499fc20f0a32e2f7cc5de54162
+DIST pipewire-0.3.60.tar.bz2 1478952 BLAKE2B a7cda37a35ea58079b5297949239fd05b895b59d397f36a68c75c9392c65ad060926caf2e61c5511ab27f02da6c1c2044e4e86009f9c5f18d2744cad63585900 SHA512 8a1c022a283f3cbe7488658563440ff6b426f0b894f519ccd5c7d73bdb5437902fbd4d7d572d5840d48bd7a2f037f0f14dd244fe36b8be891a2d2843f4a99b5c
 EBUILD pipewire-0.3.56.ebuild 15643 BLAKE2B 15b146a8ca79173ffa4b93315681fda18d1290711ec8b41715c96dcdfff325ea8ffd1fd9418671cfe966542ba7c81bef6ef08f14c7f17b569bb82abc66c6fa63 SHA512 832ba476d2e4f2bbcb78118152b407f426ed40bf514096a19fcf3f8a00afcbfaf3f17e2d914279055c8afdf526969598d9aaa3acddbc905d62509c43fd6b6917
 EBUILD pipewire-0.3.59-r2.ebuild 15852 BLAKE2B 21cf0a628f02e323ee25220ac73659813009ec786962a579ed882297315415096ebcbd2db9a0463d892a592d22142cd2eaf39c8abd767a18124bbaf523b057ed SHA512 3294fc701cd4953e40920e9679b57531e29512cdb65f82a9b2f611212497572e388b3a3ced87898a0f262279588ac82d861d7de46f4048976f1508c16663f364
-EBUILD pipewire-9999.ebuild 15796 BLAKE2B 2949a6d3fafe2d924352f1d8c932e024529264376241c093bd4bca67866e1dd9ce2c9c2757cfe5c3a092233fac266b158b3f540b4c6a1523aea8632e4a3cfb94 SHA512 43a3d853cea62ccd6c43f5530cac884e8ecf0d37d5519438ca4cfbfb44f6cd3c233bba2d1dbcfc06a9a275c838e7d9a493d1fb501a163966e0db33a24ab7fc3d
-MISC metadata.xml 1602 BLAKE2B 20c1af858595d4c5c8ebe84ea71b5ddb74b04f7861c277a2234951031162cdc681021b0a8fc95f62d141cb3bd5faa4d5195e59cc28429b68c5946b459561ac8a SHA512 904e1a750aaf22fd955f2cc20a275dfb57bdbbf73be8b30bc46e565f981cd9071b4f64f8e23b511ce3cc745827675586ac1ba5e2701488a054d6afca531568cc
+EBUILD pipewire-0.3.60.ebuild 16170 BLAKE2B c7ddcd901f1789bf160d883bb027b7daf03d8b28fd3b8b939fb1cbee2d1bb51952909cd36867d5f8dd74ddf7682c7030cbedf2e440947b62f19c0594113af320 SHA512 e9facf6954b22d2570e2f00c10a5adfff55e927b6aa13b2ff1ed1f65d0879dd4c113f9422b4844eba39615841347753504a7491df218a2cfa313d7ff334bf09f
+EBUILD pipewire-9999.ebuild 16093 BLAKE2B 50fc7a6f22231edf7219ebf8a1d96365254d74ce21632645a99ac76b494f2484aef428e3a45970abbc322fb3e4c4374c63f41f98ddfcd0a2c0c3d3e872e3badf SHA512 ba9a277a141fadcbd51cdefa22e353417adcc52ff6a561d16090c010dae189ea387dc665cb0ff792e48d48fbaf1ed19e8632fae30584b6432bcfcb0d33c183fd
+MISC metadata.xml 1722 BLAKE2B 6a4692e613c388004b0bae188be9173e1eea5ef7e387db99d4c949a78a3cba3b295d09d1be60eb2ee528adf97f8980cc06e0e634e11f6b74f8cd6d135866f0cd SHA512 a45a5c0052fa38ceee1bd010596dae9b8643bbfa1f632d8b290795cf16fe28cda1a5f4b6d4f823e6aad5116cefdee52f4d445e5c9c6201cfe2a84fb66fdeb0be
diff --git a/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch b/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
new file mode 100644
index 000000000000..99e752391885
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch
@@ -0,0 +1,29 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b720da771efa950cf380101bed42d5d5ee177908
+
+From b720da771efa950cf380101bed42d5d5ee177908 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 10 Nov 2022 16:13:33 +0100
+Subject: [PATCH] pulse-server: also advance read pointer in underrun
+
+So that we ask for more data from the client.
+
+Also retested with #2799 that caused this regression.
+
+Fixes #2821
+--- a/src/modules/module-protocol-pulse/pulse-server.c
++++ b/src/modules/module-protocol-pulse/pulse-server.c
+@@ -1433,10 +1433,11 @@ static void stream_process(void *data)
+ 						stream->buffer, MAXLENGTH,
+ 						index % MAXLENGTH,
+ 						p, avail);
+-					index += avail;
+-					pd.read_inc = avail;
+-					spa_ringbuffer_read_update(&stream->ring, index);
+ 				}
++				index += size;
++				pd.read_inc = size;
++				spa_ringbuffer_read_update(&stream->ring, index);
++
+ 				pd.playing_for = size;
+ 			}
+ 			pw_log_debug("%p: [%s] underrun read:%u avail:%d max:%u",
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
index f5b7e177d5f3..af21a7316abc 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -22,6 +22,7 @@
 		<flag name="jack-client">Install a plugin for running PipeWire as a JACK client</flag>
 		<flag name="jack-sdk">Use PipeWire as JACK replacement</flag>
 		<flag name="lv2">Allow loading LV2 plugins via <pkg>media-libs/lv2</pkg></flag>
+		<flag name="modemmanager">Combined with USE=bluetooth, allows PipeWire to perform telephony on mobile devices.</flag>
 		<flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin with PipeWire's plugin</flag>
 		<flag name="ssl">Enable raop-sink support (needs <pkg>dev-libs/openssl</pkg>)</flag>
 		<flag name="system-service">Install systemd unit files for running as a system service. Not recommended.</flag>
diff --git a/media-video/pipewire/pipewire-0.3.60.ebuild b/media-video/pipewire/pipewire-0.3.60.ebuild
new file mode 100644
index 000000000000..ca8bc505b0d0
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.60.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra flatpak gstreamer jack-client jack-sdk lv2
+modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+# which provides adequate guarantee that alsa-lib will be able to provide audio services.
+# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+REQUIRED_USE="
+	jack-sdk? ( !jack-client )
+	modemmanager? ( bluetooth )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	bluetooth? (
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/opus
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	flatpak? (
+		dev-libs/glib
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	lv2? ( media-libs/lilv )
+	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+	)
+	sound-server? (
+		!media-sound/pulseaudio[daemon(+)]
+		!media-sound/pulseaudio-daemon
+	)
+	readline? ( sys-libs/readline:= )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? (
+		acct-user/pipewire
+		acct-group/pipewire
+	)
+	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${P}-pulse-server-also-advance-read-pointer-in-underrun.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		$(use system-service && {
+			echo @pipewire - rtprio 95
+			echo @pipewire - nice -19
+			echo @pipewire - memlock 4194304
+		})
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
+		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth bluez5-codec-opus)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		-Dbluez5-codec-lc3=disabled
+		-Dbluez5-codec-lc3plus=disabled
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_native_use_feature flatpak)
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature readline)
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		$(meson_feature udev)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		dodir /etc/wireplumber/main.lua.d
+		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
+
+		dodir /etc/wireplumber/bluetooth.lua.d
+		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+
+			break
+		fi
+	done
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "To use PipeWire, the user units must be manually enabled"
+		elog "by running this command as each user you use for desktop activities:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both new users and those upgrading need to enable WirePlumber"
+		elog "for relevant users:"
+		elog
+		elog "  systemctl --user disable pipewire-media-session.service"
+		elog "  systemctl --user --force enable wireplumber.service"
+		elog
+		elog "Root user may replace --user with --global to change system default"
+		elog "configuration for all of the above commands."
+	else
+		ewarn "PipeWire daemon startup has been moved to a launcher script!"
+		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+		ewarn
+		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+		ewarn "advised that a D-Bus user session is set up before starting the script."
+		ewarn
+
+		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+			elog "are recommended to edit pulseaudio client configuration files:"
+			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+			elog "if it exists, and disable autospawning of the original daemon by setting:"
+			elog
+			elog "  autospawn = no"
+			elog
+			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog
+			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+			elog "command:"
+			elog
+			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog
+		fi
+		elog "NOTE:"
+		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
+		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
+		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
+		elog "and just override the sections you want to change."
+	fi
+	elog
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+
+	if has_version 'net-misc/ofono' ; then
+		ewarn "Native backend has become default. Please disable oFono via:"
+		if systemd_is_booted ; then
+			ewarn "systemctl disable ofono"
+		else
+			ewarn "rc-update delete ofono"
+		fi
+		ewarn
+	fi
+
+	if use system-service; then
+		ewarn
+		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 2b66ac34cdf5..e8726d26413b 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -39,7 +39,7 @@ LICENSE="MIT LGPL-2.1+ GPL-2"
 # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
 SLOT="0/0.4"
 IUSE="bluetooth dbus doc echo-cancel extra flatpak gstreamer jack-client jack-sdk lv2
-pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
+modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf"
 
 # Once replacing system JACK libraries is possible, it's likely that
 # jack-client IUSE will need blocking to avoid users accidentally
@@ -54,6 +54,7 @@ pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
 # When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
 REQUIRED_USE="
 	jack-sdk? ( !jack-client )
+	modemmanager? ( bluetooth )
 	system-service? ( systemd )
 	!sound-server? ( !pipewire-alsa )
 	jack-client? ( dbus )
@@ -74,7 +75,6 @@ BDEPEND="
 RDEPEND="
 	acct-group/audio
 	media-libs/alsa-lib
-	sys-libs/readline:=
 	sys-libs/ncurses:=[unicode(+)]
 	virtual/libintl[${MULTILIB_USEDEP}]
 	bluetooth? (
@@ -105,6 +105,7 @@ RDEPEND="
 		!media-sound/jack2
 	)
 	lv2? ( media-libs/lilv )
+	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
 	pipewire-alsa? (
 		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
 	)
@@ -112,6 +113,7 @@ RDEPEND="
 		!media-sound/pulseaudio[daemon(+)]
 		!media-sound/pulseaudio-daemon
 	)
+	readline? ( sys-libs/readline:= )
 	ssl? ( dev-libs/openssl:= )
 	systemd? ( sys-apps/systemd )
 	system-service? (
@@ -208,6 +210,8 @@ multilib_src_configure() {
 		$(meson_native_use_feature bluetooth bluez5)
 		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
 		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
+		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
 		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
 		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
 		$(meson_native_use_feature bluetooth bluez5-codec-aac)
@@ -233,6 +237,7 @@ multilib_src_configure() {
 		$(meson_native_use_feature lv2)
 		$(meson_native_use_feature v4l v4l2)
 		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature readline)
 		$(meson_native_use_feature ssl raop)
 		-Dvideoconvert=enabled # Matches upstream
 		-Dvideotestsrc=enabled # Matches upstream
diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index 43a20f080399..929bd38a24ed 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,4 +1,6 @@
 AUX webcamoid-8.7.1-gcc11.patch 469 BLAKE2B e6994f1f0bd90a83ee1a3510990ff3e31867f89da9a66ff755a60f364f4bdbbbd5e8130816329beec533a48d1517261f60f2650fa9ff45a7e1536066d8fc7d3e SHA512 ac225037ef06604d413452447d863875a10f896a396ffc0def178e3bab447f3f2357558724f00ab9128f94a8f916a4d454e9fef2915e17465d4166508f9c2012
 DIST webcamoid-8.8.0.tar.gz 8887888 BLAKE2B d0c3f0cee1fe487e8e61cb50148415899f2df8bdd1c48f1d944cece167e69fc6872cc7a45dbf441d6b4b88d0ae99c1a227339594a6ad94416b765a89eb1a70e0 SHA512 e21e3f6b7ad4f4031658033e94f377db06e06d5bad8f0540af6ac824972aa2811336d5edfef19c674e9b98d0bf9d96f22ac46623d5cb4c39bc310d248daf0bfa
+DIST webcamoid-9.0.0.tar.gz 9257331 BLAKE2B df7044650c92fd1e557043e2a721079dcc2531a59fb9859c19e02f95bd091fb33cec5e69bbc323baf8c11faad404824f875afe643e9d21085d3496a78acc04f4 SHA512 0de39dc6a5bc3fb8d6477728d971bca933c57e354a6d041389b33c3e48ec7c7912007f6f87bc9be5db303f58ddc5143bb28dc1b475c9ca361f579e1532b515a4
 EBUILD webcamoid-8.8.0.ebuild 1741 BLAKE2B f80de276c25421a4187139976551e07192f2d716750e444e66633da59621d87a72cbf26d3afce398beda4486f3900ebab6885ce4009de59c71ce1a12992dbaa0 SHA512 b03f081bb55d6279657d6b05ce7eede8476669bfaf6a2e1fbdc48ac93648fc2012b8e08cad2487057308b032a65534deb1cd5e95ebd4baf6511319bf5fa607ec
+EBUILD webcamoid-9.0.0.ebuild 2038 BLAKE2B e6258d0bdbd1daa20eb70b1b877eccf1c969bd3df28784838b9676ce706bc7bfe412f8626df80305fb994ae92da8cb1c789e8be8c694df280b4200aed7f8f52c SHA512 130c085ab6410400c1e49eb3c19ee0d9104de01a9cae038be002b6d03c7c37c2866886c0bad12d8f5391d4057e90482955236ac6b73c81723e17d6f36fa4467f
 MISC metadata.xml 586 BLAKE2B 55df36c3b4fd6319354c699e5e789b47dfd6f223068721ae842cdfae1dd158b3765e5796deabe8ca63a50da450f541e37f194c8665c7a7a1a6c2272677159d5d SHA512 729ba6c451fcc437d71c0c379179913b22e169368695daaf3452313d061641d647697f47a76684fd4bfcac318c5c7126a5214d5e0e1474c6685cbbc29fd8d0e8
diff --git a/media-video/webcamoid/webcamoid-9.0.0.ebuild b/media-video/webcamoid/webcamoid-9.0.0.ebuild
new file mode 100644
index 000000000000..2f9d1d781288
--- /dev/null
+++ b/media-video/webcamoid/webcamoid-9.0.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A full featured webcam capture application"
+HOMEPAGE="https://webcamoid.github.io"
+SRC_URI="https://github.com/webcamoid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects debug headers v4l"
+
+REQUIRED_USE="v4lutils? ( v4l )"
+
+COMMON_DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	ffmpeg?	( media-video/ffmpeg:= )
+	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
+	jack? ( virtual/jack )
+	libuvc? ( media-libs/libuvc )
+	pulseaudio? ( media-sound/pulseaudio )
+	qtaudio? ( dev-qt/qtmultimedia:5 )
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.6
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/opengl
+"
+
+src_configure() {
+	#Disable git in package source. If not disabled the cmake configure process will show a lot of "fatal not a git repository" errors
+	sed -i 's|find_program(GIT_BIN git)|#find_program(GIT_BIN git)|' libAvKys/cmake/ProjectCommons.cmake || die
+
+	local mycmakeargs=(
+		"-DNOMEDIAFOUNDATION=1"
+		"-DNOAVFOUNDATION=1"
+		"-DNODSHOW=1"
+		"-DNOWASAPI=1"
+		"-DNOVLC=1"
+		"-DNOPIPEWIRE=1"
+		"-DNOALSA=$(usex alsa 0 1)"
+		"-DNOCOREAUDIO=$(usex coreaudio 0 1)"
+		"-DNOFFMPEG=$(usex ffmpeg 0 1)"
+		"-DNOGSTREAMER=$(usex gstreamer 0 1)"
+		"-DNOJACK=$(usex jack 0 1)"
+		"-DNOLIBUVC=$(usex libuvc 0 1)"
+		"-DNOPULSEAUDIO=$(usex pulseaudio 0 1)"
+		"-DNOV4L2=$(usex v4l 0 1)"
+		"-DNOV4LUTILS=$(usex v4lutils 0 1)"
+		"-DNOVIDEOEFFECTS=$(usex videoeffects 0 1)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	docompress -x /usr/share/man/${PN}.1.gz
+	cmake_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 839cf3a676ae..c098dcc1e747 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 1c3a8507fc84..de0a363426b4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2022 02:39:38 +0000
+Fri, 11 Nov 2022 08:39:38 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 82d9740d400d..3352274c618c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 536244 BLAKE2B 47908e9e54099299278f14e5112b789aac78178d7406b6880e3986163e8e2aeec411757dbe131202da7291c508ea72a7d158f7fe08facf6e36a23a28a992a7d8 SHA512 ef16d73b0d889ec01efae4d55e398ba1b384a7b46066c129d82b336f46e8804d0dd1765c65c49d93842dc829696efc67759ac790655f316a70359fb8847d9e4e
-TIMESTAMP 2022-11-11T02:39:41Z
+TIMESTAMP 2022-11-11T08:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNtte1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNuCk1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCttg//bWI86nnIbUPkQ9iIQPzcr2JJOBawPVMdlm6GeRnq5aKBDyoU9/SSoQgA
-BoHXZaj1aR969VUPSd4VJ/3t5JJ4IrZQxe0F7dKNgtH/ynOvhPC1IMVBUsRIOrBw
-A4JoiiI0OoWyfvmBJJ/rslkLzdHsuH+vAP1z9TCs1oRP0S2UeximJh65E1EggA9V
-h+pkgJ9z5OG5GQ2XXbKGUhA32FMolc4G8F/6yqyHG8YxbP32GolLnV2998URAgvL
-wcGk2vTlMVKYmN1VwRhXvhHwFSe10fiTjfgAag4fbsLzkP4EUm7XsElAqUIa9+Vb
-xUW3Ra+1NyWsfSVS9Z3+rTubs8iTga7dUdMLbPys171tn5BT2OIOtuVdkY5Tw9CY
-fghUICVplA2VINfWFA4zwNuU3U3BU7uk5R7RNGQRlzlFWR3UuGP7+/fNSJYKdZHq
-jU3QV5szuk5MXJvdkW3pki2nRV4RkPmGLEPXEXf62KzuLFhBTiRxxCBM+y0z+fQd
-S6ddhhrojHNaZrnTmUmbHbNWHQtnGoke5fRJKWXEAMfqmhzmQff3biRTDdA64ELx
-xpUWg6OAXyvuDV6QPKWu9WBaYBQp8tEbdNpRCWZaafO6jVIz4H9ZoOd6j6YV/FA/
-B/SbUiJ//eA1Pae2sxj9TNAVoJs/OLYDuqdygNu+Bwgo6TJMoTo=
-=fFHM
+klApcQ//bfyqeSGq4JiCmIf5LPGgGEzZ6BtH6BU38m/jrknlm0cVAqOxSXyQNehu
+jTRT4WAIeA3FlmBe2Kfp79eAr8Y4mjySz8o9yhg3ZfIy+psUsETUVmcYUF0ZQJjn
+KkzMNM9ScIBxuCU7CPctdFZpijCuKf71lkzrAaGCTcjEN4NxDfVQO8UCKoE/J34h
+Q85mdnmxkCFmQVmdPatRoBsuFb9IpkrB9dj4DDZkQMC0U/VCkagjYVJfsSPVcLF4
+3qAlpBjfcL0Dy5C/1p657+flu1iwvTCtGFUpbgAUpE/k5OiVALKkWZ5u9KLTAQp9
+KX8RJafi5hARdhk9JxgtK60JXWH4qfMx7f24inwQJcvD5/5E+E9wIOm/X3t9Ai8d
+qPclWAcAgLRxw2fx/w/Vl9kZZRfsuL18ipKUy6h6Ssd7mpdUY7dkM471Rl1oQ0f8
+6RdNLfnqinD1kkRNZdq+QHHACN2QL7ezp8Up21axvYD9qphEOno/gREq8HUF6L25
+GtnIe4xzwkDYEFnkMQG3kpkjgY99UZq+0LVicjfhW2qu6oPpKiDtgtS8rIj1A8qK
+hpNnv5M3pXL74UbNKKW6Xoph/ks3MG+CgZDNsindlZeOEbOo/qlf0Jpij6AgmbLp
+oUUmAOvrjaa+0UyDL89sZstNV8+t04VnroWxsPizHZIIhilJBvE=
+=I6u8
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1c3a8507fc84..de0a363426b4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2022 02:39:38 +0000
+Fri, 11 Nov 2022 08:39:38 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0be4acbc1a4b..60dce2460547 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 937b0f01ba1a..c9bc97092b55 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.7 b/metadata/md5-cache/app-admin/awscli-1.27.7
new file mode 100644
index 000000000000..9a46ad84c646
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.7
@@ -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.7[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.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.7[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.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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.7.tar.gz -> aws-cli-1.27.7.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=066408fc86005265f1da2d31d73a7996
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 0224c549c59e..7eeb009fd06b 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/chntpw-140201-r1 b/metadata/md5-cache/app-crypt/chntpw-140201-r1
index 55df2aee872c..e9ef951214a6 100644
--- a/metadata/md5-cache/app-crypt/chntpw-140201-r1
+++ b/metadata/md5-cache/app-crypt/chntpw-140201-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://pogostick.net/~pnh/ntpasswd/
 INHERIT=toolchain-funcs
 IUSE=static
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://pogostick.net/~pnh/ntpasswd/chntpw-source-140201.zip
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=52b92b22e119c97af6107444483955c5
+_md5_=c9800db4a97df712d7e5e5eb5eb4a87d
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 2d08fd0eeb6a..3ae47bde4bb0 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/vscodium-1.73.1.22314 b/metadata/md5-cache/app-editors/vscodium-1.73.1.22314
new file mode 100644
index 000000000000..8af0dcaeaa3a
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vscodium-1.73.1.22314
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=A community-driven, freely-licensed binary distribution of Microsoft's VSCode
+EAPI=8
+HOMEPAGE=https://vscodium.com/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop pax-utils xdg optfeature
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
+RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-crypt/libsecret[crypt] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/util-linux sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
+RESTRICT=strip bindist
+SLOT=0
+SRC_URI=amd64? ( https://github.com/VSCodium/vscodium/releases/download/1.73.1.22314/VSCodium-linux-x64-1.73.1.22314.tar.gz -> vscodium-1.73.1.22314-amd64.tar.gz ) arm? ( https://github.com/VSCodium/vscodium/releases/download/1.73.1.22314/VSCodium-linux-armhf-1.73.1.22314.tar.gz -> vscodium-1.73.1.22314-arm.tar.gz ) arm64? ( https://github.com/VSCodium/vscodium/releases/download/1.73.1.22314/VSCodium-linux-arm64-1.73.1.22314.tar.gz -> vscodium-1.73.1.22314-arm64.tar.gz )
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=42e2cfb51e38937c79239d26309667af
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 994ffbd226d6..9c7fa7ae9ae2 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/asciinema-2.1.0 b/metadata/md5-cache/app-misc/asciinema-2.1.0
deleted file mode 100644
index d7005e0d0c67..000000000000
--- a/metadata/md5-cache/app-misc/asciinema-2.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7_p20211111_p1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line recorder for asciinema.org service
-EAPI=8
-HOMEPAGE=https://asciinema.org/ https://pypi.org/project/asciinema/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/asciinema/asciinema/archive/v2.1.0.tar.gz -> asciinema-2.1.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=496e62b0a891571c6a9821026d39edd0
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 5f4a6063eabf..ba8a3e94acc3 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/sqlmap-1.6.10 b/metadata/md5-cache/dev-db/sqlmap-1.6.10
index 0b2665eeefa1..1abff582b330 100644
--- a/metadata/md5-cache/dev-db/sqlmap-1.6.10
+++ b/metadata/md5-cache/dev-db/sqlmap-1.6.10
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://sqlmap.org/
 INHERIT=bash-completion-r1 python-single-r1 wrapper
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/sqlmapproject/sqlmap/archive/refs/tags/1.6.10.tar.gz -> sqlmap-1.6.10.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a30c0eeccc3d53be3be8a623c3c2df58
+_md5_=b0e401850e7993ac1d9c6196ea5aa726
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index b556fe715cf8..81c6538de935 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/jaxws-api-2.3.3 b/metadata/md5-cache/dev-java/jaxws-api-2.3.3
index e88fb8d447b6..8d52bf6717fc 100644
--- a/metadata/md5-cache/dev-java/jaxws-api-2.3.3
+++ b/metadata/md5-cache/dev-java/jaxws-api-2.3.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/eclipse-ee4j/jax-ws-api
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/jax-ws-api/archive/2.3.3.tar.gz -> jaxws-api-2.3.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=0050e231673fdf22317781d58adad161
+_md5_=520b92f115908b456c7f99746eb67b1f
diff --git a/metadata/md5-cache/dev-java/jmock-2.12.0 b/metadata/md5-cache/dev-java/jmock-2.12.0
index eedc6b947f21..116da219b7f2 100644
--- a/metadata/md5-cache/dev-java/jmock-2.12.0
+++ b/metadata/md5-cache/dev-java/jmock-2.12.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://jmock.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jmock-developers/jmock-library/archive/2.12.0.tar.gz -> jmock-2.12.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=14a343e0a77e0f24c0c31d91dfc10e84
+_md5_=1521abaefb5ec042b7d304daf626e49e
diff --git a/metadata/md5-cache/dev-java/jmock-2.6.1-r1 b/metadata/md5-cache/dev-java/jmock-2.6.1-r1
deleted file mode 100644
index 80f742589230..000000000000
--- a/metadata/md5-cache/dev-java/jmock-2.6.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=app-arch/unzip >=virtual/jdk-1.8:* dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Library for testing Java code using mock objects
-EAPI=7
-HOMEPAGE=http://jmock.org
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2
-SRC_URI=http://jmock.org/downloads/jmock-2.6.1-jars.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=2829f7a8add333ca99df12006b171866
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index d052e5cd3a59..a62c1cfd61b2 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/rust-1.65.0 b/metadata/md5-cache/dev-lang/rust-1.65.0
index 9567d3f5c568..8e36386670de 100644
--- a/metadata/md5-cache/dev-lang/rust-1.65.0
+++ b/metadata/md5-cache/dev-lang/rust-1.65.0
@@ -6,11 +6,12 @@ EAPI=8
 HOMEPAGE=https://www.rust-lang.org/
 INHERIT=bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
 IUSE=clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler profiler rls rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore 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=~amd64 ~arm ~arm64 ~mips ~ppc64 ~sparc ~x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:15[llvm_targets_AArch64(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_AMDGPU? ( sys-devel/llvm:15[llvm_targets_AMDGPU(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_ARM? ( sys-devel/llvm:15[llvm_targets_ARM(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_AVR? ( sys-devel/llvm:15[llvm_targets_AVR(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_BPF? ( sys-devel/llvm:15[llvm_targets_BPF(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Hexagon? ( sys-devel/llvm:15[llvm_targets_Hexagon(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Lanai? ( sys-devel/llvm:15[llvm_targets_Lanai(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Mips? ( sys-devel/llvm:15[llvm_targets_Mips(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_MSP430? ( sys-devel/llvm:15[llvm_targets_MSP430(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_NVPTX? ( sys-devel/llvm:15[llvm_targets_NVPTX(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_PowerPC? ( sys-devel/llvm:15[llvm_targets_PowerPC(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_RISCV? ( sys-devel/llvm:15[llvm_targets_RISCV(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_Sparc? ( sys-devel/llvm:15[llvm_targets_Sparc(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_SystemZ? ( sys-devel/llvm:15[llvm_targets_SystemZ(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_WebAssembly? ( sys-devel/llvm:15[llvm_targets_WebAssembly(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_X86? ( sys-devel/llvm:15[llvm_targets_X86(-)] ) wasm? ( sys-devel/lld:15 ) llvm_targets_XCore? ( sys-devel/llvm:15[llvm_targets_XCore(-)] ) wasm? ( sys-devel/lld:15 ) ) ) <sys-devel/llvm-16:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) !system-llvm? ( !llvm-libunwind? ( elibc_musl? ( sys-libs/libunwind:= ) ) ) app-eselect/eselect-rust sys-apps/lsb-release
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) rls? ( rust-src ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) rls? ( rust-src ) rust-analyzer? ( !wasm ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 RESTRICT=test
 SLOT=stable/1.65
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.64.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.64.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.64.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=a7e8430b79896d1f531a2a9aa9b04d4c
+_md5_=bad398512497fb2781eec06508e50e29
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.65.0 b/metadata/md5-cache/dev-lang/rust-bin-1.65.0
index a1c405f69e8a..1000ead6391d 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.65.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.65.0
@@ -5,10 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.rust-lang.org/
 INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
 IUSE=clippy cpu_flags_x86_sse2 doc prefix rls rust-analyzer rust-src rustfmt 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=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-eselect/eselect-rust-20190311 sys-apps/lsb-release
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2022-11-03/rust-src-1.65.0.tar.xz )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=0ca1e4302f179f9e83873e22bfdb60d3
+_md5_=6d659937d416ad3ca185d0fe65dc67fa
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index bf6941f91702..02d3bbc5c99f 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/capstone-5.0_rc2-r2 b/metadata/md5-cache/dev-libs/capstone-5.0_rc2-r2
index 2458ea2c7396..7ea452c1688d 100644
--- a/metadata/md5-cache/dev-libs/capstone-5.0_rc2-r2
+++ b/metadata/md5-cache/dev-libs/capstone-5.0_rc2-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.capstone-engine.org/
 INHERIT=cmake distutils-r1 toolchain-funcs
 IUSE=python test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=BSD
 RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/capstone-engine/capstone/archive/5.0-rc2.tar.gz -> capstone-5.0_rc2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6b9f343d2ce964183c0cbb1a36742025
+_md5_=21f98bff2fad8bdb842a56f172b718f2
diff --git a/metadata/md5-cache/dev-libs/nss-3.85 b/metadata/md5-cache/dev-libs/nss-3.85
new file mode 100644
index 000000000000..ece01b6f55bf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.85
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/nspr-4.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(-)?] >=dev-db/sqlite-3.8.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/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=8
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
+INHERIT=flag-o-matic multilib toolchain-funcs multilib-minimal
+IUSE=cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx 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 ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.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(-)?] >=dev-db/sqlite-3.8.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/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_85_RTM/src/nss-3.85.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=e2173440ce8ea6cc6e56af2dd9c275ae
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 52f946ccdc0a..93574155ce86 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.2.9 b/metadata/md5-cache/dev-lisp/sbcl-2.2.9
index 71edda4dd42a..2d88c0bec763 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.2.9
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.2.9
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.sbcl.org/ http://sbcl.sourceforge.net/
 INHERIT=flag-o-matic pax-utils toolchain-funcs
 IUSE=capstone debug doc source +threads +unicode +zstd
-KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=-* ~amd64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.3:= capstone? ( dev-libs/capstone:0/4 ) zstd? ( app-arch/zstd ) !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.2.9
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.2.9-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.2.9-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) ppc64? ( mirror://sourceforge/sbcl/sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a7e44735f6b1921ceb82b8f247701741
+_md5_=06743f10486fd0a803528e911aace6bc
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index b7d1c4bc374b..d9f22961ee71 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/aesara-2.8.9 b/metadata/md5-cache/dev-python/aesara-2.8.9
new file mode 100644
index 000000000000..171cdad83e6e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.8.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-48.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=8
+HOMEPAGE=https://github.com/aesara-devs/aesara/ https://pypi.org/project/aesara/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-48.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.8.9.tar.gz -> aesara-rel-2.8.9.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=8bfd2cf638badc66be6234e043cbfb10
diff --git a/metadata/md5-cache/dev-python/bcrypt-4.0.1 b/metadata/md5-cache/dev-python/bcrypt-4.0.1
index 38842053c49d..7610c6dba366 100644
--- a/metadata/md5-cache/dev-python/bcrypt-4.0.1
+++ b/metadata/md5-cache/dev-python/bcrypt-4.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/
 INHERIT=cargo distutils-r1
 IUSE=test debug python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm ~arm64 ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016 Unlicense
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bcrypt/bcrypt-4.0.1.tar.gz https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bcrypt/0.13.0/download -> bcrypt-0.13.0.crate https://crates.io/api/v1/crates/bcrypt-pbkdf/0.8.1/download -> bcrypt-pbkdf-0.8.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/blowfish/0.9.1/download -> blowfish-0.9.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cipher/0.4.3/download -> cipher-0.4.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/digest/0.10.5/download -> digest-0.10.5.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/inout/0.1.3/download -> inout-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/libc/0.2.134/download -> libc-0.2.134.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pbkdf2/0.10.1/download -> pbkdf2-0.10.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.46/download -> proc-macro2-1.0.46.crate https://crates.io/api/v1/crates/pyo3/0.15.2/download -> pyo3-0.15.2.crate https://crates.io/api/v1/crates/pyo3-build-config/0.15.2/download -> pyo3-build-config-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.15.2/download -> pyo3-macros-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.15.2/download -> pyo3-macros-backend-0.15.2.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.102/download -> syn-1.0.102.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.4/download -> unicode-ident-1.0.4.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zeroize/1.5.7/download -> zeroize-1.5.7.crate
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=73357d066183315c2ff9249eb8f944f1
+_md5_=f7d66ac86781027840416914af1ab10a
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.7 b/metadata/md5-cache/dev-python/boto3-1.26.7
new file mode 100644
index 000000000000..58ba2562b691
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.29.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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=doc test python_targets_python3_8 python_targets_python3_9 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.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.26.7.tar.gz -> boto3-1.26.7.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.7 b/metadata/md5-cache/dev-python/botocore-1.29.7
new file mode 100644
index 000000000000..7d1f5664e406
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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=doc test python_targets_python3_8 python_targets_python3_9 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.29.7.tar.gz -> botocore-1.29.7.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/contourpy-1.0.5 b/metadata/md5-cache/dev-python/contourpy-1.0.5
deleted file mode 100644
index cc2cef411f44..000000000000
--- a/metadata/md5-cache/dev-python/contourpy-1.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pybind11-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for calculating contours in 2D quadrilateral grids
-EAPI=8
-HOMEPAGE=https://pypi.org/project/contourpy/ https://github.com/contourpy/contourpy/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/contourpy/contourpy/archive/v1.0.5.tar.gz -> contourpy-1.0.5.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8df755b9f89a7409c1311ee08104e6ed
diff --git a/metadata/md5-cache/dev-python/fsspec-2022.11.0 b/metadata/md5-cache/dev-python/fsspec-2022.11.0
new file mode 100644
index 000000000000..02ca673fa9f0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fsspec-2022.11.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A specification that python filesystems should adhere to
+EAPI=8
+HOMEPAGE=https://github.com/fsspec/filesystem_spec/ https://pypi.org/project/fsspec/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fsspec/filesystem_spec/archive/2022.11.0.tar.gz -> filesystem_spec-2022.11.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=6a186866a2ad2d537ebdea50e302994c
diff --git a/metadata/md5-cache/dev-python/lark-1.1.3 b/metadata/md5-cache/dev-python/lark-1.1.3
index be72f0b536ab..af103f0fd724 100644
--- a/metadata/md5-cache/dev-python/lark-1.1.3
+++ b/metadata/md5-cache/dev-python/lark-1.1.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/lark-parser/lark/ https://pypi.org/project/lark/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lark/lark-1.1.3.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fdbfc639f041c980c8d35332d69dd821
+_md5_=3ed7b4db6e09a3797b6946fe01ed5b03
diff --git a/metadata/md5-cache/dev-python/libcloud-3.6.0 b/metadata/md5-cache/dev-python/libcloud-3.6.0
deleted file mode 100644
index d28a78f04350..000000000000
--- a/metadata/md5-cache/dev-python/libcloud-3.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/cryptography-2.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lockfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Unified Interface to the Cloud - python support libs
-EAPI=8
-HOMEPAGE=https://libcloud.apache.org/
-INHERIT=distutils-r1
-IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/libcloud/apache-libcloud-3.6.0.tar.bz2
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b1a81ba33d2aafce2a0f785d983a0e4d
diff --git a/metadata/md5-cache/dev-python/libcloud-3.6.1 b/metadata/md5-cache/dev-python/libcloud-3.6.1
index 1fdd83866210..d63bcd75dd02 100644
--- a/metadata/md5-cache/dev-python/libcloud-3.6.1
+++ b/metadata/md5-cache/dev-python/libcloud-3.6.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://libcloud.apache.org/
 INHERIT=distutils-r1
 IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/libcloud/apache-libcloud-3.6.1.tar.bz2
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=336d18a498715db8809ddd82752bdc82
+_md5_=b1a81ba33d2aafce2a0f785d983a0e4d
diff --git a/metadata/md5-cache/dev-python/patsy-0.5.3-r1 b/metadata/md5-cache/dev-python/patsy-0.5.3-r1
index f045c8db0841..8b8c9ac21992 100644
--- a/metadata/md5-cache/dev-python/patsy-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/patsy-0.5.3-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://patsy.readthedocs.io/en/latest/index.html
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !hppa? ( dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/patsy/patsy-0.5.3.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=208825f90a5af99070cd9e8d449ec7f6
+_md5_=45418a51b9392b7b118569efd3e61d57
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-9.5 b/metadata/md5-cache/dev-python/pymdown-extensions-9.5
deleted file mode 100644
index a8aeecf5177f..000000000000
--- a/metadata/md5-cache/dev-python/pymdown-extensions-9.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pygments-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) test? ( >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/pymdown-lexers[python_targets_python3_11(-)] dev-python/pyspelling[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/pymdown-lexers[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/pymdown-lexers[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/pymdown-lexers[python_targets_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensions for Python Markdown
-EAPI=8
-HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
-INHERIT=distutils-r1 docs
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/pymdown-extensions/archive/9.5.tar.gz -> pymdown-extensions-9.5.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7d3afb6f4d9314ca951c69bdade588a3
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-9.6 b/metadata/md5-cache/dev-python/pymdown-extensions-9.6
deleted file mode 100644
index 0c7634cef969..000000000000
--- a/metadata/md5-cache/dev-python/pymdown-extensions-9.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pygments-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) test? ( >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/pymdown-lexers[python_targets_python3_11(-)] dev-python/pyspelling[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/pymdown-lexers[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/pymdown-lexers[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/pymdown-lexers[python_targets_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensions for Python Markdown
-EAPI=8
-HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
-INHERIT=distutils-r1 docs
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/pymdown-extensions/archive/9.6.tar.gz -> pymdown-extensions-9.6.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f8ce6aca6effaa92bbb612e8a526aa0b
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-9.7 b/metadata/md5-cache/dev-python/pymdown-extensions-9.7
index 64815b6ba6a2..d4cc6f51b98e 100644
--- a/metadata/md5-cache/dev-python/pymdown-extensions-9.7
+++ b/metadata/md5-cache/dev-python/pymdown-extensions-9.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
 INHERIT=distutils-r1 docs
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/pymdown-extensions/archive/9.7.tar.gz -> pymdown-extensions-9.7.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f8ce6aca6effaa92bbb612e8a526aa0b
+_md5_=8debf795d99957fc4e53621d63789cc6
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.9-r4 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.9-r4
index 89909e192800..8a5e79588734 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.9-r4
+++ b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.9-r4
@@ -3,10 +3,10 @@ DESCRIPTION=PyPy executable (pre-built version)
 EAPI=8
 HOMEPAGE=https://www.pypy.org/
 INHERIT=pax-utils unpacker
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( sys-devel/gcc >=sys-libs/glibc-2.35 ) !dev-python/pypy-exe:7.3.9
 SLOT=7.3.9
 SRC_URI=elibc_glibc? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-3.gpkg.tar -> pypy-exe-7.3.9-3.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-2.gpkg.tar -> pypy-exe-7.3.9-2.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-2.gpkg.tar -> pypy-exe-7.3.9-2.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-3.gpkg.tar -> pypy-exe-7.3.9-3.x86.gpkg.tar ) ) elibc_musl? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-2.gpkg.tar -> pypy-exe-7.3.9-2.amd64-musl.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-2.gpkg.tar -> pypy-exe-7.3.9-2.arm64-musl.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-2.gpkg.tar -> pypy-exe-7.3.9-2.ppc64le-musl.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.9-2.gpkg.tar -> pypy-exe-7.3.9-2.x86-musl.gpkg.tar ) )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=28ea11ddab678b063f11f24c8e99c612
+_md5_=0f5273ab2a228f9a5c14f3996f08df69
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.9_p3-r3 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.9_p3-r3
deleted file mode 100644
index 00b69c728ba3..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.9_p3-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=PyPy3 executable (pre-built version)
-EAPI=7
-HOMEPAGE=https://www.pypy.org/
-INHERIT=pax-utils
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-devel/gcc sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( >=sys-libs/glibc-2.35 ) !dev-python/pypy3-exe:3.9-7.3.9
-SLOT=3.9-7.3.9
-SRC_URI=elibc_glibc? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.x86.xpak ) ) elibc_musl? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.amd64-musl.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.arm64-musl.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.ppc64le-musl.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-1.xpak -> pypy3-exe-7.3.9_p3-1.x86-musl.xpak ) )
-_eclasses_=pax-utils	91d47e5d20627c717aa878b9167c62a8
-_md5_=0a7aa25b683d41e0c3c13f22ab60f55a
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.9_p3-r4 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.9_p3-r4
index 76cde5465dc3..cc0d0155d9bd 100644
--- a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.9_p3-r4
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.9_p3-r4
@@ -3,10 +3,10 @@ DESCRIPTION=PyPy3 executable (pre-built version)
 EAPI=8
 HOMEPAGE=https://www.pypy.org/
 INHERIT=pax-utils unpacker
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( sys-devel/gcc >=sys-libs/glibc-2.35 ) !dev-python/pypy3-exe:3.9-7.3.9
 SLOT=3.9-7.3.9
 SRC_URI=elibc_glibc? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-2.gpkg.tar -> pypy3-exe-7.3.9_p3-2.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-2.gpkg.tar -> pypy3-exe-7.3.9_p3-2.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-2.gpkg.tar -> pypy3-exe-7.3.9_p3-2.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-2.gpkg.tar -> pypy3-exe-7.3.9_p3-2.x86.gpkg.tar ) ) elibc_musl? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-2.gpkg.tar -> pypy3-exe-7.3.9_p3-2.amd64-musl.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-2.gpkg.tar -> pypy3-exe-7.3.9_p3-2.arm64-musl.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-2.gpkg.tar -> pypy3-exe-7.3.9_p3-2.ppc64le-musl.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3-2.gpkg.tar -> pypy3-exe-7.3.9_p3-2.x86-musl.gpkg.tar ) )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=1256f90487ab4a7025e363ca014fae73
+_md5_=4826b7f84a254187d118eef84883da6a
diff --git a/metadata/md5-cache/dev-python/stevedore-4.1.1 b/metadata/md5-cache/dev-python/stevedore-4.1.1
new file mode 100644
index 000000000000..285b297fb53c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stevedore-4.1.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_11(-)] >=dev-python/reno-2.5.0[python_targets_python3_11(-)] >=dev-python/sphinx-2.0.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_10(-)] >=dev-python/reno-2.5.0[python_targets_python3_10(-)] >=dev-python/sphinx-2.0.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_9(-)] >=dev-python/reno-2.5.0[python_targets_python3_9(-)] >=dev-python/sphinx-2.0.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_8(-)] >=dev-python/reno-2.5.0[python_targets_python3_8(-)] >=dev-python/sphinx-2.0.0[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Manage dynamic plugins for Python applications
+EAPI=8
+HOMEPAGE=https://opendev.org/openstack/stevedore/ https://github.com/openstack/stevedore/ https://pypi.org/project/stevedore/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/stevedore/stevedore-4.1.1.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=bb524c3ce7851efa492b1c6c135a2a38
diff --git a/metadata/md5-cache/dev-python/trimesh-3.16.2 b/metadata/md5-cache/dev-python/trimesh-3.16.2
new file mode 100644
index 000000000000..8de9871ad1a8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/trimesh-3.16.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library for loading and using triangular meshes
+EAPI=8
+HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mikedh/trimesh/archive/3.16.2.tar.gz -> trimesh-3.16.2.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=838f01dcebb4615d2db7ea9115b9431e
diff --git a/metadata/md5-cache/dev-python/wheel-0.38.4 b/metadata/md5-cache/dev-python/wheel-0.38.4
new file mode 100644
index 000000000000..0f1a8afc9762
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wheel-0.38.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A built-package format for Python
+EAPI=7
+HOMEPAGE=https://github.com/pypa/wheel/ https://pypi.org/project/wheel/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/wheel/archive/0.38.4.tar.gz -> wheel-0.38.4.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=bf5eaa5ce36f8a7cc7b1094ceb67f6a0
diff --git a/metadata/md5-cache/dev-python/zope-exceptions-4.6 b/metadata/md5-cache/dev-python/zope-exceptions-4.6
new file mode 100644
index 000000000000..780a5520edaf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zope-exceptions-4.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-zope dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=General purpose exceptions for Zope packages
+EAPI=8
+HOMEPAGE=https://pypi.org/project/zope.exceptions/ https://github.com/zopefoundation/zope.exceptions/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=ZPL
+RDEPEND=dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-zope python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/z/zope.exceptions/zope.exceptions-4.6.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=9c80ed2e9be852400bb5f9cbdbd38df1
diff --git a/metadata/md5-cache/dev-python/zope-interface-5.5.0 b/metadata/md5-cache/dev-python/zope-interface-5.5.0
index cbc4a77b1c22..f722008c0ba3 100644
--- a/metadata/md5-cache/dev-python/zope-interface-5.5.0
+++ b/metadata/md5-cache/dev-python/zope-interface-5.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/zopefoundation/zope.interface/ https://pypi.org/project/zope.interface/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZPL
 RDEPEND=!dev-python/namespace-zope python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-5.5.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=28ef9c48d7c7b8201cdb219f3f7a64ea
+_md5_=500b4597390a86bd1b00f29997f2780b
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 9921ca34ab8e..12b145562399 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/jquery-rails-4.5.1 b/metadata/md5-cache/dev-ruby/jquery-rails-4.5.1
new file mode 100644
index 000000000000..fd53aa94c79c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.5.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby27(-)] <dev-ruby/thor-2:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby30(-)] <dev-ruby/thor-2:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby31(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby31(-)] <dev-ruby/thor-2:*[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=jQuery! For Rails! So great
+EAPI=8
+HOMEPAGE=https://www.rubyonrails.org
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby27(-)] <dev-ruby/thor-2:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby30(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby30(-)] <dev-ruby/thor-2:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/railties-4.2.0:*[ruby_targets_ruby31(-)] >=dev-ruby/thor-0.14:*[ruby_targets_ruby31(-)] <dev-ruby/thor-2:*[ruby_targets_ruby31(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://rubygems.org/gems/jquery-rails-4.5.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=4a877f2c85686d604fb18506581468b5
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 43ab23fef58d..e055be1bbdbe 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/gource-0.51 b/metadata/md5-cache/dev-util/gource-0.51
deleted file mode 100644
index e85da96377ad..000000000000
--- a/metadata/md5-cache/dev-util/gource-0.51
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure
-DEPEND=dev-libs/boost:= >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre:3 dev-libs/tinyxml media-libs/freetype:2 media-libs/mesa[X(+)] virtual/glu:0 >=media-libs/glm-0.9.3
-DESCRIPTION=A software version control visualization tool
-EAPI=7
-HOMEPAGE=https://gource.io/
-INHERIT=flag-o-matic
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/boost:= >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre:3 dev-libs/tinyxml media-libs/freetype:2 media-libs/mesa[X(+)] virtual/glu:0 media-fonts/freefont
-SLOT=0
-SRC_URI=https://github.com/acaudwell/Gource/releases/download/gource-0.51/gource-0.51.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3691e366eaf6d7d604eec8bf1bfab2f9
diff --git a/metadata/md5-cache/dev-util/gource-0.52 b/metadata/md5-cache/dev-util/gource-0.52
deleted file mode 100644
index 57f93adc4df9..000000000000
--- a/metadata/md5-cache/dev-util/gource-0.52
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/boost:= >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre2:= dev-libs/tinyxml media-libs/libglvnd[X] media-libs/freetype:2 virtual/glu:0 >=media-libs/glm-0.9.3
-DESCRIPTION=A software version control visualization tool
-EAPI=8
-HOMEPAGE=https://gource.io/
-INHERIT=autotools flag-o-matic
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/boost:= >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre2:= dev-libs/tinyxml media-libs/libglvnd[X] media-libs/freetype:2 virtual/glu:0 media-fonts/freefont
-SLOT=0
-SRC_URI=https://github.com/acaudwell/Gource/releases/download/gource-0.52/gource-0.52.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=47d56e3e8d0769a80b6eebba0d28f196
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0 b/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0
index 84383b315d20..eb2407f4f550 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/SPIRV-LLVM-Translator
 INHERIT=cmake flag-o-matic llvm
 IUSE=test +tools
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=UoI-NCSA
 RDEPEND=dev-util/spirv-headers sys-devel/clang:15 sys-devel/llvm:15
 REQUIRED_USE=test? ( tools )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=15
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v15.0.0.tar.gz -> spirv-llvm-translator-15.0.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=59edecf6beeb881fbf71d97fec537c23
+_md5_=33e681a6ff3bf5beabbd4d111954d614
diff --git a/metadata/md5-cache/dev-util/yamllint-1.28.0 b/metadata/md5-cache/dev-util/yamllint-1.28.0
index 48b49be0e538..cc1cabe36a7e 100644
--- a/metadata/md5-cache/dev-util/yamllint-1.28.0
+++ b/metadata/md5-cache/dev-util/yamllint-1.28.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/yamllint/ https://github.com/adrienverge/yamllint/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-python/pathspec-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yamllint/yamllint-1.28.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c5b976745c3a06493796d89cf8fb06da
+_md5_=459ef547d23e2ffae84212170e9400cc
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 65eb6c430ff8..6c1b03d21e73 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/gweled-0.9.1-r2 b/metadata/md5-cache/games-puzzle/gweled-0.9.1-r2
deleted file mode 100644
index e37e7f0e6fe9..000000000000
--- a/metadata/md5-cache/games-puzzle/gweled-0.9.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/gtk+:2 media-libs/libmikmod gnome-base/librsvg:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Bejeweled clone game
-EAPI=6
-HOMEPAGE=http://www.gweled.org/
-INHERIT=autotools flag-o-matic
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-libs/libmikmod gnome-base/librsvg:2
-SLOT=0
-SRC_URI=https://launchpad.net/gweled/trunk/0.9.1/+download/gweled-0.9.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1c9b35f160ff6c6abe81faf6ab5d394c
diff --git a/metadata/md5-cache/games-puzzle/gweled-0.9.1-r3 b/metadata/md5-cache/games-puzzle/gweled-0.9.1-r3
new file mode 100644
index 000000000000..bf2c1d85d2d4
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/gweled-0.9.1-r3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=acct-group/gamestat dev-libs/glib:2 gnome-base/librsvg:2 media-libs/libmikmod x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2
+DESCRIPTION=Bejeweled clone game
+EAPI=8
+HOMEPAGE=https://launchpad.net/gweled/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools xdg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=acct-group/gamestat dev-libs/glib:2 gnome-base/librsvg:2 media-libs/libmikmod x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2
+SLOT=0
+SRC_URI=https://launchpad.net/gweled/trunk/0.9.1/+download/gweled-0.9.1.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=bd70356b6f7cd2227e4a4c94a520d744
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 462b53959b4b..9c4a515a548e 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/harfbuzz-5.3.1-r1 b/metadata/md5-cache/media-libs/harfbuzz-5.3.1-r1
index c4b83fba653d..7a99ece85914 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-5.3.1-r1
+++ b/metadata/md5-cache/media-libs/harfbuzz-5.3.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 INHERIT=flag-o-matic meson-multilib python-any-r1 xdg-utils
 IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) icu? ( >=dev-libs/icu-51.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) 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(-)?] )
 REQUIRED_USE=introspection? ( glib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.0.0
 SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/5.3.1/harfbuzz-5.3.1.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1ffed69bd691a7b0dbb568e5ebf7441d
+_md5_=63672d9f4925498b21c4245b28afea5c
diff --git a/metadata/md5-cache/media-libs/libva-2.16.0 b/metadata/md5-cache/media-libs/libva-2.16.0
index b0a4cd98e2ee..f0904057f377 100644
--- a/metadata/md5-cache/media-libs/libva-2.16.0
+++ b/metadata/md5-cache/media-libs/libva-2.16.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=meson-multilib optfeature
 IUSE=opengl wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.60[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.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(-)?] ) X? ( >=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(-)?] >=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/libXfixes-5.0.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(-)?] )
 REQUIRED_USE=opengl? ( X )
 SLOT=0/2
 SRC_URI=https://github.com/intel/libva/archive/2.16.0.tar.gz -> libva-2.16.0.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7502762dffe58fc523c4dbeff6c080aa
+_md5_=3598e85a164d06741c1d304b349bd48c
diff --git a/metadata/md5-cache/media-libs/libva-intel-driver-2.4.1-r4 b/metadata/md5-cache/media-libs/libva-intel-driver-2.4.1-r4
index 736b4e28c07b..8b25643b2fa1 100644
--- a/metadata/md5-cache/media-libs/libva-intel-driver-2.4.1-r4
+++ b/metadata/md5-cache/media-libs/libva-intel-driver-2.4.1-r4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/intel/intel-vaapi-driver
 INHERIT=autotools multilib-minimal
 IUSE=hybrid wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.52[video_cards_intel,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/libva-2.4.0:=[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] hybrid? ( >=media-libs/intel-hybrid-codec-driver-2.0.0[X?,wayland?] ) wayland? ( >=dev-libs/wayland-1.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(-)?] >=media-libs/mesa-9.1.6[egl(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/intel/intel-vaapi-driver/releases/download/2.4.1/intel-vaapi-driver-2.4.1.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c513e2334c9b23e2e65fdc72d939ca19
+_md5_=54e2af45acfa9e1e83ddec4e5a34cafa
diff --git a/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20210314 b/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20210314
index 3306c2e5e661..fb0d88cc1dd4 100644
--- a/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20210314
+++ b/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20210314
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libsdl-1.2.15-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(-)?] png? ( media-libs/libpng: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(-)?] ) jpeg? ( virtual/jpeg: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(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) webp? ( media-libs/libwebp:=[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=Image file loading library
 EAPI=7
-HOMEPAGE=https://www.libsdl.org/projects/SDL_image/release-1.2.html
+HOMEPAGE=https://github.com/libsdl-org/SDL_image
 INHERIT=toolchain-funcs multilib-minimal
 IUSE=gif jpeg png static-libs tiff webp 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 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32
 SLOT=0
 SRC_URI=https://github.com/libsdl-org/SDL_image/archive/5d792dde2f764daf15dc48521774a3354330db69.tar.gz -> SDL_image-1.2.12_p20210314.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5429fa1af51917aa1ac87f04bc5972bb
+_md5_=7e471be76ca36e8d0953a733c91b43b0
diff --git a/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20220527 b/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20220527
new file mode 100644
index 000000000000..9e71f384df73
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20220527
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libsdl-1.2.15-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(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( media-libs/libpng[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff[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:=[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=Image file loading library
+EAPI=8
+HOMEPAGE=https://github.com/libsdl-org/SDL_image
+INHERIT=toolchain-funcs multilib-minimal
+IUSE=gif jpeg png static-libs tiff webp 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl-1.2.15-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(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( media-libs/libpng[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff[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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://github.com/libsdl-org/SDL_image/archive/633dc522f5114f6d473c910dace62e8ca27a1f7d.tar.gz -> sdl-image-1.2.12_p20220527.tar.gz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=f98521be2425179159d4f51fea16817a
diff --git a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12_p20221010 b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12_p20221010
new file mode 100644
index 000000000000..79f9402207f5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12_p20221010
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=media-libs/libsdl-1.2.15-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(-)?] flac? ( >=media-libs/flac-1.2.1-r5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-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(-)?] ) timidity? ( media-sound/timidity++ ) ) mod? ( mikmod? ( >=media-libs/libmikmod-3.3.6-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(-)?] ) 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(-)?] ) ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) smpeg? ( >=media-libs/smpeg-0.4.4-r10[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/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/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(-)?] )
+DESCRIPTION=Simple Direct Media Layer Mixer Library
+EAPI=8
+HOMEPAGE=https://www.libsdl.org/projects/SDL_mixer/
+INHERIT=multilib-minimal
+IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl-1.2.15-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(-)?] flac? ( >=media-libs/flac-1.2.1-r5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-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(-)?] ) timidity? ( media-sound/timidity++ ) ) mod? ( mikmod? ( >=media-libs/libmikmod-3.3.6-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(-)?] ) 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(-)?] ) ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) smpeg? ( >=media-libs/smpeg-0.4.4-r10[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/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/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(-)?] )
+REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod )
+SLOT=0
+SRC_URI=https://github.com/libsdl-org/SDL_mixer/archive/7804621c533dddfe970e97c94c4ea72d48ed7f48.tar.gz -> sdl-mixer-1.2.12_p20221010.tar.gz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=415a0c8b3396a16d251fec33b09da9be
diff --git a/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2 b/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
index eeb9f37fa17f..573995ba90d6 100644
--- a/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
+++ b/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=media-libs/libsdl[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=Simple Direct Media Layer Network Support Library
 EAPI=8
-HOMEPAGE=https://www.libsdl.org/projects/SDL_net/
+HOMEPAGE=https://github.com/libsdl-org/SDL_net
 INHERIT=multilib-minimal
 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=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips
 SLOT=0
 SRC_URI=https://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=edf37329e0f2a4cd246ce53ceb8b4581
+_md5_=e2bb9c758ac5cf0236936a5ffa5ac7c5
diff --git a/metadata/md5-cache/media-libs/sdl-net-1.2.8_p20221010 b/metadata/md5-cache/media-libs/sdl-net-1.2.8_p20221010
new file mode 100644
index 000000000000..6420deb1e810
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl-net-1.2.8_p20221010
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/libsdl[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=Simple Direct Media Layer Network Support Library
+EAPI=8
+HOMEPAGE=https://github.com/libsdl-org/SDL_net
+INHERIT=multilib-minimal
+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=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=ZLIB
+RDEPEND=media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/libsdl-org/SDL_net/archive/091c95c031769f48d3ffaacddfdea1af999f4446.tar.gz -> sdl-net-1.2.8_p20221010.tar.gz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=623b8eeaae73cd589ddb24022470e544
diff --git a/metadata/md5-cache/media-libs/sdl-sound-1.0.3_p20220525 b/metadata/md5-cache/media-libs/sdl-sound-1.0.3_p20220525
new file mode 100644
index 000000000000..123439b941a9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl-sound-1.0.3_p20220525
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libsdl-1.2.15-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(-)?] flac? ( >=media-libs/flac-1.2.1-r5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mikmod? ( >=media-libs/libmikmod-3.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(-)?] ) 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(-)?] ) mp3? ( media-sound/mpg123[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] >=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(-)?] ) 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(-)?] )
+DESCRIPTION=Simple Direct Media Layer Mixer Library
+EAPI=8
+HOMEPAGE=https://github.com/icculus/SDL_sound
+INHERIT=multilib-minimal
+IUSE=flac mikmod modplug mp3 speex static-libs vorbis abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=LGPL-2.1+
+RDEPEND=>=media-libs/libsdl-1.2.15-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(-)?] flac? ( >=media-libs/flac-1.2.1-r5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mikmod? ( >=media-libs/libmikmod-3.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(-)?] ) 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(-)?] ) mp3? ( media-sound/mpg123[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] >=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(-)?] ) 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(-)?] )
+SLOT=0
+SRC_URI=https://github.com/icculus/SDL_sound/archive/2076a4f555f95ed28dead5e28ee8e57cc74e425f.tar.gz -> sdl-sound-1.0.3_p20220525.tar.gz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b8a507bf8a4cde2132c8c654d052f48b
diff --git a/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1 b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1
index 7a6b10e3ee2f..f4ba9b5856a2 100644
--- a/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1
+++ b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=X? ( >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/libsdl-1.2.15-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(-)?] >=media-libs/freetype-2.5.0.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/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DESCRIPTION=library that allows you to use TrueType fonts in SDL applications
 EAPI=6
-HOMEPAGE=http://www.libsdl.org/projects/SDL_ttf/
+HOMEPAGE=https://github.com/libsdl-org/SDL_ttf
 INHERIT=autotools multilib-minimal
 IUSE=static-libs X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=X? ( >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/libsdl-1.2.15-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(-)?] >=media-libs/freetype-2.5.0.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(-)?]
 SLOT=0
-SRC_URI=http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz
+SRC_URI=https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=50ba19d1c2d18a7b26dbeef1a345f67f
+_md5_=8886e23633a36f456ae21f12ba684533
diff --git a/metadata/md5-cache/media-libs/sdl-ttf-2.0.11_p20220525 b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11_p20220525
new file mode 100644
index 000000000000..5278edfcfadb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11_p20220525
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libsdl-1.2.15-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(-)?] >=media-libs/freetype-2.5.0.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(-)?] X? ( >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Library that allows you to use TrueType fonts in SDL applications
+EAPI=8
+HOMEPAGE=https://github.com/libsdl-org/SDL_ttf
+INHERIT=multilib-minimal
+IUSE=static-libs X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl-1.2.15-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(-)?] >=media-libs/freetype-2.5.0.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(-)?] X? ( >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://github.com/libsdl-org/SDL_ttf/archive/2648c22c4f9e32d05a11b32f636b1c225a1502ac.tar.gz -> sdl-ttf-2.0.11_p20220525.tar.gz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b1177649aaf88d57312950908e1dad87
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index ee0cf0d736ce..63068ff6ffb0 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/din-54 b/metadata/md5-cache/media-sound/din-54
deleted file mode 100644
index 43b022784cb6..000000000000
--- a/metadata/md5-cache/media-sound/din-54
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) dev-libs/boost
-DESCRIPTION=a software musical instrument and audio synthesizer
-EAPI=8
-HOMEPAGE=https://dinisnoise.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools edos2unix xdg
-IUSE=+alsa jack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
-REQUIRED_USE=|| ( alsa jack )
-SLOT=0
-SRC_URI=https://archive.org/download/dinisnoise_source_code/din-54.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=47641be04e9d460c8e5699f91e549430
diff --git a/metadata/md5-cache/media-sound/din-55 b/metadata/md5-cache/media-sound/din-55
index a670f9b1e0da..a5e24997787e 100644
--- a/metadata/md5-cache/media-sound/din-55
+++ b/metadata/md5-cache/media-sound/din-55
@@ -7,11 +7,11 @@ HOMEPAGE=https://dinisnoise.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools edos2unix xdg
 IUSE=+alsa jack
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
 REQUIRED_USE=|| ( alsa jack )
 SLOT=0
 SRC_URI=https://archive.org/download/dinisnoise_source_code/din-55.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0f3b6c483754ffcf42e7ee92c58a4ba2
+_md5_=41c7271a258d878ed8c5053b23ad1446
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 466e2f55cf88..21b495e13b84 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/libva-utils-2.16.0 b/metadata/md5-cache/media-video/libva-utils-2.16.0
index 393bf010e593..00ae354900a7 100644
--- a/metadata/md5-cache/media-video/libva-utils-2.16.0
+++ b/metadata/md5-cache/media-video/libva-utils-2.16.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=meson
 IUSE=examples putsurface test +vainfo wayland X
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 ) >=media-libs/libva-2.16.0:=[drm(+),wayland?,X?]
 REQUIRED_USE=putsurface? ( || ( wayland X ) ) || ( examples putsurface test vainfo )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/intel/libva-utils/archive/2.16.0.tar.gz -> libva-utils-2.16.0.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=884465de49c1893e798bfc3b7fa4df50
+_md5_=4ddfba5a9931dff44717592e6ea36785
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.60 b/metadata/md5-cache/media-video/pipewire-0.3.60
new file mode 100644
index 000000000000..d570353116ab
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.60
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Multimedia processing graphs
+EAPI=8
+HOMEPAGE=https://pipewire.org/
+INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
+IUSE=bluetooth dbus doc echo-cancel extra flatpak gstreamer jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+PDEPEND=>=media-video/wireplumber-0.4.8-r3
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.60/pipewire-0.3.60.tar.bz2
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=b118318d17d6c95685f20d562c9bae65
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index 9ea0addd5838..88c47c32a100 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -1,17 +1,17 @@
 BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
 DESCRIPTION=Multimedia processing graphs
 EAPI=8
 HOMEPAGE=https://pipewire.org/
 INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev git-r3
-IUSE=bluetooth dbus doc echo-cancel extra flatpak gstreamer jack-client jack-sdk lv2 pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=bluetooth dbus doc echo-cancel extra flatpak gstreamer jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT LGPL-2.1+ GPL-2
 PDEPEND=>=media-video/wireplumber-0.4.8-r3
 PROPERTIES=live
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=ae6f4788725a9cdf2fa1f5155337e05d
+_md5_=8e75857008836d7d659340ee908ff8a4
diff --git a/metadata/md5-cache/media-video/webcamoid-9.0.0 b/metadata/md5-cache/media-video/webcamoid-9.0.0
new file mode 100644
index 000000000000..07cc0b4b71a5
--- /dev/null
+++ b/metadata/md5-cache/media-video/webcamoid-9.0.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gstreamer-1.6.0 ) jack? ( virtual/jack ) libuvc? ( media-libs/libuvc ) pulseaudio? ( media-sound/pulseaudio ) qtaudio? ( dev-qt/qtmultimedia:5 ) v4l? ( media-libs/libv4l ) >=sys-kernel/linux-headers-3.6
+DESCRIPTION=A full featured webcam capture application
+EAPI=8
+HOMEPAGE=https://webcamoid.github.io
+INHERIT=cmake xdg-utils
+IUSE=alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects debug headers v4l
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gstreamer-1.6.0 ) jack? ( virtual/jack ) libuvc? ( media-libs/libuvc ) pulseaudio? ( media-sound/pulseaudio ) qtaudio? ( dev-qt/qtmultimedia:5 ) v4l? ( media-libs/libv4l ) virtual/opengl
+REQUIRED_USE=v4lutils? ( v4l )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/webcamoid/webcamoid/archive/refs/tags/9.0.0.tar.gz -> webcamoid-9.0.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9a75be009f45516b28cad685cee5d6f9
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 89d631e82262..34ff85e035b4 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/nodejs-14.21.1 b/metadata/md5-cache/net-libs/nodejs-14.21.1
index d65eefde549d..524ff26579dd 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.21.1
+++ b/metadata/md5-cache/net-libs/nodejs-14.21.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 arm arm64 ppc64 -riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= ) sys-devel/gcc:*
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/14
 SRC_URI=https://nodejs.org/dist/v14.21.1/node-v14.21.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b24ccd950442492adc0c2f3dcfa13762
+_md5_=db1b1bf2b1a9c2203546fa4d4cde890f
diff --git a/metadata/md5-cache/net-libs/nodejs-16.18.1 b/metadata/md5-cache/net-libs/nodejs-16.18.1
index 2f0b97b45ce0..da38010c850f 100644
--- a/metadata/md5-cache/net-libs/nodejs-16.18.1
+++ b/metadata/md5-cache/net-libs/nodejs-16.18.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://nodejs.org/dist/v16.18.1/node-v16.18.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=669479a42cc2c97bc073a8427c24728f
+_md5_=d0ab9e50666cd6e6e7fdeef91f75453d
diff --git a/metadata/md5-cache/net-libs/nodejs-18.12.1 b/metadata/md5-cache/net-libs/nodejs-18.12.1
index 0b5001465977..c032a2ed44cd 100644
--- a/metadata/md5-cache/net-libs/nodejs-18.12.1
+++ b/metadata/md5-cache/net-libs/nodejs-18.12.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=https://nodejs.org/dist/v18.12.1/node-v18.12.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1831052a522dbac5c7fe4b4481fbfe15
+_md5_=d198127c2c4263d46ac367946ee50b6d
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 6dd87753411d..c157d8dadefc 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/rabbitmq-server-3.11.2 b/metadata/md5-cache/net-misc/rabbitmq-server-3.11.2
index 4bd1e2b7018d..e908a5bc8415 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.11.2
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.11.2
@@ -5,11 +5,11 @@ DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written
 EAPI=8
 HOMEPAGE=https://www.rabbitmq.com/
 INHERIT=python-any-r1 systemd
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MPL-2.0
 RDEPEND=acct-group/rabbitmq acct-user/rabbitmq >=dev-lang/erlang-25.0[ssl] <dev-lang/erlang-25.2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.11.2/rabbitmq-server-3.11.2.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1917b738f6d3fa911519f2bdc799aadb
+_md5_=83012ae392343e7daf6bfcb1b81c7a8d
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 30745b1b8636..1291c942461d 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/obfs4proxy-0.0.14 b/metadata/md5-cache/net-proxy/obfs4proxy-0.0.14
index c643385639de..3d1e2a637c49 100644
--- a/metadata/md5-cache/net-proxy/obfs4proxy-0.0.14
+++ b/metadata/md5-cache/net-proxy/obfs4proxy-0.0.14
@@ -4,10 +4,10 @@ DESCRIPTION=An obfuscating proxy supporting Tor's pluggable transport protocol o
 EAPI=8
 HOMEPAGE=https://gitlab.com/yawning/obfs4
 INHERIT=go-module
-KEYWORDS=~amd64 arm ~riscv ~x86
+KEYWORDS=amd64 arm ~riscv x86
 LICENSE=BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://gitlab.com/yawning/obfs4/-/archive/obfs4proxy-0.0.14/obfs4-obfs4proxy-0.0.14.tar.gz -> obfs4proxy-0.0.14.tar.gz https://dev.gentoo.org/~marecki/dists/net-proxy/obfs4proxy/obfs4proxy-0.0.14-deps.tar.xz
 _eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd
-_md5_=21a0f80058d7d3084418bda732bc8c42
+_md5_=56bb9a309d1db7bf5f909887d05d8c1c
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index ad49b38f06d9..38d3d2ac70ef 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.7.11 b/metadata/md5-cache/net-vpn/tor-0.4.7.11
new file mode 100644
index 000000000000..c73f875abc7a
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.4.7.11
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install setup unpack
+DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) )
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=8
+HOMEPAGE=https://www.torproject.org/
+INHERIT=python-any-r1 readme.gentoo-r1 systemd verify-sig
+IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.4.7.11.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.7.11.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.7.11.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.7.11.tar.gz.sha256sum.asc )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=5e7abad2e0dc19e060c786152a192544
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b1e7c7f4b0f0..4d6c8058cfba 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/gptfdisk-1.0.9-r2 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.9-r2
index 1fe8bc32ad70..246dd26b5981 100644
--- a/metadata/md5-cache/sys-apps/gptfdisk-1.0.9-r2
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.9-r2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.rodsbooks.com/gdisk/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=ncurses static
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!static? ( dev-libs/popt ncurses? ( sys-libs/ncurses:=[unicode(+)] ) kernel_linux? ( sys-apps/util-linux ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk/1.0.9/gptfdisk-1.0.9.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=faa023fd91763c7357b5ae01c3fb1754
+_md5_=c4ecda0c38146a56755df21d93c93a23
diff --git a/metadata/md5-cache/sys-apps/lm-sensors-3.6.0-r1 b/metadata/md5-cache/sys-apps/lm-sensors-3.6.0-r1
index 774d834e8080..052fbfe6bee5 100644
--- a/metadata/md5-cache/sys-apps/lm-sensors-3.6.0-r1
+++ b/metadata/md5-cache/sys-apps/lm-sensors-3.6.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors
 INHERIT=linux-info systemd toolchain-funcs multilib-minimal
 IUSE=contrib sensord static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1
 RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.36
 SLOT=0/5.0.0
 SRC_URI=https://github.com/lm-sensors/lm-sensors/archive/V3-6-0.tar.gz -> lm-sensors-3.6.0.tar.gz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=adc9d3000017c886700b1015a625524b
+_md5_=af257a35f16d332a7433ffddfa1bdb10
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index c7b26219f134..e21e8132f5ca 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.34 b/metadata/md5-cache/sys-power/acpid-2.0.34
index 6f5b7bd96e7f..85a2818418cb 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.34
+++ b/metadata/md5-cache/sys-power/acpid-2.0.34
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/acpid2/
 INHERIT=linux-info systemd
 IUSE=selinux
-KEYWORDS=~amd64 ~arm arm64 ~ia64 ~loong ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ~riscv x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.34.tar.xz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=97a1b5233a9a3e65b10c7d1330efc624
+_md5_=5b264f2046033ece37230990968d841b
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 597610453101..ffc9c6d7b207 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/rust-1.65.0 b/metadata/md5-cache/virtual/rust-1.65.0
index de0f46e0186b..511918f796b5 100644
--- a/metadata/md5-cache/virtual/rust-1.65.0
+++ b/metadata/md5-cache/virtual/rust-1.65.0
@@ -3,7 +3,8 @@ DESCRIPTION=Virtual for Rust language compiler
 EAPI=8
 INHERIT=multilib-build
 IUSE=rustfmt 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 RDEPEND=|| ( ~dev-lang/rust-1.65.0[rustfmt?,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-lang/rust-bin-1.65.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1a7bb1c7c0cee332d3d8c65f91afca4b
+_md5_=8217f02f49438e24f91ca8348b310f9a
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 3ef0282b9cfa..9af3aad53cac 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.53 b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.53
index 7fe09ad32134..c93363026852 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.53
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.53
@@ -13,4 +13,4 @@ REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/525
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/525.53/NVIDIA-Linux-x86_64-525.53.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/525.53/NVIDIA-Linux-aarch64-525.53.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.53.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.53.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.53.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.53.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.53.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-525.53.tar.xz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=5d4612a0fb6c3c0bd198c4e8c8ffe713
+_md5_=7720d5af38fb9a0453e1df2013d60f80
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index dd4fa628989e..135336be0996 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/lightdm-1.32.0-r1 b/metadata/md5-cache/x11-misc/lightdm-1.32.0-r1
index b1408ba95289..fb7c10422d1c 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.32.0-r1
+++ b/metadata/md5-cache/x11-misc/lightdm-1.32.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/canonical/lightdm
 INHERIT=autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
 IUSE=audit +gnome +gtk +introspection non-root qt5 vala
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~x86
 LICENSE=GPL-3 LGPL-3
 PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
 RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libgcrypt:= dev-libs/libxml2 sys-libs/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) acct-group/lightdm acct-group/video acct-user/lightdm >=sys-auth/pambase-20101024-r2
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/canonical/lightdm/releases/download/1.32.0/lightdm-1.32.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8cd9e2e825b66d7233604b73e8609346
+_md5_=f0c688f0d3ba3b759b04fa9657864331
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 0d182d4f294f..f1d98908b4d2 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/xterm-375 b/metadata/md5-cache/x11-terms/xterm-375
index 8bd57ce2629f..870a9d658ff4 100644
--- a/metadata/md5-cache/x11-terms/xterm-375
+++ b/metadata/md5-cache/x11-terms/xterm-375
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://invisible-island.net/xterm/
 INHERIT=desktop flag-o-matic toolchain-funcs verify-sig
 IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama verify-sig
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/xterm/xterm-375.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-375.tgz.asc )
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=cd7bc2eed5ccd285f294195d21ab0cd7
+_md5_=0c1fcecf9d3c80baa0ff1d4a61ce5fb2
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 60a455f87140..d4827735e7e3 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-11-11T02:39:41Z
+TIMESTAMP 2022-11-11T08:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNtte1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNuCk1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAdXxAAi8+TEyrE5wWwGVKF4X5wlRp9xrMo/FvqDQWKW9JHHrsReAMuePu6/eg3
-Xc0Ldaztt4a8ZCbjOYM0GhotO5U5A/0x4zHgTErSGAny3H1LCohxSNMeyEjQYsQe
-LhScSYXCjnpB64HuxNrPFde01V+RLV2oYmZInCSFnfxjpPbVsCrele5rKAXhJqgt
-ZdLUKxIkxn30IVRqpIk9njf3ONMNA+2PfVj/wmxgmXhnLyyILS+hcdlbZUVhEU2X
-zp5/oGvNYnUPLnCT0LehZx/OK8j9A0QVydM+nOfIfprqh0ZJllsQppzs3EJJUEP0
-ATIrzSIa4G8nr3OiXHikjY/tNQQLJJeOutl3jf5axGmKXDDMb9s0he2QMcvqtXqP
-sAyNLjWGAWFGwnYdI4K46+StgvxsGXstalKOGSCdj636bXBRdFMylreuiKP4FhoX
-z8fpVf7KGUL3xLprtE4Dr+mYwmfrQKgBWZpSkwY4OO1zVXGUNrHoA2cXwLQTij6P
-A2DE6hFN8tO6oIy8iMcDIXwCAvGVnxfZLA4F+lwQktuLQRnL65W1S2gmQeOmK33C
-YEO+a8p7TjVhmj5lCBOazELyeuw4iPkJgPaFx8ovqbinEt87wcN5rffqwUjPYrjs
-uUxfhhRdkdrMrg7zpWtcnpt94Jwv6sJoK1N6FfvolZ+DXyTGP0k=
-=/Asx
+klD6Tw/8CKnckSI4F8OZjm0MJbq0KDB65C5htR4dRsaijvCYhi4G7y8HM6y6QSq3
+RQpAs1K7mdZNpZ99ibHH6u2qRUr9bSf0rID1XpAVXAGbsBVtfVn5DO39TcvKfV99
+fehPTI/CBWMKuWvx4tOJ5cw8TDRkEvOhLMf9/gTSWEUQWOnlBv3OkNMlbBK7Hk6h
+WuTHo9176xg02rGzzxW82OnPDP8Y71ZP4xmvluy7ag8vjd41P/maQNrvNu+IoYE9
+c0l9FcSK6b2GIPle987Nsg5RtkTwjentcK8Tk0PgwTAitgWUpFJh7VyCmkBF4MVt
+6IEX+CCQPlaL0ftTEhoTdD65guAxv6ez2+xi8As1AoEupPPYmcHCR8Vm8GgSTIK4
+GfBDhfzB19kyDoMcby1vZfqACKkWMJ7xgZvR/XsEZ4hpCJoEeC/RZcRMZCChVQ6p
+v97H6ysYNAVEU6ivbyGspaRYyqRVgiDHVLTzIU1w6MbdhTVPULxqaGpX/OfiIXDP
+Vy8uvKYtoQIeZ1IrBWt7hrcGXbRjlxpABgC+Ary3c1BhmgxIWVGzxMyCGFfMfCIQ
+fDbs9oetsvY1Uv7FYt+J3Jv+6sSdI9uZHfWmXwh2hgzdbXx/pZeQtyI2j4CBQv74
+GfTUH4Kpw8fgOiR436TKnEtBbe/ZECPIcS+n1iSRq844+Y650IU=
+=NwcL
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1c3a8507fc84..bd7bce3130e7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2022 02:39:38 +0000
+Fri, 11 Nov 2022 08:39:39 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 814342d269f9..450146ed18a6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Nov 11 02:39:37 AM UTC 2022
+Fri Nov 11 08:39:38 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c370e1a3292f..8e3743eafb71 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2022 02:45:01 +0000
+Fri, 11 Nov 2022 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index fffd4e944277..0874bb1f80e7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-32372ea3298d68229cc954b5b5ce7d8a18dabbad 1668130069 2022-11-11T01:27:49+00:00
+09599eb4281b6f5d92ecf06683e155b502baf682 1668155638 2022-11-11T08:33:58+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b42048b67616..f8c433aa1dbb 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1668134401 Fri 11 Nov 2022 02:40:01 AM UTC
+1668156001 Fri 11 Nov 2022 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 1c3a8507fc84..de0a363426b4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2022 02:39:38 +0000
+Fri, 11 Nov 2022 08:39:38 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ebe5d8728f03..af857f09fb87 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 0fa973c31c10..3ef344fd86b3 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -15,12 +15,12 @@ DIST node-v18.10.0.tar.xz 38364672 BLAKE2B 0746f9c8bba75a996987c77e6e4c328e56a54
 DIST node-v18.11.0.tar.xz 38437152 BLAKE2B 836af1d07493017fc9863a21a7b38fc7118ec94b0eae5089291cc9819637c40332c21676ddc360af28dbf98c48fc83acd035c6ac5e5f4eb62e0043f340eda311 SHA512 dfb36f438e59913cde540c8bc429bf856078c174a53406de851ac59337f70efbd5988e6a969bd16ab8cb2a197871c6f7353c3ccbdaf492a4c047fc11ede36a78
 DIST node-v18.12.1.tar.xz 38454588 BLAKE2B dade180304ebe2bf30fc3270a13b8e024dd48a6dda26be7f730925500f997a9c703608b782eb40a16ed174699af256430434759678ae683b92f4fb4ba48b4707 SHA512 1eb4978a1de19c026561a8484df87bdeb6f7f2ec8ae1eb38b6241d0b0ff6158a4a7d19f42df7e295a63b8047eaf862a7470494143b2e27bb36b65e4663966588
 EBUILD nodejs-14.20.1.ebuild 7148 BLAKE2B b361effbe5645588daffc199e0e67a1ae2de09c8ff36aae5e7c68bcedd154b1ba2feb7bb9f3b9ab276f73254d0004caf644b5928ea55a86802c3a8b5cc3d0c1a SHA512 3151d756b43f2efa91b13a9b7eaa2dc5a714ada13137b90a209cab8ae64b4da954dab598f17c4fa8e1f76824c3a85904f28b95601680c98a0f6e5bdf3c3e1e63
-EBUILD nodejs-14.21.1.ebuild 7153 BLAKE2B c522e2a9ecec086d52433d869bcc1af81c902f4248fd66b0c7e98edf200d4b93a638e601857f94d11cf8d254417dfff50cc8fc95b78546c8956803bf0e4d4093 SHA512 ceff2904cbd87452d61ba4601e80d386a4efc6a2997ed00007fc143743527a1508d7e41924abcbaf2bdf0b8338295030c010ad8223c5e1889a88ea5934718809
+EBUILD nodejs-14.21.1.ebuild 7150 BLAKE2B 07318b86c0c593ddf0ff287baae193597f47f3a5eca1a89015f0825477be668eedbb5f35fa0cd4e322b260507a6e7f95f38ef9a8f0b8e98c46aaa21bb9cf4cda SHA512 33af6fcc845888b82105a076d61425b1f3d9bf8e197e600b68c3e5d9dfa877a4c3901bc7a894035b18620be8f14aa2d71d2a21125df514cf6419942f1aebc20a
 EBUILD nodejs-16.17.1.ebuild 6762 BLAKE2B d278f9efabb906fbbd301916d13879c6a9a1ecc957c5c6d23d1d8095baca0b22ff61b83e28fc1bf5e034431080cf527bf19437ffe2bd014e41e188d02def11f6 SHA512 797936389325834aef302f428ea66ee5d87c90beb156333f75210bc8b13efb700eb9ca945116e0017d4265ba010975d2fde571ad854a4391d69777f09cf0e85d
 EBUILD nodejs-16.18.0.ebuild 6733 BLAKE2B f22acbdda582845a79560c5deedb44ab8d5989de4992cda35074d34b548c0a6ecc8c40b213f2cd5d0ba69cffc7ae65fbac2297ff0050d4c08438f17b3022b990 SHA512 cfd0e78387fb05b6a1cd59ae631bee3ce5da601390c686bceb606766eec7c6989ceded8a48a727686c48fae9bba3b81407cbd2e2cf3b04c70d9010d74af6dcde
-EBUILD nodejs-16.18.1.ebuild 6767 BLAKE2B 5c5729dc468ca0ff374151b9fd2a3b33170dd67bd212cc94603b1749970cae30152212c2f4a24d9099b2278d9f4b878a755e3ee28675eebf2011129f0a5a8cc2 SHA512 b6da0f6cc0fa87a2828adbfec0bfd3fae3aaef6c54de577108396c766b7d92a577842aabc443d512c656f216509eb0ad72ad3d216ff7da6cf360d2734ece05ae
+EBUILD nodejs-16.18.1.ebuild 6764 BLAKE2B b378c1dcb1cf431e952e76be5093ffaaf3ee78f5c803526454c1776aa94e1831297a29d1464719b650faed37a2547216c92687680b5dc02d4669c4340f928f92 SHA512 a01222762b045cad7d4a41fff07f78709c0cb8f42ce886c0ac26502eb60a99591cb69c2fcbe0f80d5c4a37086932a8e74db45db6110000d584462d5bf0225fb7
 EBUILD nodejs-18.10.0.ebuild 7521 BLAKE2B 4ad01cada842a8e0c22ec469ff4448e9b459b00aa5854d4a811f1ec42f3186aed38af92dbb2f768dd4e9fca8953c914614fce60689382a381dab9c22aa168ccc SHA512 2df578a3d1df8cd76ea21e6b52c22bfe54cae1ccb24144d3aea72ac422352fe3c9172304847b23f836767436928ed8dbc2de2ec526af641eda5734db13176c0e
 EBUILD nodejs-18.11.0.ebuild 7492 BLAKE2B b4c56a266693fa31370785937c5f898631e3134b7830e3bc675c480f2cc048857612621f2f9962bc29b544bb3875392b2ef654863ce9fc6490dd617d148d01fb SHA512 c7bd59aef5b76beb67c070b5619aab15b9971c68b7414d7eece64dc31668f7b41708eec46985f3a4c522889f37d0d89a174a0fc743c12e7a1973e5fb7c57bb27
-EBUILD nodejs-18.12.1.ebuild 7526 BLAKE2B 0b7faf08125e39755080082675e70dc1c507040cedddd147e4d717434fdf19794b35045d6a44d6d6908153d124f401a9d3b5820ccf1d5512fb1440ebbf1ded27 SHA512 cbe30fc9022c1fc74d0b8d900e99de0b724db583eab2157a46f72ef14d9bcf815807cb6afd0c1e65d2e5e866afcd9781c3473dfe7962fa840186dd9d9ae2a1dd
+EBUILD nodejs-18.12.1.ebuild 7523 BLAKE2B 46343936ae255ecb47dee86634333bd572418c6ee582669183f87fb0b3d347ccc89900afcb0ee8aced05766e5411941c87dbd345caaf984f749b306b5377b892 SHA512 8f854fa6681f21662d467a300dd750d5e41a6d3e820c76020a0cb869f1ad9644a20bbf8f2682ee85d43d974246e1b88231e7f1c6a15c9573fd5935a9c58d868f
 EBUILD nodejs-99999999.ebuild 7492 BLAKE2B b4c56a266693fa31370785937c5f898631e3134b7830e3bc675c480f2cc048857612621f2f9962bc29b544bb3875392b2ef654863ce9fc6490dd617d148d01fb SHA512 c7bd59aef5b76beb67c070b5619aab15b9971c68b7414d7eece64dc31668f7b41708eec46985f3a4c522889f37d0d89a174a0fc743c12e7a1973e5fb7c57bb27
 MISC metadata.xml 898 BLAKE2B a67e85ea95c272b8d18746254894b058433267a74b5bad66bac7d78c7db4cec297e06bc87fad3ee836fc91749aaee2c11c88b48b6ba033c36fa79132552faa81 SHA512 d498b288058e7282c5e9a28d4ba192a2ac5ef796eb1edf644aea41cab2d0eb6036426b188dd9af7eeb2eaf04b84011460cb3c3695ca8dde5667add21d9963c97
diff --git a/net-libs/nodejs/nodejs-14.21.1.ebuild b/net-libs/nodejs/nodejs-14.21.1.ebuild
index cee8ed1e8ad4..7c379ef96c6e 100644
--- a/net-libs/nodejs/nodejs-14.21.1.ebuild
+++ b/net-libs/nodejs/nodejs-14.21.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 -riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 arm arm64 ppc64 -riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-16.18.1.ebuild b/net-libs/nodejs/nodejs-16.18.1.ebuild
index 146acf19edab..044e64bb6992 100644
--- a/net-libs/nodejs/nodejs-16.18.1.ebuild
+++ b/net-libs/nodejs/nodejs-16.18.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-18.12.1.ebuild b/net-libs/nodejs/nodejs-18.12.1.ebuild
index 9c480407154b..fec5881c4739 100644
--- a/net-libs/nodejs/nodejs-18.12.1.ebuild
+++ b/net-libs/nodejs/nodejs-18.12.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index df82a33221f1..466d53fdb35e 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 8fee7c42aa5e..47fa4e199e2f 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -5,7 +5,7 @@ DIST rabbitmq-server-3.11.2.tar.xz 3752644 BLAKE2B bc98808579cbaa12371fc95d137fd
 DIST rabbitmq-server-3.8.19.tar.xz 3263712 BLAKE2B 3dc990d3720883fe2b6b61d48122b64c81564124f48f0a0e6aa2dc1d0837f6dce0bf174b4044c39dc0c8da64b2f78499922c58c90d7e7f80e50b80b4535f55c7 SHA512 05c789dc25e2f236d9643e582792c8a9ab90129247d9306e60c303fa3a707e68dcbe685460b255b6f610c8ab55d48cb7b372ea51ce1d3c86d8d770e4e4f7cfea
 DIST rabbitmq-server-3.8.34.tar.xz 3415500 BLAKE2B 90cf0ec285e53fd8ec7663857c036d9f202769840c1ae7ae0442fcbdc2cf32cdaf29a2ebbc6b50d2e73ba42f5ed407ea66443e1b39e92ae97f1dec66e9c706ab SHA512 3d30e81de8e6293d2784909109bdcc9c09c0f1e385da9c8570f844ab8dd0ac999631cff198c2f70c9345097759f87c4c7926dfb0c92c2a81a3753a2d740e9635
 DIST rabbitmq-server-3.9.20.tar.xz 3540364 BLAKE2B c430b08b5ecab1e6015a6d2ef2ac653ce111043bf41c8d80743c36273266b65d10c819e251fbc91a2d65276eea837b75d8d0ad01c61c3332b05b7e42843f34e8 SHA512 20205551e077545cdee6b64b28beebae0d9da32658ac1aea2548238bfdbeaf7b067ae28ce849e0458d611d8905219dfde17f2c46b229d27d7231ab6442936ec4
-EBUILD rabbitmq-server-3.11.2.ebuild 2346 BLAKE2B 7cd981040f0028723164aa97b2bdbb14639a91fe1f9711351b7c7e913a6dc8485436701bf59a8455d6a482241e8e1f95825900fef5587991e6beaefa98590873 SHA512 9197b3627c4196c4f8ff65807667e83727992c5dd19f8db0075482a655551d77f314b1b112319df4f17f935792ace68fbbb4c174edaa1907a042e972bbf42cbb
+EBUILD rabbitmq-server-3.11.2.ebuild 2344 BLAKE2B b328a8807242baa3edaa808142b2c74f5af696d4c930fa369ae85f1bbe24fe3b942da79118f57503928ca199acfbf1649f140c0ca155e9748804860c355d8139 SHA512 72f3a25b1e506d3d42cace5d570d89a798b8f1130d5312c7e5046a3d3088fd100d26057b45150707f341d0be544be3a8314f80193967f6975f6398673e517620
 EBUILD rabbitmq-server-3.8.19-r1.ebuild 2206 BLAKE2B b810d721ff0299c8567ff3ca151108ce622a7c4e0be4d61ad206d03a0f7291a9470e30bc79b2658cd2cb4c2758b1bd2832c51e3017a3d83549164391064d5835 SHA512 b4b016f59504729eaa2b274391cc5d539b0761056da18022d94e7bd59024dbe18fe75117c9a21cd0e425508dd97d9c3ca66eef5ae0e40d645187f86baa7c655a
 EBUILD rabbitmq-server-3.8.34.ebuild 2210 BLAKE2B 1d7d66cedda261fd36ac656b33ed4112582f618c53c0431c3f3fbaccfd5b5817f461c1efdd96e066b53569014f7756e0f92a74ffb437ca2115ab36fb9f7f6a8d SHA512 372de561dab2047413bb58fdf920c8f02f39d06c2a1c4ed989743dd73e98c6a2f6949099ef246dfdbf48db5f695320150ac19d87f721abc04466784a907851bf
 EBUILD rabbitmq-server-3.9.20.ebuild 2210 BLAKE2B 1d7d66cedda261fd36ac656b33ed4112582f618c53c0431c3f3fbaccfd5b5817f461c1efdd96e066b53569014f7756e0f92a74ffb437ca2115ab36fb9f7f6a8d SHA512 372de561dab2047413bb58fdf920c8f02f39d06c2a1c4ed989743dd73e98c6a2f6949099ef246dfdbf48db5f695320150ac19d87f721abc04466784a907851bf
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.11.2.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.11.2.ebuild
index 28bca1956f53..98ff40705796 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.11.2.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.11.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/${
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 RESTRICT="test"
 
 # See https://www.rabbitmq.com/which-erlang.html for Erlang version
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index af514dbf7920..53dd6e5e6185 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest
index 3c9ced36df7c..b08db2c63543 100644
--- a/net-proxy/obfs4proxy/Manifest
+++ b/net-proxy/obfs4proxy/Manifest
@@ -3,5 +3,5 @@ DIST obfs4proxy-0.0.13.tar.gz 86593 BLAKE2B 1ac3adaa0c1c4169635abc511f3232d22c31
 DIST obfs4proxy-0.0.14-deps.tar.xz 23134868 BLAKE2B befa45afeb9566dbf46be07ae469dca305d91584b04f6cb8529c50c2d1b3fb94e0adc6434ffa069b8fa1af6be2a29ffc550a7bcf1aa45eac0ed66252e37a31f8 SHA512 81f4bb778230c2f040dd1682ffaff3a635d4a57a5cef42b9d4ff7df486476cb037d7851d6e8ce5bb021c6a9a5116355e963eccfc2d1fd94cbc24df21bff7ff2e
 DIST obfs4proxy-0.0.14.tar.gz 88649 BLAKE2B 6d2198dee67998b1793c28d77dbfd8f922248e8acba481ea9496567652e132fe45c09061b3052dcdebe0dbc356744ea454641789dc688ed333ede73186b8c69a SHA512 2e28516ab888485d14d7f60fc0bee9a8268faf681803c71faff49185b7870cc0c5a6df3dbbb2a4d446307997812092ca64070be978997bc82cc89ee435698feb
 EBUILD obfs4proxy-0.0.13-r1.ebuild 994 BLAKE2B 435fffdb8fdd8a489087018cd9628a7d0200718faed583d46f41b81e35ae14b9de330e465ece9db7cb27104407e966147e05b37ccdf3bcf3d8390e70ab3f34af SHA512 f669360661e24643429cf094fcccf66ff9eb7b838b9ec9a6db970e98e3146c1706c6d51d5d3f6e2c6e7c616c935b3488b99bba52171b7e02371eaaca1da8d844
-EBUILD obfs4proxy-0.0.14.ebuild 834 BLAKE2B 7fbd9a5b90ae765ea2079eacfce7068da61722c9cafc48843db901a059213110027b202821bc8cbad53fd8d808f991521cac88454cea163a773122cc1aea7246 SHA512 01174d161e1bbeb7ee1aa8f8b99539642fb6a14cff86eb9ee28af5446261fb7bf3621eac08bb03fab596fd136a3fa992f95c7a3bb4f64829e468464437ae7356
+EBUILD obfs4proxy-0.0.14.ebuild 832 BLAKE2B abf5ac03810e5207d440fc4a6ad784b0edee908dbe93cbc440aad3d52e3bdec0a4de48e709f653b32ba82c8faa5f9477bfabadc9b388c33f01d18f96c4868bd6 SHA512 99c97ad987e27ad6269b3346f383fcf5a38b41147c39a91e96568a690e11f8b775accdd3deec386ef44e5b3cdcd07ad05c1a2f81559d8b034f53a916ed9020d0
 MISC metadata.xml 437 BLAKE2B aad226fe4a4891683070aec2c5726682c0622dbb85b69c94caf0c830ac9f3b891341f80200fadae3b71ca1bc545a6269237cf90c6413ffba98462bdbf64dfdff SHA512 cd0d8f64fbb0fda5f55e6bf2f0bd9e2d1b13e5c8b7b5934bb7a3180219fba7c63f2c2a16abb5906d4d2a4e5222473fa67723c9ae3be0fac08321235b96f4d845
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.14.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.14.ebuild
index 16382a91b841..f2282b63925d 100644
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.14.ebuild
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${
 # See https://gitlab.com/yawning/obfs4/-/issues/5#note_573104796 for licence clarification
 LICENSE="BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64 arm ~riscv ~x86"
+KEYWORDS="amd64 arm ~riscv x86"
 
 S="${WORKDIR}/obfs4-${P}"
 
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index d5cc4e2e6532..2a967014f9c6 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 1851c9ff0808..22aa5d50460b 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -8,10 +8,14 @@ AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9
 DIST tor-0.4.7.10.tar.gz 7933376 BLAKE2B 46a9d932e7451bcc683e18d296d7a26bb4b544767cf4622910ebf90d82715718451ec3e0d6cd215eff5fe2cc3ae8441b8e6065c5877d7fc92c2f26ab5c7fa0cb SHA512 e82877807d9e73fe12ab424830641e52b9b45034ca06f07e37648f50a3c1c10cd1b07081d8646b8e92c58658bdff5f6e9670e5104e9d05a531b1d85d0851a606
 DIST tor-0.4.7.10.tar.gz.sha256sum 86 BLAKE2B 4b372b3508ffee497ecc9adab4a4d3d2b548100bb7dd54e1036c71004503d96148899096bbae807f2d626a5e26d0a947f7546df0a708a78b59b4d39bed3e849c SHA512 518b6e617702386df7a84155d528f1a904a45221c946402da3fc3d40170dcdac117bff38c92a2e58ef4dd8d422433950f3904d27da66a99d808204432732cc9b
 DIST tor-0.4.7.10.tar.gz.sha256sum.asc 1321 BLAKE2B fc7fd43115992e5d434cc1bf2808eeb971ead532935be7493b4eef7804a65cad3cf4f9fd18158a0c8f3e19bb9e55c5fe7487ded9adb6782cbc1583e1159aaf7c SHA512 789923b465e72a1a77b1b1951cd0f66c266c10119a480ce8b622f1f4aa07381b7403c27aca3badf51381da0b41498c9b0d42b2c5cedd6c54a617df9dc138689e
+DIST tor-0.4.7.11.tar.gz 7983705 BLAKE2B 2d743e7d0aea63e76f6e24aa235792af8691fde419f56bbdf8c6ee865250a09ec06454ec84abac8ba47e3d61a363c937fc050376172d3ec6b0815998d1c8679e SHA512 318377916880310438aa9804d1ea0154c5416d6b13988c4ff7f2e65fd38c94e2cd6c53252fd76a4dcb488f452837468e19197bf5feee4020e3c1927a76ed2937
+DIST tor-0.4.7.11.tar.gz.sha256sum 86 BLAKE2B 1e49ba88ae21af6589a9815603ee375cc0dc85fcd8dd5a5f52cd44659438874ae9d10b09b7f15cadd2c30d2e8012a27be4233dcb19195d4627f19a59ccf68d0b SHA512 cfdae54a70dc0d8eb0eaf8b8c9902a7dd8bc8d597a678d5a0bf431c3e09a8b56206b70b6f9207e3c06e1ba11913b25b81d7c269e49cde5f297ff7b165a3348a9
+DIST tor-0.4.7.11.tar.gz.sha256sum.asc 716 BLAKE2B 2336ff3869b3a759626cd68c0c931dbdb6cf5b13e7a99e2dcc1c784e3832ba2f0314c1c2f3a9e5ccaba3f20d7aab9b9c918373194290769e358cbb5411323012 SHA512 b5e3c82378bc18268d6d4523787e12ece39246cc0f035fd1aedc50c2182d1ba3d2a8f8817a3dada2cd60acabb78f604f06ab347b92c6f42a82f260cc49285c2c
 DIST tor-0.4.7.8.tar.gz 7910081 BLAKE2B 40f6eab453d95a09e4531ce7cdb59715a21b84e1d0b1045d107add6a443fb7563a5747734b23e0e1dfda6490a5a7659f912e38c11cdb5fa635535dcff6169eeb SHA512 2daeb4ef9144772b4e0793ccd00990b7eda58c533f9616670940931d6d12770e9a7d48b33b5626d330f62bb71fbc6e1f559881f062d16bc15fbb162e29fa91f4
 DIST tor-0.4.7.8.tar.gz.sha256sum 85 BLAKE2B 0fa1e094af83c74f46f87d0569a623bd3061b416f272d19326faf08ab6e9e926b14c2d46c99fba80d68f22188aa74c73e68477015e1c37382e4acb115d10a5a2 SHA512 8d8ef020e8028a0d481cbf6e50809212ebfb493b11c3937f1f732be48ca139a991e68b799342a17374f6faf77f0a7113d15c5220a5bf94d110d11582a078a013
 DIST tor-0.4.7.8.tar.gz.sha256sum.asc 1321 BLAKE2B b70d64db73c45f50bac4ef07f12d755eaf02b676d929bd6f3a9b5b593326e1cce4a3bc8466f2ccce003ab044084fa812ce6ea4cbf32f5a4c0321199dcd291bee SHA512 5c58745abb4db4a9d53c4c4df209cab96689494704d661439efa705f143267aac648ed23240aedc802e9689223f79d2d1c7eba865d2d5b3296590f8b93e03c37
 EBUILD tor-0.4.7.10-r1.ebuild 3234 BLAKE2B a80b64e1f6e6a0b158cfd42e44782b563b4f6020560f930caeb56db931ea8bc0f8f4e43cf7b14436cc81d91baf474c9ce9643e88dca873f0f354fa30261fed9f SHA512 17780bc894b55b1fd5b4dfab4b789034518f0d8e1d534f1ea9d61f66c7c7a2eb189feec70cba38e9d30a48629c07888877e4d4de2bd9f0526ae5f7ff21693677
 EBUILD tor-0.4.7.10.ebuild 3188 BLAKE2B 38219b96311d1b087f15543634fec44839223a1f5e74ea3baeddbcf3907819bb6fa5b8dc07364802d51e453d50d3c352de461a8014cfab2c9f40b5526e5d6853 SHA512 f3e2012daae2cf4afe29bd01d5bd5c3d64dfbc221f3c519070d04758e65e11be8fa28a4c88833f72d0af6a852c5927a3523e187fc1c421ec14622bdf701e11bf
+EBUILD tor-0.4.7.11.ebuild 3188 BLAKE2B f40c82a55f716ede917c546078cab99a992c2bc4db55ad9e8c3a89e9cdfe096d24510426fb52f68be5275550404b46553afa5d78c93f945d45b0ef4d0612291b SHA512 c209e94735786bd4cbdf8aedaf37c1c5ccb4eb8f1fe248326b05e1a5f9fc88147b3355069d3c0366c09c435f288930364cda4b3ae16eb8a6baf4553af938e837
 EBUILD tor-0.4.7.8.ebuild 3182 BLAKE2B 33b1531bbaf9ed8f176b1801fa9a7c7a17d7feeac0bd2007b9cab0f3bf36f838e242c13ae566776c8844da7b9557626cebdddba7aaf54284a08005a85a4c2fdf SHA512 35133f9dfc685723739a53f2714032b0a428a338473945769386c57e96388b11dad64f6c68bd6e152d47efb77fed308b55cbc1345dcd41b77860d03ef762d5f2
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.7.11.ebuild b/net-vpn/tor/tor-0.4.7.11.ebuild
new file mode 100644
index 000000000000..4a5266e2af76
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.7.11.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
+
+MY_PV="$(ver_rs 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="https://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
+	verify-sig? (
+		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum
+		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc
+	)"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+fi
+IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+RESTRICT="!test? ( test )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
+
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 )"
+DEPEND="
+	dev-libs/libevent:=[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	man? ( app-text/asciidoc )
+	dev-libs/openssl:0=[-bindist(-)]
+	lzma? ( app-arch/xz-utils )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
+	systemd? ( sys-apps/systemd )
+	zstd? ( app-arch/zstd )"
+RDEPEND="
+	acct-user/tor
+	acct-group/tor
+	${DEPEND}
+	selinux? ( sec-policy/selinux-tor )"
+
+# bug #764260
+DEPEND+="
+	test? (
+		${DEPEND}
+		${PYTHON_DEPS}
+	)"
+
+DOCS=()
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+)
+
+# EAPI 8 tries to append it but it doesn't exist here
+# bug #831311 etc
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
+		verify-sig_verify_unsigned_checksums \
+			${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_configure() {
+	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--disable-all-bugs-are-fatal \
+		--enable-system-torrc \
+		--disable-android \
+		--disable-html-manual \
+		--disable-libfuzzer \
+		--enable-missing-doc-warnings \
+		--disable-module-dirauth \
+		--enable-pic \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
+		$(use_enable man asciidoc) \
+		$(use_enable man manpage) \
+		$(use_enable lzma) \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable server module-relay) \
+		$(use_enable systemd) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage) \
+		$(use_enable zstd)
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r9 tor
+	systemd_dounit "${FILESDIR}"/tor.service
+
+	keepdir /var/lib/tor
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r2 torrc
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 00712f65b698..f7fa1db72928 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 5609dc901228..a54c74e4c003 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-08-09)
-# dev-java/jaxws-api not keyworded
->=dev-java/jmock-2.12.0 test
-
 # Alexey Shvetsov <alexxy@gentoo.org> (2022-09-15)
 # Mask nvml use flag for slurm
 sys-cluster/slurm nvml
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 1069f058f4ff..6ffae733544c 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -13,10 +13,6 @@ media-gfx/geeqie heif
 # dev-cpp/notcurses not keyworded here
 media-sound/snd notcurses
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-08-09)
-# dev-java/jaxws-api not keyworded
->=dev-java/jmock-2.12.0 test
-
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-09-23)
 # Only PyQt5 is keyworded on pcc64 at the moment.
 # Mask the other Qt4Python implementations
diff --git a/profiles/package.mask b/profiles/package.mask
index 6305bc3cc77a..3363b2a046f2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-11-11)
+# Causes memory corruption when building x11-misc/colord on x86
+# bug #880865
+=media-libs/lcms-2.14-r2
+
 # Jaco Kroon <jaco@uls.co.za> (2022-11-05)
 # Some potentially breaking changes here, please check the UPGRADE.txt file.
 # Most important:  chan_sip no longer builds by default, if you've migrated to
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 8bec34338ae9..7be620bda1f9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5126,6 +5126,7 @@ media-video/pipewire:flatpak - Enable Flatpak support
 media-video/pipewire:jack-client - Install a plugin for running PipeWire as a JACK client
 media-video/pipewire:jack-sdk - Use PipeWire as JACK replacement
 media-video/pipewire:lv2 - Allow loading LV2 plugins via media-libs/lv2
+media-video/pipewire:modemmanager - Combined with USE=bluetooth, allows PipeWire to perform telephony on mobile devices.
 media-video/pipewire:pipewire-alsa - Replace PulseAudio's ALSA plugin with PipeWire's plugin
 media-video/pipewire:sound-server - Provide sound server using ALSA and bluetooth devices
 media-video/pipewire:ssl - Enable raop-sink support (needs dev-libs/openssl)
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c462f0da94c7..eda4978ea69f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 5e78bf76000a..69d9518658eb 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -2,5 +2,5 @@ AUX gptfdisk-1.0.9-libuuid.patch 899 BLAKE2B 534038452a7184945486b8435099adf7f19
 AUX gptfdisk-1.0.9-popt_segv.patch 671 BLAKE2B 1d46905caca1b7a403d1d200f5f0afa89953b86997f834df16002780d4371027bc34988c58b9a67e6b10a8978d4c99e93b2e711cbe00f5c49f3a868f708efc29 SHA512 b559c479dd2d62208b41a4ba3c6e68cf3e3b099d999bb8c2bbe251d77f217ccde28a44de0ca26c86004a6cecc17cf8360a120f3f1dd884ab4616c061110fde60
 DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2
 EBUILD gptfdisk-1.0.9-r1.ebuild 1287 BLAKE2B 9a46d6625eb48a72b7e4882d8ff08d5a8525f7cd9884e2b5ecaa43c13e4295a9570894d857b1b2dc5cdc3a8128de2d3439a216b0e35c1b8c08e02c297cb07713 SHA512 2083c0cf8325732699c6703545089768934f1221fc5ec93b4996e1c973a9fe6c113aef9665a2b7942d0ecefe4c907dfe3a40c04b6cec720a1ec41235c89df5d3
-EBUILD gptfdisk-1.0.9-r2.ebuild 1361 BLAKE2B 8bcfa746b47003f40a4d703205315259853c0d99b2c023fc2f6338fd800157a4c6e3d97ab54fa552c5740e5f28f15714c59c328116a0415e21abe0bbc669c7ad SHA512 62310cd3978627983faebb42f544bb80e009342507920aecbbd22d3758675839d6c804c49e9fdf63dbde06c4dbeb9656af094f824df73601af7da7f2c99d8fa8
+EBUILD gptfdisk-1.0.9-r2.ebuild 1358 BLAKE2B 56c0c2b60c3001a45f78291eaadea1d721dc057d07c98a789b7494b16f7aab31a44b0ea9ed2e2ae3f4f733a589fc3854cf324dacbbc52ddb3074dd3041002514 SHA512 429afe574179db85681b28cad3c28388906aaf3e281b7dd8c677c03d2b0328a63fbaae3e4aa383e12f417ed6579eabd18818bde075a81436e92ea091718c1f35
 MISC metadata.xml 324 BLAKE2B 71325b739cb7e216be64dfff099ebf3a3f24d8a714ce59838780b6944a65f7d9abdb9b0afb43c617364071778768a7d90da9ef8c7eb4c3bc0cd6b5dc9e04c773 SHA512 ad7457ef87228bef7db385c72bee2c9cf1f913cf261641582a57e4b72c05e7106ad39092c55e2aae1e4d92f86a0bf6f4537dd7de9fdd6e1dc64677b36df4a273
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild
index 6d028d9c8c59..549350be0e05 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 8b185536583e..f47347aa9386 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -10,6 +10,6 @@ AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378e
 AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
-EBUILD lm-sensors-3.6.0-r1.ebuild 6635 BLAKE2B c74d9baebae1989bb1f54b7242760c7b3f7a8d18c8b56d600631c537a42e96057f2c937c309a4e6892361c06fbc4fea089eb2e64ad886dbe2bd0ca1c3453d5e4 SHA512 a607ca4981063f41801a3731256c1357daa8beb1d1d5d75f9f41ea4dbd456f51e7496c992f376a84e18fc4fc686ad379e80fe8ae564081b3983ddf4a84f05866
+EBUILD lm-sensors-3.6.0-r1.ebuild 6632 BLAKE2B d3a46a5d7748f4b9e59e8c44668e342e66380394d5b0dc8852682af82274e851144b9333560d639fe3a026bbd33fb7716e40ce144d30131ab00dc9f575f193e3 SHA512 594939b80915bcb8b80595639af77705418225b1a6087172bb7c4bad2e8f862981be614acaf9fdb8d872666624d29c892dfe2d59ec93dc89f0d1ead9e92d289c
 EBUILD lm-sensors-3.6.0.ebuild 6672 BLAKE2B efecba75234ac2175f71f070cd16b3bed7dbae5e74c91ce78c3999de502155286669651dd8ff3149d83d51190bf672e90a477aba5d528b540e1fe6ef2b2aa3f2 SHA512 2f120c58c561c148ab755b85dc3d1e65c731e1fad666cc39ade50e98fff6de3c0c0ab59cdd57bbd262a47a15ef2095f7d4139c996446288d3ddc6e9d61f7cf7d
 MISC metadata.xml 826 BLAKE2B f4bbd7a126d042dc595f2f5f980445ee576f61c589ecd61359b0f68935b92a2483890add6f4b3fbe73d7e43a5e60462cde524c25561df0036d43c95dd36bdc2f SHA512 83e3b7b23643aff17671420de8bb32095e2170d4b80abd4bf5cee4f08a7168475f8779a40a6d35d587f8820a7f6d32eb8c9a83015860bc521064ca157e23782a
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild
index 8612e3a12419..cdd007850a4f 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.0-r1.ebuild
@@ -22,7 +22,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/5.0.0"
 
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index c14661fe1db4..3b1fe3970642 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index adbb1f0c1189..39e83bb2f510 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -7,5 +7,5 @@ AUX acpid.socket 115 BLAKE2B 9d869f1fd573b2dc885a3328e5e70fcc28922343a7a408e71a1
 DIST acpid-2.0.33.tar.xz 156580 BLAKE2B 72a0835f3d88f4ccae44016809fdb930977f6b02dae6f74068186a8c850237764a1e8cd69a478e5af42115d5f630a9f91cd77b35b8cf01854e24b7e06bbdd536 SHA512 491a58c62fcad44dc57cbd9294437fbc215c2ec99a030286601cd1956ea504e723e61b11b315983073d66aace1997bc40e6421475f6073298f60b8dcda2add75
 DIST acpid-2.0.34.tar.xz 159924 BLAKE2B 1379978f8c5816febcde2d3bb641f8a51736ae0caed97a45caa990576d314608a455307df11f6abafa2ef8bbaa47554f581605aa9c1af150ee64b9eb684fee15 SHA512 2bf92295b55bb44fe83074b3e0c1ae639f63edaeea84b2184ae95b38852be40f380d5413110b8c0fcb2efc2ec01bf4764e1dcb97022fc724bebbfc35c0b63c81
 EBUILD acpid-2.0.33.ebuild 1500 BLAKE2B 1dea84343f87e457edec570258436550cc7abbb6e77919060b6ec0ce611cc3c0a212a6507b0953c0705521a49ba6a6f78880e8b1b3cda48d540c3f037c441f2c SHA512 d649af8cbf409e4193b9511f0642b376231cfdbde6c10af309c0e62914a3e50e7700a35119517bc831517118270235f66e1f314a1bef2fd1472643570a74779d
-EBUILD acpid-2.0.34.ebuild 1502 BLAKE2B 394de2559a5dcb426b1b6ae3802f87638deb742f4f276a77d4b75916fb571c032d0a468de92bbab9addcd807a39a1775b8424ca6af8e4b49fe0ef9355bdf479c SHA512 7a106fb61887b45c637ee3dfa4f09f79bfd75c11babcf2c0f78c980d499ba5c3410f68648c746b38f947d21b38682e12d7980be5932abfbd8ca27f29ee53c386
+EBUILD acpid-2.0.34.ebuild 1500 BLAKE2B 1dea84343f87e457edec570258436550cc7abbb6e77919060b6ec0ce611cc3c0a212a6507b0953c0705521a49ba6a6f78880e8b1b3cda48d540c3f037c441f2c SHA512 d649af8cbf409e4193b9511f0642b376231cfdbde6c10af309c0e62914a3e50e7700a35119517bc831517118270235f66e1f314a1bef2fd1472643570a74779d
 MISC metadata.xml 322 BLAKE2B 8b701e7a97b323471ea98b4eb2ffcd6d6b195182e2aa1aa07cbcdafc7d0ae9afb7d24b55982adb183c7c73c33cbedb8a82232b6531ebb2fce30d22cb29a0cdee SHA512 0e5ea0b0d6f75b99babbd2578e1fb2b2fff20584699c3a762cb8395cb52c141509f109ed2894e5c3fb4c338ce32297a67a31f313c5141b5a23c758c7a21586f9
diff --git a/sys-power/acpid/acpid-2.0.34.ebuild b/sys-power/acpid/acpid-2.0.34.ebuild
index ce3ff788217e..46b15088a97b 100644
--- a/sys-power/acpid/acpid-2.0.34.ebuild
+++ b/sys-power/acpid/acpid-2.0.34.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~riscv x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index ef8078c334e0..042cda84d093 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 8691471f7d0c..83f59621c019 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,4 +1,4 @@
 EBUILD rust-1.63.0.ebuild 375 BLAKE2B 01b7658bdb911adf084a25345ec03cfd49c4f2395593f44972638d21a20e0e2d4c56d79ccf823054d031dad7b14474908785db626485cda48537bdab80113bc1 SHA512 92202e5d6c300c275ebe6f78d41346e455a4398a6c9d83bd4f6892b622ab02083c79a39a87ba0a54c22dbaf792183e18aced25b87e9ebe42f3b5aad10a15bd4c
 EBUILD rust-1.64.0.ebuild 416 BLAKE2B 6a14e5f7411bf5ab0e38b9649d1ad915d2ade4628f6012f384deec0fd1bfd3a23574dfd226aa6880baba52b8f6d1da5a1d07cfea9c5ff680c0787c8a9822c9c1 SHA512 42973ab4be0d7b1f6a6299c3a547fd1960cf6727f28d9cfec8abcc55cb565965dbe02a84414e82dc7ad766a92b9b819e8697836fb60bea88a7616f9eb0dbf06d
-EBUILD rust-1.65.0.ebuild 431 BLAKE2B 25c0a7ad64e371852f57c554f9636248b61df67705794cd09d08f755d471ab28179b57af4a16d5053ff9f7f52bfadaf53c09fd8e00c671ea4dae81bb2329abf2 SHA512 72bad112220f723780e7a418010c7511fc2458c44b3ae107152d921f9b42c28a6e3eb8afb1019e102fdbb2fb722937f7d1b5f81cc0176f01671b7da1330dbba7
+EBUILD rust-1.65.0.ebuild 423 BLAKE2B 6c2f94c96414d12096694e9c0426d7abdb95f00c7129a771d91feae648c62f26878a5cb023c826d1834f292b4612a4ef35c2e122c22672a7bec96ea2bb3891e8 SHA512 27bb984fc15b669fda87bdfda51169c1f4189f9f56c887bf5e74b693a6e1d73fc7d7a42b1c0b76e7d3d7233a87bfe48561d469771014f2165b7b186ff2de6a63
 MISC metadata.xml 351 BLAKE2B cf3c7f2e804dbe6ddce9380d9c7b32e734df16a04ea867a474a4e6868edfaa72abb79dd6eb47f67128a1b60cb4872c999949e8237102bc2117e581309307f862 SHA512 d32137e0b4549baf85ffaff35d2c5fb058a44e3fbeb7f560db3ebbfc1d44d9ce3651e033cb8434f211994218a85d5bf89f42ea9e3ab76e361c1014dcc6f25997
diff --git a/virtual/rust/rust-1.65.0.ebuild b/virtual/rust/rust-1.65.0.ebuild
index fa697f3e1e2d..d5fca4afec85 100644
--- a/virtual/rust/rust-1.65.0.ebuild
+++ b/virtual/rust/rust-1.65.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-#KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="rustfmt"
 
 BDEPEND=""
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 801573e0650b..d9c4dcd7afdc 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 82c9abd8595a..28b0537d1160 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -66,5 +66,5 @@ EBUILD nvidia-drivers-510.85.02.ebuild 18275 BLAKE2B 8de4b4dd6169ad21bb0bcdd75ac
 EBUILD nvidia-drivers-515.49.24.ebuild 20057 BLAKE2B 6b40e0bfbbdccc91301ef0d4074cc7a2a14913203bd54ca4d8a528a664aaae8072922524c0332946e4cef8211c09ca368ea1188ebb4558b10056026809917704 SHA512 90a246f94934607ec182124a42504b7c02cbe6923ee613c6485a0612d697bf4f746b64eb60e1d5fdd8c6905f67120f11fbd21d241a96c3bd10d9191be1dbdc34
 EBUILD nvidia-drivers-515.65.01.ebuild 20303 BLAKE2B 29b5b2845949542ada9bc8aed0d0bd904093805b644c3b9fd444b85d1215a449c98e7802d823534f2bea6cab8348c30ee7b17bde161b6f4ce9741fc242e0dba8 SHA512 d8089077061122ab8193fc2def277d9b3458128417a2e96dd793a7bc51d9aa39d7bdd62c0f75bc9e2b85b6b4037089b5c8ee5e9bd59dc6efadcfe8d50d98dcb4
 EBUILD nvidia-drivers-520.56.06.ebuild 20058 BLAKE2B ddd97c1da12252e434fbd4b45f5b7f4e3cfcbdefc1bf3197cbba3f45b332c95ff2e7310e4d8c58f1643a69ac62f9a01602ef3b65bdd5ef1c6e78c3a5c1212eb6 SHA512 c3a469350121c021192b60058d93346897de1ea0d6593d404159bb86bbde8705b64b553385f8932d36c5393ea0a0b9e9298b544564c6193e804fd1a200a4cc3f
-EBUILD nvidia-drivers-525.53.ebuild 19769 BLAKE2B b2bf48bc3279c7bc9d088857f970ed35730d4eb35e51c1e97ff4d56f6a55fcf57162c84082aa72237fd612f2adeab1817287bec6995e2b4837b17119fba40cfc SHA512 9b457fd2135911477c2fead5b3ae65e42ea1226c51f7adf087c43b6f1124255a2ad244aa32c9500c9efe36b2c8956e335ec2987a4c8d02088ca399c7061b8a97
+EBUILD nvidia-drivers-525.53.ebuild 19854 BLAKE2B e1262e1771e0cf43b2d52e6288da80f6974920f4625ef00178056f12f1a111d5df2601b287af972e1778e9360137a64aeb6134b70fec7982764b95c8a0e7fea8 SHA512 ee34c20c051b6662b56c89ac9663cca05b56e4d30f12caa95c7597ca52c0c865ca820fee4b1236b15da55bc12c3d089da263a6bb1820ccc153f2367224b595cb
 MISC metadata.xml 1320 BLAKE2B f8aa8f9a39d6da284b60afb50087acf75744057628e79b77a95e6bebb1e386e9d1a819f41e73d3e94b8ab74322ec8e8b077ad6d2af0804a5c6f20b4dd5f2897d SHA512 9fb939f8c8892ce43afc4f577181474c88a0aae3cc58af57987000b82f6c52f3f7b40fc538fa8eae0d5dbaf1fe3734d84f72fda2106853edd945149b3f2d2747
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.53.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.53.ebuild
index 3c8fb42432e7..27eaf46ca842 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.53.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.53.ebuild
@@ -300,7 +300,9 @@ src_compile() {
 			RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" \
 			emake "${NV_ARGS[@]}" -C nvidia-settings
 	elif use static-libs; then
-		emake "${NV_ARGS[@]}" -C nvidia-settings/src out/libXNVCtrl.a
+		# pretend GTK+3 is available, not actually used (bug #880879)
+		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
+			-C nvidia-settings/src out/libXNVCtrl.a
 	fi
 }
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0b5f49ebb1d8..fc061bae2d1e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index a21f9dd31b20..2bb13b7bc938 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -10,5 +10,5 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
 DIST lightdm-1.32.0.tar.xz 518168 BLAKE2B 90191559895a58e2c5892705ea95766aaaaa87d3470f1372ab90fcf3991d27f9280d5bbabe0cfce70e25f960d63c1e7eab7beeeb501341996afd155788cbe1c7 SHA512 81497fb25904bc2e8687dc99992628eb534f7418f72e1908c4766e917fc1221714210d998739417e1cae2ee15e3197a2eb8d4981cb944cfeb0334dc9e356e716
 EBUILD lightdm-1.30.0-r3.ebuild 4139 BLAKE2B bb436a18ccb2e229b57ec10be9524542fc81dae8034b802b00dee64b69f704723a9d79b270c2a46ac056edb837c47827c7fab9fe36efe78ce4015f0cda886d20 SHA512 c004da29823aa0dd3db06c22a0bb36548d6d25a593636cff79511c1972b695f1b7920e17f23f4a7b911b7bfd45e0bc1cfea81986bf7d92c463536ca3549740f7
-EBUILD lightdm-1.32.0-r1.ebuild 4147 BLAKE2B 949e53f6a10b957d5222eccd4b17ec2fa20412e700403b9a6cf683970a22927ef027093e2313578ee283f572c1321378f339585cadf50a9c67b96a7e75978b1a SHA512 9c64fc78de241ec42f26b40f9af0b27a415fdd6a58aa19d77dcf296e800aaca41644f448c080a7c9d111e8deec54c8faf537ca3c3be5d41fe032298e8530c6af
+EBUILD lightdm-1.32.0-r1.ebuild 4146 BLAKE2B ace6787e4252f38355317667da8e3f5ecb7077040403f3f2f01bd588b7b00fff70360ad9181c4b2869cb0ac9f5b18a39ab5831a5a6b31c2a32d2e5c949e6316e SHA512 4b59caddf7a3a1ca95a8b13a2c69f659b3b30d85fdc13bc2363eff1cc3bf7ba3d458e262f018587c65a9a11118f022616f6e4213dd9e42ad178556ae57322d61
 MISC metadata.xml 454 BLAKE2B 66c069f7c5e3b820059e67736ebd898389a8243bce08fd364c8d0a1704f484a13a935bc2a7a31ad975535f8df5a091cbc337c48ea65f45a1cebdcb2c0888b8dc SHA512 f5e5c7467eef552ac808daa8289f803438fc72c81028b48cb20f4f18ff2462216520312294eeff8fffc1357a4330e1e264da70dd35ef3c20baff2c5c26bc654e
diff --git a/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild
index efcf661d8750..1b5586edeaab 100644
--- a/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/canonical/lightdm/releases/download/${PV}/${P}.tar.x
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~x86"
 IUSE="audit +gnome +gtk +introspection non-root qt5 vala"
 
 REQUIRED_USE="vala? ( introspection )"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index afbc5b795a03..8293e7e3a0aa 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 929933660f63..987aa37f3a17 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -2,5 +2,5 @@ DIST xterm-372.tgz 1507107 BLAKE2B 256b99b13512740086203c4c05685cd170356118e1102
 DIST xterm-375.tgz 1518304 BLAKE2B 29b81cc7ceb9cf03d4e91f731b4e78dcf963afe8995dab442f7bdb9df0f41b1ba0b2fbe45f220868c6d4e2655714d308064d41b9346edc5f61e5157fa21a966e SHA512 5492320055348f5f0c42789a2e47ae2fba4c19f7d55f50c174948fc79ab011e52435755b302e1439390a4ba44316eaaa7b79ce0ad9a366e53a84cfb2c3565a51
 DIST xterm-375.tgz.asc 729 BLAKE2B 2ae5833284a7cb978625be0de1233e8ba54a36fae7657e0169e94de907e37cc4677d1b3a8d89384f469c6f2786a91dc280a930c6fc04c21d74a0a83571771b5a SHA512 c7b4b5006c7a197e29adfbb741ff57a6e39f97e23e1739a3935ff9bb338f4245809591974aa8a5608261e190355ad76b810b757a18740918b6fcaf5292240a40
 EBUILD xterm-372.ebuild 2602 BLAKE2B 34217a79398617f43dceb77255dc2f60ef742e0626a75a3362e0f440e976eabeabe5b68f01b64b04c944102b041b490550a7cfa11a49bb9a26a4f4a7045d4326 SHA512 931ebdb5db36135ab730418b2bcef4565040250f27b4d403cfa57abead4b2b2046f5982c202a034b5dfca3705b3dd613359b56740d8280336bb66da1211be1e0
-EBUILD xterm-375.ebuild 2853 BLAKE2B 9ed2701916669a71599686dd0e5563bde3f63980bc6394eabb10de1c7fd06863825996adddf89d4221289ad4036c4b8bdac76490aabc05543681935fc2359fa2 SHA512 218eb0fd4b04cfe87bb3566f6c43d1a367deb787afd3a9fbc406c5beceba74758846561a87a150ad71af586aa4d349b814a759bc690cc57972c0af3b50e4a8a8
+EBUILD xterm-375.ebuild 2850 BLAKE2B b715175cd30f87bb4fbb319b2e102c16301e8a95cd210fe0eb046659614876a44f0c500b0ef070a8eb18d3d63833ca607f415bec60b8df313cb182165df60947 SHA512 f4f593822272a7b7eeafe86ca306c8ca9f913f1145f279812fd08f80a66355ae7bbec74ab45c22c0009b34635657e5fbfbba3ba3662f84d9953ddaa2f5ab0fdb
 MISC metadata.xml 552 BLAKE2B 1de52230aa9b681cee30dd4ee4651521bf9474cb2a99168fd6c8f13e0918cf185dbddd3dc6f97e0c81118680294e9c4d74137378763b021a07d8ce0a1430e18c SHA512 019a08f2f03a270da7a33bf1b0e9bb42864b806990884b9f2c19110238ad5d5fd18bc896e9fa7cde130b4ccf3f7003db43f6b485caf5b021f5d5e36f279f9d36
diff --git a/x11-terms/xterm/xterm-375.ebuild b/x11-terms/xterm/xterm-375.ebuild
index 987881290c13..2ad16272a2c1 100644
--- a/x11-terms/xterm/xterm-375.ebuild
+++ b/x11-terms/xterm/xterm-375.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2022-11-11 09:29:30 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-11-11 09:29:30 +0000
commit	7d6f532c36268a2a8f53fa33c8e547c59702faa6 (patch)
tree	6fd7a5cb102e736fe8969482dbce6c8a98808f6f
parent	b4899ed9fc78f45325ef4e2ebd460869e53a605d (diff)