gentoo auto-resync : 18:10:2022 - 01:55:31

author: V3n3RiX <venerix@koprulu.sector> 2022-10-18 01:55:31 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-18 01:55:31 +0100
commit: 5fa0e0c7e62842b1491426c8c6e506f51b6c78e1 (patch)
tree: c494340a21568e82965da87fb559b9133375e762
parent: d941e0a66c717c1f67ae35cf31afdfcbf7f7acbb (diff)
463 files changed, 3778 insertions, 1843 deletions
diff --git a/Manifest b/Manifest
index ea710a39d58a..d613e5e9bf97 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29626 BLAKE2B ad87aa922a21eb5432a964689ca33c99b153991d70be7fce517e58d89a713f5c05e7fde68deb200624af890181998d1485a605cf75690f9ccf5d322b0e75982a SHA512 19d8152f89296c7d9251d55fe3a899f8f278459b290ed19f121297fba8da9cb4df914bd26ac411b4651abb8873e1717a6bb60984c20704abd8683ac620d1c699
-TIMESTAMP 2022-10-17T18:09:58Z
+MANIFEST Manifest.files.gz 29621 BLAKE2B e4115269a58758fbedd4c969021558ed1b57796c775160740ad2c962bc78f01963dcf385a4d69e45acc172056d7a803ae9af2c146b4354d839d5e725a49c47e4 SHA512 7dc96caa5dcc2df501272f0ebb8782ae3fd75741f8a2387be6aec13be1003ded23600e310b20e67e8e2e050a9c7a68f5bdec282a9498c764f4931a9c09131f21
+TIMESTAMP 2022-10-18T00:09:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNNmnZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNN7tZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCqOBAAnmiWTNScFpzRP/RqJwdzVs6BLE1HQkNOrfa+ikkfOz2RPwjRvBt37Evo
-gJgUBYtm0DrQgYAK0D1vwEN/x6IZWAnI3pa6n+QSOyXfStzWliQhV0W2S8fjv0YQ
-yVbPlhS+++vVuBGc5rnog2NDy2JqlIRiiaKC/5yt9EGt3TU7p4YFyyBedmaWuqAl
-mHHlx5tEdcIexAZwyPN9uEdEkDp9rzkzpCZHLZfgoo+FKn9TtDs3TPO3Lx/prb1k
-OpEkXcB4TZVBK1E2/OpAaI/d/K4kSMnCMoU4gBiFuniT9knvCEk6Pj5QePbIbBr1
-63gkQ2vudtcqciC7M6BQOVmarc9K0oqwa1nyQ/5eAV1D9m3n8eco/ei7SQiyUXYc
-KVq6utYIFnFszKPfb9fmVVCLG5Q69NbhzyS3nQ28LMkJbmtyQFyW5/cbhY65lG4G
-yn3lsIKWxfyX7mDyCALZHhtrVJYXl1tO9M/QdWq6ZON2oOiwdh29AkvVxWlmFILg
-tierYGm1Fy7onVQSxmBI8Vu4XxUZtYXr2Qywpv/6r12BPqYHWH3abK/vkfGzSgG2
-K2xC9dGU/jxJEOvEw3RXgaTPBietk55UQsUUSNIW9Jfrq88oSAW5j+uXFqJAu5Fe
-4MSzavoPE8C+sQpzdkO/0hhWHcCCfYbtfA8xxbTU4H0cZ8d3+fg=
-=CVmG
+klBk+Q//WaAl71dj3zihLEmnX+uLFcnxKVTdh2GEOHUytvDCFsXw3uu6kj1RY9xp
+INPt1zdQC/oqfnPyM8QzZ7G05DVotknDInJ1LNnScExxe1mS7nns2fLm7ynPRItw
+NEb//Iz/rod8Wf5sWaJpixdTdDeCTyH2pGKXHKOu+HpCADOMOuZUN5UqyyAkke1N
+QWif6d1qvotQO4Nnh8P7m5/UBOBXeJaikO+K3zZDGq0SbCeYCW6Yj7ZDKdTfbXe/
+MfHmFInN8flMRXz9/TbDmHmYDnkNO+9uW4cN+FwO7YP9Zoujvs3WZrIAVUTnruMD
+d90KW6V3POkDzI7zThiXQvFbRHTltVqVHm3e7MCpV2V52AfHC5SWesaHzWAqDOfG
+Po848pdWV99nWlSK6dwDVS5VO55MXyczMbSYYNbd76y6uIcyiZAnhoAzOUpwEcuo
+a0OUx1O+dnXujRsjVUWhpoddm9rMUnNle1JbDqNoO9oA1ZnHbAuePLdcC7W6M9e9
+f7IhUTz8TWF9aUth/958XlgeQdOT3Ug7BwfwhQcTN52NLUVhfAq1hgw8Nh8Evwr/
+vHV26HZA3MDWjjURh1LY4qOTBcsCohZoktcSR3nE+pDqJ+KSKjZ0zOlzp43KwaDP
+dqc98vekugSxGXDICgX7SLQzJ7mz+Vf0zLNZ0fi0nBwFqeBGELY=
+=ocSt
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3d9404ad3ff0..32b6c4343ada 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 0961eba42ac2..bc06ac8ea385 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index 1dba83ffe84c..b641802f2463 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1,4 +1,4 @@
 DIST pixz-1.0.7.tar.xz 120876 BLAKE2B 23563837169611d54dc4540715537b2e16c66bd9682097e4f37957e7422b487f221603b11aa30a39fd05c77dbeddc1697ac9ffe208d984c1da885a67f79a180f SHA512 7f343cb74958b9582b60a2e916243e72421fad1ebecc5867c9e046c881e8a318da9bb885edd71da8fe6953fd5d5c2f5119133cd0bbbf4d0f9b35f8aecd61120d
-EBUILD pixz-1.0.7.ebuild 1167 BLAKE2B ce9ad2bd97b046df0664ee57b9a46c35363dcc994b8a693f1df7d64a041dead17ebd1587b96d0564f94234a18d2649db5b961148a478b74e446387f49dcaaaae SHA512 7f061eb5bfabd04b593f45fb2b180b2a21734e1dacacff0a743625379dba7c9276c127c626a3b762dbaa9774b5413edcf61097bb1161dc41cb6ad4bd5bced071
-EBUILD pixz-9999.ebuild 1168 BLAKE2B 2549f6755339a3fea8f4d7ef07320941055892f95ec82d148ad03c7e0bed11cde07c046945079e2f53784be4defca73d0d16d9193a1e20b6967a8c56d472029f SHA512 1e16db665616095f5ee4a989b18eb3cacd5a2883a366cd628019220312dcd9345489202a7f5c72307d05163f6d92cf257f135d0ab24eb595d74be6c66c060380
+EBUILD pixz-1.0.7-r1.ebuild 1211 BLAKE2B b40d93e52fb1446acf2388eb4b6c7792e53dc147eceba37d765a7db00cea7adb20e69b40cf5f23514d0ad8367ef251fb0893057055f7e9578cc44e769fe7ec65 SHA512 255472730320368cb8fe02da6584227596f0d6ca3bbb82ab7e0e6ce9aaaca3c80a9ea639e9c828041b3c3bf8c86673cf81b50f69630f4a379b0d4482aeff1479
+EBUILD pixz-9999.ebuild 974 BLAKE2B 922f792e8add0747a10a678c137346b575a980893f44bcad57f49e83f843422406f13d6a41863b7bb769fb20d14b7c3c923096d460cfd12da0adcc07c28d872b SHA512 5284711f211ea74cf134155200ed03cb5e93bdfa2af4a50325436b0821fba939fa9761622fbb4fa77de9ccc73daaf6e15028d8c09d139b5b5381426d6cfc93ff
 MISC metadata.xml 332 BLAKE2B abab0a5f43e5804d6f84a00007db2114e5a1167b32c7fa7d9c56777bab8e19c52a419633fa8a1547b86801eabcfe50ba91eb9b4f18e478056df69777548fc2a9 SHA512 9fc1e0881130a254dae5e1cf745026c067df22bd77a44c92f2b0a453d7ca56d89d2247d4aa2245414ab9bdb24ae171869b1152482b01d729a7c46a573e0f3b9b
diff --git a/app-arch/pixz/pixz-1.0.7.ebuild b/app-arch/pixz/pixz-1.0.7-r1.ebuild
index 7882044a1cad..4cee8e634c94 100644
--- a/app-arch/pixz/pixz-1.0.7.ebuild
+++ b/app-arch/pixz/pixz-1.0.7-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
 	inherit git-r3 autotools
 else
@@ -27,25 +27,30 @@ LIB_DEPEND="
 RDEPEND="
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 "
-[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc"
+[[ ${PV} == 9999 ]] && BDEPEND+=" app-text/asciidoc"
 
 src_prepare() {
 	default
+
 	[[ ${PV} == "9999" ]] && eautoreconf
 }
 
 src_configure() {
 	use static && append-ldflags -static
 	append-flags -std=gnu99
+
 	# Workaround silly logic that breaks cross-compiles.
 	# https://github.com/vasi/pixz/issues/67
 	export ac_cv_file_src_pixz_1=$([[ -f src/pixz.1 ]] && echo yes || echo no)
 	econf
 }
 
-src_test() {
-	emake check
+src_install() {
+	default
+
+	 [[ ${PV} == "9999" ]] || doman src/pixz.1
 }
diff --git a/app-arch/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild
index b3f2858f5bbc..78fd9a6c159b 100644
--- a/app-arch/pixz/pixz-9999.ebuild
+++ b/app-arch/pixz/pixz-9999.ebuild
@@ -5,12 +5,12 @@ EAPI=7
 
 inherit flag-o-matic
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Parallel Indexed XZ compressor"
@@ -27,25 +27,21 @@ LIB_DEPEND="
 RDEPEND="
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 "
-[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc"
+[[ ${PV} == 9999 ]] && BDEPEND+=" app-text/asciidoc"
 
 src_prepare() {
 	default
+
 	[[ ${PV} == "9999" ]] && eautoreconf
 }
 
 src_configure() {
 	use static && append-ldflags -static
 	append-flags -std=gnu99
-	# Workaround silly logic that breaks cross-compiles.
-	# https://github.com/vasi/pixz/issues/67
-	export ac_cv_file_src_pixz_1=$([[ -f src/pixz.1 ]] && echo yes || echo no)
-	econf
-}
 
-src_test() {
-	emake check
+	econf
 }
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 78acec59b4a5..a39b10195a36 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index 49faaee8b00e..c12c53116b27 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -2,5 +2,5 @@ AUX cfssl-1.4.1-build-fix.patch 587 BLAKE2B 74651f5b21947cab2a004e25ca4b30cc6f33
 DIST cfssl-1.4.1.tar.gz 5736648 BLAKE2B 581627eb269fcbbbe9ff3afe558c6ddc7afa10f563444899244045baa0ae195d8822b389e7c59bec6c9135b1159b18d2a5e497c83cd26eaa47a3a87de23ce694 SHA512 0aa557708a300e2eaf48a99d55794069530b6842584cdd867a864272b205c89d5abc2acf3a19d34b3b5519a6429b5f55685129638e65d574ad6afe5b7e1e1e8f
 DIST cfssl-1.6.0.tar.gz 7428162 BLAKE2B 100313b756885e00a09003bfd326f8b0d69a14d148cd65b97a53667716c14a8841d862740b7dafbca74da30a8f1d6465ca3f3bad6ccd2ed39379bb1de80fd225 SHA512 a1470c50a6ffa506d2c1798a9e8af5a60206cd41d24cc3ca8a071e9ddfc3249a07fa79c03dabc3df0800985be7e930018045ae95ee83d31486cba93e516da111
 EBUILD cfssl-1.4.1.ebuild 647 BLAKE2B dd609e6e27897765ad3fd1bbfe55362f484e633a5779a38f3d802b40406ece3ec343e0a1c76fdf75bdec144504b9046d582b2341605dfb12314a30cf4ee51152 SHA512 f13adc0c6c0274309b37ad504bf641483ae905173224a746bc6f045ebad138c21c294bd6707cb4e42f2ed6efcd1bacbf60d082e83a91daf357ec37b6bca9a2a5
-EBUILD cfssl-1.6.0.ebuild 655 BLAKE2B f2913443d106b6b32f166d14755cf7fe844c5dca6dacfb04245efaa4342241ea0cdd53d9ae8274014468640d55204c8f2ac1a283c0a6d596e135c650619ef730 SHA512 bb5fc4d96246e47e413d3d563380c033d0d176c523821a7098e1deb9d7cefd844a6b213fc8637652a9e37ae26334bdf7985027f4cd4ea446acdeb8ceb7af6547
+EBUILD cfssl-1.6.0.ebuild 662 BLAKE2B 9b6e300b5544a416a4bec839e4e73d8e6894c7b74b7393d2305a2a5a5656712cb7e51e853daf0709e5d9130b102a659b6d434ccb5ae7df683fb08e4487cb4742 SHA512 4f012386ecb46ce513c81ca13c0dceb132071e627d34f5dcb3e6398db5c49b8c28253eae6adb024ca0a2f9b74bcbd89b31a4e20034f4e133526a1c1cab45b372
 MISC metadata.xml 330 BLAKE2B bbb2f2d9abd1ba1fbde9fff4d2d359cf7c3b73d5ddc0eaf0b5a8dc9bce9fcadef9ee807a2f68145d5b02979aec8d509b592a36bfb64cd9780fa7a18420814253 SHA512 c8c8a7ae44906be864148824b20790319e86c4fe2424cfc5d5560610e7bbfcf04103af2f8a365c88dfd801154a5c3f4a35b4fc0f8bead4eb3ef0af77473a59a9
diff --git a/app-crypt/cfssl/cfssl-1.6.0.ebuild b/app-crypt/cfssl/cfssl-1.6.0.ebuild
index 58eda26f63bc..a9502128157a 100644
--- a/app-crypt/cfssl/cfssl-1.6.0.ebuild
+++ b/app-crypt/cfssl/cfssl-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cloudflare/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0 BSD BSD-1 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index cfc1b2604594..a089db8f1413 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -8,5 +8,5 @@ EBUILD easy-rsa-3.0.4.ebuild 754 BLAKE2B 5320048ea820a0c8dab45444ae87e41ea5fcca2
 EBUILD easy-rsa-3.0.5.ebuild 728 BLAKE2B 004d82cb884a346ffc147df7d3963195d36d4445f4869d2454aad6500be2c9fd724abe8abbdc504708214505d99006ae1d4fecb93c84540d651dfd4bd065021a SHA512 636b944bbc1b49cd8e3bf65d684cb805c05501ff018d0bf7907854e1c2136fdae3e4a019bd6d17ab5b4193848cb9baa0f5ead51b504e3512f649eb29aa29bc91
 EBUILD easy-rsa-3.0.6.ebuild 726 BLAKE2B 7877107a820558a01423c4e7060d92c44e645fe5ca2d2a8ac715a758d3c0bb3ee5cbc2ab573d49df79a7ba32ed6fc51825abba661be2d4490d43c273492857a7 SHA512 a618400d47f9fd8628099b4c20a282e552bb00e759976c6c628cfe75a7f70cc6d47c17916a0201e29ea86490947ffe2031055b12d636d5125ea47ab2f38da282
 EBUILD easy-rsa-3.0.7.ebuild 726 BLAKE2B 7877107a820558a01423c4e7060d92c44e645fe5ca2d2a8ac715a758d3c0bb3ee5cbc2ab573d49df79a7ba32ed6fc51825abba661be2d4490d43c273492857a7 SHA512 a618400d47f9fd8628099b4c20a282e552bb00e759976c6c628cfe75a7f70cc6d47c17916a0201e29ea86490947ffe2031055b12d636d5125ea47ab2f38da282
-EBUILD easy-rsa-3.0.8.ebuild 732 BLAKE2B c19125a13a7c688f30617f25f921e3943cfcc5cb90fbb6cbff653d1e340d74d9d42af1881f7e31041268fda3a35add44f7b8295e744233995abfe9757a5e5844 SHA512 de6ddd4740ced90a4c8a3965a3fbb92c3913acd630ed8589f4601a249cd8ee6952e83a802b2fd46335a4465e55bdc77a39f36a25676b0dc3f2ec6476f9f78e92
+EBUILD easy-rsa-3.0.8.ebuild 739 BLAKE2B 1e1b400e8d237bc95c4b6e7b0901b18ad6b6a92ea1cc56f04826bfea1575c694f5fea048f093b13465cbe12f0a12582255225ddc0cceb815fa2e559da4fcba52 SHA512 620c59b0ea50d11b1c9183533e97caf35c6d55fcb3422583e4bde11bfb31cf53da66d68607f48aed69911cfccce1238e04111cc98f88a5c9c9bd1e5c61cf3d00
 MISC metadata.xml 322 BLAKE2B 18ac636ffa3e14bf7fddf2da142d1096647b8448d796f3887283acad32fd68d34de7aca6c800cb9d498c29c3b15c45fb0d20bf3021a579e041941f89f35e560a SHA512 02e65e67c2a18b5b7f55ea245bd2df759807a9a4337c2e8b3017f199129c4c89b34a038f92c167dcf3c53c4460840e8b51a81c8f904c1814067dbf0e6f3fb31f
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
index 551894f3a47a..be19abce63eb 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND=">=dev-libs/openssl-0.9.6:0="
 RDEPEND="${DEPEND}"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index a1e4b2b31cf6..43f651e2a786 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 09b130b1906c..8beedd0611c4 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -4,5 +4,5 @@ AUX kile-2.9.93-fix-ktoolbar-usage.patch 962 BLAKE2B 05ef1605d01aabb40f2c64a8ec1
 AUX kile-2.9.93-fix-overriding-existing-templates.patch 6492 BLAKE2B 38b851368913d50aba95d5f037933fdd801be90921bfffc2b25fb2cca433c85806875f1472368fc9aace4475d9b24926bfe32ca5d4615ee83bbc728d402bc8aa SHA512 24cc76a554da0e25a37dc05356cf59224fd697278da8532ee2baaa6be4e04710620120545b11dd8a7986f56859ee9365fb072c1d3eaf6ef3fb4fcd5ed9543455
 AUX kile-2.9.93-no-khtml.patch 1361 BLAKE2B 01ab239474e4446368bd4a39da8e2f26f7cefc72f1150ea99a8ecf69dafc405fbdbc18d357da136f97ab446464a579a1d3e792f3d62c7c22a22954f6e6a7ab4e SHA512 2cc92a484315c61941ea19e73a5c98e0ae275a1475fd46bbfccb9f57283454f90d2b6a7e03da0a8e7f766c4486a4d1f6fef4b6c21b6349bc368ef14d936d9ed9
 DIST kile-2.9.93.tar.bz2 8580239 BLAKE2B a43f160240dfdffc23c6898385994ee4e49e1f3d793915d1f392e41f606350269f2b9e80592c373680adb56454510abdd0b7e69131f20737fb5efa54d4eaa111 SHA512 d87277b8ef16c82cfd415dd191916641fa1a25e316e1eb2c463b275d3654dcfe180bea03027589ab30cd8b769d92d97005846a78aff8058bcfb20eed76287504
-EBUILD kile-2.9.93-r1.ebuild 1885 BLAKE2B a43ca13561cf4cec6b1d2e770ac8c18e24cb8b04c6f6bea672648e815518795e8d195dfba4a9d13d4b8f46b8cd0bcaefad0e4a6b35d4f06efbd3a2cc8eb51b7d SHA512 e6ceeaf1d0a47fb1e422fb10c4f369e7752f6ab4da18925ab1fcd6235c3cdc95f48ae6a2b38a4a7731cc0dc7daa4e5bc0958934c8486129bac394d36c52dff89
+EBUILD kile-2.9.93-r1.ebuild 1892 BLAKE2B 631acbad2cc2460164293d59044a8ae88d03ded1e646acd54900b7574c0da7709c57848f7f5d6f7c6bae2661005dfa66ec35fcf05dd229ea598b079bc5569a87 SHA512 5c1a29302716fa65569f644a726b4452287674bec41b3f301181e7668257784b5c3f894cadd115d5590dfc6e9772d8dece3cf855e7065163c9edb5d7fb8f3090
 MISC metadata.xml 477 BLAKE2B 29032be5f6ed3ad553c35bdeb1fe167470cada69818b6faebf03959ae9fdfdbb4e1154177bbf990647c3bff89f59d5a4c333ebdd5e535734f4d15257ba0673c8 SHA512 76c905140f86d5e6c08e90ee0d4d39430a0136e9df304204fe42e17ef9c809b8585678175aefd3743b7def5976ad1a7ca62650434fbd63f4e234e5649ee09bf7
diff --git a/app-editors/kile/kile-2.9.93-r1.ebuild b/app-editors/kile/kile-2.9.93-r1.ebuild
index 59d9757bfdc5..60a8f8484e9c 100644
--- a/app-editors/kile/kile-2.9.93-r1.ebuild
+++ b/app-editors/kile/kile-2.9.93-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kile/ https://kile.sourceforge.io/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~riscv x86"
+	KEYWORDS="amd64 ~arm64 ~riscv x86"
 fi
 
 LICENSE="FDL-1.2 GPL-2"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index b66351c12358..fbc342c94508 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/compat/Manifest b/app-emacs/compat/Manifest
index c19932410713..1da6d46033c4 100644
--- a/app-emacs/compat/Manifest
+++ b/app-emacs/compat/Manifest
@@ -3,5 +3,5 @@ DIST compat-28.1.2.1.tar.gz 82434 BLAKE2B daf82d8f44af3f1b20dd25d042f401623d84f6
 DIST compat-28.1.2.2.tar.gz 82479 BLAKE2B 154104a3d1cf953f712de357d21736d648289dbdaccb0f9ca5cbd44cb1e41b9b7b4b52394548658b47216f9205f28d2020b015d22b5d0c4df63c79794ddfc56e SHA512 65cafbf4d48815f447e412c4dbd87c5bd3357df5302660a5296582648926f8e3fe96b4b90b53674f18be8affe66af95c8db7e58d7a9dd63d2b57983962e5a53c
 EBUILD compat-28.1.1.3.ebuild 996 BLAKE2B 659a6059db70cab8bd9e29255fe7b8ed207dd31e9e1d4858374dc0152f61bb318732d2bd4446dfa7ed25b126ef0b02b3e32c3c70438b86ca06ba8b88d88d0c06 SHA512 a7e0c0d0e24438e548d46cfb7f34f76772afe8dd41dbf4997db5d0026ba5ffd27cf097cd0e7901e80d730860e61afb55f14b17264cc5de41ab04a90bc8643dfa
 EBUILD compat-28.1.2.1.ebuild 928 BLAKE2B 6c7bb9c1fdfd3f13bd71f496a26f643ba4f74f0997915b79baac24ac3b85e9c026df7d8235299091a77057dda43605aea98f4abbd2f27781ff55caced85564ef SHA512 26038544d1326fa4fed95ff7fc67135fc5e7f5819ce7e8f1680e673fad03eb06e51021b4bac2a67fe9ab944a5927f83a2e592c6ee012ee9404f1f6806dae0f2f
-EBUILD compat-28.1.2.2.ebuild 940 BLAKE2B e05e794cfa6fe7d7d7b05f366823e1a70b0c0b48ed02cf25f69031852c0615237c14185fb622d54cf40be12c68c46a85fb0beebd7258223bbe49240b7231b134 SHA512 c508b519dc39138ac05315561629fedd81e34ca056afe550415bc2b63b28910245aedbc63350b26c8403906b75b6d9c2b0c9b3f2f7d45488d81d376c2649e3ce
+EBUILD compat-28.1.2.2.ebuild 947 BLAKE2B d1b5002850ea63cf9282197df3eb4528ac442d08d77b9b403f33315f51e1f747fb8c9c8cd17782ae86e2ef0d86cbc6a46b83fd003c4e49e6dee6c2a975a24cb7 SHA512 485ced37ed452fa31263c341cc5b52fcd79e0d8c32e314898af2484f75096b0c32fa482d1abb086d8e8d22ceecd90844637f25a6b985ff87a81e0df38a65539a
 MISC metadata.xml 377 BLAKE2B 8ce540883fffde341a940cab53981315feb803dc351a8837573893c9d5f7f215394f27ee1bed5e074afe561490b21220233229f25031e0387ff8ab16ea909f65 SHA512 bfb5638ae14ea67a99dc877e7007b5c543e54275c586a9579ea8cd8de468a813fa9019437fbd1771fef5de78fae9b75428ed4766070673fcf31e58c88020c186
diff --git a/app-emacs/compat/compat-28.1.2.2.ebuild b/app-emacs/compat/compat-28.1.2.2.ebuild
index 353e22b71d33..25a6e34f331f 100644
--- a/app-emacs/compat/compat-28.1.2.2.ebuild
+++ b/app-emacs/compat/compat-28.1.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://git.sr.ht/~pkal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/transient/Manifest b/app-emacs/transient/Manifest
index b3049832b3f0..fe6e132b4061 100644
--- a/app-emacs/transient/Manifest
+++ b/app-emacs/transient/Manifest
@@ -4,5 +4,5 @@ DIST transient-0.3.7.tar.gz 103105 BLAKE2B 3253529af82116881b6fdbb5465d3e0ffa824
 DIST transient-0.3.7_p20220918.tar.gz 125422 BLAKE2B 19d1e2e4ea24076856a1816042d63964527b4c98d5727805058e5bfd829c708afa277d88b46e0e4da64b8a21fc4c012b410399f7bc71d877c285edda6b9e7d8e SHA512 9dd61f6eb69bdcd9a582e34261f9b6806d048df3d009aefe5f3a5a8f36e733187140b933f8e4af02c6e6f35fac6a3d5d13665ac108fa74299b1555c485be87c3
 EBUILD transient-0.3.6.ebuild 632 BLAKE2B f90048b6da631dd63750ab4d8ec5ca04bdde382b42d32b88dda9b2636f1fb7bc2e7169e448b74b0a51e2c98934a47a766caf1a65427a24ead8843c2755253360 SHA512 9d2eb466481bb27193e735acd5530bfd6c2d9e8357061783fc53aef0dde5e981392db318bcf18388d86d0229082d4b68b283d542a09fb9c04437551ea282b2d3
 EBUILD transient-0.3.7.ebuild 632 BLAKE2B 1ac33d5f4c2d989e7f863df815ab30bd3d7513ce30b65c4405cdf77e75d5c3821307e88bb035b78980fb1903708169e7e2b512bd03cb846bd3fe6e2c82e3b6c1 SHA512 4747e729b7f9d01042f43b073933954f65ddfc428dc3e8b1c526765cea198378ebad8d8f43574160487c6ea55d9a1d0dff1e9bc514b0e275d6da0f06e29282b3
-EBUILD transient-0.3.7_p20220918-r1.ebuild 710 BLAKE2B 59666c87d483f31267f9c05866d28f687a709032a9a5c9e1dedfe60f6f11b1111b465c392691b355c96bb73624aa3410fcf29ac0a70263577f8c7a2c932aca35 SHA512 eb80e01d762e9012354d83e6937661e62e6bc08068d4d58ecbd9a8ae12105eec8a852d027c5924a850ca96447e32c2b851ee894e7462e7b1da0b87c5bb141a63
+EBUILD transient-0.3.7_p20220918-r1.ebuild 722 BLAKE2B aa42621508de24bb49728adcc0e21022bfa69b562df599363507cb90a66a55b8ca5f6aedb44a697442e145b13e0edeae08db0d28e3e72e2fa965ccfe20d3d24c SHA512 02ee230aa17852c21672a112a7f9601f0403a49ac805bd34d58b0a9d90fa18de0e8369c49d8bf005fc198d250b93d7db8dd7d242de59117f825e4786e5e36a6a
 MISC metadata.xml 1434 BLAKE2B 6f7f91e2cd8c87559f15552d6fbe920e5262a50f21919a096af55df037726eb380a774cfba8be73b588ba9aa2c39da5caf6ad64a31106b843c6bd308fe7aa40e SHA512 3316d9ac21d2a2aa0a5824f2c8ded736ad1bfcd7319a9c4cb8b02f0ffec5f440820bfe48e4f4d4264fbc3864bd7959875f1396285b6a7eb2ad3333a6a062a14f
diff --git a/app-emacs/transient/transient-0.3.7_p20220918-r1.ebuild b/app-emacs/transient/transient-0.3.7_p20220918-r1.ebuild
index b51c38a685bd..664f1e168a38 100644
--- a/app-emacs/transient/transient-0.3.7_p20220918-r1.ebuild
+++ b/app-emacs/transient/transient-0.3.7_p20220918-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${H}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DOCS=( README.org docs/transient.org )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 624bce8d2849..5085a5b5d012 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/spice-protocol/Manifest b/app-emulation/spice-protocol/Manifest
index 8b61919f1857..e841581d4171 100644
--- a/app-emulation/spice-protocol/Manifest
+++ b/app-emulation/spice-protocol/Manifest
@@ -3,6 +3,6 @@ DIST spice-protocol-0.14.3.tar.xz 22224 BLAKE2B 32e69c56ea78e21cf2ff9474e34908ea
 DIST spice-protocol-0.14.4.tar.xz 23540 BLAKE2B a36ea56f000fbbfd87f3a318ff932332116f5229d89cbf19be53e7605aef52cc650d453982d23d1f2decb7ef1273758b40022dc1dada49f40cd6f75e55f014d6 SHA512 c55677fd6da37303487f8245388cbd555715c736e15bca4a305c4374feafc655b74e549ea401949d72e17b2e6ad76f16c5add3963008a18a1fefedd4b4a001c1
 EBUILD spice-protocol-0.14.1.ebuild 389 BLAKE2B 499cabe06ee6ea7c989ffd1a03c7ff57442f0317527ebad33637fe3688fd3e857406b8283cf1876719c2828f3386fe3b777fb668fb3f5f4b8df21a499c640926 SHA512 3a7acc22a6e8ca837fd7c279a77190e06d5af7b6f0eaccd183cac591b79745c0c63aa5e3ff24bfeeb1887c382ed966c3d28aa644476a8d8b944e0890f184dc2c
 EBUILD spice-protocol-0.14.3.ebuild 380 BLAKE2B d7f1703c7f72d29ff647a29a632a511a0c6a4ed4e5a834adbe2e20fb91d7d8d799797341ee07a340661750176eb3b7bd5c3346fa8454c6241a40118a6cc391b5 SHA512 f705cf7044913710d270031c3141a074b3d7e061e9ad8512c1c29583fcb744d7914ac8c0ff7be3afd0c4dfb27d0987aa0f005100d67c0bf8c42e2137638a816f
-EBUILD spice-protocol-0.14.4.ebuild 391 BLAKE2B b240d01072b2dfa1a4994bd019498aa76924c71821cf5f4dff8d01e7e1111d81421a21b39a156d130b3ccc2abea354e5b8b3d458bf47c4a19f8f48b5dbe99c82 SHA512 8ca3c452ed3400aa4833bd0afc5149b64e98d10acb8c0193620d22dc90c7fd8e47edc027532ac6f64c0a4e680faebae4cebd53697a0f603aa11d9265a2c6dd93
-EBUILD spice-protocol-9999.ebuild 553 BLAKE2B d08a20664a23a34bd2ea047a6165d53fd14222de4617d832a4a599f519acbb8215868fe1e19ae11f2f4fe56965b8183f3b5a4ed715ee39203fc888061ab9c932 SHA512 dba54afe71f0552a24f6beb53c7d87dfe5ffd8d885f048de3f5eff81ec31fd899d1ff67b976c43e631d599798ef3a935ba4b760fa0aa5ad6b67e358bd3fdc230
+EBUILD spice-protocol-0.14.4.ebuild 522 BLAKE2B bdcbc9a62eaa5a753be9d514bf1c780095f81909476014ea1a0c44eb7e1fb0be31d3b600814f98f13016b2af46e5185896b0672112f5300fcb1078d0013c9c27 SHA512 3df7728aee4a4e89490fbebbebb98df573cd0eae13ce4a3057ac7b79e329186fbec22934d0adc34b832b25344a52bf261a2011ba300e094ad1ee1cfdfc2902fa
+EBUILD spice-protocol-9999.ebuild 522 BLAKE2B bdcbc9a62eaa5a753be9d514bf1c780095f81909476014ea1a0c44eb7e1fb0be31d3b600814f98f13016b2af46e5185896b0672112f5300fcb1078d0013c9c27 SHA512 3df7728aee4a4e89490fbebbebb98df573cd0eae13ce4a3057ac7b79e329186fbec22934d0adc34b832b25344a52bf261a2011ba300e094ad1ee1cfdfc2902fa
 MISC metadata.xml 272 BLAKE2B 27a9c4c06a3f01a09abd1c554d9682f0248cd486fa866be62e1e63fcd59c57df6ab036d307b91c4c509bf1190aa5a1620c5995e98fb518bad215eb94b024e2f6 SHA512 aaaaf0683baa09807a821ff4eff365008ee8f7cd7852fb042e7d0aa40cfcc8b192f3bd7bdee6c4cdaad2621b9ad42ea0a5784eb93e0923641e02f8aa24e562fe
diff --git a/app-emulation/spice-protocol/spice-protocol-0.14.4.ebuild b/app-emulation/spice-protocol/spice-protocol-0.14.4.ebuild
index 8109d81af69c..8908284a7192 100644
--- a/app-emulation/spice-protocol/spice-protocol-0.14.4.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.14.4.ebuild
@@ -5,10 +5,16 @@ EAPI=8
 
 inherit meson
 
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-protocol.git"
+else
+	SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
 DESCRIPTION="Headers defining the SPICE protocol"
-HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.xz"
+HOMEPAGE="https://spice-space.org/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/app-emulation/spice-protocol/spice-protocol-9999.ebuild b/app-emulation/spice-protocol/spice-protocol-9999.ebuild
index d2d8fbb6a858..8908284a7192 100644
--- a/app-emulation/spice-protocol/spice-protocol-9999.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-protocol.git"
-	SRC_URI=""
 else
-	SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Headers defining the SPICE protocol"
@@ -19,7 +18,3 @@ HOMEPAGE="https://spice-space.org/"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 77286e68c25d..6b772104ed3a 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,5 +1,7 @@
 DIST VBoxGuestAdditions_6.1.36.iso 63803392 BLAKE2B bcd795e4f4ed5b25542011370b0d0ede0a163c89df597d085d731627bf041a5bc8eb8d60c2041bfe1654986751e16bb382680ad487d90def2e8a7d9fab21dd24 SHA512 cf07e77ac882eb9cd6da39c6491f2536ac8c1e4bddb27e50bb6d1016ab7a291746cd59c6966c54ba007bb4cb79b82ebcfacec5984a6e7453f60ad167014542aa
 DIST VBoxGuestAdditions_6.1.38.iso 63887360 BLAKE2B 36688f43d8be5b0f408715f9ad902caf1e298d01f77e5fbb236e15c56da5097c91a4df846b786cb3fa4aa9b97d0360c627b757eebc0503a675b7eb6b752015a0 SHA512 df7051988174227af733d2fb4fd703c885f9637345077090034f3392b2c4deef8ac87d0b9e76f29149609b6e2b7158109377c9af5fdbcdc5691ae6e401c4731b
+DIST VBoxGuestAdditions_6.1.40.iso 63883264 BLAKE2B b9a22604b7dc135e9944bb46e7fb59e6202e692dd75de89763c6fe432328f65bacf4d893221a5e6f90ed3236fd36af2f6608932402e0ae967eb1ed24f6b1153a SHA512 149311a826c20f9bc8212e7580d3b552b4cd82f7e9dbaf4e44f363807f8132f0a81eb39082fc8876fcd5fb527d7d7c8ae1b3b6d8372b9bb39273d88fbd84a185
 EBUILD virtualbox-additions-6.1.36.ebuild 698 BLAKE2B 964287e281587ca7c9f0be58f785b9ebac268fd1546ae405b325aaafbc1c05d523d3cf0f1bdf0317ce2099810682192f905bb857a3415b14e36285e42000b072 SHA512 e7c0a43549bddf6e5c0bc655c468b093108eaf1e283e2addcbc8aa8f4631f2bc441d504376321d7404392351cb66ecd72c5bd66a4a08fd7084842be5e85ba415
 EBUILD virtualbox-additions-6.1.38.ebuild 698 BLAKE2B 964287e281587ca7c9f0be58f785b9ebac268fd1546ae405b325aaafbc1c05d523d3cf0f1bdf0317ce2099810682192f905bb857a3415b14e36285e42000b072 SHA512 e7c0a43549bddf6e5c0bc655c468b093108eaf1e283e2addcbc8aa8f4631f2bc441d504376321d7404392351cb66ecd72c5bd66a4a08fd7084842be5e85ba415
+EBUILD virtualbox-additions-6.1.40.ebuild 699 BLAKE2B 0893b9ed5284f8b713e828c670ad2a7929e0532f02e1226b97b791e1eb5d9e9cabd22c71360aa3f095f96ff3ef613141c0423a6ff39109588c8ec3448e0b4c83 SHA512 7c24e2216681f62d3f4cc125c26998bcaa04297de7d6e02b8e81d317995eda150813d6fbf4d9cac77b2a5c534cc5e3e710343c4ec128e4d7532d478c3621af4b
 MISC metadata.xml 415 BLAKE2B 9b88f53744c7399cfd98a2a06bd6a61f9e73214b6cf2c126936ffb608400b49a0328eeb1e226679ffd3b43a0d5dd6c353ea56df549b222a4ca851c0c34137ee9 SHA512 6206d0e6ab3dfdde8e022e630f8598b3ba167c0b532d1ea77f4666d83202ef721a9b07d47ebd1770d01b36e18e8adfc6027a337c4e0415008085c2d9f0495c23
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.40.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.40.ebuild
new file mode 100644
index 000000000000..e989261fd89b
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.40.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 2f3c822202a8..161e860d2cc6 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,5 +1,7 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.36.tar.gz 11231896 BLAKE2B 08872189b8be959e13f07b69635b08d41661841cc30bdea1bec73c8fc87f1e374e53658e160cd290b919465bad62ef633cdc79e11d477a6bf0b9a67ae8131f73 SHA512 98ba542fbe60848877c25cf8e8f252081e231687d8b4cc4324283e6e787c00cb83c0570379a50364ee239a10195b25740f9c2e0e559cec28b75f56717623df16
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.38.tar.gz 11232961 BLAKE2B d736cad4b9d2f0eb6207918588a1f4794b3366cc2cb5ad857d9b7501d9cf8db6e9e56fa1d99954016d508d9600218e06587b5725b3834e82d0e2ec754db00877 SHA512 1ae455bd478d47eafd13ca196914685a08105156cd706c7aa86103daac2bbe76edd051deb56a873344b40df2f8418308ce69de61f2ea68353b34a27d8ffd9510
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.40.tar.gz 11233264 BLAKE2B c169747b6c0214bd850c5e639d5245e2084701c1ee764e8798a779545d95b8eb8ec0cf4622d5156c0a17126a6a522d041ec126984062b72e71a2283ae9652bd7 SHA512 6d8ff0f7f0c4eaaf9c6fcf965133fddc1d4057cffb98a10ade6cf0065e9f656bc49656bb3ac817694cbf9ca2fb4226f3e9ac9b1383ab07cdcbe05ffe18809ce1
 EBUILD virtualbox-extpack-oracle-6.1.36.ebuild 1064 BLAKE2B 63d4c01cf703966e7c9a98be5df8dd0b81b51ce7781e8014bb8e37585cb4e02401e113cc925d43b494562c13beecf080a107ea10b6a45a5186ce7b91cd93c11d SHA512 61063ee060f2a0352a66de441128c5f21b52f41149067f0f3f544e627e7c2b018e1dcc608b6c228e21323eecbc4ace9eada07bdd8b192d9f785289ebf9c593d7
 EBUILD virtualbox-extpack-oracle-6.1.38.ebuild 1064 BLAKE2B 63d4c01cf703966e7c9a98be5df8dd0b81b51ce7781e8014bb8e37585cb4e02401e113cc925d43b494562c13beecf080a107ea10b6a45a5186ce7b91cd93c11d SHA512 61063ee060f2a0352a66de441128c5f21b52f41149067f0f3f544e627e7c2b018e1dcc608b6c228e21323eecbc4ace9eada07bdd8b192d9f785289ebf9c593d7
+EBUILD virtualbox-extpack-oracle-6.1.40.ebuild 1065 BLAKE2B 692e1eef70426e91903205198e6a46e90a8dc39e34ec7d5a095a98edb47419f71b7e35de75023bb3d9b5dd0b0e101b8bbb833bf2c895e5a35fd438b7230449e0 SHA512 242d3b0bd1ed0d988825acee325c36f2b1754a4281efcb8f6d0d026da8c69815a2d4e561b08558b5df352982ac1f52de9e566f05f381031a426876d3ee77c992
 MISC metadata.xml 415 BLAKE2B 9b88f53744c7399cfd98a2a06bd6a61f9e73214b6cf2c126936ffb608400b49a0328eeb1e226679ffd3b43a0d5dd6c353ea56df549b222a4ca851c0c34137ee9 SHA512 6206d0e6ab3dfdde8e022e630f8598b3ba167c0b532d1ea77f4666d83202ef721a9b07d47ebd1770d01b36e18e8adfc6027a337c4e0415008085c2d9f0495c23
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.40.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.40.ebuild
new file mode 100644
index 000000000000..10b24ce1fc11
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.40.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+#VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}" #-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="bindist mirror strip"
+
+RDEPEND="=app-emulation/virtualbox-${DEP_PV}*"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 614cbe675874..a70a5bb0f3b4 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -7,7 +7,9 @@ AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
 DIST VirtualBox-6.1.36.tar.bz2 165685382 BLAKE2B 98dbb06450b9df650cb72493bcdea4b88fa9dd21f76d723fdc0bb2c1ab8266f67e972a7222dc9b5bd0d43754911710664bddace753995be025cf6bcc05a24ae5 SHA512 cc3b984a7da40c9bf14831808a2bc2bf7bf6821e53c25fa11cb4b4275feb1d4b0cb4a47d8a360b90c89e5a4038481efe8fe28ee22996dbefb6446761e88a8dec
 DIST VirtualBox-6.1.38.tar.bz2 165761175 BLAKE2B decda6e7a595f79e6ace6f8f6b8a7829223ac1422c3d280b6287a40ef942e773ad473f4fa4640a76f8fb825ebd8561c646f1b3d87922b1af55c138298b4c8f4f SHA512 7a4f2dc80e3251b1da6d29d3c6f6b802527decc70497b1a1d1008c0ab3109c2039d131c587d6ec4786aea619546757655337c2ec3456243336ca13c6f6748116
+DIST VirtualBox-6.1.40.tar.bz2 165769795 BLAKE2B 5c216f23422be3fc4f7760881c666c57a516d12726ed8ef040bbdf918f1af53c69d204b22949e25f751cbe788b00c810c49c27b7c51c1837fd1c503a3eff202c SHA512 0dace071fe58500d0912fe4da4751de6840752375039554a56c8c753a0880a419c4a1ed7f1b0ebc51230f7099ca3f5d987dc7b91ad4d98dbd75bf63e3c27e096
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 EBUILD virtualbox-guest-additions-6.1.36.ebuild 7702 BLAKE2B 5cdcd964b29fc6e1b2c6ed7a136eeb6a6911313724dcd1f3124fbf10c38df1d42df6cafa1608efa15fb6d82de72c983d453cfd3b5d648c7322ca3d8eee5b105b SHA512 038cb223285c19ec6aa1b46df6d868314d30a37c36d7eb4bd373ecb10438ecf7775f6e7b2330d9423cd23a421f0c6c8eb8765e0089e59285e27fe6ecaf29febc
 EBUILD virtualbox-guest-additions-6.1.38.ebuild 7752 BLAKE2B a16fdb2fb381209101aa022521ebf81d91064d87a8b184b6988bd18f1f3f5bc05bd5fdb8865776bfe210be127c74c913e34eff42aaf30192725fdbdf70201b49 SHA512 c813bb0e76300e0ab983dbde2887e2233fca2baeb3f76e97478f12f164ab6f146e5016429820a43a44d7b7d23b16f1f60ff5e1f9dfdfa17426d0fd579a059f42
+EBUILD virtualbox-guest-additions-6.1.40.ebuild 7754 BLAKE2B 41bb42decafd49cbab56154cdf3507cdd748ef2c51eac8bba92090dc9ecd8fef6c22c3a1f9b087e090003a6867689505a1547e15674641e6c3924907719f2ebc SHA512 9ad2af217d6f9cb952003e5110cb7052a7b35c11cf9a4d1ed2daf0f4906dc21106c2d1f33efd0cb0c5bad1ebf3b54f6ce56427af98cdf9ea42bdaf4949176b7b
 MISC metadata.xml 415 BLAKE2B 9b88f53744c7399cfd98a2a06bd6a61f9e73214b6cf2c126936ffb608400b49a0328eeb1e226679ffd3b43a0d5dd6c353ea56df549b222a4ca851c0c34137ee9 SHA512 6206d0e6ab3dfdde8e022e630f8598b3ba167c0b532d1ea77f4666d83202ef721a9b07d47ebd1770d01b36e18e8adfc6027a337c4e0415008085c2d9f0495c23
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.40.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.40.ebuild
new file mode 100644
index 000000000000..f4ad72e4a393
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.40.ebuild
@@ -0,0 +1,281 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo linux-mod systemd toolchain-funcs udev
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+RDEPEND="
+	acct-group/vboxguest
+	acct-group/vboxsf
+	acct-user/vboxguest
+	X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE )
+	sys-apps/dbus
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	x11-base/xorg-proto
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
+VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
+MODULESD_VBOXSF_ALIASES=("fs-vboxsf vboxsf") # 485996
+
+pkg_setup() {
+	export DISTCC_DISABLE=1 #674256
+	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
+		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
+	eend $? || die
+	popd &>/dev/null || die
+
+	# PaX fixes (see bug #298988)
+	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	# Respect LDFLAGS (bug #759100)
+	sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk
+
+	# Do not use hard-coded ld (related to bug #488176)
+	#sed -e '/QUIET)ld /s@ld @$(LD) @' \
+	#	-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	eapply "${WORKDIR}/virtualbox-patches-6.1.36/patches"
+	eapply_user
+}
+
+src_configure() {
+	tc-export AR CC CXX LD RANLIB
+
+	# Build the user-space tools, warnings are harmless
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+
+	# bug #843437
+	# Respect LDFLAGS (bug #759100)
+	# Cannot use LDFLAGS here because they also get passed to $(LD)
+	cat >> LocalConfig.kmk <<-EOF || die
+		CFLAGS=${CFLAGS}
+		CXXFLAGS=${CXXFLAGS}
+		CCLDFLAGS=${LDFLAGS}
+	EOF
+
+	edo ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_ONLY_ADDITIONS=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		LD="$(tc-getCC)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_CXX="$(tc-getCXX)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+		TOOL_YASM_AS=yasm
+	)
+
+	MAKE="kmk" emake "${myemakeargs[@]}"
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	# Move this here for bug 836037
+	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+		doins VBoxDRMClient
+		fperms 4755 /usr/bin/VBoxDRMClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	dodoc "${FILESDIR}"/xorg.conf.vbox
+	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	udev_reload
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+	udev_reload
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 7694f65fa90d..cbd35e34ffd1 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -4,6 +4,8 @@ AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
 DIST vbox-kernel-module-src-6.1.36.tar.xz 678624 BLAKE2B b09a9f4281287dc3a356e2af77fa024f06f64db41eac10efe8cf2b4ab39df292fac13a75247bdfa8b22dc3fbbc3747d217651da11c4788cfd08a2b6d775bb4f7 SHA512 b00c99a2db57c78c538539afc900ffa1e4729727f39ed68565a18c3fcbc28080d1ca340ee16f45e5616f535ce38ba646020a5373acc124a15821287fa29ddd52
 DIST vbox-kernel-module-src-6.1.38.tar.xz 678320 BLAKE2B 02fce9d8436e5e05cefae5e947c814470ff2898fa5ced2b734a7570e42fde2a84ecc98cbd2a3f0254443af1dd8131d541d565ecc4eb6a57ca88f7c638ed4994d SHA512 ef933e68942b847bd17ae9173d8c9963e12ffba73fe1d049e2fe9af10f720cc269ffdf7d2341ab75374f4737f4521c24316786574c0c71feb153a430c744eb0a
+DIST vbox-kernel-module-src-6.1.40.tar.xz 680112 BLAKE2B 95bcb598bc3823c8bf4bfeb734a5d812a4830d072b186c999ed8632552550d0d21318bc50419fd18301cd6e8e58d091a4f6363c9ee86725d6bf8e74050b552d2 SHA512 8eec3c960077205d53b3d2a8367ce562edb02a6d90fe0a4bd06e1dfa256760e128b9895fc8005ceeb50a72eda6509533a28c6ee264d10a2cd30601ed5ced2eeb
 EBUILD virtualbox-modules-6.1.36.ebuild 1876 BLAKE2B c6f4531dfa093528ca5adc4048b0d1f062df2be4fc01ae3a450b284b1b35352c95b00287d375c29cd51b2bd9b77b1b2bac84d74ccceedf65ac8e50f95366ea30 SHA512 a5850b902d83366c033d8b005615060910b07d8587d22b2ae93c211ae99e44ae5a73fa77aec0dfc8d7947e9b49d0873d93fa084f9b50a52206c0873c2a0f97d7
 EBUILD virtualbox-modules-6.1.38.ebuild 1876 BLAKE2B c6f4531dfa093528ca5adc4048b0d1f062df2be4fc01ae3a450b284b1b35352c95b00287d375c29cd51b2bd9b77b1b2bac84d74ccceedf65ac8e50f95366ea30 SHA512 a5850b902d83366c033d8b005615060910b07d8587d22b2ae93c211ae99e44ae5a73fa77aec0dfc8d7947e9b49d0873d93fa084f9b50a52206c0873c2a0f97d7
+EBUILD virtualbox-modules-6.1.40.ebuild 1877 BLAKE2B 331631020f4440c7e008c21cfc634582785583c0198e796d0a4756349c2581d52e0e2aee69caf2ce850440f9c2754124d96b810206dfda1cf10e5a7cb8d75295 SHA512 0d3fedadd583dd16ccc0fc6fd06660339e87d7be5a7e97b40bdd9a52f7bfc23d29e7c56bc693bcef903958ad24a9d32bec34637b1d0e60da43ae206591d4c61e
 MISC metadata.xml 510 BLAKE2B df97f34230d3350b0f5272ddcb4d5a2ebca06520de69446d83d3a0fc422d1320c202f7fa1603731de14d30001fe92aef830706ccc90b692ca9a6d72eedb106eb SHA512 91e5d17c1f5cd04f08751e8b97bcee1461d32d0a0cda0ab6d9a8307731948b029585d4752c51177003f21396eacbf7cb4ced592b3802ece1d8f795902e1544e2
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.40.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.40.ebuild
new file mode 100644
index 000000000000..d293415c5d91
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.40.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from VirtualBox-*.run
+
+EAPI=8
+
+inherit linux-mod toolchain-funcs
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://github.com/ceamac/virtualbox-modules-dist/releases/download/v${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64"
+IUSE="pax-kernel"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+MODULESD_VBOXDRV_ENABLED="yes"
+MODULESD_VBOXNETADP_ENABLED="no"
+MODULESD_VBOXNETFLT_ENABLED="no"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+	if linux_chkconfig_present CC_IS_CLANG; then
+		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
+
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	if use pax-kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
+}
+
+pkg_postinst() {
+	# Remove vboxpci.ko from current running kernel
+	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 1f72f66019bf..84e104d74444 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -13,7 +13,9 @@ AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-6.1.36.tar.bz2 165685382 BLAKE2B 98dbb06450b9df650cb72493bcdea4b88fa9dd21f76d723fdc0bb2c1ab8266f67e972a7222dc9b5bd0d43754911710664bddace753995be025cf6bcc05a24ae5 SHA512 cc3b984a7da40c9bf14831808a2bc2bf7bf6821e53c25fa11cb4b4275feb1d4b0cb4a47d8a360b90c89e5a4038481efe8fe28ee22996dbefb6446761e88a8dec
 DIST VirtualBox-6.1.38.tar.bz2 165761175 BLAKE2B decda6e7a595f79e6ace6f8f6b8a7829223ac1422c3d280b6287a40ef942e773ad473f4fa4640a76f8fb825ebd8561c646f1b3d87922b1af55c138298b4c8f4f SHA512 7a4f2dc80e3251b1da6d29d3c6f6b802527decc70497b1a1d1008c0ab3109c2039d131c587d6ec4786aea619546757655337c2ec3456243336ca13c6f6748116
+DIST VirtualBox-6.1.40.tar.bz2 165769795 BLAKE2B 5c216f23422be3fc4f7760881c666c57a516d12726ed8ef040bbdf918f1af53c69d204b22949e25f751cbe788b00c810c49c27b7c51c1837fd1c503a3eff202c SHA512 0dace071fe58500d0912fe4da4751de6840752375039554a56c8c753a0880a419c4a1ed7f1b0ebc51230f7099ca3f5d987dc7b91ad4d98dbd75bf63e3c27e096
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 EBUILD virtualbox-6.1.36-r2.ebuild 18102 BLAKE2B 8a6a0b4b10f39f05cdc429052eb61b3c61d6ca0e7eab02b4be928a6a617cde528cd8137b3621ab76eb0f0f74de4c0f6bdbb708c5ec5293b2ea50eb32531f0649 SHA512 67a0e9334adb171d26fadd4c72fbe1c90ec4d8ead561eb65bd2ad0ad5954e105bb9932509453bf3a6635a632d7fb4870e9242786365e30eb50d49ecb9dc644d6
 EBUILD virtualbox-6.1.38.ebuild 18317 BLAKE2B bda3b31a13adbc1e1a66ef275e2be6b05b2447e63e5bc2a3140a3e320608d1a7d4cff9ae39a45fcf3a3cc81f0e7ca61140ba27aaf528d0f1473acee43c29c650 SHA512 fd40c238b5f7f0c8035295245df29959c198cefc1035c73daf92ca2dba10b3aece746fab3a58a72d91bd59feb8155f42f00b4ebaeb60f1a6df18195508648185
+EBUILD virtualbox-6.1.40.ebuild 18318 BLAKE2B 91468b4c280b52d5e772a4434cdf61636a135454f81d172cf586d91490c5ceddd1eee9db0e714f56499a23d0b11f9492dfd7589d438f69b0253df47bdf899e9c SHA512 0690cecb2610eafc5a3200695a049ddbec26c0bd7f321f68cb99ab3b576d3d35ca6ca8f4589215e4a93abddb3414ceb84d008d103d94bba2991edf358e225ae8
 MISC metadata.xml 931 BLAKE2B bda8433410b0bf400bee4795ce53cd85554463417beec3d7f60fe5fe090317b2d75671a2c091718d4d57c5cc8c2961e0e93fbf9f6d70c652f812317ce4fc1b20 SHA512 0d7e309078a5b5c5cf891da6e8581fce8563e9014e822e9c99d6c7c62a88173b2536fe2554ea22f93965dfccd505543fe2022e6c064acc8d836ced0150fe491f
diff --git a/app-emulation/virtualbox/virtualbox-6.1.40.ebuild b/app-emulation/virtualbox/virtualbox-6.1.40.ebuild
new file mode 100644
index 000000000000..93c8ac5113f7
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.1.40.ebuild
@@ -0,0 +1,663 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}-${MY_PV}
+[[ ${PV} == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
+
+LICENSE="GPL-2 dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64"
+fi
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		sdl? ( media-libs/libsdl:0[X,video] )
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? (
+			media-libs/libglvnd[X]
+			virtual/glu
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #832166.
+DEPEND="
+	${COMMON_DEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? (
+		x11-libs/libXinerama
+		opengl? ( virtual/opengl )
+	)
+	java? ( virtual/jdk:1.8 )
+	pam? ( sys-libs/pam )
+	pax-kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( virtual/jdk:1.8 )
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( virtual/jre:1.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+
+	# This patch is needed to avoid automagic detection based on a hardcoded
+	# list of Pythons in configure. It's necessary but not sufficient
+	# (see the rest of the ebuild's logic for the remainder) to handle
+	# proper Python selection.
+	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
+
+	# Patch grabbed from Arch Linux / upstream for Python 3.10 support
+	"${FILESDIR}"/${PN}-6.1.36-python3.10.patch
+
+	# 865361
+	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
+
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-6.1.36/patches
+)
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie ; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Only add paxmark patch when we're on pax-kernel
+	if use pax-kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something more sensible.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch ; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug #488176
+
+	#856811 #864274
+	# cannot filter out only one flag, some combinations of these flags produce buggy executables
+	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
+		append-cflags $(test-flags-CC -mno-$i)
+		append-cxxflags $(test-flags-CXX -mno-$i)
+	done
+
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-dbus
+		--disable-kmods
+
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus '' --disable-libopus)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+			$(usex sdl '' --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile ; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
+		if use sdl ; then
+			vbox_inst VBoxSDL 4750
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+			for each in vboxsdl VBoxSDL ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+		fi
+
+		if use qt5 ; then
+			vbox_inst VirtualBox
+			vbox_inst VirtualBoxVM 4750
+			for each in VirtualBox{,VM} ; do
+				pax-mark -m "${ED}"${vbox_inst_path}/${each}
+			done
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox{,vm} VirtualBox{,VM} ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			domenu ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
+		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
+		|| die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	if use python ; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/./_}"
+
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
+		if [[ ! -x "${python_path_ext}" ]] ; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev ; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev ; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c8e9a3a6701c..2ef2076f8ff6 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest
index 2db61e9deff1..4cb580385c4f 100644
--- a/app-misc/boxes/Manifest
+++ b/app-misc/boxes/Manifest
@@ -1,3 +1,6 @@
+AUX boxes-2.2.0-fix-clang16-build.patch 309 BLAKE2B cde9c190dfbb57b94a48a8d68d459ccb6521fa2eacd5103e624acc1974346e3ecd3d8ec91431309a7e09d1e421babdac3307f05a9ac081fcffb84d2ff8b184c0 SHA512 84c0f84e3c07094f0e27b1d89a8094d43712c12d6b9bd79586d73440ae92f330eada9bf4d4438bfd7eaa8109f4197d0c8fbb7078f7678a2b5c97d2b87879923f
 DIST boxes-1.1.2.tar.gz 101658 BLAKE2B 002cd1a458d39069cf0955fc37c05e60590003ac987619d89851b3943cdaca986b57e631081a196e7c9a2a245397e72f8c882fb6e190c0127289602ead223a7b SHA512 10efb5f62d94003532e2f32d6a0f7c76dd86c7cfaf150f35c24516dc6684f5e3909ecd5fd48c1c64f25f874cb1364bdf3d959a2fb837bfe74c2d879a35f443dd
+DIST boxes-2.2.0.tar.gz 230099 BLAKE2B 4adb8ddde85cb31f32e98916d5ea2a57afcaa0470f796ba296cb3b80780f158a24b2bc5e9ba923b6a3b35b8f7781cd6ddacd89abadf6f2c07549be7ffe1458f4 SHA512 534d441c34316572d0c7e89f343a3bc5bb5a8466e4d4ed703fb2d14b714f5a6b224f7b0d408525d492da4610f9c5ffd8508e16d98a0781897567fb4aeb316f39
 EBUILD boxes-1.1.2-r3.ebuild 858 BLAKE2B 6d6c97b11914495c628bb8553c665d890ff6d866e76d041c22364b17b078226d7b8e8f190a480a58be4e7ee66ea70cf724bfbe74798b535be373b28db199bacf SHA512 b67bf1174118b6fc9c545ce3949988e517db42f19a31de49a3cd67a46aa879005e4cf7f88a5156c7893371bf369b572bf70ba11a5bf11f3d7e34ce59559ec14e
+EBUILD boxes-2.2.0.ebuild 1008 BLAKE2B 39aff37614138e203004b4e5af30bce465716c1319669fcd365a8922c6058f2db3d988db70caedae2ab08d05ede2ed6049484125108a38077ff22d5d21efc233 SHA512 1fb4de6b9748ad01630b27ecbb5c0530d47b07807fb59dfb142f536be44b101010983ac7d1eac528c2dc4d6aca3a4f3dcdcdd2fed9bf1d786b11d08948b517ec
 MISC metadata.xml 358 BLAKE2B 009ea1a1bba193715ba3b086107a7669499a56fe990f4cb251b31e961edea4b2a2b0c1613331850ffe0d9929ba8a02f03f91ee1d0e234abf76c3dfa19169f00f SHA512 d3dd2ee8c1b72f22750d126edd6cacc2233932f54dbcb1875461aa98b19868aff4863f9add0294fa372ad0d73a7b27b895ee22b9f572937937dde66aee496535
diff --git a/app-misc/boxes/boxes-2.2.0.ebuild b/app-misc/boxes/boxes-2.2.0.ebuild
new file mode 100644
index 000000000000..dbd9e72ab418
--- /dev/null
+++ b/app-misc/boxes/boxes-2.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Draw any kind of boxes around your text"
+HOMEPAGE="https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
+SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre2[pcre32]
+	dev-libs/libunistring:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	test? ( app-editors/vim-core )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-clang16-build.patch" )
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:STRIP=true:STRIP=false:g' \
+		-i src/Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS_ADDTL="${CFLAGS}" LDFLAGS_ADDTL="${LDFLAGS}"
+}
+
+src_install() {
+	dobin out/boxes
+	doman doc/boxes.1
+	insinto /usr/share
+	newins boxes-config boxes
+	einstalldocs
+}
diff --git a/app-misc/boxes/files/boxes-2.2.0-fix-clang16-build.patch b/app-misc/boxes/files/boxes-2.2.0-fix-clang16-build.patch
new file mode 100644
index 000000000000..38be8e1ede81
--- /dev/null
+++ b/app-misc/boxes/files/boxes-2.2.0-fix-clang16-build.patch
@@ -0,0 +1,15 @@
+change function prototype to work with c2x standard. Build fails with clang16 without this
+
+See: https://github.com/ascii-boxes/boxes/issues/106
+
+--- a/src/remove.h
++++ b/src/remove.h
+@@ -22,7 +22,7 @@
+
+
+ int remove_box();
+-void output_input();
++void output_input(const int trim_only);
+
+
+ #endif /*REMOVE_H*/
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index a33b61cd261c..429e2a740d06 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -12,5 +12,5 @@ DIST lirc-0.10.2.tar.bz2 2418298 BLAKE2B fa067ff3de9779962e34a87f948b978eae73056
 DIST lirc_0.10.1-7.debian.tar.xz 39392 BLAKE2B cb7527bb33a1d724fea487ca468f98f406c8af894b185580dd285ed46ee0d7f6eeb5c2d66ae09c917d580485568f6510ef968283c56511dc9b4281c77fcc4563 SHA512 9bcd7dc2d30647ab807a65036c02d4adc425af288046d8f0b9bee2f38389f39be21103e4980684827e736b4b76a05688ae870f0871bc50213de429c35b70211e
 EBUILD lirc-0.10.1-r4.ebuild 3883 BLAKE2B 7e92b4db1b735321745a27cde5646d33f4f29e1aa383be5f2c0a9666f61af1152fe92652c0f0605ba6bc421bf912a99b76848669dd9f4f230deff93adf34ef6e SHA512 76d026e9c9b46fa502cc45b3d76cd9b830fdcd7cb56e7b207fa376a932cb6daad782bc1dc70a41b0f873dc1e82ff9796606d694e52821d317495cc046f63e765
 EBUILD lirc-0.10.1_p7.ebuild 4367 BLAKE2B 074285194814a7898a201194b0a3f7d90dc5efb0f2840ca00d5a692d3534f2ce6101e56d957cb9d79da26f69df5c408da6f5730b3f463009c2ecdeb69bb9c260 SHA512 083a027d7ccc0cc42d9a0fec5cf756898df2b76ef72c92bc4fb194a4b7fd1e042a1d3309ff221c104ee78d3da25f3f0dc2fb3e006daa52fd7407bf0a35c94bcc
-EBUILD lirc-0.10.2.ebuild 4321 BLAKE2B a55cc6d62ec24db65abd211ac65633332d35cf269e02c5c27ce069902f700326d255524f35356451926b36a14688167180ef2c5304e3c6c61e45192439ede18b SHA512 4565d719c899beebc682b6f1b55aa5d8f25d788c121b2c9a338e3e0a840fbece442af5e060016743335d1058f21be9424ff2573e939c2cdf21a1532159950020
+EBUILD lirc-0.10.2.ebuild 4325 BLAKE2B 27e07efce8f39510744998b52f40184fb6771326ed9dcf24d8bfb1f2208444933d08f5c79af41a36a79d2eec5755aab8e9638c62e8f61a9068bc0c04839a5e4b SHA512 da212e8b40213b1efc7cba0941d70a6c30c0f51218d4d80a5e567c51dfd051070c6fc6f78c52aa1ac2dc21bbf9d03190977b60fc302b0b034d831d801f651b67
 MISC metadata.xml 829 BLAKE2B 987d7dafc070e593a79a65ea323684f5722ae167060e9ddd22e362c421fdb8ee254e7ca8e87e6a29ed1f5dbd9114c29dbb97c4643f9b3a1f43443fef18841afe SHA512 93498941521daa19726f37a99d016ca365e233353f45bf42f1b4facb8cc9fd6e6421ebaaf19e17a7fd68d0d0e52bd2c5b954c2fa523868458b90b28118fb6d42
diff --git a/app-misc/lirc/lirc-0.10.2.ebuild b/app-misc/lirc/lirc-0.10.2.ebuild
index 38716618961c..920f1a3fe1b0 100644
--- a/app-misc/lirc/lirc-0.10.2.ebuild
+++ b/app-misc/lirc/lirc-0.10.2.ebuild
@@ -28,7 +28,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
 
 REQUIRED_USE="
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 8eb24341b7aa..24bdbc59ebfe 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/sc-im/Manifest b/app-office/sc-im/Manifest
index 0a4638f9e51e..ed0f623bbe68 100644
--- a/app-office/sc-im/Manifest
+++ b/app-office/sc-im/Manifest
@@ -1,3 +1,3 @@
 DIST sc-im-0.8.2.tar.gz 1619617 BLAKE2B 1957b79749012b5e8b24e26f3cde63c84bf971d2183791f986c98ec823a9ab74bf8a126dcdb2a58920af07e068520ebd7efe9c9394235c5a58670f120495e980 SHA512 ae02fd31eb7254208de26802ed6d8b21d77ce2d6997f4a2de5bd2f0a002c763f67f53e6c8e49d66ded096ecd8bf50b1117015e9a0356eaf11c3caef22cf4552c
-EBUILD sc-im-0.8.2.ebuild 3980 BLAKE2B 80bdbeb864ff6dc89aa07dea465416318c9b3252c488da848e407385557b09fe465de15ef930c23b9f6cd77d2f6dd3229af1b80af9a8fb14d84f259c1198913a SHA512 96f5002ec88afdfba9af9cd0dc70b3a64584e9985a23d982e9e44b382416783881c5f8cdd1e7f5855267bb6176cc6361f9f624f1ad52da53d907c86c954fcad8
+EBUILD sc-im-0.8.2.ebuild 3985 BLAKE2B 993daaac74edfe32676760896ce7c5bbe91c261424d279c22c96f2cde577c61cc42a10d10613a493c71b28c8dc3d7b747ccd85d2ee15e17178e5f56cfa0e942d SHA512 cc180ca389b731ecd074b85aaa9d30ec6c2f37cd0ae1522555cb59e28a7c4a4b1cf2af51f2999ade54fa2ffb7229a8e9acf205a86167983a22a3de47321cb3af
 MISC metadata.xml 974 BLAKE2B 2e46ac845ba9978e8b646007003dcf2b53844e5dd2a86f4cbdf812d58850e41f3636ba2807503aa56d6c69a8e04033d868534415c7fd71d424444af1eea392a9 SHA512 1f66c4340b79c43daca9d66be2b3e20e59405fc501a793d0159cbe40e7f541af79b036f53905bca0ea8001a14a9f4d17cb3fd060ce95cfbbc0b0ef9c8e521dff
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index 315fd9e5d581..055adeb7b420 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="X plots wayland xls xlsx lua ods tmux"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5889cba68eed..a96c014ab6aa 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 9e86f4411474..95b07b49af8a 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,9 +1,5 @@
-DIST asciidoc-10.1.4.tar.gz 215656 BLAKE2B 461dd31ebc7067430e595935681ec6e0207a481ec183f0c29e08be444b40a26afabe84ac46dd8f7c563eb8d28ad8eed4b63a23fccd1105d817f7402f6afbfc5e SHA512 fba8c8efe215da0170fc46f1245af831c7b9e982705fbd9cbfe4cd2b979286b49f30570b116bc9f095f060099904a30671ab0498a58fc24b0069575ecf026a7d
 DIST asciidoc-10.2.0.tar.gz 216824 BLAKE2B 500038d655f820fe89048bbff683ae029c7044de839ae4f9ec4666b843585511c99bbc1991ec1764262f33c55b08845661fc1e62eb21bb3250d3168e369928ff SHA512 2f83c7f6d1d0a34948035347833ca59841de1271e8d008b4c4a43a7a8273b230148e6f51ee8f6e2dc702460e27c495037fbe2d6d43195b70bf3447ad86390d28
 DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6
-DIST asciidoc-9.1.1.new.tar.gz 1259206 BLAKE2B da274d3a9389ee2e42ad1be70467f11d0164df3e6f9102e6ef1be6a802dbeb12898786fa1fe37a95755d0db8c9df5d5dd3faf000dfb73b701a83af3cc0261606 SHA512 74b83e8c8904fd761783c2f572d353656fc0794c6cb427f61e9179c9f80b6fc3b3ee8d028baba4e25eafe5f8cf5318f9984a5828849a793a7520f83e6fe50d66
-EBUILD asciidoc-10.1.4.ebuild 1692 BLAKE2B 778cf7374ea0dc5082c48a3d4f037e064f3283f59a8d97f21fcbff606395f5318efd9cd5cc96c52d7890530fe056276f65145fb448e153f0fe95f4f7fa6634c4 SHA512 1fa77bb1e8095df7412a2d0896548bfe27dd949ea6c36383f877608c49ec156342b0973f8af7726ba98654481e2995b392c5271b30cfd8ec0daba60b405e76ca
 EBUILD asciidoc-10.2.0.ebuild 1692 BLAKE2B 778cf7374ea0dc5082c48a3d4f037e064f3283f59a8d97f21fcbff606395f5318efd9cd5cc96c52d7890530fe056276f65145fb448e153f0fe95f4f7fa6634c4 SHA512 1fa77bb1e8095df7412a2d0896548bfe27dd949ea6c36383f877608c49ec156342b0973f8af7726ba98654481e2995b392c5271b30cfd8ec0daba60b405e76ca
 EBUILD asciidoc-9.1.0.ebuild 2334 BLAKE2B 17cf7c01cdec7a9b24f82a82446e8dfb7033396efdd4941660a47fc9d87938a52e18b20ce739797ba0409c8a2f27fff3db131a56c6f45a93d36062a166ea0fef SHA512 e3fdf9af5fc2ddfbf935616ac49a13691952fc2f6fefb16b1bfd7b2c35428ad4730ea01a8eda7402a80982e5d4d98b15e71fb1aa172b74b758916939188b774b
-EBUILD asciidoc-9.1.1.ebuild 2342 BLAKE2B e5c950868bcb3d5e185540c588433deda3ad4d1197cc3062002d66fd8af18471552ad59bc4c6b48203bfc1d22e292bb83ae5e42001f300eb785b424e439e3837 SHA512 b4c7e2232546238a9a4b46b2a59036e64aa13eb46e39747d06f1b55d2a3345f0670a8039f68c463d395053945b14b7144f70e511d66fdabd579707501533dcd7
 MISC metadata.xml 389 BLAKE2B 3b83fe10e6041ef28e6c63e08ffd80a2762c5429f3b41ed2a324717b9d9fd8ffd0cbd88ebae46f3a0be47fbf8cd83d268d6b85179a628f6ac5ace8be3a5b4957 SHA512 56182f3887fd1097dbd62ee542318e18699261a303bb0246489b50e15c0a0ef9a23b207d0531e716b9cbe58a15d5232ba01a7fc2dbf7ce676a2389dbe4e3f136
diff --git a/app-text/asciidoc/asciidoc-10.1.4.ebuild b/app-text/asciidoc/asciidoc-10.1.4.ebuild
deleted file mode 100644
index 9f376b493bd3..000000000000
--- a/app-text/asciidoc/asciidoc-10.1.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1 optfeature readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-# Could use the github tarball but we need autotools then
-#SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	dev-libs/libxml2:2"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-src_install() {
-	distutils-r1_src_install
-
-	# TODO: Consider using Debian patch to allow /usr/share?
-	insinto /usr/share/asciidoc
-	doins -r asciidoc/resources/.
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "music filter support" "media-sound/lilypond virtual/imagemagick-tools"
-	optfeature "source filter support" "dev-util/source-highlight dev-python/pygments app-text/highlight"
-	optfeature "latex filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
-	optfeature "graphviz filter support" "media-gfx/graphviz"
-}
diff --git a/app-text/asciidoc/asciidoc-9.1.1.ebuild b/app-text/asciidoc/asciidoc-9.1.1.ebuild
deleted file mode 100644
index f3c86d982e94..000000000000
--- a/app-text/asciidoc/asciidoc-9.1.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit autotools optfeature python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	dev-libs/libxml2:2
-	"
-DEPEND="
-	test? (
-		${PYTHON_DEPS}
-		app-text/dvipng
-		app-text/dvisvgm
-		dev-texlive/texlive-latex
-		dev-util/source-highlight
-		media-gfx/graphviz
-		media-gfx/imagemagick[png]
-		media-sound/lilypond
-	)"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
-	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
-	   filters/code/code-filter-readme.txt )
-
-src_prepare() {
-	default
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		asciidoc.py || die
-
-	# enforce usage of the configured version of Python
-	sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		emake DESTDIR="${D}" docs
-	fi
-
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
-	optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
-	optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
-	optfeature "\"graphviz\" filter support" media-gfx/graphviz
-}
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 9ed1cc6ac495..041bd17c8e10 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,6 +1,6 @@
 AUX podofo-0.9.6_p20190928-cmake_lua_version.patch 522 BLAKE2B b911b2ab2b35f5eccb58b32e575a775fe43cac1576831bb4e47d10c666a1e7040d8c01c865ee63ef1c3ff3c1a1feb2059dc25c71924b61995302dad21c32c868 SHA512 953f41b44468918aa96af42ecf3de8e3dd0d7721ed7c6283d8a6d44941caf70d9ef63d7d59ee1d94081fdc91a915ba8770bc335f8af5d60b24cd1f6c04698f6f
 DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
 DIST podofo-0.9.7.tar.gz 1005247 BLAKE2B d8f123008d272c1c39f60438d7cd6112cdd851488775e7e0fcb3fd9c4669fd64867fa293ef18b3189eac01f84a8a6b3c536171528f2b6097a5fe181c98501a71 SHA512 0e699739c2fb7d4d02ffca371504bb19f3a8a97ddcbfc06f8d9636db9e73064b4f633f7f09bce92140bb2174610ad68c1e5f8460d474d176ab803ed28295251b
-EBUILD podofo-0.9.6_p20190928-r100.ebuild 4622 BLAKE2B 087e231b372536232efa5fda6b5dde449e4243642e9485b21ebd3f4c5cb9d579e4ebc782d4081e878dda0e15179641f764ebecc7b524d9b9d227a6bdd7d11c5a SHA512 05e740499bd547f6a307927d52c6f83ccae8ce2d824b9f371a1025ab7561bf9ee0de37b1b63547bb85392efbc87c80211cd855423de1c053323b303b987152e0
-EBUILD podofo-0.9.7.ebuild 3062 BLAKE2B f6b8790121463002a291095278dd992ccb649285a282aaad91a499413fe51b66324c6668da5a3fe5516b045cc5b78a0c1b69d3b9046961cab7150c73850faeeb SHA512 d0d78ee49a71c3b3e13d64c6e8db11ca5a7e23fc9e328f604af2d573e6f5b0a207bb184d218429ad59f0db6d367cc52057289c08aeb336191be350d9e2d04a09
+EBUILD podofo-0.9.6_p20190928-r101.ebuild 4655 BLAKE2B c379c5cef61673671c9dfbda5e6b4123f9d66ff93a3064bc40bac56ba6e99e5672049f18710e31a4dfb0d1d56160ed10191ff1699836f77cb1b1811fcdc831e3 SHA512 bea8324cf06beb7d0b920c3659639656e439f0a224102391b66aab2aaf5148948117c4f79a0657596993eed0c8c7131e44683aaaa49c88916453fc6c76ec873e
+EBUILD podofo-0.9.7-r1.ebuild 3159 BLAKE2B faeeae5cbd4e445961db6eb50180fc82e7a50e6f63dc29d7569b6fd134562e806e59ae441e5a74be1448c4f89ccb7898dd1fd211eba2f97682088456f28ce2d3 SHA512 7ecb65bf995b5f8ad796fe67a25fee8cd797abd0d7dfc27d10f1ef0e8e39ec1ba0c5a66c775511aa9dd5d36e694edec5466a474bd1dec6f475442ad130b555e3
 MISC metadata.xml 510 BLAKE2B a8b777ebbbbadbb251c30aa0c662509559849d74c326e38d8ef965aa32f4cdd613a8d2251771d43fd217dbedd195dc11c8167e09bb2aa7ecf064a7dc2e13abe9 SHA512 d47dfa7ef44f0f0758662550afafd90e2566ad1ee418173aa27ead580ec0d328e0facd812e68b9701a2a6d7e6dcb9d62576c62c9a441c2c7f2fd664cd8f92bbc
diff --git a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild b/app-text/podofo/podofo-0.9.6_p20190928-r101.ebuild
index bd8bf05d1b85..b38d2983b91f 100644
--- a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928-r101.ebuild
@@ -21,12 +21,13 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
 
 RDEPEND="${LUA_DEPS}
 	idn? ( net-dns/libidn:= )
-	dev-libs/openssl:0=
+	dev-libs/openssl:=
+	dev-libs/libunistring:=
 	media-libs/fontconfig:=
 	media-libs/freetype:2=
-	virtual/jpeg:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
 	sys-libs/zlib:="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )"
diff --git a/app-text/podofo/podofo-0.9.7.ebuild b/app-text/podofo/podofo-0.9.7-r1.ebuild
index 97e2a987c7a1..e15f6767e6c5 100644
--- a/app-text/podofo/podofo-0.9.7.ebuild
+++ b/app-text/podofo/podofo-0.9.7-r1.ebuild
@@ -21,12 +21,12 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
 
 RDEPEND="${LUA_DEPS}
 	idn? ( net-dns/libidn:= )
-	dev-libs/openssl:0=
+	dev-libs/openssl:=
 	media-libs/fontconfig:=
 	media-libs/freetype:2=
-	virtual/jpeg:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff:=
 	sys-libs/zlib:="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
@@ -100,9 +100,11 @@ src_configure() {
 		-DLUA_VERSION="$(lua_get_version)"
 		-DWANT_BOOST=$(usex boost ON OFF)
 		-DHAVE_LIBIDN=$(usex idn ON OFF)
+		# We use libidn for unicode support instead
+		-DCMAKE_DISABLE_FIND_PACKAGE_UNISTRING=ON
 		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
 		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
-		)
+	)
 
 	cmake_src_configure
 	mkdir -p "${S}/test/TokenizerTest/objects" || die
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 33061ddbdc3b..a00dceafdffa 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
 DIST zathura-cb-0.1.9.tar.xz 5848 BLAKE2B 665efbc8dc83585dc3a55a31d92b8ebdb92eba955aa8f5f74b7e055c096046ce4b1f02e2d2b06e73fe3351c1c113bfae298eade9a6ee34beec68c4d39b335da5 SHA512 5c45f112a077af53caec6fbdfc46ffdf20e9f923d97b69395e327cf05e131b3cd2db617d5650bc0cace0935719d8e68645230d7de9ddc1a8d4fbc01ede0f72cc
-EBUILD zathura-cb-0.1.8.ebuild 895 BLAKE2B 9b6a276bcbd0685f05aec8f492b25f168be8ff1d5a2395f91c336fd6ec33205a70084f2dbc7dc88c7322f47c9c65c072ae922650bfbb6f730cee25319215955f SHA512 a4d85eb270e731c207c8ac69646f35302f6ebcb5ba80711d77203d7cd8cece902808ac41f3a7b598d910fe3ff84daede5eabbe780572159142488a436f9c9232
 EBUILD zathura-cb-0.1.9.ebuild 890 BLAKE2B deb04a042f3a225e5dd84d88268b71eb3ea6d379371dfcec2a710613112d93db5008f1af033a5c921cf39b90c3eab0cad618507355fbe8d87e9c6500feb0d7ef SHA512 c05e31dadcdbf15021e44cd2d6cf03321679e9f91f0a74940d5b98ca5e0529201ab2004f26f2a7a6c0b1ea13a821a5f97b4dbc165437261ad5996d360a86da14
-EBUILD zathura-cb-9999.ebuild 898 BLAKE2B 591b8e8c047fe736b2271d6ee4f685b6443fc7919146ff8dfaae88bddaa3c70d3aea48f766f3bece87d3360e5437bc2ff55a85e8c8442bb0eef59e2e9be8dc56 SHA512 603db72b8c1e77da38575f97d6523dbd02a8c32823298ed2532e0871353854c2cf4280f35f085eb02968ff999db9f5630bcd7666d71f70c0f71413c27acb77c5
+EBUILD zathura-cb-9999.ebuild 893 BLAKE2B 10d8d81684467fc0676cec24e554fbd204b9d58ce6df85d2ce9873d193a8aa89bc349afea4457546c11e02207b6e4a2bf1dff76c1202bf7f2284fd25850223d0 SHA512 284c23d10550e71915600ab7a7d6f491d2e97334ee7c0d51fe1f690a5c992f427202c0eb0de443be45695b03a11dafa331bef59b5c7c79cddcadea560f7303b7
 MISC metadata.xml 583 BLAKE2B ca246e0a76aa83c55397bb48f58b196e816b11fa1c873a49b21ebee38512566d377b23ea926377ae8a08325d8494e49a12aad7caa2b8a3a19a1342ab2f8178ce SHA512 81c6f5d849fd80dd4b226db01e97f34ce8ae6affafd6b680ae31130484859983f1f1c7eaa5abaec9ca9c225fe7a7b3ecd0481f44fc9861b8c488e3c0aba24166
diff --git a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
deleted file mode 100644
index dbee873ba606..000000000000
--- a/app-text/zathura-cb/zathura-cb-0.1.8.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
-
-inherit meson xdg-utils optfeature
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm ~riscv x86"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND="app-arch/libarchive:=
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	optfeature "jpeg support" x11-libs/gdk-pixbuf[jpeg]
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
index de2653af775d..3686e39e9456 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson xdg-utils optfeature
 
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+	SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
 fi
 
 DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index b7544ac426f1..70101b0b6b60 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,9 +1,7 @@
 AUX zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch 719 BLAKE2B e8fee9b67dd4e3156eb48a69505bb81533751e29c9f05a46c5f93ea069eda042f72a24c4af1f804c28d2058ffe0d6ed646ba8f97610b113069cbadf05c841664 SHA512 a4b4a5b2d207ecd37a05d38f18f1f6a2df2acfaacf7a03fc97b14c3bf04441b3e0caa9aca30551fb4e12e0d41d1c4760d8033fb1c7a6b13dd8475453b59b529e
-DIST zathura-pdf-mupdf-0.3.7.tar.gz 8957 BLAKE2B e25412423ba8ec7c9c96d320129f9a3e71a974a118476f2720a356a0c51476f7c827d16b4fbb00d4cebcd803e75ff34b5e7d5c024db57fae17861c137487e021 SHA512 1e27bcf0fc2eb730e77d3dab7c25575e0ae830ca251f380d740a4b8bef588122d279b2c97a7b75fb749daaf24bb458cd54ec7a11321d75bfb5c1b4b0dc0fccac
 DIST zathura-pdf-mupdf-0.3.8.tar.gz 9198 BLAKE2B b873d3352d4f324d5dfceebe0ca1cd13e5e5b9bbedf89a5fdae553a2d2cf59ece455bbe931fc021310a7be3c765663ef73931016d48abaedaf2d3488f96d0866 SHA512 5742f22fc919af390a8a42f64640c36aaf1499a20d1c6603e70cc47b3f6634dafc94a31bfbb30c88524ac0c18c040f0fd6c63d236dbb556784cb17a9b0446374
 DIST zathura-pdf-mupdf-0.3.9.tar.gz 9201 BLAKE2B a74621e6330889363e25875e25984d8f9d9250a654ddb628849a8750fc4bbbb730cb6707d1959d0d28189d99af6bc041e1806036737b3daaa739373e632e304d SHA512 12537ca4c579be6dfa4c94195eafea09e45a08207eb131ed806ab868a71d781dbe6fef5e4442f77bcc0a70921d44654d97d48a6f4bfdbe28e0bdb9fec67f69b1
-EBUILD zathura-pdf-mupdf-0.3.7-r1.ebuild 770 BLAKE2B b03dbb81d5570940d90c4f91c755a5c95ff9e09b9932a44e8a0edcad2811762f8ddf20d78fa17dafe91d3e7984c9bbe5f0c9b7cb89032f1d6fee4a1dbf42db9a SHA512 3284605db9a02201670e81ce465bd8c3005b4755114ba2e92dfe76fd60242d5cfaa5ce32bc1ed53f90be60213a5ed7e089db4ae98ae6f81380b5d06e4ec8b6d6
 EBUILD zathura-pdf-mupdf-0.3.8-r2.ebuild 783 BLAKE2B 87ad7d1eadc88026806ec9999bfc3486257362db0b3e0a6546c98f00b32dd89c8a699362c3085e822110fdd4b0645b3b968538917bbafd852eb69bcd49b01e2f SHA512 677fb3b5ced87f54d9d69367cba816f781bc08800f32219dea880e1cb767252401410b67c211908e815e3d54a2d3e7754d16d818439e9291bacbff9a182267a9
 EBUILD zathura-pdf-mupdf-0.3.9.ebuild 787 BLAKE2B 942b51d2a72ed0a3b26eb4f88deb4f1fc510c0a8551e563c6799cbcd653bca158fc1467f1bda0a768d78aa5464714ee15bfc308bbf70f95fa2cd0424118a1195 SHA512 253121b5df0ec0322f7393c748470d062f834df39560a14755a14ba79fe28ad60523717a117b6f4d774e62fde71b1712b813cdc059b61d2fa774544de60009c8
-EBUILD zathura-pdf-mupdf-9999.ebuild 800 BLAKE2B 6feb5d919001645d5a5502f81cf71758fdac6b0dd852ab2be17e1afe477bfe1d553a6b64c3d5ed03b0422f874134be8aa9ae961610035d3b7dd37bdd456c8da0 SHA512 d7a4f042e05cae1a2d5a40512b4cb0004c221c87e2d0e9a3e1779a55f1eb8c73b10ec7673a90908e8c64ea5bc3128cd8dcde948fec2c03a498de96e8e0e13813
+EBUILD zathura-pdf-mupdf-9999.ebuild 787 BLAKE2B 942b51d2a72ed0a3b26eb4f88deb4f1fc510c0a8551e563c6799cbcd653bca158fc1467f1bda0a768d78aa5464714ee15bfc308bbf70f95fa2cd0424118a1195 SHA512 253121b5df0ec0322f7393c748470d062f834df39560a14755a14ba79fe28ad60523717a117b6f4d774e62fde71b1712b813cdc059b61d2fa774544de60009c8
 MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild
deleted file mode 100644
index 9c4eda569f63..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pwmt/zathura-pdf-mupdf.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND=">=app-text/mupdf-1.17:=
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2
-	x11-libs/cairo"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e '/mupdfthird/d' meson.build || die "Failed removing mupdfthird from meson.build"
-
-	default
-}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index e1fbd119eba3..5ca8fe3fc822 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
@@ -20,7 +20,7 @@ HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
 LICENSE="ZLIB"
 SLOT="0"
 
-DEPEND=">=app-text/mupdf-1.20:=
+DEPEND=">=app-text/mupdf-1.20.0:=
 	>=app-text/zathura-0.3.9
 	dev-libs/girara
 	dev-libs/glib:2
@@ -29,9 +29,9 @@ DEPEND=">=app-text/mupdf-1.20:=
 RDEPEND="${DEPEND}"
 
 BDEPEND="app-text/tesseract
-	virtual/pkgconfig
+	dev-lang/mujs
 	media-libs/leptonica
-	dev-lang/mujs"
+	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch"
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index ffd27a5a4b0b..4747cf7a5beb 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-pdf-poppler-0.2.9.tar.xz 7456 BLAKE2B f6454ea750597f797f8dee5dda6812245e0f7d158f37d63d4d554ea83c935bd1785cdcb1fcbbf60e4519faaa8e824e5d9d69884ff7dd8bac8e24164aa953d48b SHA512 d363c9051fcd5be73c11ee3a88fff277e9a42b5878ce5a64715d801457380b113891504a01b7343affdf275bbd31cc3c0bf17d5208cb513edf52d6c2f5270cde
 DIST zathura-pdf-poppler-0.3.0.tar.gz 8895 BLAKE2B 42ea3e63901474106af744f8c48ff74f91ada036f0cc9beca49b2ebac3e09dbc8334b150ac313d75c3f05f7be59d1f42873a67b77c58186a40c41f88d4772f15 SHA512 588c1d03fef2b0cbb44af6904ab078ae3686d79ce05b1448a41a62ac807226cade4b54725002f0c4bd9c428b192b607664da4bdc8d83c792fab250ef43622a85
-EBUILD zathura-pdf-poppler-0.2.9.ebuild 742 BLAKE2B e3a1fbaf7947512832385b3b8ffd47a56ca09cba148a5d80af28457a9d041563eb5dfdf7bb89a0cd590f990a9c4265349a8ceb832c77b6ac1b0dd185b730125c SHA512 a8504ef444e936e214b3621ea3111d82a0e86f89f087531f9f82b9ea05e2648c9aa11adc19c923e33b6bee85330bc8fd9bf782ae78801dc303fccf62b0438ed8
 EBUILD zathura-pdf-poppler-0.3.0.ebuild 767 BLAKE2B d4955dc86e748ab9710b15b17c83cb2cff34e11d845eb3261efc854ba7b132a8d6a90c05b5b3001fcbbc6c6d128a1442272012388ff2d48fcbeaa6724e84822d SHA512 e9e573f14940d53d9627b782aabe16e1903044b7490cd03047d05bba924ddac57493b98449602bce074611535fef9d4f7a031f90a1a9f3347670ce2ea20cda0a
-EBUILD zathura-pdf-poppler-9999.ebuild 752 BLAKE2B 1aa9d28b4eb5af1bbaa3b98351d744766a97e08e2395f2f180e2ff4b076865dbb58359cb1b616079e1bf0a6fd83f3e228eba0ac26631ff684a79018f371e7dfb SHA512 bd09f493abef296daba93fd43f3d68d2a1e2cf5015f189057cd676fd12707246eacb2ff7947fe9e3bb32f769720afd336d3a5d90e87aba6b88e2ecaf0f16e9a6
+EBUILD zathura-pdf-poppler-9999.ebuild 770 BLAKE2B 83a617fbab49073633f120c1d3974c17998b2d5b92d71e195434e7527d6fe4b1c1d9598bc82c8c84984e517ef2e27f884159899b1a4f30f0af647668298bb939 SHA512 d31e24d52bae236e369f46245ca852f0c7540adc22980f08a9a101fa10ce3084ffd443442d7086a93be2e1f04d302061f1d1125b0b2e94d4c230f58e1e7c6f33
 MISC metadata.xml 669 BLAKE2B 60a8af6a6f1ef902d941ebbfa7bc86fa10a773af260878d0bdc2d211d6792ae1eb28106e653247a03ffb3dfbc4bddf76d7332fd7b703a9e03dc37c90c69b1deb SHA512 c2afc877f4c46a55d662fd0ee6a66fd940f32e7b396a0124cf24209b1cf9d9fd2cc8dc05fccaa5a7a067f7760207a2f8b2ddc54964c6191f2a438d790b3a0d34
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild
deleted file mode 100644
index ebbe11bcdbf3..000000000000
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND="app-text/poppler[cairo]
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index 1d1d57e3ea67..448941a99c64 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~riscv ~x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+	SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index d8748f375e75..67ceee5bdcae 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
 DIST zathura-ps-0.2.7.tar.xz 4488 BLAKE2B 4513173a2f9ca725abf8444516a78fd789286b082a1146ab5d0dee504cdda92962f3e6cef46f24e0307bc5ea6bb6595577fac2dfbd2d4ef0cf8e69d34337baf5 SHA512 86cf4cea8f32e446960c7727745711d6bb6723bb41127ccba335fbdaeb78e9f681ce4104b2be8718a2f19e06aef30d49ae7c90091fa0774b5ffe22303cf37d5f
-EBUILD zathura-ps-0.2.6.ebuild 785 BLAKE2B ea456f3cee1a359e4176d2cceca60445224f0c0f2b63e19376ad1875ecc84f579a59f77c3626b11df22a416b41c60fbcbc08119c08d327e4591f151fa53b4166 SHA512 ded381a60d4e220c4f5a71bb89873daafa9a6135763727d41c30a8ae87b90f07a7b2ccd9e2c65bef06651c0d6a2c7705aa72bf9aad5f9b17f78f7d79efe2f618
 EBUILD zathura-ps-0.2.7.ebuild 780 BLAKE2B c132179888fb1cdd532af15cd6cd4270de3d7e87bc1ea0e755fa9f28620a2ec27c99327d982584aed42b7a31b693fce53c0165ca146f50fc2a76f82b16fe24ec SHA512 c89a12f7d29d834f461eadc0823bbfa365b4afeef18c412424ab62c4a0a9c7b963a9a0ef2fce596affd96552ba0cba4289396fc803ec4e95622c5730e0e30b89
-EBUILD zathura-ps-9999.ebuild 788 BLAKE2B 5cca1dd318b0b42d25d5256c8a8ac041982ec42aecbad33f74fb41ec1ee9304725913c93d29ff6fa7dce1a7c120eaa1bb546c7c84c1acf38153650738146197b SHA512 87db8d6a258a48923eed12296c924e253cec2201780c24f169b7a22118818b394e9c1ac674a748377a49de4b39f02257c469b0fd4ad0cb81d9287ab8d7fd0b47
+EBUILD zathura-ps-9999.ebuild 783 BLAKE2B fd0580968eda5cab5aea8a4d073d0891db52ce8f25b431ef037f8f8d3e7904adf12605e8f129ebdf530c99f8199d8596aca6f0a51eae1eabf1a05cc1ad2d6aa4 SHA512 27e382034e7c50c6465390a6e10a80858b07d484e1c243f214eae1757a75382949c9bd5ceba206882f4d6caf48fdd6894a87b902799b98d4b18a14bbfc2ffdc8
 MISC metadata.xml 583 BLAKE2B ca246e0a76aa83c55397bb48f58b196e816b11fa1c873a49b21ebee38512566d377b23ea926377ae8a08325d8494e49a12aad7caa2b8a3a19a1342ab2f8178ce SHA512 81c6f5d849fd80dd4b226db01e97f34ce8ae6affafd6b680ae31130484859983f1f1c7eaa5abaec9ca9c225fe7a7b3ecd0481f44fc9861b8c488e3c0aba24166
diff --git a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
deleted file mode 100644
index 023f84490bc9..000000000000
--- a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="PostScript plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND="app-text/libspectre
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2
-	x11-libs/cairo"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index 01488806de7c..52b16b0f9b8d 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson xdg-utils
 
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+	SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
 fi
 
 DESCRIPTION="PostScript plug-in for zathura"
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 60a9804095a4..d291d8815ba9 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,9 +1,5 @@
 AUX zathura-0.4.8-meson-0.61-build.patch 814 BLAKE2B 692fa4e525d8ca5bad33e1e36a288832509da06399db895f53235709db2367e4011a58d6b6632ee8850677619e6cf8a8d419989737af4cbfc6b6ed04ed8ea83e SHA512 ebf7769d5775f60e57521bdbfbc5a749c584ed706dc0f28d63ec2b6de6e5324a1835ad6f66827301a8ccedb3f2e4b6d60822c0176d63a52173b37fbf36e8f5ce
-DIST zathura-0.4.7.tar.gz 199857 BLAKE2B c4fd99049ed81c7965cc474f0c543ebd1aef55ff63312c21a33ce9161afb78da1c9f0a13ff86d5d69b2ce6b17965632de282a9c8bd60b0a8297d96528b5f2c5f SHA512 adfe69cbef6088a6fa7d49686194a0a3dc13757535974476742c733076dc5bb5ad95ed447d50cd1efdfb23fe2fb1f64452d5d8aeb27a80c3101f2ab5c68f9b60
-DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 70916ac23624b8e55b39bc2b9329fc5d992d3e2e3989b17bebf0f8b1bcb26ed943c15866c0b37e0a4a29fee7c264d6309bf1d036d770817e13a14a13af7499d7 SHA512 00d7b735154ff0e857f8a0a21c24b3fbbff8c166d93a34bee725072ee00f2870adecb956e9445334be2a84827778bd874cc1d4bda7f8b32e4468ea3784834b86
 DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10
-EBUILD zathura-0.4.7.ebuild 1355 BLAKE2B f5e59096beb3e8cc13dde9cb887a1ceea87c7ee22f28f1599e235240c4e065da858ffadb96c3c702602684b6c0f6c6ed9018cf039ad16077f6f6b041d1c4f3fa SHA512 a1996b203c933b5e6e3661151bdba217ef131cd1e895ad2328c6cc6207b7f841434671671f7cc49af97bc6554fa366c9cc16f8eb38eafbb6bbf584b41632c3c4
-EBUILD zathura-0.4.8.ebuild 1414 BLAKE2B c9e53786f10e0bcdd9057124a365b050881a640e7dd42e87a962b71aaa0702d7090a43b360dc92976456ccaaa1af84160bbae95a9a21a3fc315b116303a3aaf7 SHA512 fc53625f6057cc6433c61e30b8beb9e37c83772ee6eae7ad3177e4f00d8de56223ebcdd728a9773b9fadc93746295cb99e1331a1c6763c6fbb9108539987f95e
 EBUILD zathura-0.4.9.ebuild 1355 BLAKE2B 82e932b9fddd23316066c358a6aede8480532c970a992270f9f6fa2a3c7545b4286249d4ce9a96b9079500ede0e2371fe8682e2b234a93c4e351d1781507b7ea SHA512 7978966e9716677442b274af5792aa3e2a682f7e1963ed6c3ed094f322e8a12db1118525b06c600c407c362177584c543679de2583cfadfd5e4ad95e86d30734
 EBUILD zathura-9999.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
 MISC metadata.xml 769 BLAKE2B 417d92ddfcbc7c2352a79c4275022515fa0bf31b7c06058bb29452f7e15882b59ad3d2b92a2aa8063bb54120377e028449c0e253cd2aeab719a92e4853a3eea7 SHA512 9f7284f67e9bb6b454670393431546685ede815937bb06f7a73ebf25c9cbecca734a8e09753ffc803f8f44ce3a67002c59e31d98bce6185b4237e5d499e3165f
diff --git a/app-text/zathura/zathura-0.4.7.ebuild b/app-text/zathura/zathura-0.4.7.ebuild
deleted file mode 100644
index 90354da9273c..000000000000
--- a/app-text/zathura/zathura-0.4.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx xdg
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-libs/girara-0.3.3
-	>=dev-libs/glib-2.50:2
-	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	magic? ( sys-apps/file )
-	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
-	synctex? ( app-text/texlive-core )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-libs/appstream-glib
-		dev-libs/check )
-	virtual/pkgconfig"
-
-src_configure() {
-	local emesonargs=(
-		-Dconvert-icon=disabled
-		-Dmagic=$(usex magic enabled disabled)
-		-Dmanpages=$(usex doc enabled disabled)
-		-Dseccomp=$(usex seccomp enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsynctex=$(usex synctex enabled disabled)
-		)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/app-text/zathura/zathura-0.4.8.ebuild b/app-text/zathura/zathura-0.4.8.ebuild
deleted file mode 100644
index 83b02ddfd08f..000000000000
--- a/app-text/zathura/zathura-0.4.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx xdg
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-libs/girara-0.3.6
-	>=dev-libs/glib-2.50:2
-	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	magic? ( sys-apps/file )
-	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
-	synctex? ( app-text/texlive-core )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-libs/appstream-glib
-		dev-libs/check )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-0.61-build.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dconvert-icon=disabled
-		-Dmagic=$(usex magic enabled disabled)
-		-Dmanpages=$(usex doc enabled disabled)
-		-Dseccomp=$(usex seccomp enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsynctex=$(usex synctex enabled disabled)
-		)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 876bd5850295..218df584478b 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/kokkos/Manifest b/dev-cpp/kokkos/Manifest
index 76d22673f663..2debfa7ae89f 100644
--- a/dev-cpp/kokkos/Manifest
+++ b/dev-cpp/kokkos/Manifest
@@ -1,3 +1,5 @@
 DIST kokkos-3.1.01.tar.gz 1972707 BLAKE2B fe31556ecba6b01ed6e480f0cb4ca4d7dc487d6b2a7e52df94d0e93b864ed5269a752f4fcdbacb55383e9dee3b72236f121b67d2f5eed10f3351219b063e7099 SHA512 4fa428ec33ec207147b3fcc5e0d297bcff4ed772ba6baa24ccaf56b691b72b70c69bd48fdf134f4e78234bf755377fe01a31611a41539c2d211ba9caed24b1f2
+DIST kokkos-3.7.0.tar.gz 2301343 BLAKE2B b63ffc7c70141396986414375143d4df62a4bfffec0f0a346a278819557b42a025cd7f2a0825cd4d2d7c94a5c7c374b58be79dae9c45e012574b4c87c2ae0371 SHA512 f72b43096126cba11129ab44c2ebaeb1ee92b14db45bd451e86f40746e8edbfbe3415dee089080a6664ae4985e5796717c64bb5c508ca5e287b31bac248802f6
 EBUILD kokkos-3.1.01-r1.ebuild 1263 BLAKE2B 93ef4adfa0b71df2e57d324007d80f3617ca325b5e563eff9366b3204a69cf42ca1f83b65aebcde4e1022686d0c69097a9f2255308ec81ae0062820c81798b20 SHA512 286c9d2071ea2deb1d9f6ac1cb653eb710e2a45249cfc9c680313f13e93d754a2bd359ae28b52de7e6f6aadd06fefd146833b31cc3be31dabb4340816d3ddfb2
+EBUILD kokkos-3.7.0.ebuild 1285 BLAKE2B bbaf18a7bad9dd6e02659830df4484e33538071d1ef1a2b1e388ee5a4079767273803facc5ec2190f7d5c57b93f957c92451cdb08667a2f2b201d96336f69ecd SHA512 8678f63dc2d393009971e718d502c89e0ff819055b383dd20e04569dfdba4aadd2f1b56377d5c9845a95bbde589e2b95550dc28bf86710fd92c25ec6488b7409
 MISC metadata.xml 254 BLAKE2B a78564cb4b2bc87f6bba710cf53a3cb19dbd43363361b936e2041b564a2840172c4bbf1e42a5fb1aff7adb5a4843c36cb4e53a75989137343cfea0655add5a19 SHA512 83ce2926ad7bdadbf376ce803de60225491e26c23739394f46787d443648f747b84c962193b85230d22e936534c0d5d2ca7a759f33a1fb22c2d0ceeb0ea1f2ab
diff --git a/dev-cpp/kokkos/kokkos-3.7.0.ebuild b/dev-cpp/kokkos/kokkos-3.7.0.ebuild
new file mode 100644
index 000000000000..b8f927d8aac1
--- /dev/null
+++ b/dev-cpp/kokkos/kokkos-3.7.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="C++ Performance Portability Programming EcoSystem"
+HOMEPAGE="https://github.com/kokkos"
+MY_PV="${PV}0"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 -x86"
+IUSE="+openmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-apps/hwloc:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_INCLUDEDIR=include/kokkos
+		-DKokkos_ENABLE_TESTS=$(usex test)
+		-DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
+		-DKokkos_ENABLE_SERIAL=ON
+		-DKokkos_ENABLE_HWLOC=ON
+		-DKokkos_HWLOC_DIR="${EPREFIX}/usr"
+		-DKokkos_ENABLE_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Contains "death tests" which are known/expected(?) to fail
+		# https://github.com/kokkos/kokkos/issues/3033
+		# bug #791514
+		-E "(KokkosCore_UnitTest_OpenMP|KokkosCore_UnitTest_Serial)"
+	)
+
+	cmake_src_test
+}
diff --git a/dev-cpp/notcurses/Manifest b/dev-cpp/notcurses/Manifest
index c8dbf326daae..28d5d42449ab 100644
--- a/dev-cpp/notcurses/Manifest
+++ b/dev-cpp/notcurses/Manifest
@@ -1,4 +1,7 @@
 DIST notcurses-3.0.5.tar.gz 10135637 BLAKE2B a0ce682dca69de15eb17b153a96e7159ae2ff00f36694dbd72caa6fe0938bf52a5a1e1319ca8f3f011c56fb51fcb23e1b029b6b3307153f8c8768a58fd150aa8 SHA512 81aef639afc78225c4eb81f5576b773a5714476f09062f5ff290c10d4ab6ad3d67646c836556a0404f638684bfc3774897f75408033f447a6a14529c5f9f04b6
+DIST notcurses-3.0.8.tar.gz 10146073 BLAKE2B 82540f37bbb27858692df5cf081f7ebbfebdf3c6024c4967d7402c86bbba4caeb8ff9ab4449c51c83b1a971c92af5dee1c53648ede80d8925c500398513f89ca SHA512 ed019daea4cc462043876d61c7798c7aa6a39e70671158388c8a108426172cefd7fd3dbac90d1a0eee1e26c9c1a7b16c98d49bd8be02fd39650dbdda67e545bb
 DIST notcurses-doc-3.0.5.tar.gz 148376 BLAKE2B d899a21e40b5c39ee455326c607301a73fbe63f7e5336323397441bdb127324b50c444de578de08752a735b38476549c54b3902a0f4675722db6667ecd383195 SHA512 88537f912b9044337542d0c2dfa3777f5837a6a9fdbbe9ba2152c2e2874fca1c54a73e9f6459b9bd78784f4b3042845e9dc3ef7018cf9be043c6111eda70a82e
+DIST notcurses-doc-3.0.8.tar.gz 150000 BLAKE2B 8262157c051876302889c74e7986be928d9997e8b5e69028e2edf996df2f93078dcc584e2bb2860a74fecdc8e52c17d3448638f39036fe8acd8b54c0b6af3a39 SHA512 ff2d4a5fddfd775d862b4f1b93131d4600c3e15b1044b73a0b24fe5a6ffe6298960c4caab2848c4dc2ba2872d50fba49f86f34433e36b7e3f3782e920497defb
 EBUILD notcurses-3.0.5-r1.ebuild 1239 BLAKE2B 8998e532c630a084f7f4ea18ba8df405f31f8c9f522a4aacdde5971ec3e39f39f6d55f40a5f5b3e31bdc368f715fb2e494da1578058dc11214c7cd688d6d282f SHA512 dc6396705ea25e396dde2724d14ac3037dc69d02c571d276f5d885abc37687ff803dab01e8a8c3e1596c5160e72657dd8e6b9271858aaeb1de48c7c82433c276
+EBUILD notcurses-3.0.8.ebuild 1310 BLAKE2B e9d7646757b7cf6d574e919265af1a65ce7a9bc8da4e6dceabed1e48037d418e6a25d09429ce800769967236721f681e06418b67dfcfaf41886a6ef5991b4656 SHA512 201a673122f248e1c39c7fe8f32b31549a729d6c108b7c2640a777c92b36a078af6df61a5268d822b1f0e1921a900f09b90944e02645e9c8e2c9fb5f2c8ecc7a
 MISC metadata.xml 961 BLAKE2B bd06aa38b589c3771f604473a4ee81dd4a3f39c9ade0443369bab9a7700e69994c8d8f49faf758e673e8063dca2a28c7c1225f2cd618a421e225e350cd0aef32 SHA512 977b0f3b00a345e3c4b563310ff915829d9ac8965345943ec2e51f40c1c31a0af40a5eba975050b0be95ef0c48efda30b0711139d5345762dd58b4330118c040
diff --git a/dev-cpp/notcurses/notcurses-3.0.8.ebuild b/dev-cpp/notcurses/notcurses-3.0.8.ebuild
new file mode 100644
index 000000000000..7966695b02fe
--- /dev/null
+++ b/dev-cpp/notcurses/notcurses-3.0.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Blingful TUIs and character graphics"
+HOMEPAGE="https://notcurses.com"
+SRC_URI="https://github.com/dankamongmen/notcurses/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/dankamongmen/notcurses/releases/download/v${PV}/notcurses-doc-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libunistring:=
+	media-video/ffmpeg:=
+	sys-libs/gpm
+	sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DUSE_DEFLATE=OFF
+		-DUSE_DOCTEST=OFF
+		-DUSE_GPM=ON
+		-DUSE_MULTIMEDIA=ffmpeg
+		-DUSE_PANDOC=OFF
+		-DUSE_QRCODEGEN=OFF
+		-DUSE_STATIC=OFF
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	ewarn "Tests will fail if you don't have a UTF8 locale available,"
+	ewarn "or if you're missing the proper terminfo database for your TERM."
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# we use this tortured form lest we try, every time we release a
+	# x.y.1 or x.y.3, to install the source dir as a man page.
+	# exploit the fact that there's a bijection from html<>man.
+	for i in ../*.html ; do
+		doman ../$(basename ${i} .html || die)
+	done
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3870b59174b2..6cdb6e5f091a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/editline/Manifest b/dev-libs/editline/Manifest
index 290e047baeaa..b6c6a5b8537a 100644
--- a/dev-libs/editline/Manifest
+++ b/dev-libs/editline/Manifest
@@ -1,4 +1,4 @@
 AUX editline-1.16.0-rename-man.patch 466 BLAKE2B 0fa3edfe0733d2a72fe2bed1c03dfb0ff3f14cac9b33d6258a19489cb5db3b97b2fed3d6fd9c2fe3b350db102f287ade6006627ec92a3e956309550e3af218a6 SHA512 2226b4312f13d433248d705d6abf6ba77e71bebdf1774af131909139856541bdcac4e7483a8e2e38b3e9f009016bc6b36838519fcf423ba9562020d97dd6cfcf
 DIST editline-1.17.1.tar.xz 252196 BLAKE2B ae25ebc8efcc5ddf7d68553b6a5d93738e4fbf67c556b4089ace7386cb70058f36137d99df2385e324b36a285aa319b49e1c2eb82059d99d511c43c70f55ce11 SHA512 9b3f5f4a833e9e38c4f99d2e7f8d2716d4db74b6a2d3362e6c513505ff17a79044496405458835d508efd79cbe9046f3c1db602aaad210926312c22057145d35
 EBUILD editline-1.17.1.ebuild 780 BLAKE2B a7b816f883c8ba443177b64420a91c9a8a7eb9cc6f55ce6c4c4fd58e64089f2a07d9e0230eeefe6736446216803df9e9c440ce66e47cb3e974e232406d4f7a05 SHA512 08fbcbab0c74ea648886347e93d311040db80d23f1c237dde4c6c5734540e1a429abc2b2d0dda274db875f129a8ef286f72fd3c2a355c1d9f0fdaa51e7d69e1d
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 251 BLAKE2B 6eebd5eb731ca8b43437902bfad1f90c793849142f79eb7ef37c0b2c446b03b01d05dbba804c83b94215f979face0af761c846ca16e20a982f4abb3869012c3a SHA512 f40eeb372d081e0be29f97e34cbc9f873104a25c66476c103510d45b30124abb05ff3678aba11934c5a7c84e9cffff9a6f1abe35acb875df2373f463814ee54e
diff --git a/dev-libs/editline/metadata.xml b/dev-libs/editline/metadata.xml
index 115e9d64a669..94a7a4cd944f 100644
--- a/dev-libs/editline/metadata.xml
+++ b/dev-libs/editline/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">troglobit/editline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index 5502fd3b0027..c8bf2ae60406 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -4,4 +4,4 @@ DIST libgnt-2.14.2.tar.xz 106128 BLAKE2B d3db0ba3a297c14f32cc49b4e5b3392f47031e9
 DIST libgnt-2.14.3.tar.xz 106388 BLAKE2B bba785c998e53c75ed9c3b0b4ad1d96d63628a6e2b0ac7abec76a671ddfc0284fd787cd6793433aef83e6b31c6efecce0c656e131ca9b8bf548486de1010e1f9 SHA512 7131834cfe585177865bebf26167de08a04fced3da4e9a072d9b09b3becd1194914757b1a1fc8f129ae6c8fefe3ec1ce0d80d6c50cb624a5698b66ee2e06c6c8
 EBUILD libgnt-2.14.2.ebuild 779 BLAKE2B 4276e180412105d5a1efb42d90e63f53005314233b3eff2d080c9055d057377a0e8a151b536e4b9ca76c53e0cfdfbba79dd6372f5eaa8d35bd115a1fa86926b7 SHA512 9607b64bc4070f2817a9dab608af514bdd0bdb6fc9d338178aaf5d482b0b4c61835e8e9c71f9c60ba089c3576860d0a4cde8f12b537c7d0f020a1dcc721b52fe
 EBUILD libgnt-2.14.3.ebuild 749 BLAKE2B f8cc7f4f6e97f662133563b5d179b7bcef271b88c42fd2f60371c9b26acc3160753e4ebcb6722beca75b69a8b41f8955b66288745c62417a053de516093f7042 SHA512 ef01ab6a4ae687c335f098aa84400c15fc7a116f1c8896df9ddf4f0663df2ebfecb413616ef6ead6ed35b7dc7078004633f65113fec98ee3bcd738ae82e61e30
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+MISC metadata.xml 244 BLAKE2B 712aad52336f293671d3f59fd0a8f82b2e1490ece1c499fe2eb163895ba6fd9af4268c23d396de8ee4420139e3b33af18702a1ecaba5ce89e177e2f4bbb0c156 SHA512 63917f78ba2986f9ad72fbd373903d41876d6399e68f4142561dd39f41b82be610937c005579a76ac25e19ec10fb6a4c297e796bfb4ab839e073f68bdf2bfda2
diff --git a/dev-libs/libgnt/metadata.xml b/dev-libs/libgnt/metadata.xml
index bef24d2c2337..fd4b4bbf86d7 100644
--- a/dev-libs/libgnt/metadata.xml
+++ b/dev-libs/libgnt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">pidgin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index fd5f4b6c5994..275129e8cf99 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -6,5 +6,5 @@ DIST libksba-1.6.2.tar.bz2 667846 BLAKE2B 93abe745fe951ead0d1c05a1006e8ec20ab68f
 DIST libksba-1.6.2.tar.bz2.sig 119 BLAKE2B 5ce2bd1065996ecb2a6e687eaf96ce52ba807f5ae487612c43a8da8da78a91985f37257396f1d179a4a38a8d1efb8cae8c7a57f5f1b4eb92c33d70559e3c2186 SHA512 e84f653ee64a6769145df3e4b8e36f9c19983771d63c14e1a27a7f27b8cbed00af44f46db69a47ab9b282c405c21a9445569630b7b7f7ee7cb91b4d836524fc4
 EBUILD libksba-1.6.0-r1.ebuild 1129 BLAKE2B 02bc3e3ca7d5ff452f0adabbde65371df3eee9ad17fa8972b7440637dcfcc1caf9830b1b70645fd6bc95c49de6a9dd0f8d0f90009bf169af9f4e64bc2e1d06fb SHA512 211797f35a8f267e511fafc946fab54a4aaf8bcd52c6df6ea1d46c6c7f58d952adb92f175f940c49dd2b58443ce985b196256e2e39a247f94334aae54967c1df
 EBUILD libksba-1.6.1.ebuild 1337 BLAKE2B a04dabece502895887e9593bd75adab5351036018922feca1819ccad22435bfd575178d43f21eda1ce00f98c48301156c3dfa2bd63356a5cf75825a0b789134f SHA512 89f5cabc2341a8bc2de8a60d3f4f11e2bd8d2dca34ee8291d45e763ad98839b451b956383b86dac5d6b42d0b3681d1f0c1fa3d2e2547621cb1494f2e559c2028
-EBUILD libksba-1.6.2.ebuild 1625 BLAKE2B 644b076627c11a54f61da021be63dc8b0980b68e714bbf533235abc0ef94292aff18d2922d9ec204291f366e9e104972d83da2c5e0d0f5116e07fd1b5736152a SHA512 6a10be3cff2336c33ee7a5392b85dd30851bef3e2e759477c0c76cdb249551aadf550c80ea3d191e546fb7b83d4ebd2e771aa0496e4cbf525b7ee2a92541048e
+EBUILD libksba-1.6.2.ebuild 1624 BLAKE2B 5b2c3463ceb046ecaa1e442f58136f96f0faee0bd6c19b2e9cbf483db6f7b195a5d75c1bbd7b4b412b7dff5dce2cd12b7434f8ff52a31697c0207f2604eb548c SHA512 0d6eeb5f65506a87c42f23e44a6ee000aa312b2f93ddd475ee669c29c0a187b2a6288cf4a61ae879742d49fca451102e99b8fbc97f659f24194225c9867087d8
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libksba/libksba-1.6.2.ebuild b/dev-libs/libksba/libksba-1.6.2.ebuild
index 9732da8a58f0..da8db458d8cf 100644
--- a/dev-libs/libksba/libksba-1.6.2.ebuild
+++ b/dev-libs/libksba/libksba-1.6.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index 7cc6991fcfba..437f19e7ed6d 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,4 +1,4 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
 DIST libxls-1.6.2.tar.gz 443736 BLAKE2B 46f875613caa423dcb3acac0c38a68c7274993b25cc9be891266b8cf59e8eb0f17580e399305cf927854e090f34fa34f57f7fcbdceb75dffaf04c3362fa63095 SHA512 55e5cb33ec63484063d0893eee7352b89f993363762cd5ef42b5f918b09d1eafcf933fba076255267d9413c963481eb07c7054a2495d2d529db2e1d626353d22
-EBUILD libxls-1.6.2.ebuild 601 BLAKE2B 5b9e22e4b583ff674f141feced3d805e7089c87bb4272158b820f74154f2ec6b26372e729506ad4eedb27e3ab8db866e2950e1d2b9c9d577686c4343aba0d772 SHA512 37b95fd45ab535e10520a3b7f99d44f3c631d91eaff05e629f469720fc08a3775613d473cd833e3131bd9ef31f868a3a0b1e8770de6423a7f0f195e44ce524ac
+EBUILD libxls-1.6.2.ebuild 606 BLAKE2B 84d666cde338bf29513688a2894def2ce0bd39266ca38243bcf53186a625694ab4a8439f309e44abb5d330684c39c5d058a277a7174d6f8263ba0b1939c4b29e SHA512 357225002518240aaf0bad025acb45b3ba4e133027f9532fb48756844bcee51702ba615ba74b97b950ab5001650544677becf7590e697fdf28185c2d79cc514e
 MISC metadata.xml 304 BLAKE2B b1b6c500fe0d22b04f956c8adeeefaf3fa1a9776f485c8285b6c4774d6e8c32868c7f056b10ab743dd3a003fd833ce6df05e31b64ba7f496cd5061a9c9ad4f35 SHA512 5ee99e9cc9769d406b48e2f44895d1066bd02df0547df172fd08edfe8d614f56f97829645ede881f7dc65fbb03fb9cabd22e42b526222d21cdaa7db532ba7231
diff --git a/dev-libs/libxls/libxls-1.6.2.ebuild b/dev-libs/libxls/libxls-1.6.2.ebuild
index 42867c0d7710..95af65648371 100644
--- a/dev-libs/libxls/libxls-1.6.2.ebuild
+++ b/dev-libs/libxls/libxls-1.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/8" # libxlsreader.so.8
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-libs/libxlsxwriter/Manifest b/dev-libs/libxlsxwriter/Manifest
index 810572b33f78..fd6f4a9eb9c9 100644
--- a/dev-libs/libxlsxwriter/Manifest
+++ b/dev-libs/libxlsxwriter/Manifest
@@ -1,4 +1,4 @@
 AUX libxlsxwriter-1.1.4-fix-pkgconfig-version.patch 675 BLAKE2B 19771b0b921a613191695ab0dfc65dabf3941678df01e7241cc37b5dcb9544c59f917d9d0090781e525708b4e1fa314cd49b6887c9915e809f4111b3fe0d2831 SHA512 dd43e9b8738298dbf568f9fe7cc518ff44ecd352a01554af776506be6c815e51c954195f4bcd046dfeb35ced4d590824f4dc26881f03a70639486f8fee768797
 DIST libxlsxwriter-1.1.4.tar.gz 20442200 BLAKE2B 38308dd8e954820b6debf15bc884effd583c0e0fa1667ed4451085ff8cf1bf4101807110873a501617785763886c107c19ab30c16390b5fb608f52b2736465be SHA512 fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5
-EBUILD libxlsxwriter-1.1.4-r1.ebuild 1110 BLAKE2B 4dd289fb62d3f85062d6b1f3a80184111e9a2886e23705a5feafcb9a0c92b84179001e627933ee610c848d14356cff3c8b674c64e2c2d527120afeaff464cf8d SHA512 39840ff3765bd608f597dc275fe72fc2b8c1181b83ca6fe5984bb1848cf8648f1eae87017a9aa215835579e4397cca419d8737c86e5f50d44bfde30eb5cca014
+EBUILD libxlsxwriter-1.1.4-r1.ebuild 1115 BLAKE2B 1fea96b52e8178b493ecb0958dd2305012470a75e356d3ee62650e40bd9d9fe6cf64a6ec8ba90805529d423a00ddcd8afdabf7a449f178bacadc955048c649f4 SHA512 0894f812b4561c41bec2507429f90b8cc6c3d53360c3972311b2bc30816360bf8c17af81a9868df8c1dfacb16bda2e2376c76cc7aeea8efddcc232b9401b3d1e
 MISC metadata.xml 579 BLAKE2B 0c3294a1f69d9cc7e3e95a37f2708ce4672cc931f28cdded82aadc9cdffb323ac4bd7518c61fee57ad30022617acb572625f3b6b0972fd903a1ae3afcf98aee1 SHA512 83d288575e27337692c3cd94bad56d8e2882240343b739eeed72742bd82e9177c45a81ef94ebab9e035b99431ecc2cf21723e408a90fa6b5f551e8a7f1f17a0d
diff --git a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild
index 8f131ad06a59..cf7cafc76cf7 100644
--- a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild
+++ b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-RELEASE_${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="openssl"
 
 DEPEND="
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 2e500457e822..70452e705ce2 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,3 +1,3 @@
 DIST libzip-1.9.2.tar.xz 763980 BLAKE2B ceeca4dccbe7552f7f545b00ea44b342398d18eb996e39045b9d6efafe50f8890333ddf220c86b59f5ab2849420eb76761c42b16de8b174629f53e327f9e83e7 SHA512 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5
 EBUILD libzip-1.9.2.ebuild 2444 BLAKE2B 51346ce953bcc1dcf87c096eca13dff0f9df40354ba00ca2d7da33df8367e9f819bb159d196609520bf771f0941ca23a7e1a1d36294fbeb72606f4cb678c33a1 SHA512 2f016de22bf84be086435187c90d63d81322e51373694a40e1b1fe160b1cd206108c09a9c7daeda687f048a95b2056e1d9b57b244dc428e3630919d84fe9cc1d
-MISC metadata.xml 510 BLAKE2B cd0e88d175985805badcbe4b6aa771fd65ab9e8e86a3d37e18531e61ef9fac92ba191ba4a3806c37743a51541b1f353f5bf58b7195898de74eb2c389623a6994 SHA512 e073a6f074e9d5dc8abffada8338c608915527ab3c76f693cd261c6a99aef73e18c0e0088d508d62032619f779f1c6d9445cdd0273aeb61e41b9e3b449762337
+MISC metadata.xml 563 BLAKE2B 2cb57938618664b1424b3c4d475d79ae6a66964788665c559520ff8d7466d9a1c41c1a1821dd1213dde1062898e3bdb79478ff44fa3290c4ef6802a64539e77c SHA512 d14c625c1a43bbe8d69508cba6c78adad10287b6018693938a46af322614b3ba999fabf6f2d97c48836a80ded2dd7e0e32c1d6491654a8bdb5b77bd23acd1b24
diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml
index e8ddaca4fc3b..fb236457f255 100644
--- a/dev-libs/libzip/metadata.xml
+++ b/dev-libs/libzip/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:nih:libzip</remote-id>
+		<remote-id type="github">nih-at/libzip</remote-id>
 	</upstream>
 	<use>
 		<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 5ea1d960b593..1093a2903985 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -9,5 +9,5 @@ AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc
 DIST nspr-4.34.1.tar.gz 1096874 BLAKE2B be12bda63a72d25a60542c5cdadaa7dc59ad2d40d41affc0af5eab07659129ff235a62227a78285e4c00bc72a365b49691658aee7818ffc4c5d014aa0c2b0df7 SHA512 b77226c3fbba6fc9acc90deb8496370dba1384de72ce564524c03bc239846fd17c27d7e1fd7ce99161faafdd8c92413ee58ce1a74a41c786759210bbab478991
 DIST nspr-4.35.tar.gz 1096974 BLAKE2B c80402d7be9e69ab6d1e768a18d271a8d28900f4cae7df2709d1ab26e100d908f508762bb771d4042aa7152934ce83d495e2102e894c56574187be8040d65629 SHA512 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f
 EBUILD nspr-4.34.1.ebuild 4860 BLAKE2B 9cc8a8f045aa6f69987d7285927566dcc4578c1a9d16ae52de238462936565459e5f4a5dec655c4fa70dcb95dcdae461464422b10bf54feacaa2676825743520 SHA512 9e3f5aa90aea50e0c3b5e350d841f5c18a1dd41afa5aa80807454f18c339aa3d95b3e717b77fd1747de5c46f0cf118d1f7efe1ea496259d7a053f76e3a19d60c
-EBUILD nspr-4.35.ebuild 4826 BLAKE2B 6e3a4ce2edf6d16f924b8688cc45b4031932b46965b5b7229c8b50d3846a5bbe3ae17ab378eddaa78c7da5b7a9249a378d6f6900edf4e81fb3d66cb2c8ec7356 SHA512 c16efe5bbed3df20f22d10d6bfe8717edd3c321fa4a97d2aa2d8e544c7f08e73a7285fd6fb5d339a4f269892b362f14138006bd0ae5f23da67595e644b25a8f4
+EBUILD nspr-4.35.ebuild 4825 BLAKE2B 68f0b9cb6f5c16e95f058dcf15e51cd84efa63b3064b7bc1448f098bdb2cdea9c1d6b878a4fc140f1590a7bb74cc39c02ebb40bf9d156be5f0e14dadf71cf529 SHA512 1f2014764123a7ae05fa31a562566e993f7e1eff343111461245b6712a0f4da6cb33d2a1e41aaf4bd0f69ccd8c625f0f600b3cc22075676147cf886a0fceffdb
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.35.ebuild b/dev-libs/nspr/nspr-4.35.ebuild
index a95a6afb2447..5a491d16187d 100644
--- a/dev-libs/nspr/nspr-4.35.ebuild
+++ b/dev-libs/nspr/nspr-4.35.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 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-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index ab831d822314..d5ac470189ed 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index e3cceef0261b..7048597d94f9 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -1,9 +1,10 @@
+AUX unknown_option.processed 149 BLAKE2B ceba6d06805d28310bef8f8b098a83b5e87c7ae412ec597c13b61a157e685bd1c6e8bd74b31296116b24b38e3de7e88267f48dd1bed7bcef1400442ef0dfef6a SHA512 8bcec43869fc2748011f252396546479f7f0a87c97fc5b144fee9199156820129bd10b30c74db6ce2a7d5e3f4087546ac66d85922effe85f45a2bb6c1c523e9a
 DIST alcotest-1.2.3.tar.gz 274177 BLAKE2B 1c38baf8932fe16ec3899cd1dd747099065cf93677271aad5ec33706ed7b6fd82dac84f9ed7518c56d178bf1f98a0b131d5e0f4745d47b07021f0fef932fde28 SHA512 0f3e2a5f56a17b6ddf5173d490b8a1aa2b23382bd0535d9d8be09fb8d4dd02dd1b92f9d00b957b11843d671262469e28b3be4f987538e373eb5e1f30c3a406a3
 DIST alcotest-1.4.0.tar.gz 279675 BLAKE2B 3cc50ab37a16948ceca9b5e6aa885fa50bbe0722c6132ed4991fb64c568253d9913287d1b9e5547f59a210d6803e2a83565f02950fb12cb91ed9f8e24d7864c1 SHA512 adb73c8b2be6f47cb406bbc49dba7dc86e990a60e2e68302592a24dcc24e11e76e2aa6fc2f003c1e4fdbb79744df6ab601daff9540cd7b0096ac9f9bff18098c
 DIST alcotest-1.5.0.tar.gz 288227 BLAKE2B 6af28f2516888273903bbb7750ba583778c54447157ece29ad8053323492dddfde9b901699be26c868f1f3835ad89d6f163176033f52ffdccc82fa2609e57b64 SHA512 9f496d1b14a78a9cba5dfde71cbda41d3090d2083bc9895dc9d9f54876b86630079219e678f13f6ffd382deb2a1a298b61b2a222fc65d25d4a242d8c280b4784
 DIST alcotest-1.6.0.tar.gz 288586 BLAKE2B 6e7ab4618d899346de3d8ef63c1b81f92d9cdca06e9df03bf2ea5f0a6b7d5b8ae5a231dc92aca5ebc268e3fda93d448f6edd12333ad6c657ef5361921e31f838 SHA512 58079596334c193d00f22c5fc708952f01b40593eabb26cf9725d51250fc5b816d0bf40c70bab50e9b88a973008a9889f95601127731e8c1583e4ef17173fe9e
 EBUILD alcotest-1.2.3-r3.ebuild 669 BLAKE2B e79c8a3b452332fcd49d7a50644b8be752356e9301e634852191d521325c1af08787b50f79a38c38a37e7b4a0b23de3cd69716a1bad34a9f1320ceb164adc113 SHA512 dcfb8d3059e2754ddfd916838218c7769beaa468cc6c5c0f3b28d20052a9954632d9488ff34f634b64b2f192e103b7a890996b6768b6950800058190f1a868dc
 EBUILD alcotest-1.4.0.ebuild 669 BLAKE2B e79c8a3b452332fcd49d7a50644b8be752356e9301e634852191d521325c1af08787b50f79a38c38a37e7b4a0b23de3cd69716a1bad34a9f1320ceb164adc113 SHA512 dcfb8d3059e2754ddfd916838218c7769beaa468cc6c5c0f3b28d20052a9954632d9488ff34f634b64b2f192e103b7a890996b6768b6950800058190f1a868dc
-EBUILD alcotest-1.5.0-r1.ebuild 709 BLAKE2B 599c80045b2459f3c61e90de0be3e1ed0d8ff6dd647c9be16dc0cc54bd1813107d853cb685d7dc1874e10db3361232be88444a61838062c2836833372cbc74bb SHA512 bf07d19371bcb41b25313b463d58d04e161895e476b45f3a85b732ce2ac445e9964b7e372f53acbffb3af31dc1317f96f2a9757a55f9b3e7475c2498164b1eeb
+EBUILD alcotest-1.5.0-r1.ebuild 921 BLAKE2B ada4869b8280df1e0a0a0851307e289ec71a3fff02274b092f049cc09115e2ab1936432a23dc30ebd5bfe9abd4267c4d9b0f83ce589ec435cd1660b925782458 SHA512 5e9181d95c53fb29ad1c35b81fc616cd822471620ed71ed09520457b7844bd8cdfb5c0632900d841d9c0420e62c16e372d2085bde1905938058347b7c8e38791
 EBUILD alcotest-1.6.0.ebuild 781 BLAKE2B 4e831b1c26bed311bedd6cccf199001316a7c488efa3b708f48711bf82126f9fec69c22a9917310eb698dd820a7ed02c90a6239f875dc19813f2f321f3ad083e SHA512 4e23d56baba6475b65062ede8a1cb18466b3b6e333805f80be66fb9d623c050be7d2e854dbd9bd6fa29d1817e9d926dc234d91926c1561dcac77f057c52aa01e
 MISC metadata.xml 313 BLAKE2B 8f2a0fe29ed0694a9f3b13a3c093cec830ed9bdfc482cfcb78019fa7621f5982f4f158fd8d1505dc7972a9fd4386629433f679ed216a006176444bca75313911 SHA512 72de033c1529758f63f093c39f71336490bf8628cdd51f3c0d40fcafa4602d2a877601bd316851db15097747bf1342840f150d390cd093c843767f6785cdb3f2
diff --git a/dev-ml/alcotest/alcotest-1.5.0-r1.ebuild b/dev-ml/alcotest/alcotest-1.5.0-r1.ebuild
index 9d4860fa648d..7e2047961acc 100644
--- a/dev-ml/alcotest/alcotest-1.5.0-r1.ebuild
+++ b/dev-ml/alcotest/alcotest-1.5.0-r1.ebuild
@@ -12,7 +12,8 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-ml/dune-2.8:=
@@ -31,3 +32,11 @@ RDEPEND="
 	dev-ml/uuidm:=
 "
 DEPEND="${RDEPEND}"
+BDEPEND="test? ( >=dev-ml/cmdliner-1.1.0 )"
+
+src_prepare() {
+	cp "${FILESDIR}"/unknown_option.processed \
+		test/e2e/alcotest/failing/unknown_option.expected \
+		|| die
+	default
+}
diff --git a/dev-ml/alcotest/files/unknown_option.processed b/dev-ml/alcotest/files/unknown_option.processed
new file mode 100644
index 000000000000..fc26b53daeb6
--- /dev/null
+++ b/dev-ml/alcotest/files/unknown_option.processed
@@ -0,0 +1,3 @@
+unknown_option.<ext>: unknown option '--dry-runn'.
+Usage: unknown_option.<ext> [COMMAND] …
+Try 'unknown_option.<ext> --help' for more information.
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a4bc7edd9019..e6f9074e1480 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index e784a4adfcea..24c7c382ea67 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-socks-0.7.1.tar.gz 19813 BLAKE2B e49ff94a63e3b22f082c892da6b65f71afd768ef98064f062facd382e0146e2fca563f2b7438f37e60a01d640199092c201e7ab2f77152829d8d8a64246ea152 SHA512 0f7a295e3d34d6cac78dcac5d64f76439730bf6bc6d287df9f2ed9b7ad3f1c04d61ebfd1cee75b80788f485b338094a4b02ecef2b3a2be172ffb8e1e65332b59
-EBUILD aiohttp-socks-0.7.1.ebuild 787 BLAKE2B 4bf2b00465ce0b50e842c8a7378014a939a06e23b21650a33bd76afb961019fafb225f3e47a3dd3b88004454ebbd793d6967131bda2a0cacf366c1eb5d295c6f SHA512 1a679f53abe3a9d313172aed6a27fd83d8757da9b9a673333f46ead2fbdebbc6704095cb4021593f5929b6ba280a9a271add8053ae3bc71c05504094d5354392
+EBUILD aiohttp-socks-0.7.1.ebuild 794 BLAKE2B b48a9e357ba463a9555aa2d613684ac4d5d2957ae027737f384c9939acc8293a78f2e53e6f9b7d9957d64c754d900c24fc26f8620cd6523343ee5f2a93d965f8 SHA512 747a02df0cd966d6717c449758209d29ef1c7237bfb4953657491f5dd766328e8d72f5299a2fa0987e31048dcc8c466319eaf74da55dda44182c381c798fa409
 MISC metadata.xml 417 BLAKE2B d4d70073cac054e8ce04d03c7087377b3b9b420f1f4352da54de0f6f5ca836cb49774307f01df383888bac24a2bcf9a1c2ab6920f8be16ebdb40e80c253c65ff SHA512 79af7d419eb9fe518ca8ea2a6bd4e2e1cfed7b00a032fbfdc4b05d6c59d9d7ecddd789a70a3db890a55335f293b6ebbc35f74dd73968de82e5147c991534cc6a
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.7.1.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.7.1.ebuild
index 3f13a071d2c7..006f9b41cd32 100644
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.7.1.ebuild
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index 3bb4abe6e7c5..e35dac995676 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -1,5 +1,5 @@
 DIST aiorpcX-0.19.1.gh.tar.gz 72903 BLAKE2B ba3da1bc1f8d83ec6c6d2189aee554b4b819b601d366d0e8858ec73fe6aedddf6a6ed00d56d66c38d18ee44921a4cce7cb83ebf05aec9348355f88b8ed67e1a5 SHA512 b71edf335ad78b1d46b2b23dcb102b29f988d32f75571b881e2ce3471bf48c7ffc9bf509ce1cafec036662bb06d6f90598304c207f416b4124a7b02fdca915e8
 DIST aiorpcX-0.22.1.gh.tar.gz 75206 BLAKE2B 92c481388198fec94faa10482ad4195fe6dce5ae4aa445ce2812e1e81e084c629712b87a3c157aa33ae42335c1a96bdcafa5e389802740fcae8eb9e4aaf43dd2 SHA512 3484da36ce6042d8d4c6b168fd2326c0fc77a825691b95631e54510697708a27ea07e9a808445d504056432adf04f04cb0bc28d4b7194c55c1995096bb938b4d
 EBUILD aiorpcX-0.19.1.ebuild 862 BLAKE2B e7abd298d80fb61072dcdfb3ecdd8adbafcc059a4286310fea6cc2257b1306d4bd5ca05f1b67ff03fc80e49f865c549c39a5d23b025fe1278bf713d8640b7c9f SHA512 c409b754c235ae104f3aced7e4fdeace05c144bb251599845fac18c78fb4fbce8f79cfc360a0cc142dc28afa1a463fe46c082938313a2dbe0dfa19a33f37c2c1
-EBUILD aiorpcX-0.22.1.ebuild 812 BLAKE2B b5f1de29af612f4e68df59af7a7e7f293facc0f70db490adf167d8525dc58458535bcec95631690ad1931a4bde78317aecf19186b2a59a2b982ba6624a1bd38f SHA512 97d36f89a17ac054ae76a9650b7cd045bd9f3bcf382fcae96162473a3579216bf1ae541ca7eb696071fbdcdab9050420bcb624cf8c56662cd706cb9509ef35d6
+EBUILD aiorpcX-0.22.1.ebuild 819 BLAKE2B ad9a0e01851cc8b98dc46e85003752e0d58c3b90b1484f68ec5d6fd58d14184abe641d9e44ed1e622dcbea66ef571f3197981f1a33903ee2e498b3b0963abc73 SHA512 9bfe887209459af2a7bf08b22b81b51e5e9f0a96f5b9abbe666214efde9e2453f4e5c6bd592195eacd371aefb66ef3d2a3554e090b10f1016f73d4ce1c724a9f
 MISC metadata.xml 406 BLAKE2B 9b7f11edc470d0fe068819de2612c0505b69da7974aaa85f42f41449d33e5b3f05105c8a2419a0be96afcce6356ed483a4274bb4795531c58d30603f042e23c1 SHA512 fe0980b5d6bf46d30af528c298d6aa20bdcf49914c01e35542dcc5ddb935e3bb1ed367ce7fe9fda6bf2c348aad8c2d6158ba0f270b320f9af443a8e14ecb30a8
diff --git a/dev-python/aiorpcX/aiorpcX-0.22.1.ebuild b/dev-python/aiorpcX/aiorpcX-0.22.1.ebuild
index 169614b83863..39798768ad86 100644
--- a/dev-python/aiorpcX/aiorpcX-0.22.1.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/boolean-py/Manifest b/dev-python/boolean-py/Manifest
index e9b9243c1c9d..32b64619e57f 100644
--- a/dev-python/boolean-py/Manifest
+++ b/dev-python/boolean-py/Manifest
@@ -1,3 +1,3 @@
 DIST boolean.py-4.0.gh.tar.gz 33855 BLAKE2B 68e183c670684d2f92ad94f2b88616c932c2a85db40fa1a2552bc60c9bf03999bb456e0a91623afba2af4f2c89ef6cacf0c6f0267ac55aadcf02e67c8324c8f6 SHA512 2c92188645c4949478b40c2879f02a0eb6f3f92c0781a910862fcccebaa3476b9f2668ef40a5faec9d5c3a9c7361043a8e1b92ed98e282d6ce89c56b8ac0c2ad
-EBUILD boolean-py-4.0.ebuild 601 BLAKE2B 46db8673327ba34ded945a1bfc0405bcb1d5c20b849411a8b839c1804b080e3a3e381e797ef4cd8f9d1e986fe8d7252e2b2971b15ece71a1b13c156fa5adfa12 SHA512 c562f4cd014345a08eaef7c69cc3e4ab85ca06bf8be55afd8378c1e7af662135a0e83374def78b59b166c7171b061a13d42524bd9abfc7cb497afbc266f95e70
+EBUILD boolean-py-4.0.ebuild 606 BLAKE2B 26db1e694d4992a892575af54d2ca93434af686210160b8154546ecea841230132b2350978f30fc596996cab69709d69acfff36152c2d5c48c1e2c62c98c16ec SHA512 addb4f7319de50b56a001b5e6e4783d1d196fb65a32d9f3c3590870f27d680d9a817eb417d89a1f583b2f832315499967d559c17ee1b6d952616e7f82c9e4c70
 MISC metadata.xml 374 BLAKE2B 4dc485dc736f6d9e3e47ca111cb85e0770d8701bd7a10587f6aaa035723a66f225eecb633f2a127255051637c7f64d17f69d9f449a50f00b00cda766b88503c2 SHA512 940cc16f6dddb68c7154bab0be91f5c5639e4f3563a1efa2d56a4a17ec8dbe70f86f7e53be6cb082283d2c650edbfcddc406419a6acdfe2ebc8035a12b17c35f
diff --git a/dev-python/boolean-py/boolean-py-4.0.ebuild b/dev-python/boolean-py/boolean-py-4.0.ebuild
index 2ea7887ec6b6..7cc0e5662410 100644
--- a/dev-python/boolean-py/boolean-py-4.0.ebuild
+++ b/dev-python/boolean-py/boolean-py-4.0.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 4f0579a8e274..d6004cb0d123 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -2,5 +2,5 @@ AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8
 DIST cairocffi-1.3.0.tar.gz 88784 BLAKE2B 022634825febd3d70a0115f0632e9b146719a2ab802583e0f57ebbd36c65c9e73f4547dbc5ea3651b8b38a043d519f000e908c34b77f3bf49e2ed5ded1a0ca02 SHA512 be459a5f4c1986cf339b7b15fdb7d3ac52476c8c31ff663b4708917ce8abd6fc66860d1966744b69aebf7aebca4415b32166df79505ad42f315ffd76d7163d7e
 DIST cairocffi-1.4.0.tar.gz 69851 BLAKE2B 8037d9bc619d2e96e655dc4682bb95a1e920d0b2188963088c1be21f2e157f7e791f3994f0ae7ecd338547baf2a65d03b175398bc1b3c92145ae6ea148420b5a SHA512 7ffdaf365c1251b202e2680a2f689ec6ea04c19eb75df38137624ffeb429ab61c6f54af450aec019b2570a4e91d2d701328109e4e0f5662a3b3b655ab53705ff
 EBUILD cairocffi-1.3.0.ebuild 931 BLAKE2B 2979d0c07db59eea86e753e79480b1a9550c2502c49435e24c609b20c22a4f84c409541d13f9d78e65ce76677b0cba33bf5b44667f8547dbd833a48459973730 SHA512 c993f3b94bd1481cbc0302bc04e90081870e1639921f4c713eaae4c22905beab8d2a73ed5a433439f2593fac4602021e55232d75d5dc8dbb8cbc1f9bf3474acc
-EBUILD cairocffi-1.4.0.ebuild 937 BLAKE2B c8a8ad84d0cab6ad142512bdde5fa04eb2c4bb59e3e6919f85d92b700446a79af811815416cd1797d8151cfde0ff6a95b3fdbee7dfb675f449d258b17d59e815 SHA512 7d52d7e82a49c3d51b105453e5c3cecef231cc56c1e303d6bd2147df9e6071b3322e6aa6b852515820623e1334c5fb761a28a62a5fe03a72eb0e045236223006
+EBUILD cairocffi-1.4.0.ebuild 944 BLAKE2B 6132a51f8c60ea91f8cb7afee224f96048ee03aa14c7da4eab7c71b6020e1725c9a2efca1bc2ac6e2ce7c9c99e23943efaae12a2f0bc54eafb78cdc20dde4d7c SHA512 b615953b4d9434b15810d9f6548ae2e3c3038188d990d8a0089ac3d2ee396ea2bedd5b475d19008d26921c097798a491f9b87d8289a012e206621f60f4e5f9a7
 MISC metadata.xml 380 BLAKE2B e489f8f463877335d35d1ccd7b04247ff92e5bddeffd36d42a4d8d45f3d48962d704c4a2701b8df91bb38182ada14e19ec6f97c58250f7a9881728cfa319ee15 SHA512 d64dde8aa97fa923c5b13f23539774ebcf02d5ea14b50e01e98c6a3e2f63316ab08a235613fe4bedfc496dd7ffacc2f6e41ea5a2fad310b341ad3ac254b2a522
diff --git a/dev-python/cairocffi/cairocffi-1.4.0.ebuild b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
index d81a3e5ee3f8..8f4018c0e7ed 100644
--- a/dev-python/cairocffi/cairocffi-1.4.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cerberus/Manifest b/dev-python/cerberus/Manifest
index 446901085370..4fb83a694c5b 100644
--- a/dev-python/cerberus/Manifest
+++ b/dev-python/cerberus/Manifest
@@ -3,5 +3,5 @@ AUX cerberus-1.3.4-raw_docstrings.patch 695 BLAKE2B af53c17d8b683e1d88e744330ff9
 DIST cerberus-1.3.2.tar.gz 149344 BLAKE2B ce65f3c4c612f87562c28f913cac95c1c7af9b2dfa72955bce3f0e0459e4ff9024a126ceea4587e2c72cf606be2a249046a090a2e2d5e908bfe4b700ba5e9b92 SHA512 e9cfef5a936783eb0576afd3d23397dab38d8c88b6b43f98de0ad7e20739e5ff983eaf4ac769206adb7fe9692c651583f6a5f2bab263b81b8de96f45707c84fb
 DIST cerberus-1.3.4.tar.gz 926258 BLAKE2B 6fabfcf32e26ee7f4881b64ce9c3098a27949d95fd0998e09b7adcc3b834033f904a07b6e9b2cadea218b952142f6c2bc6051d8c208a14d6e8172a0c3823c38b SHA512 c816b426ed1b32367d1e8f1c26d6ddd4b49c6578540e688baf693e3094a05800f645cfe879be6378c1e9be9899cad7bc2ad1ed9844d6762d2ef6e0cc54a7476a
 EBUILD cerberus-1.3.2.ebuild 555 BLAKE2B a2daf7c5987368b3c9c85ac67137f263200fa99819c204ecd89f7175a91a39a7415d9b567a944be7dc4e71d4adf0efb0c0faa97040eafde1772931c0f684b8fa SHA512 7be0b457e94d62f49d6b24c448ec98c07394a31c8f9f773aa0f8d0090664a23ac7d0b232d26a3b9546bf0d48ef8b7da9078b160026282388c3e8aefa5000afb1
-EBUILD cerberus-1.3.4-r1.ebuild 836 BLAKE2B b451bded8982c9b48547ade6e9236906dad652ae6a2fd026f7ee1e5e7a2db99fc495f967fe80338f8577d9df4711b2a834b75432b3082a1a86f27cacce965cb7 SHA512 eab388bb6283f373da5f1399a3402617c12b3df595cf4c2fb371367ef0c5b38af4ca71337054f2fb572a5c24a50a72a386df8c18c4ed88175ed1a0590301cbed
+EBUILD cerberus-1.3.4-r1.ebuild 841 BLAKE2B 2fb27b20cf2685a8f2a9ef5c752f42c2e79d91d5323b50e1e7642c6245655c5523d234026f10e28c719016fe5980bdc44971c184694e46a0285b21f49e2e3d11 SHA512 97f4a87ba7d609125ce912c778b9a6601614376638619a00a54d506efc0830b0a9a5b54034078ac5538beff365ca08ea20609264e4b23de7c54a42fe265b2ae1
 MISC metadata.xml 395 BLAKE2B c9dc795ac8b1daba3bb10e3aef517b28be2e88b26f5e1192c380bca300ef929608e2b2bcef23adc710e01d41fcbc640c97429d6d8ee61fe4a78014aa181b528d SHA512 c1abc73709d977c4f7a3e989c335f0d1312d07dc843dd88faadc633e2dbfa3371c1cee566a481ebfaabdba60e0a8f00068ce8a83ce9b05ab091c35917b8c146a
diff --git a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
index cb6c7e646ebe..c8a27d829a9f 100644
--- a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
+++ b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 8ae2a218cbbc..3e252532f4a6 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -5,5 +5,5 @@ DIST Flask-SQLAlchemy-3.0.2.tar.gz 128634 BLAKE2B 0203de67bd4c3a61562ad8bd69b6be
 EBUILD flask-sqlalchemy-2.5.1.ebuild 770 BLAKE2B d197db5d301949b5ccb7a911fdc40d9a69a993327517cc41c08b0c889b0d0c68865234ef8953557216c7996ad83a73463a87db6f2fc9beed655fa6f26234e089 SHA512 77f2e0076a57ec17ae06a36a3a7304ed6a9cf12c4e74b50589c8be62ea54c4455ea34dfe032bb07d0a47ee39afd5e6260dc6bd4403e2fd49b193aed62a0cde2b
 EBUILD flask-sqlalchemy-3.0.0.ebuild 843 BLAKE2B 5cb91c6e7068672dd5287b7006c6a8dd3d14387d958a38f58f19700f3dbc9b04e2873489f8cd6ad738886d5fea35bea2c2c6afad805815249620dce4bc24c693 SHA512 3f5c3ba2ea9ec2ff1bf429f42baf00132570c36cf2bc0aca40404ea2a71eb952850f7e1c2bfdd994aeec638bd03c2be624eb852b220355a2fcf8c26e0fc9e241
 EBUILD flask-sqlalchemy-3.0.1.ebuild 897 BLAKE2B 29b4aa8c2344c6bf13f306f16f00f38e19a2726203e536b1027597de390ca9346c1a8cae23139d08c1ff3c2f3747375c2080556c53535adc5de7f053d1e63e1c SHA512 d285269ee19c0617d5047cba100d7d1fd049e6622a7ea1d419371ec211e8c6bb6ee6eb717d62ba206cd8ec7a1be3352bad6b51ec5807ca65b5d2dd3aaed57d2e
-EBUILD flask-sqlalchemy-3.0.2.ebuild 897 BLAKE2B 29b4aa8c2344c6bf13f306f16f00f38e19a2726203e536b1027597de390ca9346c1a8cae23139d08c1ff3c2f3747375c2080556c53535adc5de7f053d1e63e1c SHA512 d285269ee19c0617d5047cba100d7d1fd049e6622a7ea1d419371ec211e8c6bb6ee6eb717d62ba206cd8ec7a1be3352bad6b51ec5807ca65b5d2dd3aaed57d2e
+EBUILD flask-sqlalchemy-3.0.2.ebuild 902 BLAKE2B 2791d0b1b317803cbd32dd5c61a79a35e4528375cacfa221716a6de3563efe314ec9c8c0dc1b2871e512e8e4b8f0f8a4ed0873fb757d9edbb2278722d69d62ac SHA512 4c097410adf279be379a541111c599f3243fc266484eb5716064a57d0eb06b87a1df3caad00bb32c88d5e1eeaee6eb5f2f0d66941838f4a99645bc2e4fdbcfd3
 MISC metadata.xml 728 BLAKE2B 460134fb84c2af57ce63bfe8c25a248ae4fb8c97bcc669807bac949d4f8c33ad728b6757ee96abf36354e3e1931cad1fde4cb3d17486c98c93df3dfa178c132b SHA512 72190b1d84680e846b3aee8dba5e2e9d3b172fdec925b006b182e9f7fec62c45042b8549ac6c5c32e80b5f4e1ec34b08ba14d9719fbec63739c46b8bcb2078fe
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.2.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.2.ebuild
index 4f1c66408c0b..bba4a508aee3 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.2.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/flask-2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/license-expression/Manifest b/dev-python/license-expression/Manifest
index dfa44f5ed87a..efa3372be971 100644
--- a/dev-python/license-expression/Manifest
+++ b/dev-python/license-expression/Manifest
@@ -1,3 +1,3 @@
 DIST license-expression-30.0.0.gh.tar.gz 153630 BLAKE2B 4231bf14e69705fbf40cc4af5f17a1070c780d595db5ab0098b318eeb7289740b86319c683e61aaf844a1cc5b8598d832f14e4eeac354aff37f7b82e5437df1d SHA512 ce6e3a48c1e035e98c3831180bdafb1d70afe94b1d0148c47941129a8223b8b39e11af9407b255ed7a3d1247873c18848f8236c0a805e9b2333c6d59506aad12
-EBUILD license-expression-30.0.0.ebuild 749 BLAKE2B a9a1259c302acd893f300eb9bcc40717ae18130cccda353aff8da09ab197acd7092aaca257b5f52ab6feed0d4a831285cd6ae67db97073284662f3c77d255e82 SHA512 f70272513d202ccc5d23632e92bea517f207970c13b8ae6402a8aa0f8f94d51bce64f62f6f2b45ff6a25394c991de284f3693822850b3e267f4f6ad90a3bfa4a
+EBUILD license-expression-30.0.0.ebuild 754 BLAKE2B 51ca3fff4ac84900470632f7c53ca3a4c82b33ec903ec322b710fbe05288fbe2e1aea9022c8b75ced0e79acd5c848dee1ccaf7d7c177c7446d79bb921beaf1d1 SHA512 52ad224a5c617709261e8fc10f2d9c6a94b66bbe4a530ac08c77e83c0ff6b77fc17c9b8922d387600f00697c12ac219ca314de53935418cde08d698b9d874382
 MISC metadata.xml 387 BLAKE2B 52d862f7ede77b8ab90dbd9ed2949f1c4a2b289458cff0f2e7042bf43be07b7d7e63ff94f0a10aa1db41027b3441be721656def8d59ba54155d3226e4bd30b57 SHA512 7ba89c3d94ef921fad190a85655d032a7e3a0c5794d0957c3a30ff73c75b717e87517f5f2547408426479d646ac3d157f7e659d66a18d4081689b6b41136b268
diff --git a/dev-python/license-expression/license-expression-30.0.0.ebuild b/dev-python/license-expression/license-expression-30.0.0.ebuild
index 6312f36bcd93..f2da65df50fe 100644
--- a/dev-python/license-expression/license-expression-30.0.0.ebuild
+++ b/dev-python/license-expression/license-expression-30.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 86c042c3afe0..40d0fb0f5364 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.concurrency-5.0.0.tar.gz 59343 BLAKE2B 412fba38e0281b2c6d7b27182d159c99730a22ec3400586481f234998cd2f446de5cdd84aaa3abb1cdd93eb9eff1294c87ce51e165dc49caa078e69932ecd19b SHA512 570acbaf599a8a177ba6bc7c009edb43db5e077c06bee5c5895d81944daf78c8dde197bd9af730b17b5075fdaf527252aa44ea0edb79d73e16714582645afb7e
 DIST oslo.concurrency-5.0.1.tar.gz 59944 BLAKE2B 76962f187d58c514f7465a5cac2e695ee83ca020ae0f9d0d0d5a8e27cfcfb6d008f2df97f8b353ef2e7c57562b2cd169a4f6ccfb16bdaefcce1ace81445a64a7 SHA512 5987900e71020b2b8b77eac69c3541647c1600cb8a51f02d45938367e45ddce5e71b874a1eda79aadfec51d639fdb895f056964d0b4bd9bba597ae9423f35463
-EBUILD oslo-concurrency-5.0.0-r1.ebuild 1285 BLAKE2B 063aef3f21f12f0b6532d028d27e73739c54e5f481f5909536fc4235c7de243558eb21633d7fa203242d873d40e3be8f750a2fec88ff99a7ae86f171d90f6ff3 SHA512 648aa87693351426fb31348c3d5091f0325bc229478bb15f687f5848ab7a5b21df3ee7a663f3d5ea8c0c54b0bfbd659f924f190db50e2176c727d1a72ae9f3aa
-EBUILD oslo-concurrency-5.0.1.ebuild 1224 BLAKE2B 4db3782d20b0f0054664e49ec9756c63ce7f894f88347bf0bbebd780118c48ff35503a60616778e01649c77bf26df91fa033dd79c2b6e3802ce6824321c3f2e9 SHA512 92c35947cdecd09f3555b3a53067f53389dbc2916fa82a7a1b5afde4a403c5c1fce36d1ca400f369ea3235acf79a76505eb31430caa1b704bf57e19df8163fa4
+EBUILD oslo-concurrency-5.0.1.ebuild 1221 BLAKE2B 33f3e547e7488c9efce8664edd49851a3be35181519ff27d82c287b6a99709b929f493e0a482cdd3ddd0b11ebe32054e37689830b185924ba131218e3643d23f SHA512 bcc287bdfb3149d3036db3ea93143397e3640a5f08730d9b2dafac6b0ae7691e0b06da4779597448c164a1301dc00a75e7f371cf44361701f48671a8374bf45a
 MISC metadata.xml 423 BLAKE2B 965b9f3a9b25cd0f93f13bc12af982b8435e946c1317b6c3a013d016ac6ac3df39f94e1a69f6ef28355459cc5d59fa32c2004727e6772696dab755aee6ad46f4 SHA512 ffc8e1547e6f8356071744a4cf2d5f88d02f2a34322857245c68057699f0b87ea351a7821682ab3d72b777260c8887524467a201fe931787fa1b2ad67eb022a3
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-5.0.0-r1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-5.0.0-r1.ebuild
deleted file mode 100644
index 9e00ddce9f84..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo Concurrency library"
-HOMEPAGE="https://pypi.org/project/oslo.concurrency/
-	https://github.com/openstack/oslo.concurrency"
-SRC_URI="mirror://pypi/o/${PN/-/.}/${PN/-/.}-${PV}.tar.gz"
-S="${WORKDIR}/${PN/-/.}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/eventlet-0.19.0[${PYTHON_USEDEP}]
-		' 3.8 3.9)
-	)
-"
-
-distutils_enable_tests unittest
-
-python_compile() {
-	distutils-r1_python_compile
-	if ! has "${EPYTHON}" python3.{8..9}; then
-		find "${BUILD_DIR}"/install -name '*eventlet*' -delete || die
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-5.0.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-5.0.1.ebuild
index ab3fd501a07b..79f8caee01b2 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-5.0.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-5.0.1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pbkdf2/Manifest b/dev-python/pbkdf2/Manifest
index 3f525f14f811..f943a92429ee 100644
--- a/dev-python/pbkdf2/Manifest
+++ b/dev-python/pbkdf2/Manifest
@@ -1,3 +1,3 @@
 DIST pbkdf2-1.3.tar.gz 6360 BLAKE2B 0a449b593fb1dddd604db687dab1fcdbeae37819dc17d7a875d8f592b1a45ac16903a77de46b72d87fbc2d41217f044046c4b4cf3a10b579e4f21e151d8512d0 SHA512 1297950d045f9b56f5eb9f771fe65091802c1f12f090a8a80fb5e36bfa10f1c1ac3b9dc8088f4a640b840fb7073aadd3fdf39f3979118046ba5cde477d071244
-EBUILD pbkdf2-1.3-r2.ebuild 538 BLAKE2B 022327a73a4acd6224691c552230d544f6d581673ea087d112dc4fbecf787d92b6b606d810f19a18f155f7809666abaa724484ff30ea0e454657873d9e2c4d80 SHA512 46edc0c483697cbef5b4801665b42fc38950742ab341f27ee4ba8fdc6db3ee6c3cffbad648862f01f87f3feaef5cbf0c111ff718b22bec13bf67040b169c1bec
+EBUILD pbkdf2-1.3-r2.ebuild 545 BLAKE2B 881c9f753cd63f806538ccdf0bed83ac6c9fe0f1f34bb4b4f39550b68fcc61c88e315d75688d0ce4c9716a508764a32cb5c574cc5ece13b588f20c7a8d6f2b24 SHA512 72795e8064190a6b7cce01fe178a3a82b83babc22df793c26bfad06d7aab9f0328bee95f91cea2cad4dbd241a596f905b08d3b3449aceb88276560535be5266b
 MISC metadata.xml 515 BLAKE2B 9629265ebd206e27e03ddce87f0dcc2fb6a126f5ea4340d4f0468eba0329c966bafec686c6ed96d9e36e8bc24ac1aca8a607f9f068be1b76a1abb56cd5869462 SHA512 fa169d02819b18ad3669ce538dae1fc218c5f77d055e04d3c68be1a29841ba791cd84e07150978993c0481d4aaa9ec32001385ea13c0772fadbfcadaf274a28e
diff --git a/dev-python/pbkdf2/pbkdf2-1.3-r2.ebuild b/dev-python/pbkdf2/pbkdf2-1.3-r2.ebuild
index eb2e1d7cf444..78b53146cdb5 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3-r2.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux"
 
 python_test() {
 	"${EPYTHON}" test/test_pbkdf2.py -v || die "Tests failed with ${EPYTHON}"
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index ac4333fc6ab6..47dc011664ad 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,3 +1,3 @@
 DIST pdm-pep517-1.0.4.gh.tar.gz 314677 BLAKE2B dc6fad5bf6bd4aa6d9d490c6fb1df0d1a1543ae93f90ac4d53bbd515de6f6582a4fd032cc5c67aeebf71755fec6aac3b5a462a18eb08087c6a4da279e3c989ad SHA512 4edd016873c054f20efc39b8a044c2ff5dee70509c45ba1227e6982043dabb5ed0353afef4af73c88106ffe5a2c27f569077448fb27a0d58169710d2c6573c2f
-EBUILD pdm-pep517-1.0.4.ebuild 1304 BLAKE2B 9c64a823bcd948a7470bad0415126759e4190b63123c0c3785836704446427e0492c89799656d8591343cfcacedf227e99a4b76d490fa48f0628d3ed4e439bac SHA512 3a4a917d96a70c558dc0259709951b0051002f3eae71e0bf9390df428ce563e77ed02321d505036aa157cc19808e5c87864f3001948ad2195a8b1889ce72e915
+EBUILD pdm-pep517-1.0.4.ebuild 1309 BLAKE2B c2c29ad327bed8054de90d8be424dce64baef3dcc76fad1a3516166b9d189d907b3dbf0d342120f7575671adea9b3c2d2d4c129fcc1fc116300e590673ccca2c SHA512 4a9cf172f4a931fe130ae95eca978031fc931bf8821e0a67c65521bae94b76b1bb4736e8b7bc0fab5e41e0da083e76e196844c7db6c9e3b602febfa4b34ec53c
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
index aa574aea696a..1033ec44b0ee 100644
--- a/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
+++ b/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index b2dc24f96a50..daa6a6b39bbd 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -5,5 +5,5 @@ DIST pikepdf-6.2.0.gh.tar.gz 2905445 BLAKE2B 07a6ade367c438ab5df885827d7610e9982
 EBUILD pikepdf-5.6.1.ebuild 1597 BLAKE2B 8319cb40e4d91004e5b7f9de651dcd0814cef376e9e05a309f86ceac434bce74f5f918d2ea011d7be55c63455b6fc6b2ee4356d89df581f22d924be8ec466d8c SHA512 0d1472ddabaa4361b2fc5485e2f89832b0297ff4960ba782d965f5a76e0874f2f2fc9bdfb8d171c650b98a1859eccbd2f3f248fbdda5a7ced1f89c3494aec211
 EBUILD pikepdf-6.0.2.ebuild 1631 BLAKE2B 39e3fcf6a88b8abae291b19cacc0a765549573dc53cbfc19edf2196b2c9f6b254598e2459a4037db6e44abadac5f16bd5e9bb23222dbb740e24fa060fa82b84e SHA512 8a6a5a16cf6549e92fb2329821e101bc6454bd3dbd9e7429fe9990436f08f3c6736dc59929cc51863aa8be80b41b56e42d1c634beb4f8b29e3ff0d885b16a6da
 EBUILD pikepdf-6.1.0.ebuild 1631 BLAKE2B acf667cb77539de1d593e716cbd4cb5d0ff5ed445109624a9557984d719287270014bddd957021c663c86c2c091b2c7701d32b3f5a5bd317fb3c3ecadeee6724 SHA512 1e316d672559e840eb9e14f2e1d67dab21f057e5e1a254cc0f97779183af32394d6544464e52a15e823e583be3981eea0e729e8223437f676bac165d951d7569
-EBUILD pikepdf-6.2.0.ebuild 1631 BLAKE2B acf667cb77539de1d593e716cbd4cb5d0ff5ed445109624a9557984d719287270014bddd957021c663c86c2c091b2c7701d32b3f5a5bd317fb3c3ecadeee6724 SHA512 1e316d672559e840eb9e14f2e1d67dab21f057e5e1a254cc0f97779183af32394d6544464e52a15e823e583be3981eea0e729e8223437f676bac165d951d7569
+EBUILD pikepdf-6.2.0.ebuild 1638 BLAKE2B d86950cd65b3bc01c54b320f45abd7663f1225a125aa039d122c1c16366e29e2a214f3e52d1a027227fc4ec7584ce166b06d6b2c8e72dc4b23f7209bf958ed39 SHA512 41084d0faaddc8f64ee67dad854c12ecf88351d165b9ea8a8a73bac0ebdd8664e9e6ff8283936c92565b7a2cbfb9ecdc48bb80291eba9b3f10c30112d8f05aee
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-6.2.0.ebuild b/dev-python/pikepdf/pikepdf-6.2.0.ebuild
index 2c46dba61a96..2f94f1d1f970 100644
--- a/dev-python/pikepdf/pikepdf-6.2.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.2.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=app-text/qpdf-11.1.1:0=
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index 46d5bbe61f4b..79f8f3d38056 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1,4 +1,4 @@
 AUX python-xmp-toolkit-2.0.1-test.patch 397 BLAKE2B 059d415194f4544de5e4f6bfcbc2bec466b14e72e46792ac762115dd8b33bcd87ebfcdc9412695bd5b75483ac6e82024c083725ed73713c1bad100c30f22448a SHA512 f70eb11fe5b46ec0fac9a4a5c56a7a5b9dc75427b53e8159ec873a74afde23ca4bf5940b185932fc566a10f8a47d2ff8e56fa514eac1b06c94135cfa7070747b
 DIST python-xmp-toolkit-2.0.1.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
-EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 855 BLAKE2B 7e974836479c627c9bb13d09dbb60f9fe73f5c551cf84143b48b67b0d03843fb10a8ef09af3aab59b1beab2b71a77e1756c8da83ead23e1c8194037d1719fbf7 SHA512 42d25cd781bfd61f37eece5687d923c364d5894865a64e11d1662c22e56313d1e8a7f072823970fc03bdeac14b576e18e3b075419ca038755f8c204fb7af850c
+EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 862 BLAKE2B 7bc8706d15f48c2b392a5efd3ee43d41d55ed4f62a1fb4299c0620839492c361394806e75d4275ee671de5d50d29ef037fd9f14502f4ecfdc2ff40f120e51dcb SHA512 9d0718a95ebda96d028e7753b7590a19d7d147009ed351358db7341e3dc7e2374201875bf2b1c8469e0cbbd999e47502fa39aa7146f061cd9b215ae3d90955ce
 MISC metadata.xml 417 BLAKE2B 818d54b619c9571b00493c9c463f4e2899c187071918f9e74189d8be23b97f4cd9a8ca0313c5f26507f9e581d8e268be3fe17f03c3f409b1eb333540fb48d380 SHA512 dc5ef8f44af10a54da69fc6bbd392c4da30ecc49c829f2f8c26022e2d42da3ab0a705f31bd72f404454fe76daf1162ecb72ea1e106c93a48cdf100b59f492a91
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
index 7bbdaf0c0dd4..1b45294f2f4b 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
 else
 	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Library for working with XMP metadata"
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 53120c2091db..d9e6b93d4636 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,5 +1,3 @@
-DIST SQLAlchemy-1.4.40.tar.gz 8277132 BLAKE2B fa4362a8abec9845beb3cdb65de4066a8a77a40518187a624af3207198395ae3702db5ca5f65970ec7485e8647bdc5a8685f5d9a3b772778c7d6ec66ad820dcf SHA512 49b8ad8becd6fb2c43615890ef05554ce151f44cda20971a585ff5b325a6a91bb356a3c4320f4b1ac877a9eccdca9bec65cc9942bc5948d4143495b5c884f458
 DIST SQLAlchemy-1.4.41.tar.gz 8281227 BLAKE2B 31fb2bfcb41ceefc2c6ed70444b5d8b38a862e06899dd9b5ede7fde0b624ce9f8be766028aaf32b36983268c35e61d87ada5a597260fb97efe72bfc27ce15a71 SHA512 f03a2d4d61a108b4091a4d2ccf2bf49ea22e6c30fcbd70758f89dc3817968e7b5ffa603ce0158812fe42814cd08bbadd00079609a47765d3c534d769835a5543
-EBUILD sqlalchemy-1.4.40.ebuild 2617 BLAKE2B 8463ac4ba31b500c01b444cd7b305f2c4dfcc9e39752e68fa0d82b6e7a45a34c55fb72fc87e36035139c714dd5c74fdce6a9f7c9f5c39aa1e4b52b1c0695333b SHA512 53105444a9d92f70b4823ba420d533358c609f6e567911fbe1231eb791d552f6d2a34540718c2ed224b1fdb54d09df7faa04eb9f0684322cb11853b28eadd4f7
 EBUILD sqlalchemy-1.4.41.ebuild 2690 BLAKE2B 91e714783cea0d60aa2ad38dab70bcb1defdb4db95977958970c9ca14d58a66fd7c88ade7a2f8ef392e32238161c94dc28457288d223a1ccf506fb66f148c46a SHA512 2dbb1cbda431533fc0ca7f554c819c1f190f91b6e2c1c00216009a987fae864046109eb8656ec1b50450e7b70d090719e82a6f3c5dc313c6e05f43e870ffaf7d
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.40.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.40.ebuild
deleted file mode 100644
index e4039b787fa5..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.40.ebuild
+++ /dev/null
@@ -1,93 +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=( pypy3 python3_{8..11} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4a413409a9e5..8c77d3ccdb56 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index badd33abc1da..a30856ec89c1 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -6,6 +6,9 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9 SHA512 b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
+DIST ccache-4.7.tar.xz 545560 BLAKE2B 20d08092e775354f84699ed48a88f8212517e7202ff2bc1bc381164341d4058b598d2a4981e35059ac10fc46ada183c35056732f1a61c9d14185cd41839a7485 SHA512 af7010de1f44bf5be9ba62a3af54af6b19e01b6dddf986a52c37106676bc3a5bd2298cccd2337cccbacfd1c148de177612c2bf24d254c6ade9dec253a0a62efd
+DIST ccache-4.7.tar.xz.asc 833 BLAKE2B 4c868467e53fb21021e5f553b6660b94f7fc93ba66d1798c09f09a281124f8351cbe29fcb621637e29c1f6f24468f0a9a6423a33a1691c220f929a595e961a56 SHA512 e88e8cf2ee8ce9015a93eefe3a7c8dab58da3e50536b5af8ee5013f6cb2af9928f82b4a6d9c4af2880e14698819f63c434324e45aa667e63e9fd309aaef448a6
 EBUILD ccache-4.5.1.ebuild 2295 BLAKE2B 8b89808a850d5bb512a9672d719a800c9f17fd23dddc3bb5b1c0626b4160910bead0ca27137d734340ca9a60783349b97730376d5cb35473698b843203758d7c SHA512 96c0b4dbe479a0383fb28fda5f262e4490625e0ba137e5435ba8ee9702d14fe68c42a04a462792ff96aa176e3676a819602e2e50cb989d5061842c188d8fc5ba
 EBUILD ccache-4.6.3.ebuild 2583 BLAKE2B becd6116917e1e64e1b6d7168cf99af6503196a0d414735f926b72b66757fc649e0f68df851d39eb7733deeb0b339dadea320b2a33fa3976fb1c180a5aa14c5a SHA512 b917373e3f5bf306aad19dba9df0200bf0a20b2a15a16ca91d87fdef05adcc16eb7f87999884bd83751ba3bc9f98c883cb0f0627f28fa740d0403eb7fc915c7c
+EBUILD ccache-4.7.ebuild 2583 BLAKE2B becd6116917e1e64e1b6d7168cf99af6503196a0d414735f926b72b66757fc649e0f68df851d39eb7733deeb0b339dadea320b2a33fa3976fb1c180a5aa14c5a SHA512 b917373e3f5bf306aad19dba9df0200bf0a20b2a15a16ca91d87fdef05adcc16eb7f87999884bd83751ba3bc9f98c883cb0f0627f28fa740d0403eb7fc915c7c
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.7.ebuild b/dev-util/ccache/ccache-4.7.ebuild
new file mode 100644
index 000000000000..e6fd6165c15d
--- /dev/null
+++ b/dev-util/ccache/ccache-4.7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+	redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )
+	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+	# Mainly used in tests
+	tc-export CC OBJDUMP
+
+	# Avoid dependency on libstdc++.so. Useful for cases when
+	# we would like to use ccache to build older gcc which injects
+	# into ccache locally built (possibly outdated) libstdc++
+	# See bug #761220 for examples.
+	#
+	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+	use static-c++ && append-ldflags -static-libstdc++
+
+	local mycmakeargs=(
+		-DENABLE_DOCUMENTATION=$(usex doc)
+		-DENABLE_TESTING=$(usex test)
+		-DZSTD_FROM_INTERNET=OFF
+		-DREDIS_STORAGE_BACKEND=$(usex redis)
+	)
+
+	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] ; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index f0245535c0a4..06b05c800246 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,5 +1,5 @@
-DIST mozilla-rr-5.5.0.tar.gz 1477110 BLAKE2B d37162ef68b20f1ce7878c338f480e6e1ba1850e37d2c6728705b3ab8791897bfc238c950fd5f318dc2ba0be0df04571888092418b227e396c2c524121ad8345 SHA512 4101de8ccf46533e5fc8e72f99bff39253a40543510d9bc9a611ed0909efcd45a050244994a9ebc878d1c6d0af548ec7e2879d1e737f6455db732f75175ab497
+AUX rr-5.6.0-linux-headers-6.0.patch 2303 BLAKE2B 3f804757bc221617939bcfd128546f2bb66d0bd5ec8efb42a6cd05b0aac6e83513d8df89e7838673bc53228801d83ca57a888701539007b73ab9a734d6e2674f SHA512 21216496235e7d7507d319a0b8489a96f44f711dc0727b6bd1828ac80e1ac174a9bf2c9ced7ccadd0cd6d6af64a7a2b1a3f71a25816bef8b6d6e2f884ecd85eb
 DIST mozilla-rr-5.6.0.tar.gz 1579320 BLAKE2B 14ea99c4486c72db844b5cad3f0c300d7bf5d49449e7080ed0484f89022be6d9b7f81b3808b65f59028a5256a6b3f6508729d5b7e8f3f45d8353ceb7ae2a577a SHA512 4b5ef65b6c6a4b62fc72949b4541aaf608f6133ea0b6c2e529a8eed725e6a0b5186f20ed60b210821e6929410e1f21723840eacfdc85bf12c87703e7ebf5f9a7
-EBUILD rr-5.5.0.ebuild 1343 BLAKE2B 9048afde5c6633ddae144e92d5f16f8ea8b463089364bb2e4daf97c86b398fff5cfd4c4245083323de6af4f88573686294a670a571ba9d1e3ee11f6cf7d6da97 SHA512 91094025d740dcb1a357400e1edc2598de8dbd4d7aadbdff0f153b7789647d18f0d9949ec4a05c5ce34496841ac48fa91b5971a05095fc036695277a7d610680
+EBUILD rr-5.6.0-r1.ebuild 1487 BLAKE2B 3ab41e5c4a3febb41e810b4c2f063c92cf58935632c1def384c81cad64f55aa95469e5bae91dc46820cc1c945946525b43f68cb81c624902defa0801aca2e4c0 SHA512 15e6f1b099e16dcf0deb9b9e3f6ff1199002ff0e41060e51f4fd5f44d6fd8127876c22954eba83b48767792f4f45445766be58c7c19a72178b1e603d4ab4c57d
 EBUILD rr-5.6.0.ebuild 1426 BLAKE2B 3a342707b60f863d85b32eef3b7692225df1c9ca795aae0e2d3ae454e945f02d915e4452f0edd932d50091aed7dbd7c982c55dd28fdd65aa12dcce9fa7e1825e SHA512 828f8e4e466c8790f8217f59c2b3023a02de5bc0e5065911d438cc95d91c7c0b822189d12c479e0a78db3ed771ca64e4cce5489d00b1b69924e914461443ef92
-MISC metadata.xml 444 BLAKE2B ffed074f3322dfc2fb772a2b5e7056c1899e9f424e41f774a9da86af028322f5e3b4e371fbb624b9448733c30778fcfcf4cd7a54f40148d9db24702d5beb5a6f SHA512 481d21665113f88c355c0097b6ba0980d62570d53eb130096ee8db32c46eaa1e5f8f9746d2f7a9bf1bded5b725d4805d875abb81e2d7cb6e7c3fc8cf472c3274
+MISC metadata.xml 448 BLAKE2B 2ca27171b81983b513710708955b70a7a73174ca72fb8bac4c8363a5f0fb464431d9d84d3be7818e4132ff7ca9b2f6b3325c526e6424bbeac8ee6dad1728c8cb SHA512 01fa6e40deff5fc58f51b90f75f93cf38f10ad58e994153045954ebc9d00dc41e7d8ea625b2b882a376cb0db1dbcc9e1a025c85f9fb584ef7a46b6db812b649b
diff --git a/dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch b/dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch
new file mode 100644
index 000000000000..36a911bcbece
--- /dev/null
+++ b/dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch
@@ -0,0 +1,62 @@
+https://github.com/rr-debugger/rr/commit/2979c60ef8bbf7c940afd90172ddc5d8863f766e
+https://github.com/rr-debugger/rr/issues/3369
+https://bugs.gentoo.org/877157
+
+From 2979c60ef8bbf7c940afd90172ddc5d8863f766e Mon Sep 17 00:00:00 2001
+From: Robert O'Callahan <robert@ocallahan.org>
+Date: Thu, 25 Aug 2022 20:40:59 +1200
+Subject: [PATCH] Avoid creating a struct with elements after
+ ethtool_sset_info's variable-length-array.
+
+Resolves #3369
+--- a/src/record_syscall.cc
++++ b/src/record_syscall.cc
+@@ -1450,17 +1450,17 @@ template <typename Arch> void get_ethtool_gstrings_arch(RecordTask* t) {
+   AutoRemoteSyscalls remote(t);
+ 
+   // Do a ETHTOOL_GSSET_INFO to get the number of strings
+-  struct SingleStringSet {
+-    ethtool_sset_info et;
+-    uint32_t data;
+-  };
+-  SingleStringSet sss;
+-  sss.et.cmd = ETHTOOL_GSSET_INFO;
+-  sss.et.reserved = 0;
+-  sss.et.sset_mask = 1 << et_gstrings.string_set;
+-  AutoRestoreMem sss_mem(remote, &sss, sizeof(sss));
+-
+-  ifreq.ifr_ifru.ifru_data = sss_mem.get();
++  ethtool_sset_info et;
++  et.cmd = ETHTOOL_GSSET_INFO;
++  et.reserved = 0;
++  et.sset_mask = 1 << et_gstrings.string_set;
++  std::vector<uint8_t> buffer;
++  buffer.resize(sizeof(et) + sizeof(uint32_t));
++  memcpy(buffer.data(), &et, sizeof(et));
++  memset(buffer.data() + sizeof(et), 0, sizeof(uint32_t));
++  AutoRestoreMem et_mem(remote, buffer.data(), buffer.size());
++
++  ifreq.ifr_ifru.ifru_data = et_mem.get();
+   AutoRestoreMem ifr_mem(remote, &ifreq, sizeof(ifreq));
+ 
+   long ret = remote.syscall(regs.original_syscallno(), regs.arg1(),
+@@ -1470,8 +1470,7 @@ template <typename Arch> void get_ethtool_gstrings_arch(RecordTask* t) {
+     return;
+   }
+ 
+-  sss = t->read_mem(sss_mem.get().cast<SingleStringSet>());
+-
++  uint32_t data = t->read_mem((et_mem.get() + sizeof(et)).cast<uint32_t>());
+   // Now do the ETHTOOL_GSTRINGS call
+   ret = remote.syscall(regs.original_syscallno(), regs.arg1(), SIOCETHTOOL,
+       regs.arg3());
+@@ -1479,7 +1478,7 @@ template <typename Arch> void get_ethtool_gstrings_arch(RecordTask* t) {
+   if (ret < 0) {
+     return;
+   }
+-  t->record_remote(orig_gstrings, sizeof(ethtool_gstrings) + ETH_GSTRING_LEN*sss.data);
++  t->record_remote(orig_gstrings, sizeof(ethtool_gstrings) + ETH_GSTRING_LEN*data);
+ }
+ 
+ static void get_ethtool_gstrings(RecordTask* t) {
+
diff --git a/dev-util/rr/metadata.xml b/dev-util/rr/metadata.xml
index 873579e9b8df..dc95c45f1987 100644
--- a/dev-util/rr/metadata.xml
+++ b/dev-util/rr/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Luca Barbato</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">mozilla/rr</remote-id>
+		<remote-id type="github">rr-debugger/rr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/rr/rr-5.5.0.ebuild b/dev-util/rr/rr-5.6.0-r1.ebuild
index 73cc6777d148..096ff7b1f8c8 100644
--- a/dev-util/rr/rr-5.5.0.ebuild
+++ b/dev-util/rr/rr-5.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit cmake linux-info python-single-r1
 
 DESCRIPTION="Record and Replay Framework"
 HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
+SRC_URI="https://github.com/rr-debugger/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
 
 LICENSE="MIT BSD-2"
 SLOT="0"
@@ -19,11 +19,14 @@ IUSE="multilib test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
-	sys-libs/zlib:=
+	${PYTHON_DEPS}
 	dev-libs/capnproto:=
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sys-devel/gdb[xml]"
+	sys-libs/zlib:=
+"
+RDEPEND="
+	${DEPEND}
+	sys-devel/gdb[xml]
+"
 # Add all the deps needed only at build/test time.
 DEPEND+="
 	test? (
@@ -33,8 +36,17 @@ DEPEND+="
 		sys-devel/gdb[xml]
 	)"
 
+QA_FLAGS_IGNORED="
+	usr/lib.*/rr/librrpage.so
+	usr/lib.*/rr/librrpage_32.so
+"
+
 RESTRICT="test" # toolchain and kernel version dependent
 
+PATCHES=(
+	"${FILESDIR}"/${P}-linux-headers-6.0.patch
+)
+
 pkg_setup() {
 	if use kernel_linux; then
 		CONFIG_CHECK="SECCOMP"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index eb8d10df9ce3..553b0de6748d 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/vcsh/Manifest b/dev-vcs/vcsh/Manifest
index 72c788043f54..a31c34b89773 100644
--- a/dev-vcs/vcsh/Manifest
+++ b/dev-vcs/vcsh/Manifest
@@ -1,3 +1,5 @@
 DIST vcsh-1.20190621.4.tar.gz 40262 BLAKE2B 541f0fe4873236d6b2af2f2a71c446954ca401b69beeca9b21c61a51e3cff11fd1999addcdf4f5d699ff54fa08e6b81a33e0b6d586cad250470e4646cbd5edd9 SHA512 d86168198f468bbf74d7c83dfe61e07e39772c98467b713f7a4972b779f046c51a2c983ddd444d0332d2a586159d86ccb6560d4cffb5a6441534c425a717ffe3
+DIST vcsh-2.0.4.tar.xz 84608 BLAKE2B aad8c63997b55601489443642bcd40d7f8ecb977c99d11fc309f5c76d6e02d3fe5b486c16aa5722d6aca142e77a8109f38566bd21973d78bc542793124904127 SHA512 36c823052c2e2d511b6a9e07e43e7c96255ed0fdcd620db3bb22ba3215060762c0ae556afab31522ff87a443affbee46d9ab4cc8a04aa3a6fa5fdae96aba8d09
 EBUILD vcsh-1.20190621.4.ebuild 874 BLAKE2B 03f06557fc8d731eb00d8cdd804250005be12518370535309705b0a7062c78035e790b69e8caf8a50fca6592290380f736accafa62111b4c07c0f8304d4043e3 SHA512 cf28a4fd37a4a7a1825790809d880391c22c6837c9670fd1bc3daf0f1a8b3ea6a7c02dd0160d5e1e1b6ece7412600b18dfe72e194233256118a487220db6b74f
+EBUILD vcsh-2.0.4.ebuild 619 BLAKE2B 36d4da6e96dc3050571fa6c4fff2ffe857d0fd947377b1c0cc567f10b01d92339cbcdc0feb05039a15d81e231078b72ce084638a0548274df025e145fa7511c4 SHA512 9bb70abf97ab610b8ca5d04f8667d9d80225380e32afde335d410dd6273e3f5ea34b73c1ee645733b36f4b196b6706fa2ec2e5ee677c4b5fc8048035d602652b
 MISC metadata.xml 324 BLAKE2B a4402f0755ba7b0c3692207f974df5e07d0e251fd6537f048723003214bc9293b7e063f5dd85a747d73db6ccff47960ac2811ea679255aa329b664bd92dcf28f SHA512 783c23e7722eb1111c834ed3435df9d9fc2926a0fcd7c8d33afc6e23e3f49dbfca5f20973498d5b02ee13254264a076110c12213e1869270dceeea4ef4dca6b4
diff --git a/dev-vcs/vcsh/vcsh-2.0.4.ebuild b/dev-vcs/vcsh/vcsh-2.0.4.ebuild
new file mode 100644
index 000000000000..b6b83219ead8
--- /dev/null
+++ b/dev-vcs/vcsh/vcsh-2.0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Manage config files in $HOME via fake bare git repositories"
+HOMEPAGE="https://github.com/RichiH/vcsh"
+SRC_URI="https://github.com/RichiH/vcsh/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/git"
+
+src_configure() {
+	# bash for https://github.com/RichiH/vcsh/issues/325
+	CONFIG_SHELL="${BROOT}"/bin/bash econf
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+
+	dodoc -r doc/sample_hooks
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 9ca2e3015539..d427181c9c58 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 1fa25cbc9574..7cada85e79fe 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -91,7 +91,7 @@ kernel-build_src_configure() {
 	)
 
 	if type -P xz &>/dev/null ; then
-		export XZ_OPT="-T$(makeopts_jobs)"
+		export XZ_OPT="-T$(makeopts_jobs) --memlimit-compress=50% -q"
 	fi
 
 	if type -P zstd &>/dev/null ; then
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index f0005a8cca65..7e9993892847 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -716,7 +716,7 @@ linux-mod_src_install() {
 		# and similarily compress the module being built if != NONE.
 
 		if linux_chkconfig_present MODULE_COMPRESS_XZ; then
-			xz -T$(makeopts_jobs) ${modulename}.${KV_OBJ} || die "Compressing ${modulename}.${KV_OBJ} with xz failed"
+			xz -T$(makeopts_jobs) --memlimit-compress=50% -q ${modulename}.${KV_OBJ} || die "Compressing ${modulename}.${KV_OBJ} with xz failed"
 			doins ${modulename}.${KV_OBJ}.xz
 		elif linux_chkconfig_present MODULE_COMPRESS_GZIP; then
 			if type -P pigz &>/dev/null ; then
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 9a6f33e3e1c1..7ee649d2f16a 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 38cf0e790f2d..aefae7b90e36 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,5 +1,4 @@
 AUX polymc-1.4.1-include_QDebug.patch 338 BLAKE2B f9a16cc8c4e6c9c6b4cacaf7aaee66d2230a89f4c18b79677f3f25efdf430cb8f3125a6018ed6fa82f5e8c7d5e840012d260b4dad9a0a924c67abb8c009727e1 SHA512 17107c35811afd7c3f2e654451e9b0acda8234e032d62c22d9f13b5def659f25f367f980aaadb67e91309e67998f94513f15971a348e2da6b0f749cf4e2069ab
 DIST polymc-1.4.2.tar.gz 5766773 BLAKE2B 0d40f2b1fc6df28089d874a2de949b24a719936b0961fa08a0e909a82931b411926464328ada8ec05c148ba39e405ff9f4d336fc4ade316725756e235231eb60 SHA512 6212752a176e0d3414f66b013b46adc500c5d9e7fa250646aaf9b6bd42b9cbaa7c23282c7da6105e37d6ae77f790cd0036ad4e07b8aa50b611d41045035bc533
 EBUILD polymc-1.4.2-r2.ebuild 2974 BLAKE2B 4dba48266d57157a7a043db90174b7892da48041fe2ad7a66350e3dccb80edbbe8f3acf0c8d68b5a04cb1d1e5edc1b788f0d8de1066f9b8edc1023ed6bcc5c50 SHA512 0acced994c0f0fedee6c74946cac966b7d3e1b7f0c86d8fa78a8564998d8cc2c72f71bfee1c5112c593796754cda7029ed9a952d45cf428825693a0eb267fe91
-EBUILD polymc-9999.ebuild 3283 BLAKE2B 7a5084b7affc516f4ce53dea6ff35e421d9e62ba4f17e8886e14ddfe67df61f5a48ffb0c52f6eb88b6e88d62388961ea8f41d4884e095c6c38701a6aa964e38b SHA512 b0ee4952b21e6768a76ad0117f1b03b059fe5f4b23f118d5decff262894981e7eb5461ecce1dc82b50c83b766e1d3d93425967900eac611b17861ed884991b3a
 MISC metadata.xml 1166 BLAKE2B 90d798eeae66595a665d2d694e6b4acecfc1236316ec6b254efddda7048593ee5c0045ae007498e759e9166560edc66b2c99283c3254af0a985689dcc2817dc1 SHA512 e312aaf618a920779c007beae2bc323d7bb184140e14eb0d7eacbfa1e8c182dc2d931e84fd8d0e4e36d7e513bf4b490b450fb15a87ab7728ea8f5c710edab262
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
deleted file mode 100644
index 6ab0be6f326b..000000000000
--- a/games-action/polymc/polymc-9999.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
-DESCRIPTION="A custom, open source Minecraft launcher"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="
-		https://github.com/PolyMC/PolyMC
-	"
-
-	# TODO: Add tomlplusplus as a system library, like quazip
-	EGIT_SUBMODULES=( '*' '-libraries/quazip' )
-else
-	MY_PN="PolyMC"
-
-	# Let's use the vendored tarball to avoid dealing with the submodules directly
-	SRC_URI="
-		https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
-	"
-
-	# The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
-	S="${WORKDIR}/${MY_PN}-${PV}"
-
-	KEYWORDS="~amd64"
-fi
-
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# GPL-3 for PolyMC
-# LGPL-3+ for libnbtplusplus
-# MIT for tomlplusplus
-# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT"
-
-SLOT="0"
-
-IUSE="debug lto qt6 test"
-REQUIRED_USE="
-	lto? ( !debug )
-"
-
-RESTRICT="!test? ( test )"
-
-MIN_QT_5_VERSION="5.12.0"
-MIN_QT_6_VERSION="6.0.0"
-
-QT_DEPS="
-	!qt6? (
-		>=dev-qt/qtconcurrent-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtcore-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtgui-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtnetwork-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qttest-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtwidgets-${MIN_QT_5_VERSION}:5
-		>=dev-qt/qtxml-${MIN_QT_5_VERSION}:5
-	)
-
-	qt6? (
-		>=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)]
-		>=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6
-	)
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
-	${QT_DEPS}
-
-	!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
-	 qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
-
-	sys-libs/zlib
-"
-
-BDEPEND="
-	app-text/scdoc
-	kde-frameworks/extra-cmake-modules:5
-"
-
-DEPEND="
-	${COMMON_DEPENDS}
-	media-libs/libglvnd
-	>=virtual/jdk-1.8.0:*
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
-	${COMMON_DEPENDS}
-
-	!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
-	 qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )
-
-	>=virtual/jre-1.8.0:*
-	virtual/opengl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.1-include_QDebug.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Prevent conflicting with the user's flags
-	# See https://bugs.gentoo.org/848765 for more info
-	sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
-}
-
-src_configure(){
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="/usr"
-		# Resulting binary is named polymc
-		-DLauncher_APP_BINARY_NAME="${PN}"
-		-DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5)
-
-		-DENABLE_LTO=$(usex lto)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	if use debug; then
-		CMAKE_BUILD_TYPE=Debug
-	else
-		CMAKE_BUILD_TYPE=Release
-	fi
-
-	cmake_src_configure
-}
-
-src_compile(){
-	cmake_src_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# https://github.com/PolyMC/PolyMC/issues/227
-	optfeature "old Minecraft (<= 1.12.2) support" x11-apps/xrandr
-
-	optfeature "built-in MangoHud support" games-util/mangohud
-	optfeature "built-in Feral Gamemode support" games-util/gamemode
-}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 023ca48df4a7..c3aedc7908e5 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/grim/Manifest b/gui-apps/grim/Manifest
index 4eba71e70edc..4cc3cd9dce57 100644
--- a/gui-apps/grim/Manifest
+++ b/gui-apps/grim/Manifest
@@ -1,6 +1,4 @@
-DIST grim-1.3.1.tar.gz 15778 BLAKE2B 7dc1f2fbc9e0f81c41d8ca535346d185a0f6c7a0ee28f0168a29864a36d1077be961278c1be3e647aa09165d9f3800e1bc7979f9fca95f8b39c339d621cd984d SHA512 07d04681ec589bf3e48b14c3bfcdc2a6012dfe5c5c2d7ee0cba95bc128187ca0de19ec04140dbe00907778f3d68844e6a90dc35365dafa489d65048b590fdf1b
 DIST grim-1.4.0.tar.gz 18287 BLAKE2B 72606de01624c98876fe1018877a3cf0b25b44ac4bd6a053f82c40ad1ea2c6c0e510cbb6a0bce988f14607ea162dda1d8350b9f30b0f2b9acd8f8e20ba50bc99 SHA512 d0b33528a00528b3ef7488a0984cde5034de4f5a211eb5c8d3299aea356d9348c5d02d08171802bc0315afb19d2446f5f132ea9dca0579ace803b7d5d90a89cc
-EBUILD grim-1.3.1.ebuild 856 BLAKE2B ce61e11bdcc155446782bceed844e3d20ae29b9ca5d15926cb457e541ae96b40e832d6be7856befc88f66209282c84a600327baaf2f6d249db2dfaa8b4fe5486 SHA512 61f33c1987f887b21cb293af3940d24295bdeb0e37a7b56531a8afe010d5e852895f61cf8edc34426b3192f3f72b9d5963f3cc8740098719ae77d5046dbd1055
 EBUILD grim-1.4.0-r1.ebuild 1070 BLAKE2B b6b253567adde8577bc50c454704a59e3ed5d21aa82e23d7c1b737efd4cb968a9b0ab15212a6094e3e70b203c01c822d212529a3591b8880f0476cd8ccb28b2e SHA512 e119c2fe39f63441d4a746fd0c754a3da0ad10989cfd2259077e0cbc7e27d2d6b636f10f7692e911255ad2f898a3a86836fd7e5f6dc9e9550bd2f43ab2bb02ea
 EBUILD grim-9999.ebuild 1067 BLAKE2B 25c24e3f3b45b085d0c0f6b0eaafa50feb11bfedd992a4b6d167bebc41082b6f94115459e660b6ec72d09aa5c12f52eb2bfa60781d149871c1590600ed1c36d5 SHA512 765dede84a5babe46c2e6f30efe85ae628af07a3fc121db324a487e7dd8374b9d096f92e8396b0af1a53662a9f331c28887378c2ea26f69c30da592b098ac074
 MISC metadata.xml 524 BLAKE2B c2366f76a73d9dda9a1316f946507b249c69aa8a4253c2d8e1dbc803734472e71ffbba1300b750f53e8d5bf1d4be588ba4072e72411c585a60e8dfdf21e88735 SHA512 a13136352443f4599ee0be777da4fffa1c2ef09593a0bde436b1eae3f12f135a78605152c7d5f9f58cd798608251debb306e7f1147cdeb4facdb5c8407a39ba8
diff --git a/gui-apps/grim/grim-1.3.1.ebuild b/gui-apps/grim/grim-1.3.1.ebuild
deleted file mode 100644
index 3db3bf2b4aca..000000000000
--- a/gui-apps/grim/grim-1.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Grab images from a Wayland compositor"
-HOMEPAGE="https://github.com/emersion/grim"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
-else
-	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+man jpeg"
-
-DEPEND="
-	dev-libs/wayland
-	>=dev-libs/wayland-protocols-1.14
-	x11-libs/cairo
-	jpeg? ( media-libs/libjpeg-turbo )
-"
-RDEPEND="${DEPEND}"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
-	BDEPEND+="man? ( app-text/scdoc )"
-fi
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature jpeg)
-		$(meson_feature man man-pages)
-	)
-	meson_src_configure
-}
diff --git a/gui-apps/kanshi/Manifest b/gui-apps/kanshi/Manifest
index d7c8a6b87008..67e4105405be 100644
--- a/gui-apps/kanshi/Manifest
+++ b/gui-apps/kanshi/Manifest
@@ -1,5 +1,3 @@
-DIST kanshi-1.2.0.tar.gz 16501 BLAKE2B a527b62a5aa39c7b0ee28c5a7b30827c525d07c9b85b7256392e641448e84bd6eff51d9b0a8d7f9df149efb6a49019412ec756b517ade6b72615a09a95f35c52 SHA512 d863547f0fcc2289d52220d913a7092af1c164ef0cd118288a1731983d06d1821e03f2defec9b43275b40fee23da25135e2bea39293b9de0ec8a32775369dac0
 DIST kanshi-1.3.0.tar.gz 20721 BLAKE2B 56ba2241f21c41c5ba0e33c25ed0fb32ce471ac1c5f8dd030f93cb27e142319d1643143e78d4b375f855af1af5a078168e589ef74c82aaf738cef95618c122ab SHA512 f89164b1c4440d1cb29dfd70aab0721607dd63ea144ace9a2ff30cf89e662d404044bb30a5bc6c5544e8988db498eba3cd80100424ca76d31cc35b60e38036d9
-EBUILD kanshi-1.2.0.ebuild 855 BLAKE2B e9ea34e79e02dd48dcff7dcf70efb18d1d412cc9f70e905b44f7de54fd2cf0b0bc994bd7573d23aa2dedbea72a2dbd8e44f7628c5f3c6f09dbe37e5966f7f8c6 SHA512 693eeb22b0f47ff8bb4279918692143d7fdb1b9668256114ffb171f614a476f2a029b6d2e31a25360e0f0ccee3b0e6c4a59d73ac43598d84a1febe85b98e151c
 EBUILD kanshi-1.3.0.ebuild 760 BLAKE2B 3c9af8d34b60131cfdeaf6b072b80ba826d9143b0c7001d86b20eb14de4c07c9dbb9817f856ec56ab769ed011fe0b5ae5963d7c7dfc043749bd3dc5cf371ad65 SHA512 5aa3f49b1380e1db86c49f2d9ae5633a88b5e7cee682ed03ac5a468755a22c8b2d1a8274503c250a2b94187c53a7a16d3f305a78d2f4c6fb58f9afb9d6124ed9
 MISC metadata.xml 645 BLAKE2B 752a3eb34908929a019e3003d5b705f68ff330b710984cedcdc1654fe480706d20a073575b40122b99ef3bd08f2b35640f49de86626d3e5b9984d1f1549ee825 SHA512 a4417a09202b92495c8b5369b9b487ae987e796633a2764be0af1d5e0ab222bd21fb21d5a78bd1048a0dca0a3b196054b07019b1ae37f3be9a3408a0e288ea91
diff --git a/gui-apps/kanshi/kanshi-1.2.0.ebuild b/gui-apps/kanshi/kanshi-1.2.0.ebuild
deleted file mode 100644
index b415cae3b1ac..000000000000
--- a/gui-apps/kanshi/kanshi-1.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="dynamic display configuration (autorandr for wayland)"
-HOMEPAGE="https://wayland.emersion.fr/kanshi/ https://sr.ht/~emersion/kanshi/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/emersion/kanshi"
-else
-	SRC_URI="https://github.com/emersion/kanshi/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+man"
-
-RDEPEND="
-	dev-libs/wayland
-"
-BDEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	dev-libs/wayland-protocols
-"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
-	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
-fi
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature man man-pages)
-	)
-	meson_src_configure
-}
diff --git a/gui-apps/slurp/Manifest b/gui-apps/slurp/Manifest
index e52676e12f39..c4f9b05975e5 100644
--- a/gui-apps/slurp/Manifest
+++ b/gui-apps/slurp/Manifest
@@ -1,6 +1,4 @@
-DIST slurp-1.2.0.tar.gz 15317 BLAKE2B 92de74abb54b2d53334e0f0c5d08b0b50e9c4583eb192226e38fcefa07cce2265f808ce81c04170e65d3c1209fa263352e3d70cc0a7cf745ed5e18d57c4d3af6 SHA512 443cd497049a5128e80a48c7b2afcc555a8d58a5eacc2dc6207058a9a399bc9e9804c7bca8b010af63f8be99000c05245720bd3e8cca248a74d5aa63a7faf4f9
 DIST slurp-1.3.2.tar.gz 17734 BLAKE2B 42795f1927742ce9606c685a49f2fb395905c875b50b50b60b68bf129d3c6743278a0eeaed72b94921dd65bd4ca4c078c24c693029cff84dbcbe20165242653c SHA512 9e7f9e4b46095fce5dcc05f8d04b5e576771d15080a0ec451a8a5df681d5ab818cb4d5284a74e1650f775e2d05ca32d66551d8e333d6002827c8b60b12d6bb28
-EBUILD slurp-1.2.0.ebuild 830 BLAKE2B b32d08d5dea9c0b0d73fb99169d87359bebe9c30354714e9196fcf41f3211c82040662e1580b5c8d6a723d2dcad4b9dfafcb6ba5f1f8a84d4157937ea38a76f6 SHA512 29c68d0f7a3c447d8adc7150c45d9fa95fd037926a5a35da0a17d5c4d32a538bd996de4f9a85aef33e0c2b13add1c346f5413daa7e188a86c26ba7b7f85ab379
 EBUILD slurp-1.3.2.ebuild 871 BLAKE2B 042a3e46081b90bf2b4590b88d38f555ffb7c59c4b47da5fbdbc20e811712f48b10e91b9b827e601d79e07e41280dbe7dc0746f4b0fe369a82bc280e744e7d1f SHA512 ad68e5d93bb347bf9cf20fa19feac7747e3110170b4c055a32a356977d20c03c0f17229bccd989652d54a4152f25845cae4a92cbdd2c1e193d85774639279d6d
 EBUILD slurp-9999.ebuild 773 BLAKE2B eb3dcfe4d652cfff0c96a5786415ca66d1b08e60f66f281e22ef86cebff79cea13e01442691707a6a27704c1bdf85057ac27a1159c9c23579dea36602f8fe644 SHA512 d59948c77169aab6b4950601eea71264d5bc94b42622d35f81645d5ae2b8403b46eee04842572d099af40240cc5d237a210737635bebae377467dac65ac03f7a
 MISC metadata.xml 460 BLAKE2B e1582f9ce0233e33023df1decb822f49da7aa8ab5ff47fa58ce4dd02c92e93cbaa55f091d81ea1d5eba37d4c18d2bfd5cfdd7a7df4a3e39c362a79c4c23c8f8e SHA512 4c783285e871dbc16ed89cc957643d554c926c0b6b1922fab922c4fa6871a01844ff49471f2420900ae1d4cffd4182923fe5b037a5c4dc8db03d41898b294037
diff --git a/gui-apps/slurp/slurp-1.2.0.ebuild b/gui-apps/slurp/slurp-1.2.0.ebuild
deleted file mode 100644
index b6721e1160fe..000000000000
--- a/gui-apps/slurp/slurp-1.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Select a region in a Wayland compositor and print it to the standard output"
-HOMEPAGE="https://github.com/emersion/slurp"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
-else
-	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+man"
-
-DEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	dev-libs/wayland
-	x11-libs/cairo"
-
-RDEPEND="${DEPEND}"
-
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
-	BDEPEND+="man? ( app-text/scdoc )"
-fi
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature man man-pages)
-	)
-	meson_src_configure
-}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 6505b52f61ca..c9b12ac524b3 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 2a063a123157..70e897a3f387 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -2,12 +2,9 @@ AUX 0.15.0-59b9518f.patch 3473 BLAKE2B a90910cb8be97f3c030afb3fcab3613fcff29acdf
 AUX wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch 2877 BLAKE2B ff492af5cf7b5c866e49ce1bf78286c57e54eb4d3a6c60d4b1087a796b081618b6fe87afc4efd79aec5b4b3ecdb749027cfc74f09500211a086550a5db9d70d6 SHA512 52a6cf0bd22a514adf427d9f02768f5ecc24d1c83cecd51eda89938bdd79dee50e11103ae9fa2ededfcacb5a485415453308026c68fe1e3ffdb447503696535d
 DIST wlroots-0.14.0.tar.gz 505461 BLAKE2B d2fa28f64014ef9d840838cb5938af23f6f6b211b62dc352d0d5bb824ccaa7d7a85531e1eca14feeb06d31d59955ff9a913e40a73cad21ed1ebfe76ada39d558 SHA512 83f001133cb4b11a72bb9532b7321655428826662848f67de8e3220a33d9dff4d37c859602bdc319929949d387d014a257b0347039a6649944d7b084c76bb611
 DIST wlroots-0.14.1.tar.gz 505840 BLAKE2B fca4d259cdde62da0c196344ce1d0f5dd679d012ff33e3ceb5385b9374667e16d91059a2ba6a318153e79ac2f0a6464e3066e614a13398f8c433f442560d84d2 SHA512 4f557c827f9673eccf208a3644954de80e7355b95cc374cc5e851a47087b227f196e0936c0913d21a6c776c29b74de2d028a100931264e41934c747568d8ebe0
-DIST wlroots-0.15.0.tar.gz 565059 BLAKE2B d98529b4548e3b751a505a26af143be585ed42fb9617bc67b4a10747bb494f1359d7bdb75d1730a72396e7c550fe481e858a5ac88621d61671698439e3656920 SHA512 730b1e0cf003dabae23101664c6d1993636bd3a8ecbdb3c165eef415a92811c4d5228f48e0275f75361d8528f118dfb8a2298cfb05dbf6364539224ceedca447
 DIST wlroots-0.15.1.tar.gz 565816 BLAKE2B 09b704a55d8b4a5ab19bb0fcdd041635fbbbb8eed94ff6d189ef47f9f86e90178efa8441c7db78839b1145ed79ed016d520d6599e256cdcf49130cda38bc307d SHA512 6228160f2f350a406c612f1048d7075cf2f78206cc84bc16f889d5d0acd614f9e98845fffed03d7067cfdbd7558b77fcc5d8cedc3868d866e476523126a63677
 EBUILD wlroots-0.14.0-r2.ebuild 1481 BLAKE2B f350d6bbaf05a349cb9ee5ac67cea0c29b1e737b7fdb819ab4fee051311e48c5a448e3d2f2690f9c6effcedde2fc940779fa409ba7ba03acf099b5e4961f7e19 SHA512 4f50dfcfa7fd7cc1e5c5653f9b79da8fdda49994f2a385c145a272bf1d9227d6c5b5a13bd7f4c381036343c9b7f65c6b322b2a3bc188ea39ab427c7d1a424c81
 EBUILD wlroots-0.14.1-r1.ebuild 1484 BLAKE2B 9de2dec4bbb573b4288a9c994047de1547ed6c7be66af4e8f7b5c3d459a4e2cccc97f3883bbb633942ade7f81ba2a883a14a40ac25f8033a57b24a6556d579b1 SHA512 c59c653561420f563e34584f48c646ea38a0622f65ed054d8895508f66fe4ef10e6b77d07b7bcb555fdf5c2077b7bd8f43df495a742b31075739630a666d4859
-EBUILD wlroots-0.15.0-r1.ebuild 1654 BLAKE2B d9d9d7961c85582bfb3d90011cc4b39b7f7406c92d61b6e88ee9b7f579513399561c24509f453bbb5173e9d1ed764cd975d11c44fc1fafb681cbc994db919465 SHA512 672f2b89142a6b4e8c9b1bfdac4459de4f46a921fb247aff6de20ab700ade721f8f4e1ee9d5d353171ddcf46b157a899776ae2d38b8d416222f39608ee642317
-EBUILD wlroots-0.15.0-r2.ebuild 1700 BLAKE2B db8a0270bde813a94a582e385a69ecfdac7cd104e07dc8dee9724ab5203be46f8a7eddd2ea9fbc43d6d4c359d0ad283cf1cb5f3783fa79bbae6173d1921a110e SHA512 083fcd99be113c06c6d4ced112d4591e407d5f90cf91ab7f55c6b719effd15027377b7e02ab550a47e5724e8a8e90be0197dd125f1b4cf404dc4aa19a733c927
 EBUILD wlroots-0.15.1-r1.ebuild 1903 BLAKE2B db14251e37bb2448556a7a8f98fadfea64c4c6047b3c8736932ca08ea586a8cc0db0c8d54335f0dad5d36a52c7a10f87f6d60425c35d5bf361334ab0e3ad0f5a SHA512 6bd49fad40df4267c4490e928fe750677fadf9dd1f08856fab8777000af8a3769f0710be0741ce98cfbbe2cb4cb1cfc6020937078211abf5aa5a224b702b4135
 EBUILD wlroots-0.15.1.ebuild 1694 BLAKE2B 6612ccfa47cb13280a788b766b8c986c37f8ed256808e54068709e84e629e7618ecda9624faea2ac63878f232996c47a8f36a4ae760d7747cd7c918ed0667d90 SHA512 fbb4123948bc0d9f69bfd8d9c3990aa21e648b5e1a7018aa6c4bcc6bf6aa0982bf8ff5aea6df9ea460f29ba48646687747457ec3d146808a3f0ac2b8b667f374
 EBUILD wlroots-9999.ebuild 1815 BLAKE2B 245cdb038c01b00bab6f387b03b0c2bfbf58be631a5542c2f259e10be6ec626a0ee063e10d04d7e9e80cf287b7d66fbc3a3ec08554681258d4b712f17fe4c237 SHA512 78dc65c3fc508e6647df56ffa0c2d3ada5007c53a94138f588f33df1ea6248b155a98ea5a89f9bf1e0034fd0b5c284f1a2920615a0cc002a8eecff84c6453fca
diff --git a/gui-libs/wlroots/wlroots-0.15.0-r1.ebuild b/gui-libs/wlroots/wlroots-0.15.0-r1.ebuild
deleted file mode 100644
index 79e777c25134..000000000000
--- a/gui-libs/wlroots/wlroots-0.15.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
-HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-	SLOT="0/9999"
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-	SLOT="0/15"
-fi
-
-LICENSE="MIT"
-IUSE="vulkan x11-backend X"
-
-DEPEND="
-	>=dev-libs/libinput-1.14.0:0=
-	>=dev-libs/wayland-1.20.0
-	>=dev-libs/wayland-protocols-1.24
-	media-libs/mesa[egl(+),gles2,gbm(+)]
-	sys-auth/seatd:=
-	virtual/libudev
-	vulkan? (
-		dev-util/glslang:0=
-		dev-util/vulkan-headers:0=
-		media-libs/vulkan-loader:0=
-	)
-	>=x11-libs/libdrm-2.4.109:0=
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	x11-backend? ( x11-libs/libxcb:0= )
-	X? (
-		x11-base/xwayland
-		x11-libs/libxcb:0=
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-wm
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.24
-	>=dev-util/meson-0.60.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
-	local emesonargs=(
-		"-Dxcb-errors=disabled"
-		"-Dexamples=false"
-		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
-		-Dxwayland=$(usex X enabled disabled)
-		-Dbackends=drm,libinput$(usex x11-backend ',x11' '')
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	elog "You must be in the input group to allow your compositor"
-	elog "to access input devices via libinput."
-}
diff --git a/gui-libs/wlroots/wlroots-0.15.0-r2.ebuild b/gui-libs/wlroots/wlroots-0.15.0-r2.ebuild
deleted file mode 100644
index c304488ebcbd..000000000000
--- a/gui-libs/wlroots/wlroots-0.15.0-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
-HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-	SLOT="0/9999"
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-	SLOT="0/15"
-fi
-
-LICENSE="MIT"
-IUSE="vulkan x11-backend X"
-
-DEPEND="
-	>=dev-libs/libinput-1.14.0:0=
-	>=dev-libs/wayland-1.20.0
-	>=dev-libs/wayland-protocols-1.24
-	media-libs/mesa[egl(+),gles2,gbm(+)]
-	sys-auth/seatd:=
-	virtual/libudev
-	vulkan? (
-		dev-util/glslang:0=
-		dev-util/vulkan-headers:0=
-		media-libs/vulkan-loader:0=
-	)
-	>=x11-libs/libdrm-2.4.109:0=
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	x11-backend? ( x11-libs/libxcb:0= )
-	X? (
-		x11-base/xwayland
-		x11-libs/libxcb:0=
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-wm
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.24
-	>=dev-util/meson-0.60.0
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/0.15.0-59b9518f.patch" )
-
-src_configure() {
-	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
-	local emesonargs=(
-		"-Dxcb-errors=disabled"
-		"-Dexamples=false"
-		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
-		-Dxwayland=$(usex X enabled disabled)
-		-Dbackends=drm,libinput$(usex x11-backend ',x11' '')
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	elog "You must be in the input group to allow your compositor"
-	elog "to access input devices via libinput."
-}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6106876210de..5f50c2f7839a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index e79df73f9ce2..9505968a285a 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,14 +1,18 @@
 AUX geeqie-1.5.1-no_common.patch 2168 BLAKE2B 3949807b4bdd99a9283ca1ff1108fbfcc6cc034d56339875bf1d65513461ccd2da447c4923e5c1c0c14af8f204503c8b2fa72bce4faa4e270a8309cae2fd75e1 SHA512 3198780bc3840691cf2239fdf8d963bb9ead90b38fdf32d4276bd55c70fbb69d0e88f55ed901990c50907dde5b242e0f1af96ca6733ccb767b9e5e2d82ffeda9
 AUX geeqie-1.6-yelp.patch 1044 BLAKE2B be5523c05bf0bc9a416b843a3fea8f5722272e138540ac7e1f4cdbafcf585c1357d07877c14a3dea2209f0206114b45aa4c45410e471bf5604df1be4b8553570 SHA512 fd5d11655ff788d7fb138db8f9cdce3dc9111888e0c2e37b31f9e07c956ab21f9952fd31deccb514a258426382c8c0a0de716e4cde254f4f0f4349793c119445
+AUX geeqie-2.0.1-allow_xxdi.patch 774 BLAKE2B 4bba0667ea4030bba821787d22725e0db177ab5034a77124c85467f4c4b34b3148f4b3001f9466ee472425958d6d97fd868539a7c7d04740872255aad6ed6543 SHA512 83788dc0e4e99e9a2ad6e4da20c9c8d61e8bea9678d86b40c82cfc9d925abde2bfbdc5cfa0fbf421056b3625049fdf037dcc18402049dfba8c1c4443106464d8
 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
 DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
 DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d
 DIST geeqie-1.7.2.tar.xz 1949240 BLAKE2B 4dde2c902151da677470dca359b321978afe861cafddb7baf76e68acc8a9cf7943ce8ebd8e46aa007a773cce62444d16908d1b8b1339de58587c98d911775ec7 SHA512 07b06ef51cb520b91b9097bbe06d170af39d3d513d9853c912e1b60bd5b47e0ae3571f6ac449c9f9c6cee4d227fc4c906ee5f90f7498cd0b2119d12ff4673c4d
 DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9
+DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288
+DIST geeqie-2.0.1.tar.xz 1666600 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5
 EBUILD geeqie-1.5.1-r1.ebuild 2280 BLAKE2B 9653c0f0ac69e5a18812a86534e5ff6025e754545f2d53e3f06e538f59a600c98b27fff34f425e1d342a3c0ac8ef229f58ef8da99b9cd4c5f1f54e91246eead9 SHA512 26a4d709e1c8c6f3a6db159d4e912def9ce7ed7cb7a7d1a261d2428b46440aad882d450b1f8d54f513fd02a1f637bd0328403c9c143281b889dc3f34dfca7a31
 EBUILD geeqie-1.6-r1.ebuild 2087 BLAKE2B b72278d1f36cbaed2cd0eccf1f2d8c8126ffd798c476b7432e7695221f1524f14b07d0ff98fbe281bb911cb94f80a5c8142bf2f8ad667e3aa3192bdeca8950de SHA512 d8280d69c8638a192c2875f10e807e0286d09f8820dfc91a47b62f495a508770a394bd33dd1fdfc077a6f4581d8069a7bc33edae239ad754d6f6427253d7fa19
 EBUILD geeqie-1.6_p20211016.ebuild 2412 BLAKE2B ec74ea03a4f7d9431b2fa1fa8eb474ac4c8a1e8a46b1887d7f7a67bc4af1b389c4581299aff6a301e490958412bf91561294bc8dd015220b7ad6e5e470d7e213 SHA512 23a6a0c2d60d4498b99195a87e158683a312276c1d0b29d0dbd3ca334eb0ac96e19e3985a9be1c88fce9d528ca0a74c41a739dd90bde3d3b04728321d5f94fa4
 EBUILD geeqie-1.7.2.ebuild 2324 BLAKE2B 973682fbaacbf054ad6033b45e4ec4f79f2e0ccfa2a4e7e88dd73f2dc61adaba8f0010c6190f3ea9bc16b3939974216bf19b0127c59810dc41a5d05dd6a4e3c8 SHA512 f136a470d8ffa269f47af621cf13c5f9c2a87b0dc3a0a75fb1a325ad94ccf0a7cd6d1cc789241210e18e9ab8ffc326f9c1d6d66539f86592922cc02ad0938d5a
 EBUILD geeqie-1.7.3.ebuild 2324 BLAKE2B 973682fbaacbf054ad6033b45e4ec4f79f2e0ccfa2a4e7e88dd73f2dc61adaba8f0010c6190f3ea9bc16b3939974216bf19b0127c59810dc41a5d05dd6a4e3c8 SHA512 f136a470d8ffa269f47af621cf13c5f9c2a87b0dc3a0a75fb1a325ad94ccf0a7cd6d1cc789241210e18e9ab8ffc326f9c1d6d66539f86592922cc02ad0938d5a
-EBUILD geeqie-9999.ebuild 2260 BLAKE2B fb20a91012f7771197f763e9cfbda5c201c51241e494dca0d6e499d9f6e7a8bc2887ed8c4efabfbcdcb86dd0cc7a4463506b8a7cb31c261a6c4cc82d1cce634d SHA512 4a0efeda56009c9dea7a5bcab831b251b54070a370d2f915bbb3f74be3e727e5cae1c0e8aaa0f239aa7208e052548b69e605a2b97ef817dceb78d4d5e8b49ea8
-MISC metadata.xml 924 BLAKE2B 9bafd79f0d60d1237da4b35aeb2142384c188b503c151f8e0a26cd6ea9a2658876c66fb6f248af34eb33f6d2218bafeb1f34521d23c55e244c7ee1b4c0234dda SHA512 73f82d929d6479d81dde14c922ac048feaccf4bf5ea8ffe8aea56cf7cbe0cc8f76c528f3363bbbad3e881640608265a2e583d8b675fce3aa43ad7646023167fc
+EBUILD geeqie-2.0.1.ebuild 3068 BLAKE2B 3200dc01ec0c71c412628b8849bca1e9f598252bb34678faff241ddc162510c5e81d364909fff14b04dd870a3c009c4aab80b7474c0734fc0018d4a36d585946 SHA512 5860102cf91c0b44e5412e7ec924cb5897c4962be3fda36f903911335a07d882f7250814fd39d2aad783f407b1cc49897b659baf8e2472eee4fae460f4f33223
+EBUILD geeqie-9999.ebuild 3101 BLAKE2B 8dff88fd6cfe2a8947a22baf91855894d1d4b232c0110fda519d3ec5f4a42dde5d6c35d485b647fe72cb0f90940fdf27a5ed9d1e7bfdbe27e5d24f38f8c902ac SHA512 436e0f7ae64b237f6e7b27c48c71038be72102d2a98388ae67ce2f8d93e4c68ee4f47e08232d4e7974542fa53083e659be074199db4a779e4424843f67c9a2d3
+MISC metadata.xml 1072 BLAKE2B 271e83900ee4859d4e6d89057af3c181c428956200cb4d45072a9dd95a6c7ad343b0bc04084435a25c8e2d3caa1790559583e9b3020aa60de227597b9757d8e9 SHA512 83de6f50169385f8099f389a40a1431dd3d5b87068d6a411fa01ebb68519d9625144bc83dba07c894dc2b5a23941204ee40aa5a02ce3a3330fc921c9faebedfd
diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
new file mode 100644
index 000000000000..440de7189344
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
@@ -0,0 +1,17 @@
+diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh
+--- geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh	2022-08-12 11:32:26.000000000 +0200
++++ geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh	2022-10-17 23:04:08.203219782 +0200
+@@ -12,9 +12,12 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ 
++# Allow standalone replacement for xxd
++command -v xxdi.pl >/dev/null 2>&1 && XXD="xxdi.pl" || XXD="xxd -i"
++
+ # To generate the required code, xxd has to run in the same folder as the source
+ build_dir="$PWD"
+ 
+ cd "$(dirname "$1")" || return 1
+ 
+-xxd -i "$(basename "$1")" "$build_dir/$2"
++${XXD} "$(basename "$1")" "$build_dir/$2"
diff --git a/media-gfx/geeqie/geeqie-2.0.1.ebuild b/media-gfx/geeqie/geeqie-2.0.1.ebuild
new file mode 100644
index 000000000000..4f6f2af33d64
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-2.0.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson optfeature xdg
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~voyageur/${P}-ChangeLog.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc djvu exif ffmpegthumbnailer gpu-accel heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
+
+RDEPEND="gnome-extra/zenity
+	virtual/libintl
+	x11-libs/gtk+:3
+	djvu? ( app-text/djvu )
+	doc? ( app-text/yelp-tools )
+	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	gpu-accel? ( media-libs/clutter-gtk )
+	heif? ( >=media-libs/libheif-1.3.2 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpegxl? ( >=media-libs/libjxl-0.3.7 )
+	lcms? ( media-libs/lcms:2 )
+	lua? ( ${LUA_DEPS}
+		doc? ( app-doc/doxygen ) )
+	map? ( media-libs/libchamplain:0.12 )
+	pdf? ( >=app-text/poppler-0.62[cairo] )
+	raw? ( >=media-libs/libraw-0.20 )
+	spell? ( app-text/gspell )
+	tiff? ( media-libs/tiff:0 )
+	webp? ( >=media-libs/libwebp-0.6.1 )
+	zip? ( >=app-arch/libarchive-3.4.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	|| ( dev-util/xxdi app-editors/vim-core )
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	map? ( gpu-accel )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-allow_xxdi.patch"
+)
+
+src_prepare() {
+	default
+
+	# Lua version
+	sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgq_helpdir="share/doc/${PF}"
+		-Dgq_htmldir="share/doc/${PF}/html"
+		$(meson_use debug)
+		$(meson_feature zip archive)
+		$(meson_feature lcms cms)
+		$(meson_feature djvu)
+		$(meson_feature exif exiv2)
+		$(meson_feature ffmpegthumbnailer videothumbnailer)
+		$(meson_feature gpu-accel gps-map)
+		$(meson_feature heif)
+		$(meson_feature jpeg2k j2k)
+		$(meson_feature jpeg)
+		$(meson_feature jpegxl)
+		$(meson_feature raw libraw)
+		$(meson_feature lua)
+		$(meson_feature pdf)
+		$(meson_feature spell)
+		$(meson_feature tiff)
+		$(meson_feature webp)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Manually generated ChangeLog
+	dodoc "${WORKDIR}"/${P}-ChangeLog/*
+
+	# The application needs access to some uncompressed doc files.
+	docompress -x /usr/share/doc/${PF}/AUTHORS
+	docompress -x /usr/share/doc/${PF}/ChangeLog
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
+	optfeature "Lens ID plugin" media-libs/exiftool
+	optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
+	optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
+	optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
+	optfeature "Print preview functionality" app-text/evince
+}
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index e97db26b4d23..2c4b54ad1991 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-LUA_COMPAT=( lua5-{1..3} )
+LUA_COMPAT=( lua5-{3,4} )
 
-inherit autotools git-r3 lua-single xdg
+inherit git-r3 lua-single meson optfeature xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://www.geeqie.org"
@@ -15,80 +15,95 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp"
+IUSE="debug doc djvu exif ffmpegthumbnailer gpu-accel heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
 
-RDEPEND="
+RDEPEND="gnome-extra/zenity
 	virtual/libintl
 	x11-libs/gtk+:3
-	doc? ( app-text/gnome-doc-utils )
+	djvu? ( app-text/djvu )
+	doc? ( app-text/yelp-tools )
+	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	gpu-accel? ( media-libs/clutter-gtk )
-	jpeg? ( virtual/jpeg:0 )
+	heif? ( >=media-libs/libheif-1.3.2 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpegxl? ( >=media-libs/libjxl-0.3.7 )
 	lcms? ( media-libs/lcms:2 )
-	lirc? ( app-misc/lirc )
-	lua? ( ${LUA_DEPS} )
+	lua? ( ${LUA_DEPS}
+		doc? ( app-doc/doxygen ) )
 	map? ( media-libs/libchamplain:0.12 )
 	pdf? ( >=app-text/poppler-0.62[cairo] )
+	raw? ( >=media-libs/libraw-0.20 )
+	spell? ( app-text/gspell )
 	tiff? ( media-libs/tiff:0 )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
+	webp? ( >=media-libs/libwebp-0.6.1 )
+	zip? ( >=app-arch/libarchive-3.4.0 )"
 DEPEND="${RDEPEND}"
 BDEPEND="
+	|| ( dev-util/xxdi app-editors/vim-core )
 	dev-util/glib-utils
 	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	map? ( gpu-accel )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.1-allow_xxdi.patch"
+)
+
 src_prepare() {
 	default
 
-	# Remove -Werror (gcc changes may add new warnings)
-	sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
-
-	eautoreconf
+	# Lua version
+	sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die
 }
 
 src_configure() {
-	local myeconfargs=(
-		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
-		--enable-gtk3
-		$(use_enable debug debug-log)
-		$(use_enable ffmpegthumbnailer)
-		$(use_enable gpu-accel)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable lua)
-		$(use_enable lirc)
-		$(use_enable map)
-		$(use_enable nls)
-		$(use_enable pdf)
-		$(use_enable tiff)
+	local emesonargs=(
+		-Dgq_helpdir="share/doc/${PF}"
+		-Dgq_htmldir="share/doc/${PF}/html"
+		$(meson_use debug)
+		$(meson_feature zip archive)
+		$(meson_feature lcms cms)
+		$(meson_feature djvu)
+		$(meson_feature exif exiv2)
+		$(meson_feature ffmpegthumbnailer videothumbnailer)
+		$(meson_feature gpu-accel gps-map)
+		$(meson_feature heif)
+		$(meson_feature jpeg2k j2k)
+		$(meson_feature jpeg)
+		$(meson_feature jpegxl)
+		$(meson_feature raw libraw)
+		$(meson_feature lua)
+		$(meson_feature pdf)
+		$(meson_feature spell)
+		$(meson_feature tiff)
+		$(meson_feature webp)
 	)
 
-	if use exif || use xmp; then
-		myeconfargs+=( --enable-exiv2 )
-	else
-		myeconfargs+=( --disable-exiv2)
-	fi
-
-	econf "${myeconfargs[@]}"
+	meson_src_configure
 }
 
 src_install() {
-	default
+	meson_src_install
 
-	rm -f "${D}/usr/share/doc/${PF}/COPYING"
-	# Application needs access to the uncompressed file
+	# The application needs access to some uncompressed doc files.
+	docompress -x /usr/share/doc/${PF}/AUTHORS
+	docompress -x /usr/share/doc/${PF}/ChangeLog
 	docompress -x /usr/share/doc/${PF}/README.md
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
+	optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
+	optfeature "Export JPEG plugin" media-gfx/exiv2
+	optfeature "Lens ID plugin" media-libs/exiftool
+	optfeature "Image crop plugin" "media-gfx/exiv2 media-libs/exiftool media-gfx/imagemagick"
+	optfeature "Image rotate plugin (JPEG)" "media-gfx/exiv2 media-gfx/fbida"
+	optfeature "Image rotate plugin (TIFF/PNG)" "media-gfx/exiv2 media-gfx/imagemagick"
+	optfeature "Print preview functionality" app-text/evince
 }
diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml
index 6bc08d24362e..684ebb361389 100644
--- a/media-gfx/geeqie/metadata.xml
+++ b/media-gfx/geeqie/metadata.xml
@@ -10,6 +10,8 @@
 		<flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
 		<flag name="gpu-accel">Enable GPU acceleration support - experimental</flag>
 		<flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files</flag>
+		<flag name="jpegxl">Enable support for JPEG XL image format</flag>
 		<flag name="map">Enable items map display - experimental</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 785fd4415622..d609643c8d85 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
-DIST mypaint-brushes-2.0.2.tar.gz 1564926 BLAKE2B 68a244f42cd5d9b1f96466f5409f0c7ebae257f6dbbfdc5139cb9fda86ee4898ce8fda2a35e96f3a65f41333f7f689edb85445bcd88dc0fc4b428d05ba2870fe SHA512 89cecd9d78f4de84ada97a3e33fd67b86dfd259880da15c0ecbfad0fceb8c3b0e93790f3c0bff0cc375959bdf6921b01d1f3646e27c3f961715219a349017556
-EBUILD mypaint-brushes-2.0.2.ebuild 558 BLAKE2B 47683a0c50db95c393d7e0a3e98dc9f81ae80089fb0ae943479cac4b22d5dddfcfed2e17f4e8c488fa51e96c846190390dbbf9f18b8edf9d60f7d92ba0f0a8b8 SHA512 2a7a27e1fe9bd2a31a9e9634163626ef186bb237926e2c534d3f0ffc9c915df51877a0744460006c98a6a4da31ddfdee697e94035f8b52560d9a59a1e897649b
+DIST mypaint-brushes-2.0.2.tar.xz 1522216 BLAKE2B ba274d9abcac51bba3b8e7d4489893eef62e2b35ee8d0607d476d022150d92944693cae6d1ddb9f4f9b01f229f050f4ccf7416a0ef0fe27e9e0f5e84a4e2c56f SHA512 bae870e930381b818165e5e39d38b25782d5744c9a507a71dab37ae7ca2d4502896057f919a16eb9305d803a01db3a948a735d5c5b850893997a9afd6403144b
+EBUILD mypaint-brushes-2.0.2-r1.ebuild 500 BLAKE2B 624d6859923d0aec28910979c48347619abfb8e82b59d1e88fa4148e0aa35d2cc657a7df996936b65a300252918a50ed0f387a01995558b57b5a634ec572a8dc SHA512 efa3635e18048aa02a1b33abef6a9a1a25ae2d9a9cf1f7945907a4c94d1d7e709795bc96e598ce279debdf47deddf025e2d4bde63c30005d980421b0e49ed4be
 MISC metadata.xml 352 BLAKE2B 2ab3826fec46744aceb8210d0892c4d928cb818db4bd2704c156ca74c4c85bc8778e8212ae07010a0f87876b9448bae139f988465b9b5f2e50f62061c860d31d SHA512 bf153d124d449c2b4e870b2aad73ab45708f622c09d37a42975dfa5e1c42005009bf6c0d361bc03cab7fee76ba0a811877a7518cc6b84cfe1fc941e9a41c2921
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
index 51718d70c079..64652b5f63be 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,15 +7,12 @@ inherit autotools
 
 DESCRIPTION="Default MyPaint brushes"
 HOMEPAGE="https://github.com/mypaint/mypaint-brushes"
-SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mypaint/mypaint-brushes/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86"
 
-# Chosen to exclude README symlink
-DOCS=( AUTHORS NEWS README.md )
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index bc2acdc6ae50..180db82b18c9 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 1da2e2337b5c..3a3b684f2532 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -4,6 +4,7 @@ AUX coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch 3
 AUX coin-4.0.0-0004-Added-coin-default.cfg.patch 2531 BLAKE2B a0682e9dfaa36412109fe12a8a81381915e71da73582c397b7eb2795ddad6fe706a3c0f2e5e4d02114adbf8d31bac88b6509bcdc96423b59c8d4e5168c158814 SHA512 ed9543421f62f0ebe53ffe819cc7381316215231ab9675f7867f633ed79c47df4d37d4ba35283b55fc6d621f6c65040e9eee0cb19e7708d0653b0e56e4bede55
 AUX coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch 1394 BLAKE2B 40b43a0cce0ab3e3e40723e1ac2c68185b4f10c38a3514e02d18c6ee1232b3116e1b89e6ff2cda3aa5f14eefcbc636f4b83c84d896fa485c416362e72e793bc4 SHA512 0cc392f908b044639bef3fcb960fe398ae045aba72c670b22ca48cba9c754c4a35746888fc7ee2938bb5e0309fc0104e8fe1379175886e438b00410c8f5c3a16
 AUX coin-4.0.0-0006-Fix-underlinking-against-X11.patch 827 BLAKE2B 33aaa8281fc260bb382875a0b41eac83d8099e52709e93a523ba4b048e1f9ab92c1a17cb09e1c5dd091c90878c373ef973c380211f856b32581f97992a8cc83e SHA512 37709b1a853287245b0778297154a8ea15ed86d60558af541ccd60fb0ee369c296947964080bff790595030c8e41964e008b0983bcbf5146d3c5ac81756ff622
+AUX coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch 581 BLAKE2B 97f7784d780e5d06a8c032a9d5707bd1d883dee59a0c04fe06205b98f2f3bf38d547e683eb9474da0771c3fe0a0964e611a4108c5d34b44679be27a52fdb5639 SHA512 73b95646c47f2ec07f20fb776b5b7df8e8df45a1f13c002e15cce56a8d35e374cc6a0515461aa265ae70b49cde7648554dc9aafb84f27afb6e78f368b67b1b7e
 DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae
-EBUILD coin-4.0.0.ebuild 2770 BLAKE2B d910052c94c62dd009aa910b54194e550fc96127fee4d9c37163c3f3b83167e7660ab5b219118cfd34bba1b8764652477c2b5f1f036a4f39a77657ac928bc4a4 SHA512 2b8f410b45a9bacbacf7e8a0aad60544fc8a443ea8fdd38a0fb2753d31619b070543adb661e4d0ad12dbeaac4c8db10e2f15db455dea80e1cef1d4641ac03701
+EBUILD coin-4.0.0.ebuild 2831 BLAKE2B 6075ae2a437afebb3596b22dec63ea16a6910ee93d8aae7e1fab1f042daa96962453a3f944041de91f40ef05c9b0fd4d045e14bf45218799c1f63984615697ea SHA512 07df8aa1dc519b4583dc4c8363f09e6a045daf0da9d5bf5cde1282427e264195132b0d4caeb524c0992d19319857fca8cc3d0f29d60233b0913346dcaa31cd95
 MISC metadata.xml 456 BLAKE2B bc0dd1a54611c13dc18dc24cecb17034bf9dc1a2dec1f1ef8fb35c5ce08d5ad069ae19af9e4ed4ed4cea081c414da4db3ecde92eaef8d1095f7dd69ad17afabb SHA512 ac7dda1fbc082b46d13cff9ed35c9b129ab854b8ed3552f9b1dbd7a4be914a5871f219cd280fbd96e6ac4f0b184b74282b8e952818e8a3acef6b25e70f529bc6
diff --git a/media-libs/coin/coin-4.0.0.ebuild b/media-libs/coin/coin-4.0.0.ebuild
index 90ef8396eb87..41f77c0f06e4 100644
--- a/media-libs/coin/coin-4.0.0.ebuild
+++ b/media-libs/coin/coin-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-0004-Added-coin-default.cfg.patch
 	"${FILESDIR}"/${P}-0005-Slightly-fix-coin.cfg.cmake.in.patch
 	"${FILESDIR}"/${P}-0006-Fix-underlinking-against-X11.patch
+	"${FILESDIR}"/${P}-0007-Locate-slotted-qhelpgenerator.patch
 )
 
 DOCS=(
diff --git a/media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch b/media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch
new file mode 100644
index 000000000000..7c53c4e12952
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch
@@ -0,0 +1,13 @@
+diff -ruN coin/src/doc/CMakeLists.txt my/src/doc/CMakeLists.txt
+--- coin/src/doc/CMakeLists.txt	2019-12-23 20:47:44.000000000 +0100
++++ my/src/doc/CMakeLists.txt	2022-10-17 21:02:17.868469249 +0200
+@@ -30,7 +30,8 @@
+     endif()
+   endif()
+   if(COIN_BUILD_DOCUMENTATION_QTHELP)
+-    find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt qhelpgenerator")
++    find_package(Qt5Help REQUIRED)
++    get_target_property(QHG_LOCATION Qt5::qhelpgenerator LOCATION)
+     if(NOT QHG_LOCATION)
+       message(FATAL_ERROR "Missing program Qt qhelpgenerator")
+     else()
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 4f9eef7cba44..31bc03ac305a 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -2,8 +2,8 @@ AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
 DIST intel-gmmlib-22.1.8.tar.gz 818360 BLAKE2B 5a7dadaead925eddfe52770c73eea92b8f071b498a2ed8d23928c93ba3d0284d9046339b7eb641918b17bf13bbcffc071ba71ba47cc53760258b1bb39f175e17 SHA512 4520105c7ceaae30e592acce7bae65841ecdb5d74c888cf03a2308a94a63d998941665794933c8247dbae841d13386ee99b365de0c6a5676acc960386c19ca2c
-DIST intel-gmmlib-22.2.0.tar.gz 820145 BLAKE2B 6b7966c71a24344f4525cb676aae12c7947d1101bbe46938336deeb769f5728aec4a11ce2b346fc55bc3d752c67e2f375e7008f8bb11a7fc49e91231ed09a1a9 SHA512 57ed8bb08755befeb27e096249cc31afbae7ff0ccfb0eb2ae4de38b38e6c3454a1e145f11a509b6dcae45d1a8ee7b75021353f7b1857b3e32366e84310337e44
+DIST intel-gmmlib-22.2.1.tar.gz 820241 BLAKE2B 64eed8c1863d85355f47b3bfdd2740d2472f256a679189520d284c635a1ad722ed090d503b9e224ac262498091872e686cb1732be135627d7ec8170c946a6f80 SHA512 d3a68de83946319d582ff2d7785adaf007ea744fba6b1e9e2c53023f0b01b506f500aae3c4305c01bb97ce9176d39ae884fa306b1a075b1f2758faad3a1e0462
 EBUILD gmmlib-22.1.8.ebuild 795 BLAKE2B 6bcec2581a34ec5a169eaa3508c8d7e6085865b6df1d2746db4c114eeebfd082636a3bb1aad3c6f72bc00a87effc4e32921f8d315ee58db95d71a495be00afcc SHA512 d366ef04a77026dbb3d1cae5d4e4bf74846cb6a4b7842c218f04889d0e0a0450d3ad28016a3492f5ff723dff4ac16bfd00e2d618bfb7e3400a4e841451d6c7f8
-EBUILD gmmlib-22.2.0.ebuild 796 BLAKE2B 229b1cfde21427a045a0bbf7b93428bdd4173e447055201feb6d808b7406101de1a67f4a228ffb4206ec7b3941dcb894a9a91dd0d7777954640de1615c0a8429 SHA512 11ad5fbe1a2975e13233434673ccb36960f4a7517a5b0a45c8e35aa8a77e886a89c8e304c87d7e0e0d2eba250f12170eca460b0789ab5c9eea780c7fe641fa6e
+EBUILD gmmlib-22.2.1.ebuild 796 BLAKE2B 229b1cfde21427a045a0bbf7b93428bdd4173e447055201feb6d808b7406101de1a67f4a228ffb4206ec7b3941dcb894a9a91dd0d7777954640de1615c0a8429 SHA512 11ad5fbe1a2975e13233434673ccb36960f4a7517a5b0a45c8e35aa8a77e886a89c8e304c87d7e0e0d2eba250f12170eca460b0789ab5c9eea780c7fe641fa6e
 EBUILD gmmlib-9999.ebuild 875 BLAKE2B e3b152fddf160615a384564528294e34a3e974cbca2c449c5f0c8eb35be42b0a5effca7c5f5206e0e557f1b3e97631285da731dededed27e61581bb0994236aa SHA512 c5c5798eb82b6ad5872c0b52888cb2ee3effd989b0aa1fa8b3c000c3f9842d8789e350b718d2a78c9ca465b63b90b2873eadae0528ebda3a9435b1729388b849
 MISC metadata.xml 401 BLAKE2B b8c3f2935afa450ec0eeedd745e91b14ed18386a87edc77d17894db4764b681cf1c1b80bac714662f506a9092813525f2365aad31d01b64dd8709da2df6c07f4 SHA512 ce6959033b6682ab01f830b869c972fcb774d241bca62faed86f6e1705eb2f6a7615f8781c7c75118ac5fd6bae096c08cf6a2e965429bbdcbe9f598ae67f91f7
diff --git a/media-libs/gmmlib/gmmlib-22.2.0.ebuild b/media-libs/gmmlib/gmmlib-22.2.1.ebuild
index d811e64621f4..d811e64621f4 100644
--- a/media-libs/gmmlib/gmmlib-22.2.0.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.2.1.ebuild
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 1206c304f692..f8950e86793e 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,10 +1,8 @@
 DIST harfbuzz-4.4.1.tar.gz 29231251 BLAKE2B 3947084ea2eedd76d64acfc5286ecd14d772ce0507163bc2c54a86579556a8799959ff4d47ea2919ee8472f8fe50d0266d325e3d0a7024f2ae8dcdf48d14f37e SHA512 bbc415d7b74408b1e8d34bfbc19a3cab002471fdd56d71b469c3129f0eae5532d5c7aaae7bb5cc3942fea6008d2ed9e96a7b20b10f4f5e46db63cecfa5c0248e
 DIST harfbuzz-5.1.0.tar.gz 29358116 BLAKE2B 006e66e9c76b505214b948c7c8756af38171b85cc865923e4665a4dd3eb14d89d20456ad4490b11208d57d056b087da78e1742141e41f8a22e644f20d3ea4851 SHA512 bdd7c2ca0b6f2a3a3fffbf0324d3c8bfd64a1753314048f6f67f901d4098e90054eeda9155d134f03c5d3ddefb15e087f872d2d87b2ace07bac6625fb43c7f3e
-DIST harfbuzz-5.2.0.tar.xz 17711968 BLAKE2B 5d01ee2291006505d9eec3547ff4b443789b3358ca71aabba3c17e14413d9af4b8c4755b32722b9476daf959bb5da66ccf2081662c36ce50ebe8e4da31c2592f SHA512 3c95ae9916dfc283714b936988726c0b391f634e22a62d148c201104178ee229c48e49cc82961d728a5c8bc8af06978eb172b35acb552c969bc2385892380d30
 DIST harfbuzz-5.3.0.tar.xz 17921224 BLAKE2B a220c1d4912487012f30942280651bcb63b5109e49be778a210bf26f4a0bcc7dc5ab7247775286b75cbe5b8fad7c439ae420d2085c6719088f028679242f9269 SHA512 0eae94769ac0157bf1df9b001223b30d40104ac448b1062f34ac793edb27ed1e459ac99954498c4b3cfb65c8cda29f2214a300f11523826b378ab67deec1a5f3
 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.2.0.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
 EBUILD harfbuzz-5.3.0.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
 EBUILD harfbuzz-9999.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
 MISC metadata.xml 763 BLAKE2B cb8679b8a67d692c73f1dc48facf6a98a442d34b51a90b2236070919b737d22e38a15babe5847cf4d30d4630c66d803f9d6e684c5e8b8b87a199d5d471a9e35c SHA512 0d87926c3e7a475bc84859d630cc8ed1b62e5766856e15b9aa74c87b5fd22345a9c05951508ccecadbea3513afdfd2244b1dbfbec8b41022d413a1401701e55e
diff --git a/media-libs/harfbuzz/harfbuzz-5.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-5.2.0.ebuild
deleted file mode 100644
index 0b9dc09b3923..000000000000
--- a/media-libs/harfbuzz/harfbuzz-5.2.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	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"
-fi
-
-LICENSE="Old-MIT ISC icu"
-# 0.9.18 introduced the harfbuzz-icu split; bug #472416
-# 3.0.0 dropped some unstable APIs; bug #813705
-SLOT="0/4.0.0"
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	# bug #726120
-	sed -i \
-		-e '/tests\/macos\.tests/d' \
-		test/shape/data/in-house/Makefile.sources \
-		|| die
-
-	# bug #618772
-	append-cxxflags -std=c++14
-
-	# bug #790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	# bug #762415
-	local pyscript
-	for pyscript in $(find -type f -name "*.py") ; do
-		python_fix_shebang -q "${pyscript}"
-	done
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for introspection, bug #535852
-	local emesonargs=(
-		-Dcoretext="disabled"
-		-Dchafa="disabled"
-
-		$(meson_feature glib)
-		$(meson_feature graphite graphite2)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-
-		$(meson_native_use_feature cairo)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-
-		$(meson_use experimental experimental_api)
-	)
-
-	meson_src_configure
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 15e197353b86..cc0cc3b561de 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 97e68c4af519..721f746c50f5 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,7 +1,9 @@
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b180b3ed4a17dcdc68acea5dbe0b3adc99869270fb93a3f68e6728fad0776b9ce500efb6206f4db3c SHA512 36f3246835d6476e8f4f26795f8148f46b04015141894cdf849bfdd04b1cf5aa7a3d5960587f00e2c7d0f71568ca20fee619b95415df4cd0e4978ce95ca5f897
 DIST mpd-0.22.11.tar.xz 737184 BLAKE2B b47dcbd1e01812b66c81f33a53fc0838ddb8b7a145763744d1cf1aacc7ca38e763b723498f3ab7360f49637bc80c0ada5a69c7d619f3cf167071a7bec2440d20 SHA512 c53d386d42c2360502aad5e7574ae5ff76a20df037696989f9e1700f9cffb88afdd329cce758067356c59308d0cbcf3ba3ccf6f013e2fcec54ddf08bd0212b43
+DIST mpd-0.23.10.tar.xz 774196 BLAKE2B 6b648971412a5f83fe9ff2694c030b451393c415de9c34cbea9894555ac7ea87c5a991edfdd41c7cd76511ae0680ecab35eb36ceae5e372900518c9cf5e9c55c SHA512 15e51a1fab2e187529141ebb25f0bb6cc9c2ad5127c1a9f4c40d1a944ed5bc4e7e76b26eb71f659ddd8a5ce448089e6d3dcf0c302ced8a4d08951ef1b1f09c49
 DIST mpd-0.23.9.tar.xz 774156 BLAKE2B 2c045c86ecbe2267d032ebfd4a18835e9b1323860eb348b047d0900a284f5457ca4f18fdd50ea2f678e07a63817b4e4e3245cf0d3948e1f14cf3539d47b314d2 SHA512 67db093e35693f79267f955463ecaa284773b5e47a38f1548a0d16c9ba82aecc3434fd805e224b78782c5978c07e16d26f7632823e536f5304f557985f028d6e
 EBUILD mpd-0.22.11-r1.ebuild 8426 BLAKE2B 74a9c64d3dcc4a4b97e338e8ba21415e56650e8bf10ba0ee23f555d34483af17094b96fbf6e68c770d6c46ba58962f4c063077f97d51f0ddb1840463d63f1bf0 SHA512 cc680e2be4a3819c0ce980f1335805cd8c8f67b25ec38d11d6e29feb323e1f1305243506c65da839e954ebed61dca3d52b77a17181c37e887666db125a664d2d
+EBUILD mpd-0.23.10.ebuild 7829 BLAKE2B a1c29a9d5873d2eac20a453fc6fb948a66e038a9791fd8fac073621970088977d84ab14fbc212ca79528d1122749b1cfe4f379548b8e8e847b12211627ce7a6b SHA512 27ea69e730cfe9ea5f4d6545e6b777f47a49b48755c82f8aefc13fd0778c08e7512905c8d5da561ec05f855118dff37c1337408548cee0c4b8a92ca5d2aa6450
 EBUILD mpd-0.23.9-r1.ebuild 7818 BLAKE2B 87f87088224425a560f4a2f259a85cec204f768f0bf40290e7945c48b51d62a6d138d87d4474c9fcf9c0d10f4ef369b5097d51c43696006d49926fa2faf25133 SHA512 3c0f67fdb303eecbf3157a73aa43e2fdea376c9556558353dfd185f3bc2c7719da55d9467b90ab2e9e23ec73b16d17e218eb89829baf9c46acbb509b240d1ef2
 MISC metadata.xml 2676 BLAKE2B 8ed7eaefb3d937019a36dd816d5472caf7d4c4209eb943dfdf1caef2f24cd7b530919cdd46999aac5402c929a8f4f437129edbfa78b301e6951e0b04338b7f30 SHA512 44110bae4781092d6fbdd972e8369efe45067e7ce5c505294f677a55b3f4bafb0746b17ef552f01b0b23d5453c10b5a4710d65f4cf9578184d3388b4b873ed0e
diff --git a/media-sound/mpd/mpd-0.23.10.ebuild b/media-sound/mpd/mpd-0.23.10.ebuild
new file mode 100644
index 000000000000..16cbd10a4647
--- /dev/null
+++ b/media-sound/mpd/mpd-0.23.10.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info meson systemd xdg
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz
+	recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd
+	test twolame udisks vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	qobuz? ( curl soundcloud )
+	soundcloud? ( curl qobuz )
+	udisks? ( dbus )
+	upnp? ( curl expat )
+	webdav? ( curl expat )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	dev-libs/libfmt:=
+	dev-libs/libpcre2
+	media-libs/libogg
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+	ao? ( media-libs/libao:=[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+	bzip2? ( app-arch/bzip2 )
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac:= )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (
+		dev-libs/icu:=
+		virtual/libiconv
+	)
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2.4.0 )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	openmpt? ( media-libs/libopenmpt )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	pipewire? ( media-video/pipewire:= )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	snapcast? ( media-sound/snapcast )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd:= )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib:= )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via ${EROOT}/etc/init.d/mpd, please make sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	 sed -i \
+		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+		doc/mpdconf.example || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature bzip2)
+		$(meson_feature cdio cdio_paranoia)
+		$(meson_feature chromaprint)
+		$(meson_use cue)
+		$(meson_feature curl)
+		$(meson_feature dbus)
+		$(meson_use eventfd)
+		$(meson_feature expat)
+		$(meson_feature icu)
+		$(meson_feature id3tag)
+		$(meson_use inotify)
+		-Dipv6=enabled
+		$(meson_feature cdio iso9660)
+		$(meson_feature libmpdclient)
+		$(meson_feature libsamplerate)
+		$(meson_feature mms)
+		$(meson_feature nfs)
+		$(meson_use signalfd)
+		$(meson_feature samba smbclient)
+		$(meson_feature libsoxr soxr)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
+		$(meson_use test)
+		$(meson_feature udisks)
+		-Dupnp=$(usex upnp pupnp disabled)
+		$(meson_feature webdav)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		$(meson_feature zlib)
+		$(meson_feature zip zzip)
+	)
+
+	emesonargs+=(
+		$(meson_feature alsa)
+		$(meson_feature ao)
+		$(meson_use fifo)
+		$(meson_feature jack)
+		$(meson_feature openal)
+		$(meson_feature oss)
+		$(meson_use pipe)
+		$(meson_feature pipewire)
+		$(meson_feature pulseaudio pulse)
+		$(meson_use recorder)
+		$(meson_use snapcast)
+		$(meson_feature sndio)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+		emesonargs+=(
+			-Dshine=disabled
+			-Dshout=enabled
+			$(meson_feature vorbis vorbisenc)
+			-Dhttpd=true
+			$(meson_feature lame)
+			$(meson_feature twolame)
+			$(meson_use audiofile wave_encoder)
+		)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		$(meson_feature audiofile)
+		$(meson_feature faad)
+		$(meson_feature ffmpeg)
+		$(meson_feature flac)
+		$(meson_feature fluidsynth)
+		$(meson_feature gme)
+		$(meson_feature mad)
+		$(meson_feature mikmod)
+		$(meson_feature modplug)
+		$(meson_feature musepack mpcdec)
+		$(meson_feature mpg123)
+		$(meson_feature openmpt)
+		$(meson_feature opus)
+		$(meson_feature sid sidplay)
+		$(meson_feature sndfile)
+		$(meson_feature vorbis)
+		$(meson_feature wavpack)
+		$(meson_feature wildmidi)
+		$(meson_feature qobuz)
+		$(meson_feature soundcloud)
+
+		--libdir="/usr/$(get_libdir)"
+		$(meson_feature doc documentation)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+
+		$(meson_feature icu iconv)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' "${ED}"/etc/mpd.conf || die "sed failed"
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+	fowners mpd:audio -R /var/lib/mpd
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index c69374b09311..5d5fa5db3c37 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index dfa190a28c29..3c51513809ee 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 17 Oct 2022 18:09:54 +0000
+Tue, 18 Oct 2022 00:09:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c6dfcdfe82b4..ad0c60972a78 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-17T18:09:57Z
+TIMESTAMP 2022-10-18T00:09:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNNmnVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNN7tVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBIRw/7BINoa92JRAytdfdjFj1UaWlVpYaVDMhkrS2hcgeoZYJVsoFQKNgcY+SR
-CcIvCaL5QMD8yZi9px9to32Fz7aLGNy70dPDoQUHf6Y8y7SLwvz5s7ItABAEmRgc
-ckiOlVlHBobLCCrZjLRgC0uI3EyDUN+7SelcFQ8MWtcum0w1GkDVKMsQUf7cnL3f
-R+LaYlBUB6DWZV4H+uyuo2OQY/wZ1utkkcTrbZD4qJeKXINh0LzZHn6CtPRMJupG
-XNF7oJdJMgsJCqmxp8TOZsdDXuUXm0AFZEBxxBxDcdMtDxFcs9kR5qNkshIIHXyA
-HxKT8orVTISPxWUe2rnzjWhAwDORTPDMCZ4ELlI1ogC5owItehrz7EqV8KtFuo4w
-QI05LAIfK/miU3Hnq45ckAAskC52+MLMbmdXp7ysjkvycEj7zJpFaHQiT7BQk6LH
-M53so6q2OYfeRkGTk1rDUOqTmJGBQd+RAHdW2gqSEp+f2urS7EaIpUVkqA1bUQm+
-v//M1ZRJ1WqTYxVfVj5iIr6SW5QtWOpTpqbe+n4ed7xwkCZXnexJ5F1O8BlVzQ6K
-xum9tDI1g5kD3gXVfG1kdwamkkw4xZ3AyxBgLoz1gE5CGmgp8i7UmszlpDz0gAHo
-hg8ej7FDIldcbdp6e6pGDg952A4Gipi8IeAOUox3CJk4hbpbqZ0=
-=kJU2
+klCRqQ/+ILsAjx8DdC871IbMjnVLqvLOWvbIQnliK+N66SwyvYID86fH2FXmEmjh
+IPNqvmbBrTlCxhxSZ1hONrzUW5UzdHYZtp1F7oFEtfg/BTqZ1aIsvOig6juchMcm
+BmRXYuKiJs83IpiO0hwYrnlJ12DogF6NgUJcl6FGYaxHWEopPXSGpqiljt18fJ9E
+xMnqnmdYChD8fKdY8Viq4vDeh0uNngogqEcH1yMACL/JOds/EMzYELSRiBFF+c7B
+FOpHzwquujezXWJQsPA1TNgo9hRWnK8fSHLlAOPt4fWlqt9evfqoV+QGm8rWqCmD
+jtMY9HlsqvqU9FpOICDYFLU+vXKOvv0CDqJk7vyhFszKnPMmHWymQRo6BYoGuAKd
+7rNwdAfe82z+CSURhb2fFkLdiUF7/mOo9B6PCUBZnc3J/5OAgPXVbxOyWEnuv9Eo
+dRCmHbgmkQ56nWMSJDK+h9Q8A8d5YQQkmry2qazU95hXADHandSA8cQ7coBogftF
+kc2V6+FjU85t1bMvQ1rXbR19fi0E9AnVd0lIXbJCin6T+6jdMb2CVUFwOHcYe4Cz
+dD8TQHnbXDYUkQib/r9OwuUt9nDrut+LPchlwG3R4qqNyfpQuSUFtVD9sgFuqhSG
+tSb9GelAS41+qaxJ8WzDG7NYaGCSVr0tqbJE1WLmAplrPnEW8v4=
+=2+M/
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index dfa190a28c29..3c51513809ee 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 17 Oct 2022 18:09:54 +0000
+Tue, 18 Oct 2022 00:09:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 3d221fc6a1de..171d809e21ed 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 72f2e99f6250..90b90ed7299f 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/ryzen_smu-0.1.2 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
index 7b0347bbfa12..cedaf7f96039 100644
--- a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/leogx9r/ryzen_smu/archive/v0.1.2.tar.gz -> ryzen_smu-0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=798904db1fe98f9f209d1c03553416d7
diff --git a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
index 53c4bc833302..35aebe925f28 100644
--- a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/ryzen_smu/ryzen_smu-0.1.2_p20210627.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=bdcba0d172169768cc50d2e5ba0d89e9
diff --git a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205
index 6b66225fca4a..384252c8af3e 100644
--- a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/ryzen_smu/ryzen_smu-0.1.2_p20211205.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6296b9c67e389337abfd6a3cffe0aaa5
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 79d7b25c318a..0ad5fba56d7a 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/lkrg-0.9.4 b/metadata/md5-cache/app-antivirus/lkrg-0.9.4
index 20aa203172aa..732f00ae9d67 100644
--- a/metadata/md5-cache/app-antivirus/lkrg-0.9.4
+++ b/metadata/md5-cache/app-antivirus/lkrg-0.9.4
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://lkrg.org/download/lkrg-0.9.4.tar.gz verify-sig? ( https://lkrg.org/download/lkrg-0.9.4.tar.gz.sign )
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=9e631060a81b8540edb76e3e274ce39d
diff --git a/metadata/md5-cache/app-antivirus/lkrg-0.9.5 b/metadata/md5-cache/app-antivirus/lkrg-0.9.5
index 16e678b15dfb..3c6a4dfb843b 100644
--- a/metadata/md5-cache/app-antivirus/lkrg-0.9.5
+++ b/metadata/md5-cache/app-antivirus/lkrg-0.9.5
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://lkrg.org/download/lkrg-0.9.5.tar.gz verify-sig? ( https://lkrg.org/download/lkrg-0.9.5.tar.gz.sign )
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=b3654a36dfb34cf3a4e5f085c125c87c
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 6e929efd2524..0c7421aa50e4 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/pixz-1.0.7 b/metadata/md5-cache/app-arch/pixz-1.0.7-r1
index 867b5c3fdfaf..481916a76ecf 100644
--- a/metadata/md5-cache/app-arch/pixz-1.0.7
+++ b/metadata/md5-cache/app-arch/pixz-1.0.7-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure prepare test
+DEFINED_PHASES=configure install prepare
 DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] )
 DESCRIPTION=Parallel Indexed XZ compressor
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
 SLOT=0
 SRC_URI=https://github.com/vasi/pixz/releases/download/v1.0.7/pixz-1.0.7.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2bda4a3168154a3dcc99fe90b1c260c8
+_md5_=a51a4d2eaa1d6b33c5f2948b7497cb95
diff --git a/metadata/md5-cache/app-arch/pixz-9999 b/metadata/md5-cache/app-arch/pixz-9999
index fb80fdf51fdc..a16b16f0c846 100644
--- a/metadata/md5-cache/app-arch/pixz-9999
+++ b/metadata/md5-cache/app-arch/pixz-9999
@@ -1,5 +1,5 @@
 BDEPEND=app-text/asciidoc >=dev-vcs/git-1.8.2.1[curl] 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 prepare test unpack
+DEFINED_PHASES=configure prepare unpack
 DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] )
 DESCRIPTION=Parallel Indexed XZ compressor
 EAPI=7
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6ae381d120f7f3331c8da97bcfac6fc0
+_md5_=ec2636a7bc1002370c77ba5762327ce6
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 2f1d0def99d9..0605972a9d8a 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/cfssl-1.6.0 b/metadata/md5-cache/app-crypt/cfssl-1.6.0
index a3a11697a041..53f6929afdaa 100644
--- a/metadata/md5-cache/app-crypt/cfssl-1.6.0
+++ b/metadata/md5-cache/app-crypt/cfssl-1.6.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/cloudflare/cfssl
 INHERIT=go-module
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0 BSD BSD-1 MIT MPL-2.0
 RDEPEND=!!dev-lang/mono
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/cloudflare/cfssl/archive/v1.6.0.tar.gz -> cfssl-1.6.0.tar.gz
 _eclasses_=go-module	b088539f282ed242c23f38fa65472184
-_md5_=95c7f285a5fe77fbc8bf40a0abe1013b
+_md5_=b17111976a6b62cbda217890ed522a76
diff --git a/metadata/md5-cache/app-crypt/easy-rsa-3.0.8 b/metadata/md5-cache/app-crypt/easy-rsa-3.0.8
index ecf554da94ff..dcc4ff5fd2f5 100644
--- a/metadata/md5-cache/app-crypt/easy-rsa-3.0.8
+++ b/metadata/md5-cache/app-crypt/easy-rsa-3.0.8
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/openssl-0.9.6:0=
 DESCRIPTION=Small RSA key management package, based on OpenSSL
 EAPI=7
 HOMEPAGE=https://openvpn.net/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/openssl-0.9.6:0=
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/easy-rsa/archive/v3.0.8.tar.gz -> easy-rsa-3.0.8.tar.gz
-_md5_=707bb98bb2849cdbaac07d87919ff699
+_md5_=7f2864f11c1c74892bc7b3612c66f6f6
diff --git a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3 b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
index b65db08dc7f0..e8e9fd6001e9 100644
--- a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
+++ b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/tpm acct-user/tpm dev-libs/gmp:= modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://github.com/PeterHuewe/tpm-emulator/archive/v0.7.5.tar.gz -> tpm-emulator-0.7.5.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0d5c45b47554a87aea509b8b54475e01
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index a1cf6ed62c7e..3db9d023d3d3 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/kile-2.9.93-r1 b/metadata/md5-cache/app-editors/kile-2.9.93-r1
index 21b1c6a7d71b..cd788a0eae30 100644
--- a/metadata/md5-cache/app-editors/kile-2.9.93-r1
+++ b/metadata/md5-cache/app-editors/kile-2.9.93-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://apps.kde.org/kile/ https://kile.sourceforge.io/
 INHERIT=ecm kde.org
 IUSE=+pdf +png debug +handbook
-KEYWORDS=amd64 ~riscv x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=FDL-1.2 GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qttest-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 kde-apps/okular:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdoctools-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 pdf? ( app-text/poppler[qt5] ) kde-apps/konsole:5 kde-apps/okular:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( app-text/ghostscript-gpl app-text/texlive-core ) png? ( app-text/dvipng virtual/imagemagick-tools[png?] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kile/kile-2.9.93.tar.bz2
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ae9332b9326be0666f7ab2bf60064b3b
+_md5_=93d05f49f7882dfdd8f7756877744c7b
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 6d020d36eb3c..75d8409ab687 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/compat-28.1.2.2 b/metadata/md5-cache/app-emacs/compat-28.1.2.2
index 9d7cdd5c118b..689c36a404d8 100644
--- a/metadata/md5-cache/app-emacs/compat-28.1.2.2
+++ b/metadata/md5-cache/app-emacs/compat-28.1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=Compatibility libraries for Emacs
 EAPI=8
 HOMEPAGE=https://git.sr.ht/~pkal/compat/
 INHERIT=elisp
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://git.sr.ht/~pkal/compat/archive/28.1.2.2.tar.gz -> compat-28.1.2.2.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=db506d01f9cf8d2b0318a866cd4be38a
+_md5_=aef9f7da690556570271fff049cd84d5
diff --git a/metadata/md5-cache/app-emacs/transient-0.3.7_p20220918-r1 b/metadata/md5-cache/app-emacs/transient-0.3.7_p20220918-r1
index 55b590347b21..758ad659a032 100644
--- a/metadata/md5-cache/app-emacs/transient-0.3.7_p20220918-r1
+++ b/metadata/md5-cache/app-emacs/transient-0.3.7_p20220918-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Transient commands abstraction for GNU Emacs
 EAPI=8
 HOMEPAGE=https://magit.vc/manual/transient https://github.com/magit/transient
 INHERIT=elisp
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/compat >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/magit/transient/archive/097f5be6e0c228790a6e78ffee5f0c599cb58b20.tar.gz -> transient-0.3.7_p20220918.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=ce627c2d2485928bb48b060a54a2a134
+_md5_=a9e597373e1b32106aef5bdcd5542eff
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index a2e6cd012e15..052ea1e8d210 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/spice-protocol-0.14.4 b/metadata/md5-cache/app-emulation/spice-protocol-0.14.4
index b8cc484100e9..b672b9772b0e 100644
--- a/metadata/md5-cache/app-emulation/spice-protocol-0.14.4
+++ b/metadata/md5-cache/app-emulation/spice-protocol-0.14.4
@@ -2,11 +2,11 @@ BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-arr
 DEFINED_PHASES=compile configure install test
 DESCRIPTION=Headers defining the SPICE protocol
 EAPI=8
-HOMEPAGE=https://www.spice-space.org/
+HOMEPAGE=https://spice-space.org/
 INHERIT=meson
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-protocol-0.14.4.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7748534b2452fcb69f0687b15577f236
+_md5_=edbec6b79f2d80360d8fbad41d831985
diff --git a/metadata/md5-cache/app-emulation/spice-protocol-9999 b/metadata/md5-cache/app-emulation/spice-protocol-9999
index 7d5cb743ebeb..3a553aa2b12e 100644
--- a/metadata/md5-cache/app-emulation/spice-protocol-9999
+++ b/metadata/md5-cache/app-emulation/spice-protocol-9999
@@ -1,11 +1,11 @@
 BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=Headers defining the SPICE protocol
-EAPI=7
+EAPI=8
 HOMEPAGE=https://spice-space.org/
 INHERIT=meson git-r3
 LICENSE=BSD
 PROPERTIES=live
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=73da0061fba5af48c0a3d70d3e8ace1c
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=edbec6b79f2d80360d8fbad41d831985
diff --git a/metadata/md5-cache/app-emulation/vendor-reset-0.1.0 b/metadata/md5-cache/app-emulation/vendor-reset-0.1.0
index da14d48b7322..9a6f26febdf8 100644
--- a/metadata/md5-cache/app-emulation/vendor-reset-0.1.0
+++ b/metadata/md5-cache/app-emulation/vendor-reset-0.1.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/gnif/vendor-reset/archive/v0.1.0.tar.gz -> vendor-reset-0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c21c226ba11438e81bb5936653681629
diff --git a/metadata/md5-cache/app-emulation/vendor-reset-0.1.1_pre20220902 b/metadata/md5-cache/app-emulation/vendor-reset-0.1.1_pre20220902
index df434b32d1d0..f81bbcfd7ed1 100644
--- a/metadata/md5-cache/app-emulation/vendor-reset-0.1.1_pre20220902
+++ b/metadata/md5-cache/app-emulation/vendor-reset-0.1.1_pre20220902
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/gnif/vendor-reset/archive/7d43285a5054e4b2b18dbba771b57d365943a0f7.tar.gz -> vendor-reset-0.1.1_pre20220902.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=369c02fcc7eb8a57227dbb5bc0e361a2
diff --git a/metadata/md5-cache/app-emulation/vendor-reset-9999 b/metadata/md5-cache/app-emulation/vendor-reset-9999
index d9d023e13404..679ffc986e00 100644
--- a/metadata/md5-cache/app-emulation/vendor-reset-9999
+++ b/metadata/md5-cache/app-emulation/vendor-reset-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=baf402019a40d380321dc4864c3bb6cd
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.40 b/metadata/md5-cache/app-emulation/virtualbox-6.1.40
new file mode 100644
index 000000000000..98efa402ca41
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.40
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.8 ) qt5? ( dev-qt/linguist-tools:5 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.40 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( sdl? ( media-libs/libsdl:0[X,video] ) x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) java? ( virtual/jdk:1.8 ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-2 dtrace? ( CDDL )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.40 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( sdl? ( media-libs/libsdl:0[X,video] ) x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.40/VirtualBox-6.1.40.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=26b61822ccee967a46cca6039a2dba22
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.40 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.40
new file mode 100644
index 000000000000..25ae6d002c4b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.40
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RESTRICT=mirror
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.40/VBoxGuestAdditions_6.1.40.iso
+_md5_=e7ea0ff9eb658e544c5d8f71d1b0d05f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.40 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.40
new file mode 100644
index 000000000000..8d90c91edfd9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.40
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=PUEL
+RDEPEND==app-emulation/virtualbox-6.1.40*
+RESTRICT=bindist mirror strip
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.40/Oracle_VM_VirtualBox_Extension_Pack-6.1.40.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.40.tar.gz
+_md5_=1df13d75497e063d608096af4b52c889
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.36 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.36
index 3f5e6fac6f46..af07e768f38c 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.36
@@ -12,5 +12,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.36/VirtualBox-6.1.36.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=980a34892a1d506504f69b78eec31a1f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.38 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.38
index bedde3450c63..2feee1bab2fc 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.38
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.38
@@ -12,5 +12,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.38/VirtualBox-6.1.38.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=de209b4ba7fa8fc6309c16143476e569
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.40 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.40
new file mode 100644
index 000000000000..cf3a6078949a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.40
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+INHERIT=edo linux-mod systemd toolchain-funcs udev
+IUSE=X dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0/6.1
+SRC_URI=https://download.virtualbox.org/virtualbox/6.1.40/VirtualBox-6.1.40.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=c786ab5b3e520ac1f577ce1cce7816fe
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36
index 0eba439f2f08..395f00f68066 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://github.com/ceamac/virtualbox-modules-dist/releases/download/v6.1.36/vbox-kernel-module-src-6.1.36.tar.xz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=b7dccbab0ef6e1c5a93941cf3e5b6d76
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.38 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.38
index a6ea59cb3a4d..bb49ffe72940 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.38
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.38
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://github.com/ceamac/virtualbox-modules-dist/releases/download/v6.1.38/vbox-kernel-module-src-6.1.38.tar.xz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=b7dccbab0ef6e1c5a93941cf3e5b6d76
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.40 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.40
new file mode 100644
index 000000000000..835e3c3334f1
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.40
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+INHERIT=linux-mod toolchain-funcs
+IUSE=pax-kernel dist-kernel
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0/6.1
+SRC_URI=https://github.com/ceamac/virtualbox-modules-dist/releases/download/v6.1.40/vbox-kernel-module-src-6.1.40.tar.xz
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=6fac20f4a65e16163ac678572e74a53b
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 90811706b31f..8387ac25e13b 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/tp_smapi-0.43-r2 b/metadata/md5-cache/app-laptop/tp_smapi-0.43-r2
index 4e928e8eda98..142d95c23913 100644
--- a/metadata/md5-cache/app-laptop/tp_smapi-0.43-r2
+++ b/metadata/md5-cache/app-laptop/tp_smapi-0.43-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dmidecode kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.43/tp_smapi-0.43.tgz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=ffd27862fa7438d67122f743c900c76e
diff --git a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.10-r1 b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.10-r1
index d8d4ed77f64e..594aa5a347a1 100644
--- a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.10-r1
+++ b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.10-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/tuxedocomputers/tuxedo-keyboard/archive/v3.0.10.tar.gz -> tuxedo-keyboard-3.0.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=44390d3cee00673eb415794bd09bbbcb
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index c6eb92f6ae9d..4809354f78d8 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/boxes-2.2.0 b/metadata/md5-cache/app-misc/boxes-2.2.0
new file mode 100644
index 000000000000..5d307913404f
--- /dev/null
+++ b/metadata/md5-cache/app-misc/boxes-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bison sys-devel/flex test? ( app-editors/vim-core )
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/libpcre2[pcre32] dev-libs/libunistring:=
+DESCRIPTION=Draw any kind of boxes around your text
+EAPI=8
+HOMEPAGE=https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes
+INHERIT=toolchain-funcs
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libpcre2[pcre32] dev-libs/libunistring:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ascii-boxes/boxes/archive/v2.2.0.tar.gz -> boxes-2.2.0.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=f7613990c875aba7abca3e91cf9a6bf4
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.2 b/metadata/md5-cache/app-misc/lirc-0.10.2
index b194b6d3c1c0..b3521febe094 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.2
+++ b/metadata/md5-cache/app-misc/lirc-0.10.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.lirc.org/
 INHERIT=linux-info python-single-r1 xdg-utils
 IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] python_single_target_python3_8? ( dev-python/pygobject[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject[python_targets_python3_10(-)] ) ) inputlirc? ( app-misc/inputlircd )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) gtk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.2.tar.bz2
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=97e69a1cce30d819db641ca5c7716907
+_md5_=c98a295656f2276bcdab49a97f09aa5f
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index a0ab9ac3df9c..75b507d01c38 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/sc-im-0.8.2 b/metadata/md5-cache/app-office/sc-im-0.8.2
index a3d85cf0fae5..a1d914c3b5c4 100644
--- a/metadata/md5-cache/app-office/sc-im-0.8.2
+++ b/metadata/md5-cache/app-office/sc-im-0.8.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/andmarti1424/sc-im
 INHERIT=lua-single toolchain-funcs flag-o-matic
 IUSE=X plots wayland xls xlsx lua ods tmux lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 ~arm ~arm64
 LICENSE=BSD-4
 RDEPEND=sys-libs/ncurses:= lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ods? ( dev-libs/libxml2 dev-libs/libzip ) plots? ( sci-visualization/gnuplot ) tmux? ( app-misc/tmux ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) xls? ( dev-libs/libxls ) xlsx? ( dev-libs/libxlsxwriter dev-libs/libxml2 dev-libs/libzip )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://github.com/andmarti1424/sc-im/archive/v0.8.2.tar.gz -> sc-im-0.8.2.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e0948e641134c112c87b38f0609ebd21
+_md5_=8c1f051dba6047a135381db8927f0d27
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index cf1f988357e1..110d8b210b38 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/asciidoc-10.1.4 b/metadata/md5-cache/app-text/asciidoc-10.1.4
deleted file mode 100644
index fce89fb9fcff..000000000000
--- a/metadata/md5-cache/app-text/asciidoc-10.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_pypy3? ( >=dev-python/gpep517-9[python_targets_pypy3(-)] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)] dev-python/wheel[python_targets_pypy3(-)] ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=A plain text human readable/writable document format
-EAPI=8
-HOMEPAGE=https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/
-INHERIT=distutils-r1 optfeature readme.gentoo-r1
-IUSE=python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-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=GPL-2
-RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2:2 python_single_target_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/a/asciidoc/asciidoc-10.1.4.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cb340c8347b23d407d0975bcf96f015d
diff --git a/metadata/md5-cache/app-text/asciidoc-9.1.1 b/metadata/md5-cache/app-text/asciidoc-9.1.1
deleted file mode 100644
index 441385d04907..000000000000
--- a/metadata/md5-cache/app-text/asciidoc-9.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=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 prepare setup
-DEPEND=test? ( python_single_target_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-text/dvipng app-text/dvisvgm dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick[png] media-sound/lilypond )
-DESCRIPTION=A plain text human readable/writable document format
-EAPI=7
-HOMEPAGE=https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/
-INHERIT=autotools optfeature python-single-r1 readme.gentoo-r1
-IUSE=doc test python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=GPL-2
-RDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2:2
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/asciidoc-py/asciidoc-py/releases/download/9.1.1/asciidoc-9.1.1.tar.gz -> asciidoc-9.1.1.new.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=096a5c3a0e0ff7d3e3326aae1462cbe3
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100 b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r101
index 0bf3bcb972a0..80b50c92ac4e 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r101
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig boost? ( dev-libs/boost ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) idn? ( net-dns/libidn:= ) dev-libs/openssl:0= media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:= test? ( dev-util/cppunit )
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) idn? ( net-dns/libidn:= ) dev-libs/openssl:= dev-libs/libunistring:= media-libs/fontconfig:= media-libs/freetype:2= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= sys-libs/zlib:= test? ( dev-util/cppunit )
 DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/podofo/
@@ -8,10 +8,10 @@ INHERIT=cmake flag-o-matic lua-single toolchain-funcs
 IUSE=+boost idn debug test +tools lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) idn? ( net-dns/libidn:= ) dev-libs/openssl:0= media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) idn? ( net-dns/libidn:= ) dev-libs/openssl:= dev-libs/libunistring:= media-libs/fontconfig:= media-libs/freetype:2= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= sys-libs/zlib:=
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/0.9.6
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20190928.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dd4e5035ea8b105821b8521ad05fea1e
+_md5_=c12cc6190c693774eb6810a1704e0d21
diff --git a/metadata/md5-cache/app-text/podofo-0.9.7 b/metadata/md5-cache/app-text/podofo-0.9.7-r1
index 5a7bf724ef82..7549ee4e8a75 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.7
+++ b/metadata/md5-cache/app-text/podofo-0.9.7-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig boost? ( dev-libs/boost ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) idn? ( net-dns/libidn:= ) dev-libs/openssl:0= media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:= test? ( dev-util/cppunit )
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) idn? ( net-dns/libidn:= ) dev-libs/openssl:= media-libs/fontconfig:= media-libs/freetype:2= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= sys-libs/zlib:= test? ( dev-util/cppunit )
 DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/podofo/
@@ -8,10 +8,10 @@ INHERIT=cmake flag-o-matic lua-single toolchain-funcs
 IUSE=+boost idn debug test +tools lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) idn? ( net-dns/libidn:= ) dev-libs/openssl:0= media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) idn? ( net-dns/libidn:= ) dev-libs/openssl:= media-libs/fontconfig:= media-libs/freetype:2= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= sys-libs/zlib:=
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) test? ( tools )
 RESTRICT=test
 SLOT=0/0.9.7
 SRC_URI=https://cfhcable.dl.sourceforge.net/project/podofo/podofo/0.9.7/podofo-0.9.7.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4711c2194441001fc7af6b9c41f7274b
+_md5_=d4db4eb0a7b743f5cab57e0f1cd8ef70
diff --git a/metadata/md5-cache/app-text/zathura-0.4.7 b/metadata/md5-cache/app-text/zathura-0.4.7
deleted file mode 100644
index f2330f96a6f9..000000000000
--- a/metadata/md5-cache/app-text/zathura-0.4.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib dev-libs/check ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A highly customizable and functional document viewer
-EAPI=7
-HOMEPAGE=https://pwmt.org/projects/zathura/
-INHERIT=meson virtualx xdg
-IUSE=doc +magic seccomp sqlite synctex test test
-KEYWORDS=amd64 arm ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pwmt/zathura/archive/0.4.7.tar.gz -> zathura-0.4.7.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ea4ec8967773ec0a3653ccf8b456ab3c
diff --git a/metadata/md5-cache/app-text/zathura-0.4.8 b/metadata/md5-cache/app-text/zathura-0.4.8
deleted file mode 100644
index 58d78c6ce8c2..000000000000
--- a/metadata/md5-cache/app-text/zathura-0.4.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib dev-libs/check ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A highly customizable and functional document viewer
-EAPI=7
-HOMEPAGE=https://pwmt.org/projects/zathura/
-INHERIT=meson virtualx xdg
-IUSE=doc +magic seccomp sqlite synctex test test
-KEYWORDS=~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pwmt/zathura/archive/0.4.8.tar.gz -> zathura-0.4.8.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=01506226f0f4c36333583aa0fc60f71a
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.8 b/metadata/md5-cache/app-text/zathura-cb-0.1.8
deleted file mode 100644
index eda3b6f11f33..000000000000
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
-DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
-EAPI=7
-HOMEPAGE=https://pwmt.org/projects/zathura-cb/
-INHERIT=meson xdg-utils optfeature
-KEYWORDS=amd64 arm ~riscv x86
-LICENSE=ZLIB
-RDEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.8.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a5463965426382dc1ae716b49f05e1f6
diff --git a/metadata/md5-cache/app-text/zathura-cb-9999 b/metadata/md5-cache/app-text/zathura-cb-9999
index 3c124e0773e0..c0b2cfbc6797 100644
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@@ -2,12 +2,12 @@ BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-uti
 DEFINED_PHASES=compile configure install postinst postrm test unpack
 DEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
 DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
-EAPI=7
+EAPI=8
 HOMEPAGE=https://pwmt.org/projects/zathura-cb/
 INHERIT=meson xdg-utils optfeature git-r3
 LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=app-arch/libarchive:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c35e7a98dcac0b31ce2098d8818cf0b1
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=883317814f6b79574ed002816546efe0
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.7-r1 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.7-r1
deleted file mode 100644
index 34f822b9618f..000000000000
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/mupdf-1.17:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
-DESCRIPTION=PDF plug-in for zathura
-EAPI=8
-HOMEPAGE=https://pwmt.org/projects/zathura-pdf-mupdf/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=meson xdg
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=>=app-text/mupdf-1.17:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
-SLOT=0
-SRC_URI=https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/archive/0.3.7/zathura-pdf-mupdf-0.3.7.tar.gz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ed58eb10d748a186a050cd2c374f33ed
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
index df829a3f0706..b49390bc9ac0 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
@@ -1,6 +1,6 @@
-BDEPEND=app-text/tesseract virtual/pkgconfig media-libs/leptonica dev-lang/mujs >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-text/tesseract dev-lang/mujs media-libs/leptonica virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst test unpack
-DEPEND=>=app-text/mupdf-1.20:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
+DEPEND=>=app-text/mupdf-1.20.0:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 DESCRIPTION=PDF plug-in for zathura
 EAPI=8
 HOMEPAGE=https://git.pwmt.org/pwmt/zathura-pdf-mupdf
@@ -8,7 +8,7 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson xdg git-r3
 LICENSE=ZLIB
 PROPERTIES=live
-RDEPEND=>=app-text/mupdf-1.20:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
+RDEPEND=>=app-text/mupdf-1.20.0:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0045fd977c71c5e313665274b30bdff7
+_md5_=425c3fbb3a2157c95f65380486efaabc
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
deleted file mode 100644
index 799d2e6edfa4..000000000000
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
-DESCRIPTION=PDF plug-in for zathura
-EAPI=7
-HOMEPAGE=https://pwmt.org/projects/zathura-pdf-poppler
-INHERIT=meson xdg-utils
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
-SLOT=0
-SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.9.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4a1b0d4d2227e2e7ca9c2582b12a33b4
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999 b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
index 60cdb8431d50..e95518da88f3 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f373ebcc5f8dbeb4f4f1e666d73ba284
+_md5_=74329be8e93fd816f50848bfebd4eb8a
diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.6 b/metadata/md5-cache/app-text/zathura-ps-0.2.6
deleted file mode 100644
index 74e57f495dac..000000000000
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
-DESCRIPTION=PostScript plug-in for zathura
-EAPI=7
-HOMEPAGE=https://pwmt.org/projects/zathura-ps/download/
-INHERIT=meson xdg-utils
-KEYWORDS=amd64 arm ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
-SLOT=0
-SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.6.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3ee76e1b5ae75d4d71013fa4f3201b52
diff --git a/metadata/md5-cache/app-text/zathura-ps-9999 b/metadata/md5-cache/app-text/zathura-ps-9999
index 99486e71a941..bc385cb556a4 100644
--- a/metadata/md5-cache/app-text/zathura-ps-9999
+++ b/metadata/md5-cache/app-text/zathura-ps-9999
@@ -2,12 +2,12 @@ BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-uti
 DEFINED_PHASES=compile configure install postinst postrm test unpack
 DEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 DESCRIPTION=PostScript plug-in for zathura
-EAPI=7
+EAPI=8
 HOMEPAGE=https://pwmt.org/projects/zathura-ps/download/
 INHERIT=meson xdg-utils git-r3
 LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bfd45a592fe7c7cdc374bb51ef1860df
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ba69182c062e8c85aa8a22b636852932
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 40a7aa728a6f..0f40e6aaefcd 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/kokkos-3.7.0 b/metadata/md5-cache/dev-cpp/kokkos-3.7.0
new file mode 100644
index 000000000000..8e55d851b2eb
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/kokkos-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=sys-apps/hwloc:=
+DESCRIPTION=C++ Performance Portability Programming EcoSystem
+EAPI=7
+HOMEPAGE=https://github.com/kokkos
+INHERIT=cmake toolchain-funcs
+IUSE=+openmp test
+KEYWORDS=amd64 -x86
+LICENSE=BSD
+RDEPEND=sys-apps/hwloc:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kokkos/kokkos/archive/refs/tags/3.7.00.tar.gz -> kokkos-3.7.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1aebd73c04175a25f3d6493ff17fb5ff
diff --git a/metadata/md5-cache/dev-cpp/notcurses-3.0.8 b/metadata/md5-cache/dev-cpp/notcurses-3.0.8
new file mode 100644
index 000000000000..50f4e9b8e1e8
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/notcurses-3.0.8
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:=
+DESCRIPTION=Blingful TUIs and character graphics
+EAPI=8
+HOMEPAGE=https://notcurses.com
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dankamongmen/notcurses/archive/v3.0.8.tar.gz -> notcurses-3.0.8.tar.gz https://github.com/dankamongmen/notcurses/releases/download/v3.0.8/notcurses-doc-3.0.8.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5389d702cc7dc0d53186b22466569c2e
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index fe61e2ab20c9..9907b5c23fac 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/libgpiod-1.6.3-r1 b/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r1
index b37102e643b7..328f03fca6ae 100644
--- a/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r1
+++ b/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r1
@@ -11,5 +11,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.6.3.tar.xz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=515f89aa2beea155a0b30a1f364fb9fd
diff --git a/metadata/md5-cache/dev-libs/libksba-1.6.2 b/metadata/md5-cache/dev-libs/libksba-1.6.2
index b772b1a60e85..e24a10ad956d 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.6.2
+++ b/metadata/md5-cache/dev-libs/libksba-1.6.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnupg.org/related_software/libksba
 INHERIT=toolchain-funcs verify-sig
 IUSE=static-libs verify-sig
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.6.2.tar.bz2 verify-sig? ( mirror://gnupg/libksba/libksba-1.6.2.tar.bz2.sig )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=dcc5a7c56f17977ee1f500927396166b
+_md5_=d144042f171df677c066f9e0d7e81001
diff --git a/metadata/md5-cache/dev-libs/libxls-1.6.2 b/metadata/md5-cache/dev-libs/libxls-1.6.2
index e0d2e9072866..9edce315f7b4 100644
--- a/metadata/md5-cache/dev-libs/libxls-1.6.2
+++ b/metadata/md5-cache/dev-libs/libxls-1.6.2
@@ -3,8 +3,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=A library which can read Excel (xls) files
 EAPI=7
 HOMEPAGE=https://github.com/libxls/libxls
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
 SLOT=0/8
 SRC_URI=https://github.com/libxls/libxls/releases/download/v1.6.2/libxls-1.6.2.tar.gz
-_md5_=583b57c8a7cf7536d52fa2af0fecab7a
+_md5_=62650ad82a4a47580eaa55c3753d2281
diff --git a/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4-r1 b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4-r1
index 4d53ce94520a..c8f1cbaf4571 100644
--- a/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4-r1
+++ b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://libxlsxwriter.github.io/
 INHERIT=cmake plocale
 IUSE=openssl
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 ~arm ~arm64
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib[minizip] openssl? ( dev-libs/openssl:= )
 SLOT=0
 SRC_URI=https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_1.1.4.tar.gz -> libxlsxwriter-1.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3ff92766b7a4c8cf44aeefe23904b595
+_md5_=47249025db27143ce90822ec48fcca55
diff --git a/metadata/md5-cache/dev-libs/nspr-4.35 b/metadata/md5-cache/dev-libs/nspr-4.35
index 2252e2a04e91..4f00253eb35e 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.35
+++ b/metadata/md5-cache/dev-libs/nspr-4.35
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.mozilla.org/projects/nspr/
 INHERIT=autotools toolchain-funcs multilib-minimal
 IUSE=debug 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-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.35/src/nspr-4.35.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d768a6ca4dd4b848b1f73336d9175ba2
+_md5_=14ff9869a85608da7c3346238615043d
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 6c8e44f323b8..2f29dca37c60 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/alcotest-1.5.0-r1 b/metadata/md5-cache/dev-ml/alcotest-1.5.0-r1
index 9e68cc1afa1d..b0b5465aad9f 100644
--- a/metadata/md5-cache/dev-ml/alcotest-1.5.0-r1
+++ b/metadata/md5-cache/dev-ml/alcotest-1.5.0-r1
@@ -1,15 +1,16 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
+BDEPEND=test? ( >=dev-ml/cmdliner-1.1.0 ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
 DEPEND=>=dev-ml/dune-2.8:= dev-ml/astring:= dev-ml/async_unix:0/0.14.0 dev-ml/cmdliner:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/duration:= >=dev-ml/fmt-0.8.9:= dev-ml/mirage-clock:= dev-ml/re:= dev-ml/result:= dev-ml/logs:= dev-ml/uutf:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=A lightweight and colourful test framework
 EAPI=7
 HOMEPAGE=https://github.com/mirage/alcotest/
 INHERIT=dune
-IUSE=+ocamlopt
+IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=ISC
 RDEPEND=>=dev-ml/dune-2.8:= dev-ml/astring:= dev-ml/async_unix:0/0.14.0 dev-ml/cmdliner:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/duration:= >=dev-ml/fmt-0.8.9:= dev-ml/mirage-clock:= dev-ml/re:= dev-ml/result:= dev-ml/logs:= dev-ml/uutf:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
 SLOT=0/1.5.0
 SRC_URI=https://github.com/mirage/alcotest/archive/1.5.0.tar.gz -> alcotest-1.5.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=0cb08720d65fbbf3f28066fa21bf1c17
+_md5_=4416ee735b6d09d61aa26e2c942bd633
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 719f9c6f24e7..56fcbcf50d97 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/aiohttp-socks-0.7.1 b/metadata/md5-cache/dev-python/aiohttp-socks-0.7.1
index ff20308b2303..bf3d63d0b39e 100644
--- a/metadata/md5-cache/dev-python/aiohttp-socks-0.7.1
+++ b/metadata/md5-cache/dev-python/aiohttp-socks-0.7.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/aiohttp-socks/ https://github.com/romis2012/aiohttp-socks
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aiohttp-2.3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-socks-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/romis2012/aiohttp-socks/archive/v0.7.1.tar.gz -> aiohttp-socks-0.7.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=547c418caec51e5c80f9ca88b992ef79
+_md5_=97e94bce41acd85a66b6fd733e3b91fb
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.22.1 b/metadata/md5-cache/dev-python/aiorpcX-0.22.1
index 2edfce65f2df..8ebdc36faeb5 100644
--- a/metadata/md5-cache/dev-python/aiorpcX-0.22.1
+++ b/metadata/md5-cache/dev-python/aiorpcX-0.22.1
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://pypi.org/project/aiorpcX/ https://github.com/kyuupichan/aiorpcX/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kyuupichan/aiorpcX/archive/0.22.1.tar.gz -> aiorpcX-0.22.1.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_=bc94702ebaa33514cd3113e081c94928
+_md5_=706ef00f4c6b288ee630f7b257c0ef9c
diff --git a/metadata/md5-cache/dev-python/boolean-py-4.0 b/metadata/md5-cache/dev-python/boolean-py-4.0
index 727222637181..50e69adea143 100644
--- a/metadata/md5-cache/dev-python/boolean-py-4.0
+++ b/metadata/md5-cache/dev-python/boolean-py-4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/boolean.py/ https://github.com/bastikr/boolean.py/
 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 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 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=https://github.com/bastikr/boolean.py/archive/v4.0.tar.gz -> boolean.py-4.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_=c2fadb1e3b89d0cb6b412c93c0494971
+_md5_=4af1575c4ea21f7e67186e6077da58ee
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.4.0 b/metadata/md5-cache/dev-python/cairocffi-1.4.0
index 002f4949d7d9..f7fcdc6fa4e8 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.4.0
+++ b/metadata/md5-cache/dev-python/cairocffi-1.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Kozea/cairocffi/ https://pypi.org/project/cairocffi/
 INHERIT=distutils-r1 virtualx
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/xcffib-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] 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 ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-1.4.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=2ebb14f2cae7230cd2a297c9fc1ea60b
+_md5_=62ee8a9fb2fd019234ae5a920bcb32e4
diff --git a/metadata/md5-cache/dev-python/cerberus-1.3.4-r1 b/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
index 2462fdea7784..916b9c297994 100644
--- a/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
+++ b/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://docs.python-cerberus.org/ https://github.com/pyeve/cerberus/ https://pypi.org/project/Cerberus/
 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 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=ISC
 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=https://github.com/pyeve/cerberus/archive/1.3.4.tar.gz -> cerberus-1.3.4.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5ff099315ecc6d441656f65a64d0f505
+_md5_=4b070e608e2dde38c92db56b485acc25
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-3.0.2 b/metadata/md5-cache/dev-python/flask-sqlalchemy-3.0.2
index f6ab58a10711..e38c123ee9cd 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-3.0.2
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-3.0.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pallets-eco/flask-sqlalchemy/ https://pypi.org/project/flask-sqlalchemy/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.4.18[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-3.0.2.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=67f3d424360758d687ca9e56d06db939
+_md5_=0be707ae371dd8250c64cdc8f94ef7cc
diff --git a/metadata/md5-cache/dev-python/license-expression-30.0.0 b/metadata/md5-cache/dev-python/license-expression-30.0.0
index 11ceb0528708..00e2a3ef18c9 100644
--- a/metadata/md5-cache/dev-python/license-expression-30.0.0
+++ b/metadata/md5-cache/dev-python/license-expression-30.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/license-expression/ https://github.com/nexB/license-expression/
 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 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/boolean-py-4.0[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nexB/license-expression/archive/v30.0.0.tar.gz -> license-expression-30.0.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_=3e4be17bde15d8319a8fc15d0a150824
+_md5_=aa68f985648686f89ba9bdd7810e12a9
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-5.0.0-r1 b/metadata/md5-cache/dev-python/oslo-concurrency-5.0.0-r1
deleted file mode 100644
index ff00b4c66964..000000000000
--- a/metadata/md5-cache/dev-python/oslo-concurrency-5.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/eventlet-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/eventlet-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fasteners-0.7.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(-)?] ) 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=Oslo Concurrency library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/oslo.concurrency/ https://github.com/openstack/oslo.concurrency
-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
-LICENSE=Apache-2.0
-RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fasteners-0.7.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/o/oslo.concurrency/oslo.concurrency-5.0.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=05a31474ed1444c7c58dd8dee84b1e18
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-5.0.1 b/metadata/md5-cache/dev-python/oslo-concurrency-5.0.1
index 79a747f33b1e..3e9bf004d57c 100644
--- a/metadata/md5-cache/dev-python/oslo-concurrency-5.0.1
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-5.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/oslo.concurrency/ https://github.com/openstack/oslo.concurrency/ https://pypi.org/project/oslo.concurrency/
 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=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fasteners-0.7.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-5.0.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=23d644fcb588661b3814f1e8868bcc35
+_md5_=037766e9890a833bd7c3ec951fa23311
diff --git a/metadata/md5-cache/dev-python/pbkdf2-1.3-r2 b/metadata/md5-cache/dev-python/pbkdf2-1.3-r2
index 2a018757356d..daa239158567 100644
--- a/metadata/md5-cache/dev-python/pbkdf2-1.3-r2
+++ b/metadata/md5-cache/dev-python/pbkdf2-1.3-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.dlitz.net/software/python-pbkdf2/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux
 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 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbkdf2/pbkdf2-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_=23c93034767e861cd3c175cd6d7e8fa0
+_md5_=08e9d0af332c18c00f21658c71281a8c
diff --git a/metadata/md5-cache/dev-python/pdm-pep517-1.0.4 b/metadata/md5-cache/dev-python/pdm-pep517-1.0.4
index 602738ff7a1b..fe58a12de798 100644
--- a/metadata/md5-cache/dev-python/pdm-pep517-1.0.4
+++ b/metadata/md5-cache/dev-python/pdm-pep517-1.0.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pdm-pep517/ https://github.com/pdm-project/pdm-pep517/
 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 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pdm-project/pdm-pep517/archive/1.0.4.tar.gz -> pdm-pep517-1.0.4.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=98ee0f3026cd57b96f80b57013c55b5f
+_md5_=b381b559ff08247c718808be327146c3
diff --git a/metadata/md5-cache/dev-python/pikepdf-6.2.0 b/metadata/md5-cache/dev-python/pikepdf-6.2.0
index b16ff49a2534..b9a74faa1fab 100644
--- a/metadata/md5-cache/dev-python/pikepdf-6.2.0
+++ b/metadata/md5-cache/dev-python/pikepdf-6.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=app-text/qpdf-11.1.1:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybind11-2.9.1[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pikepdf/pikepdf/archive/v6.2.0.tar.gz -> pikepdf-6.2.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_=657444ba2bed1ce607677b1bf4a03698
+_md5_=35abbeaae87a07d1b4ef3c69e363d9d0
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2
index 1e2afdd01270..e7ec59dd5e90 100644
--- a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2
+++ b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/pytz[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v2.0.1.tar.gz -> python-xmp-toolkit-2.0.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1f59421860982b1b01d618036963e8dc
+_md5_=e07aeb5fdca5f842fabfb22ef41ddca4
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.40 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.40
deleted file mode 100644
index 1f79492348a4..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.40
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] ) ) test? ( >=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=[sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite?] ) >=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 postinst prepare test
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=8
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
-INHERIT=distutils-r1 optfeature
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_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 ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite?] )
-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/S/SQLAlchemy/SQLAlchemy-1.4.40.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_=adeb419a7e20669252a8add2623dd014
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index ef382bd7b179..3e6228b2d3c8 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/ccache-4.7 b/metadata/md5-cache/dev-util/ccache-4.7
new file mode 100644
index 000000000000..8cf16e62486c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ccache-4.7
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( dev-ruby/asciidoctor ) verify-sig? ( sec-keys/openpgp-keys-joelrosdahl ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare prerm test unpack
+DEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) test? ( dev-libs/elfutils )
+DESCRIPTION=Fast compiler cache
+EAPI=8
+HOMEPAGE=https://ccache.dev/
+IDEPEND=dev-util/shadowman
+INHERIT=cmake toolchain-funcs flag-o-matic verify-sig
+IUSE=doc redis +static-c++ test verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) dev-util/shadowman sys-apps/gentoo-functions
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ccache/ccache/releases/download/v4.7/ccache-4.7.tar.xz verify-sig? ( https://github.com/ccache/ccache/releases/download/v4.7/ccache-4.7.tar.xz.asc )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=167a55abd31f0ca6c7ebbd67ca9bac00
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.12.5 b/metadata/md5-cache/dev-util/lttng-modules-2.12.5
index 8df75458e68d..347867948030 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.12.5
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.12.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.12
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.12.5.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=eb02ad59f26c4db1299d1c15d2f8d421
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.12.6 b/metadata/md5-cache/dev-util/lttng-modules-2.12.6
index 666e49a3b9b4..7c53a0341495 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.12.6
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.12.6
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.12
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.12.6.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=72e832555c6b5455db4cd7d50858d8ba
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.12.8 b/metadata/md5-cache/dev-util/lttng-modules-2.12.8
index 1314baf78f23..a93b8d711b52 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.12.8
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.12.8
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.12
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.12.8.tar.bz2
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=a1c545978cb9a18dc5ce09ed3c3d098e
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.13.3 b/metadata/md5-cache/dev-util/lttng-modules-2.13.3
index 3570cfb284c3..1dd6e8f24fac 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.13.3
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.13.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.13
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.13.3.tar.bz2
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=a167a7d9bd45c114e5a1e2c7e1bef289
diff --git a/metadata/md5-cache/dev-util/rr-5.5.0 b/metadata/md5-cache/dev-util/rr-5.6.0-r1
index 8bfd34cdc0fa..4fca9d69d36c 100644
--- a/metadata/md5-cache/dev-util/rr-5.5.0
+++ b/metadata/md5-cache/dev-util/rr-5.6.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/zlib:= dev-libs/capnproto:= python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) test? ( python_single_target_python3_8? ( dev-python/pexpect[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pexpect[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pexpect[python_targets_python3_10(-)] ) sys-devel/gdb[xml] )
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/capnproto:= sys-libs/zlib:= test? ( python_single_target_python3_8? ( dev-python/pexpect[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pexpect[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pexpect[python_targets_python3_10(-)] ) sys-devel/gdb[xml] )
 DESCRIPTION=Record and Replay Framework
 EAPI=7
 HOMEPAGE=https://rr-project.org/
@@ -8,10 +8,10 @@ INHERIT=cmake linux-info python-single-r1
 IUSE=multilib test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT BSD-2
-RDEPEND=sys-libs/zlib:= dev-libs/capnproto:= python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sys-devel/gdb[xml]
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/capnproto:= sys-libs/zlib:= sys-devel/gdb[xml]
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/mozilla/rr/archive/5.5.0.tar.gz -> mozilla-rr-5.5.0.tar.gz
+SRC_URI=https://github.com/rr-debugger/rr/archive/5.6.0.tar.gz -> mozilla-rr-5.6.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=38aa820c7f5346c77573f26f87bd4dc0
+_md5_=5c7feb3aaaa38fd5d00df48f121fe19b
diff --git a/metadata/md5-cache/dev-util/scap-driver-0.29.3 b/metadata/md5-cache/dev-util/scap-driver-0.29.3
index 5b5215e9f787..5cf537c58fb6 100644
--- a/metadata/md5-cache/dev-util/scap-driver-0.29.3
+++ b/metadata/md5-cache/dev-util/scap-driver-0.29.3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<dev-util/sysdig-0.29.3[modules] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/falcosecurity/libs/archive/e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz -> falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2752aabcc5359fdb83e67ae76d3bbee6
diff --git a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1 b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
index dfb46072ba4d..8b304f3cf2fb 100644
--- a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
+++ b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
@@ -11,5 +11,5 @@ LICENSE=|| ( MIT GPL-2 )
 RDEPEND=!<=dev-util/sysdig-0.26.4[modules] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.1.tar.gz -> sysdig-0.27.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=800fffc374f26390889cfd16c003d5e6
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 648206c1ecee..80a25ded03ef 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/vcsh-2.0.4 b/metadata/md5-cache/dev-vcs/vcsh-2.0.4
new file mode 100644
index 000000000000..01c233fa9e22
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/vcsh-2.0.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Manage config files in /var/tmp/portage/dev-vcs/vcsh-2.0.4/homedir via fake bare git repositories
+EAPI=8
+HOMEPAGE=https://github.com/RichiH/vcsh
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/RichiH/vcsh/releases/download/v2.0.4/vcsh-2.0.4.tar.xz
+_md5_=d3b124da1afaa670bcea732337e62e94
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index ebc3b893818a..b8fe35a65639 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/polymc-9999 b/metadata/md5-cache/games-action/polymc-9999
deleted file mode 100644
index 6be9a8d1aca3..000000000000
--- a/metadata/md5-cache/games-action/polymc-9999
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/scdoc kde-frameworks/extra-cmake-modules:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!qt6? ( >=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 ) qt6? ( >=dev-qt/qtbase-6.0.0:6[concurrent,gui,network,widgets,xml(+)] >=dev-qt/qt5compat-6.0.0:6 ) !qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] ) qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] ) sys-libs/zlib media-libs/libglvnd >=virtual/jdk-1.8.0:* >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A custom, open source Minecraft launcher
-EAPI=8
-HOMEPAGE=https://polymc.org/ https://github.com/PolyMC/PolyMC
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake java-pkg-2 optfeature xdg git-r3
-IUSE=debug lto qt6 test
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT
-PROPERTIES=live
-RDEPEND=!qt6? ( >=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 ) qt6? ( >=dev-qt/qtbase-6.0.0:6[concurrent,gui,network,widgets,xml(+)] >=dev-qt/qt5compat-6.0.0:6 ) !qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] ) qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] ) sys-libs/zlib !qt6? ( >=dev-qt/qtsvg-5.12.0:5 ) qt6? ( >=dev-qt/qtsvg-6.0.0:6 ) >=virtual/jre-1.8.0:* virtual/opengl >=dev-java/java-config-2.2.0-r3
-REQUIRED_USE=lto? ( !debug )
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7331b0c6d024fdbdb07f87ecf8049e94
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index b395142ea8db..dc54ccbab868 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/xpadneo-0.9.5 b/metadata/md5-cache/games-util/xpadneo-0.9.5
index 462aa9ef5ce1..3db22f28e337 100644
--- a/metadata/md5-cache/games-util/xpadneo-0.9.5
+++ b/metadata/md5-cache/games-util/xpadneo-0.9.5
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/atar-axis/xpadneo/archive/v0.9.5.tar.gz -> xpadneo-0.9.5.tar.gz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=ebe65ed99541bdafdd12b6aea3197e23
diff --git a/metadata/md5-cache/games-util/xpadneo-9999 b/metadata/md5-cache/games-util/xpadneo-9999
index 6124f5cf22b5..f09a4045cead 100644
--- a/metadata/md5-cache/games-util/xpadneo-9999
+++ b/metadata/md5-cache/games-util/xpadneo-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=ebe65ed99541bdafdd12b6aea3197e23
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index c468b98c6aaa..536ff3b31694 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/grim-1.3.1 b/metadata/md5-cache/gui-apps/grim-1.3.1
deleted file mode 100644
index 83d871066c3f..000000000000
--- a/metadata/md5-cache/gui-apps/grim-1.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( app-text/scdoc ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/wayland >=dev-libs/wayland-protocols-1.14 x11-libs/cairo jpeg? ( media-libs/libjpeg-turbo )
-DESCRIPTION=Grab images from a Wayland compositor
-EAPI=7
-HOMEPAGE=https://github.com/emersion/grim
-INHERIT=meson
-IUSE=+man jpeg
-KEYWORDS=amd64 ~arm64
-LICENSE=MIT
-RDEPEND=dev-libs/wayland >=dev-libs/wayland-protocols-1.14 x11-libs/cairo jpeg? ( media-libs/libjpeg-turbo )
-SLOT=0
-SRC_URI=https://github.com/emersion/grim/archive/v1.3.1.tar.gz -> grim-1.3.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5c23b199f60deffe2767ae82a69a077f
diff --git a/metadata/md5-cache/gui-apps/kanshi-1.2.0 b/metadata/md5-cache/gui-apps/kanshi-1.2.0
deleted file mode 100644
index 8494a7b6a647..000000000000
--- a/metadata/md5-cache/gui-apps/kanshi-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-libs/wayland virtual/pkgconfig dev-libs/wayland-protocols man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=dynamic display configuration (autorandr for wayland)
-EAPI=8
-HOMEPAGE=https://wayland.emersion.fr/kanshi/ https://sr.ht/~emersion/kanshi/
-INHERIT=meson
-IUSE=+man
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/wayland
-SLOT=0
-SRC_URI=https://github.com/emersion/kanshi/releases/download/v1.2.0/kanshi-1.2.0.tar.gz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=192da6a45e0fcd889ea766da5376d00a
diff --git a/metadata/md5-cache/gui-apps/slurp-1.2.0 b/metadata/md5-cache/gui-apps/slurp-1.2.0
deleted file mode 100644
index 37ec5b5a4368..000000000000
--- a/metadata/md5-cache/gui-apps/slurp-1.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( app-text/scdoc ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland x11-libs/cairo
-DESCRIPTION=Select a region in a Wayland compositor and print it to the standard output
-EAPI=7
-HOMEPAGE=https://github.com/emersion/slurp
-INHERIT=meson
-IUSE=+man
-KEYWORDS=amd64 ~arm64
-LICENSE=MIT
-RDEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland x11-libs/cairo
-SLOT=0
-SRC_URI=https://github.com/emersion/slurp/archive/v1.2.0.tar.gz -> slurp-1.2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e1ba1328bf3076e16da814fc569a02a6
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 0ebebd8fcf07..40260dc233c5 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.15.0-r1 b/metadata/md5-cache/gui-libs/wlroots-0.15.0-r1
deleted file mode 100644
index 9124dd028083..000000000000
--- a/metadata/md5-cache/gui-libs/wlroots-0.15.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.24 >=dev-util/meson-0.60.0 virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.24 media-libs/mesa[egl(+),gles2,gbm(+)] sys-auth/seatd:= virtual/libudev vulkan? ( dev-util/glslang:0= dev-util/vulkan-headers:0= media-libs/vulkan-loader:0= ) >=x11-libs/libdrm-2.4.109:0= x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
-DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland compositor
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/wlroots/wlroots
-INHERIT=meson
-IUSE=vulkan x11-backend X
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.24 media-libs/mesa[egl(+),gles2,gbm(+)] sys-auth/seatd:= virtual/libudev vulkan? ( dev-util/glslang:0= dev-util/vulkan-headers:0= media-libs/vulkan-loader:0= ) >=x11-libs/libdrm-2.4.109:0= x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
-SLOT=0/15
-SRC_URI=https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/0.15.0/wlroots-0.15.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=620f404fd32ec562660abee5e1cb8d29
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.15.0-r2 b/metadata/md5-cache/gui-libs/wlroots-0.15.0-r2
deleted file mode 100644
index 99e06f2dfc58..000000000000
--- a/metadata/md5-cache/gui-libs/wlroots-0.15.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.24 >=dev-util/meson-0.60.0 virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.24 media-libs/mesa[egl(+),gles2,gbm(+)] sys-auth/seatd:= virtual/libudev vulkan? ( dev-util/glslang:0= dev-util/vulkan-headers:0= media-libs/vulkan-loader:0= ) >=x11-libs/libdrm-2.4.109:0= x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
-DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland compositor
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/wlroots/wlroots
-INHERIT=meson
-IUSE=vulkan x11-backend X
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.24 media-libs/mesa[egl(+),gles2,gbm(+)] sys-auth/seatd:= virtual/libudev vulkan? ( dev-util/glslang:0= dev-util/vulkan-headers:0= media-libs/vulkan-loader:0= ) >=x11-libs/libdrm-2.4.109:0= x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
-SLOT=0/15
-SRC_URI=https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/0.15.0/wlroots-0.15.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=88df59b35ebd5dbcef0d570e90866697
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 7ebd091c9052..95a4f7a92712 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/geeqie-2.0.1 b/metadata/md5-cache/media-gfx/geeqie-2.0.1
new file mode 100644
index 000000000000..bad39eff1daa
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/geeqie-2.0.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-util/xxdi app-editors/vim-core ) dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
+DESCRIPTION=A lightweight GTK image viewer forked from GQview
+EAPI=8
+HOMEPAGE=http://www.geeqie.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=lua-single meson optfeature xdg
+IUSE=debug doc djvu exif ffmpegthumbnailer gpu-accel heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) map? ( gpu-accel )
+SLOT=0
+SRC_URI=https://github.com/BestImageViewer/geeqie/releases/download/v2.0.1/geeqie-2.0.1.tar.xz https://dev.gentoo.org/~voyageur/geeqie-2.0.1-ChangeLog.tar.gz
+_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6af573a2bac8c4311974e4a0bd8e34de
diff --git a/metadata/md5-cache/media-gfx/geeqie-9999 b/metadata/md5-cache/media-gfx/geeqie-9999
index 3eb4666f7b43..2310eb38b474 100644
--- a/metadata/md5-cache/media-gfx/geeqie-9999
+++ b/metadata/md5-cache/media-gfx/geeqie-9999
@@ -1,16 +1,16 @@
-BDEPEND=dev-util/glib-utils dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) 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 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/libintl x11-libs/gtk+:3 doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
+BDEPEND=|| ( dev-util/xxdi app-editors/vim-core ) dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
 DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=8
 HOMEPAGE=http://www.geeqie.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools git-r3 lua-single xdg
-IUSE=debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp lua_single_target_lua5-1 lua_single_target_lua5-3
+INHERIT=git-r3 lua-single meson optfeature xdg
+IUSE=debug doc djvu exif ffmpegthumbnailer gpu-accel heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=virtual/libintl x11-libs/gtk+:3 doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) ) map? ( gpu-accel )
+RDEPEND=gnome-extra/zenity virtual/libintl x11-libs/gtk+:3 djvu? ( app-text/djvu ) doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( >=media-libs/libjxl-0.3.7 ) lcms? ( media-libs/lcms:2 ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) doc? ( app-doc/doxygen ) ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) tiff? ( media-libs/tiff:0 ) webp? ( >=media-libs/libwebp-0.6.1 ) zip? ( >=app-arch/libarchive-3.4.0 )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) map? ( gpu-accel )
 SLOT=0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f6f94d6030aa214b06e8573676b5e9da
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ddbe45078b4dab184e755c6514b0035b
diff --git a/metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2 b/metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2-r1
index bdaf7698138b..d51c116103c6 100644
--- a/metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2
+++ b/metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2-r1
@@ -7,6 +7,6 @@ INHERIT=autotools
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86
 LICENSE=CC0-1.0
 SLOT=2.0
-SRC_URI=https://github.com/mypaint/mypaint-brushes/archive/v2.0.2.tar.gz -> mypaint-brushes-2.0.2.tar.gz
+SRC_URI=https://github.com/mypaint/mypaint-brushes/releases/download/v2.0.2/mypaint-brushes-2.0.2.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7cb7a145d6e0cff7138f14331b490818
+_md5_=bf6252c1e7bf8ccab90eaafb76991627
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f87f9ddfe192..63c853d37f85 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/coin-4.0.0 b/metadata/md5-cache/media-libs/coin-4.0.0
index 9d67a64cfe43..37b82630334e 100644
--- a/metadata/md5-cache/media-libs/coin-4.0.0
+++ b/metadata/md5-cache/media-libs/coin-4.0.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/coin3d/coin/releases/download/Coin-4.0.0/coin-4.0.0-src.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6a37b232aa37770d78bb2a2d1b1f9823
+_md5_=e7a966941ce8dbfb3e5dbc647e456c3d
diff --git a/metadata/md5-cache/media-libs/gmmlib-22.2.0 b/metadata/md5-cache/media-libs/gmmlib-22.2.1
index 77088a2dc0e9..339cb72ecca1 100644
--- a/metadata/md5-cache/media-libs/gmmlib-22.2.0
+++ b/metadata/md5-cache/media-libs/gmmlib-22.2.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/12.2
-SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.2.0.tar.gz
+SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.2.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=80f384a81e48314e8d79ec90afc9651a
diff --git a/metadata/md5-cache/media-libs/harfbuzz-5.2.0 b/metadata/md5-cache/media-libs/harfbuzz-5.2.0
deleted file mode 100644
index ccc1184b6252..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-5.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=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 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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(-)?] ) >=dev-libs/gobject-introspection-common-1.34
-DESCRIPTION=An OpenType text shaping engine
-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
-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 )
-RESTRICT=!test? ( test )
-SLOT=0/4.0.0
-SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/5.2.0/harfbuzz-5.2.0.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_=8906be84296b89003cbcece64761f899
diff --git a/metadata/md5-cache/media-libs/svgalib-1.9.25-r8 b/metadata/md5-cache/media-libs/svgalib-1.9.25-r8
index 0480851694b7..1fdea6e97001 100644
--- a/metadata/md5-cache/media-libs/svgalib-1.9.25-r8
+++ b/metadata/md5-cache/media-libs/svgalib-1.9.25-r8
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://www.arava.co.il/matan/svgalib/svgalib-1.9.25.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0d328e889f88ea715024f680e5c3cc30
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 9a86c7d4116f..461bf21ea35f 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/mpd-0.23.10 b/metadata/md5-cache/media-sound/mpd-0.23.10
new file mode 100644
index 000000000000..1b57a1109895
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpd-0.23.10
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=acct-user/mpd dev-libs/libfmt:= dev-libs/libpcre2 media-libs/libogg sys-libs/liburing:= alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao:=[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) doc? ( dev-python/sphinx ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac:= ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= virtual/libiconv ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2.4.0 ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) openmpt? ( media-libs/libopenmpt ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) pipewire? ( media-video/pipewire:= ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) snapcast? ( media-sound/snapcast ) sndfile? ( media-libs/libsndfile ) sndio? ( media-sound/sndio ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd:= ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib:= ) zlib? ( sys-libs/zlib:= ) dev-libs/boost:= test? ( dev-cpp/gtest )
+DESCRIPTION=The Music Player Daemon (mpd)
+EAPI=8
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=flag-o-matic linux-info meson systemd xdg
+IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd test twolame udisks vorbis wavpack webdav wildmidi upnp zeroconf zip zlib
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/mpd dev-libs/libfmt:= dev-libs/libpcre2 media-libs/libogg sys-libs/liburing:= alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao:=[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) doc? ( dev-python/sphinx ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac:= ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= virtual/libiconv ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2.4.0 ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) openmpt? ( media-libs/libopenmpt ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) pipewire? ( media-video/pipewire:= ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) snapcast? ( media-sound/snapcast ) sndfile? ( media-libs/libsndfile ) sndio? ( media-sound/sndio ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd:= ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib:= ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) qobuz? ( curl soundcloud ) soundcloud? ( curl qobuz ) udisks? ( dbus ) upnp? ( curl expat ) webdav? ( curl expat )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/mpd/0.23/mpd-0.23.10.tar.xz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a779a3540fec78acb76577296a0037c3
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 80f4f6ff5053..e7f989ac26e7 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5 b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
index ed0a6535c97d..3fff557c09b3 100644
--- a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
+++ b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-firmware/tt-s2-6400-firmware kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/v4l-dvb-saa716x/get/83f3bfd93a95.tar.bz2 -> v4l-dvb-saa716x-0.0.1_p20160322.tar.bz2
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=a71dff70c0db3cba00273de9fdb75f62
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 258adb14de91..cc19c9be646c 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/droidcam-1.8.2-r1 b/metadata/md5-cache/media-video/droidcam-1.8.2-r1
index 9bdf88a370fb..51b8a0df8ea8 100644
--- a/metadata/md5-cache/media-video/droidcam-1.8.2-r1
+++ b/metadata/md5-cache/media-video/droidcam-1.8.2-r1
@@ -12,5 +12,5 @@ RDEPEND=app-pda/libplist app-pda/libusbmuxd dev-libs/glib dev-libs/libappindicat
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dev47apps/droidcam/archive/v1.8.2.tar.gz -> droidcam-1.8.2.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b4d1593d81bebed22f929d9e277676b7
diff --git a/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1 b/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
index 393421317d7d..2ada18d8cfd6 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
+++ b/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/umlaeute/v4l2loopback/archive/v0.12.5.tar.gz -> v4l2loopback-0.12.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=bf7ef71397d198f5d6fbe1643a4d55f5
diff --git a/metadata/md5-cache/media-video/v4l2loopback-9999 b/metadata/md5-cache/media-video/v4l2loopback-9999
index 1920ab579a42..49306a96ce16 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-9999
+++ b/metadata/md5-cache/media-video/v4l2loopback-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=46d43ca1868711cdeeedbb17e663a1aa
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 44b364dacb68..ec94fe8440c0 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430 b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
index 59d4018c2c1e..663594b0cfb2 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
+++ b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
@@ -13,5 +13,5 @@ RDEPEND=!libtomcrypt? ( dev-libs/openssl:0= ) libtomcrypt? ( dev-libs/libtomcryp
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) valgrind? ( debug )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/accel-ppp-1.12.0_p20210430.tar.bz2
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=aef4e5fb05bdef9f66608ed0ee59ecc5
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-9999 b/metadata/md5-cache/net-dialup/accel-ppp-9999
index 639344ee0428..9f4a5bf13df7 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-9999
+++ b/metadata/md5-cache/net-dialup/accel-ppp-9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=!libtomcrypt? ( dev-libs/openssl:0= ) libtomcrypt? ( dev-libs/libtomcrypt:0= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) valgrind? ( debug )
 SLOT=0
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3dbd579a08de4016eec7369a579625e1
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index c8845f4bdefd..df34a8eb5d9c 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/ipset-7.15 b/metadata/md5-cache/net-firewall/ipset-7.15
index d0abee6c13fe..eecf7afa289c 100644
--- a/metadata/md5-cache/net-firewall/ipset-7.15
+++ b/metadata/md5-cache/net-firewall/ipset-7.15
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl:= modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://ipset.netfilter.org/ipset-7.15.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=59c3a7c81e9179da298b8a82be6db2a0
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.6 b/metadata/md5-cache/net-firewall/ipt_netflow-2.6
index 06ac445824ca..c4cb8a96fad9 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.6
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.6
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.6.tar.gz -> ipt_netflow-2.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d882a954fa0b5b08e40c6b6dd647d1fc
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-9999 b/metadata/md5-cache/net-firewall/ipt_netflow-9999
index c29988f2951b..6678def83d18 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-9999
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9ed926f1dbbe37f28734ea9ffcc01437
diff --git a/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3 b/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3
index c63ee24d7b0d..b6a8199a1aa8 100644
--- a/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3
+++ b/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/maru-sama/rtsp-linux/archive/5.3.tar.gz -> rtsp-conntrack-5.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=fcadb9d967f4d32041f708bee83655ae
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.13 b/metadata/md5-cache/net-firewall/xtables-addons-3.13
index d708fc9fce10..d4a74d06803a 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.13
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.13
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.13.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=bfc52e2192755aacf546455ca8e360c9
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.18 b/metadata/md5-cache/net-firewall/xtables-addons-3.18
index 1d669ff07ca8..eca93001f365 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.18
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.18
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.18.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=cf03dd80e47c0d923c0434ebd09f7fc2
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.20 b/metadata/md5-cache/net-firewall/xtables-addons-3.20
index 8f54c891b550..17ac39840b2f 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.20
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.20
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.20.tar.xz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=5329c9963725f8356af88c8321a89bbe
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.21 b/metadata/md5-cache/net-firewall/xtables-addons-3.21
index 52329d0f56e6..11801326a65c 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.21
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.21
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.21.tar.xz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=b5a700bca2cccfaafa22152b5152c720
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index e37c2ab8d9c4..4b4df54d00dd 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/openafs-1.8.7 b/metadata/md5-cache/net-fs/openafs-1.8.7
index 8c45808e1b42..32dc107bde28 100644
--- a/metadata/md5-cache/net-fs/openafs-1.8.7
+++ b/metadata/md5-cache/net-fs/openafs-1.8.7
@@ -11,5 +11,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=!net-fs/openafs-kernel virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.8.7/openafs-1.8.7-src.tar.bz2 https://openafs.org/dl/openafs/1.8.7/openafs-1.8.7-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20210116.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e74c941ed0b24472ba73235bd2afce01
diff --git a/metadata/md5-cache/net-fs/openafs-1.8.8.1-r1 b/metadata/md5-cache/net-fs/openafs-1.8.8.1-r1
index 28d3700fd4f5..baa58f5e5934 100644
--- a/metadata/md5-cache/net-fs/openafs-1.8.8.1-r1
+++ b/metadata/md5-cache/net-fs/openafs-1.8.8.1-r1
@@ -11,5 +11,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=!net-fs/openafs-kernel virtual/libcrypt:= virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.8.8.1/openafs-1.8.8.1-src.tar.bz2 https://openafs.org/dl/openafs/1.8.8.1/openafs-1.8.8.1-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20211212.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=286f06e001d0b62a1616f689a214107b
diff --git a/metadata/md5-cache/net-misc/AQtion-2.2.7-r1 b/metadata/md5-cache/net-misc/AQtion-2.2.7-r1
index 0c6bbf51da80..edd015a8b836 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.2.7-r1
+++ b/metadata/md5-cache/net-misc/AQtion-2.2.7-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/e024a859ea828ced78db310328db90dbedea837a.tar.gz -> AQtion-2.2.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=fe8a3f9578194afaea21839a2352ec04
diff --git a/metadata/md5-cache/net-misc/AQtion-2.3.1-r1 b/metadata/md5-cache/net-misc/AQtion-2.3.1-r1
index c7ffe6ca18dd..2aeaeb14704d 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.3.1-r1
+++ b/metadata/md5-cache/net-misc/AQtion-2.3.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/3c2a2a3abe3df6cb0c985a49cea9a359a83e3f75.tar.gz -> AQtion-2.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a58ce367c3719cef16fd1694636e5633
diff --git a/metadata/md5-cache/net-misc/AQtion-2.3.4-r1 b/metadata/md5-cache/net-misc/AQtion-2.3.4-r1
index c51d8597ee23..6321866ef220 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.3.4-r1
+++ b/metadata/md5-cache/net-misc/AQtion-2.3.4-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/3b96f1b5f29d844151bc2dc38443de7a9a2f0cf3.tar.gz -> AQtion-2.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0ce0697dce2e19b7d6f6d33e7eef3874
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 099a90d63174..c198d00ee3e7 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/dahdi-3.1.0-r3 b/metadata/md5-cache/net-misc/dahdi-3.1.0-r3
index 461a94eea0ae..d5dcc2a77eee 100644
--- a/metadata/md5-cache/net-misc/dahdi-3.1.0-r3
+++ b/metadata/md5-cache/net-misc/dahdi-3.1.0-r3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-3.1.0.tar.gz https://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7f0788193898d9132d7236320522e8a5
diff --git a/metadata/md5-cache/net-misc/dahdi-3.1.0-r4 b/metadata/md5-cache/net-misc/dahdi-3.1.0-r4
index 92d87739fdd9..4ad7dd663fc7 100644
--- a/metadata/md5-cache/net-misc/dahdi-3.1.0-r4
+++ b/metadata/md5-cache/net-misc/dahdi-3.1.0-r4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-3.1.0.tar.gz https://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-3.1.0-r4.tar.bz2 https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-3.1.0-r4.tar.bz2 https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=92ba8f8f9de5796d7851159ca8384067
diff --git a/metadata/md5-cache/net-misc/electrum-ltc-4.2.2.1 b/metadata/md5-cache/net-misc/electrum-ltc-4.2.2.1
index ee4db68bfc1e..764a240e3671 100644
--- a/metadata/md5-cache/net-misc/electrum-ltc-4.2.2.1
+++ b/metadata/md5-cache/net-misc/electrum-ltc-4.2.2.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://electrum-ltc.org/
 INHERIT=distutils-r1 xdg-utils desktop
 IUSE=cli ncurses qrcode +qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) dev-libs/libsecp256k1 dev-python/scrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[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/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] )
 REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pooler/electrum-ltc/archive/refs/tags/4.2.2.1.tar.gz -> electrum-ltc-4.2.2.1.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fe0e825d0164d70d517482d01e4bca72
+_md5_=f998727bc75da1d3aca77bd4ebb2d7a4
diff --git a/metadata/md5-cache/net-misc/ena-driver-2.6.1 b/metadata/md5-cache/net-misc/ena-driver-2.6.1
index 549e96edf316..06344fd678a9 100644
--- a/metadata/md5-cache/net-misc/ena-driver-2.6.1
+++ b/metadata/md5-cache/net-misc/ena-driver-2.6.1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/amzn/amzn-drivers/archive/ena_linux_2.6.1.tar.gz -> ena-driver-2.6.1-linux.tar.gz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=cd54748e9e4f81d43232dcc21328f701
diff --git a/metadata/md5-cache/net-misc/ena-driver-2.8.0 b/metadata/md5-cache/net-misc/ena-driver-2.8.0
index b3ad9a999e74..36e77dc9f9ee 100644
--- a/metadata/md5-cache/net-misc/ena-driver-2.8.0
+++ b/metadata/md5-cache/net-misc/ena-driver-2.8.0
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/amzn/amzn-drivers/archive/ena_linux_2.8.0.tar.gz -> ena-driver-2.8.0-linux.tar.gz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=cd54748e9e4f81d43232dcc21328f701
diff --git a/metadata/md5-cache/net-misc/nyx-2.1.0-r3 b/metadata/md5-cache/net-misc/nyx-2.1.0-r4
index 32eaff58a272..45873ba3c4dd 100644
--- a/metadata/md5-cache/net-misc/nyx-2.1.0-r3
+++ b/metadata/md5-cache/net-misc/nyx-2.1.0-r4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nyx/nyx-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_=fb379497f1bfec5ecd5136cb91e750ad
+_md5_=77d73fd4858455a1a925b016338e2310
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.15.0 b/metadata/md5-cache/net-misc/openvswitch-2.15.0
index d076752a9bbd..848511ab9e5b 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.15.0
+++ b/metadata/md5-cache/net-misc/openvswitch-2.15.0
@@ -12,5 +12,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_8? ( >=dev-lang/pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.15.0.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=64395503faf8c187dfdcc993daecd4c2
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.17.2-r1 b/metadata/md5-cache/net-misc/openvswitch-2.17.2-r1
index 9a18b66c7a1c..577a7bedafd3 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.17.2-r1
+++ b/metadata/md5-cache/net-misc/openvswitch-2.17.2-r1
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_
 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://www.openvswitch.org/releases/openvswitch-2.17.2.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=87aef8e1628e8b256f7382f8754a6717
diff --git a/metadata/md5-cache/net-misc/r8125-9.008.00 b/metadata/md5-cache/net-misc/r8125-9.008.00
index 41982bd88d68..fa8602d93a24 100644
--- a/metadata/md5-cache/net-misc/r8125-9.008.00
+++ b/metadata/md5-cache/net-misc/r8125-9.008.00
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.008.00.tar.bz2
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=23a5e12e892efd6f61ca5e460c952345
diff --git a/metadata/md5-cache/net-misc/r8125-9.009.01 b/metadata/md5-cache/net-misc/r8125-9.009.01
index d5dc7b287abe..882463b238ba 100644
--- a/metadata/md5-cache/net-misc/r8125-9.009.01
+++ b/metadata/md5-cache/net-misc/r8125-9.009.01
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.009.01.tar.bz2
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=277b84845d030e9f1cbcb24547b640a3
diff --git a/metadata/md5-cache/net-misc/r8125-9.009.02 b/metadata/md5-cache/net-misc/r8125-9.009.02
index acfe337af69b..cb17fb34af19 100644
--- a/metadata/md5-cache/net-misc/r8125-9.009.02
+++ b/metadata/md5-cache/net-misc/r8125-9.009.02
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.009.02.tar.bz2
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=841d771608bac9b680b88507647c19e3
diff --git a/metadata/md5-cache/net-misc/r8168-8.049.02-r1 b/metadata/md5-cache/net-misc/r8168-8.049.02-r1
index 7cd22c6840aa..698a8ccee82b 100644
--- a/metadata/md5-cache/net-misc/r8168-8.049.02-r1
+++ b/metadata/md5-cache/net-misc/r8168-8.049.02-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.049.02.tar.bz2
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=4734ead8ee66bd6b73416850908cad63
diff --git a/metadata/md5-cache/net-misc/r8168-8.050.03 b/metadata/md5-cache/net-misc/r8168-8.050.03
index 1a58626845e1..0a4ebcb58740 100644
--- a/metadata/md5-cache/net-misc/r8168-8.050.03
+++ b/metadata/md5-cache/net-misc/r8168-8.050.03
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.050.03.tar.bz2
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=726df5169402cbfae6b2bae857d9c0f1
diff --git a/metadata/md5-cache/net-misc/whois-5.5.14 b/metadata/md5-cache/net-misc/whois-5.5.14
new file mode 100644
index 000000000000..6015103481c2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/whois-5.5.14
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils >=dev-lang/perl-5 virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) !xcrypt? ( virtual/libcrypt:= )
+DESCRIPTION=Improved Whois Client
+EAPI=7
+HOMEPAGE=https://github.com/rfc1036/whois
+INHERIT=toolchain-funcs
+IUSE=iconv idn nls xcrypt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) !xcrypt? ( virtual/libcrypt:= )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/w/whois/whois_5.5.14.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=64df7f8e2f90cf876c6727ea22cef865
diff --git a/metadata/md5-cache/net-misc/whois-9999 b/metadata/md5-cache/net-misc/whois-9999
index 0c23591f6f54..86460bb15757 100644
--- a/metadata/md5-cache/net-misc/whois-9999
+++ b/metadata/md5-cache/net-misc/whois-9999
@@ -1,7 +1,7 @@
 BDEPEND=app-arch/xz-utils >=dev-lang/perl-5 virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) !xcrypt? ( virtual/libcrypt:= )
-DESCRIPTION=improved Whois Client
+DESCRIPTION=Improved Whois Client
 EAPI=7
 HOMEPAGE=https://github.com/rfc1036/whois
 INHERIT=toolchain-funcs git-r3
@@ -9,7 +9,6 @@ IUSE=iconv idn nls xcrypt
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) !xcrypt? ( virtual/libcrypt:= )
-RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=01cb5918c48a837fa079754a784945fe
+_md5_=64df7f8e2f90cf876c6727ea22cef865
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 2398a46fa9d2..ab28fb01690c 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/wireguard-modules-1.0.20220627 b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20220627
index 3239f226f1c8..d38d2794123e 100644
--- a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20220627
+++ b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20220627
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=module? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20220627.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a7ae71cdc79836bdfb9368657ebb7514
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index e82558d21358..f2a31e58c01e 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6 b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6
index 2a7367c03048..34e8d76fd6fc 100644
--- a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6
+++ b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6
@@ -11,5 +11,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz ) amd64? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz ) https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt -> README-broadcom-sta-6.30.223.271.txt
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2da30aceccc2acac0c0561d6212d9728
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index b89c7476064c..9dca2987ebcb 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4-r1 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4-r1
index f58214a81d77..3d2049f45a57 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4-r1
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/gpib kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.4.tar.gz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=fabcbe98ce224967428dbf8a361c868c
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.5 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.5
index ed672ff00e30..f26276b74892 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.5
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.5
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/gpib kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.5.tar.gz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=cf969497836feff6d4daef1346b585fc
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 71c295bb2f7a..e85046b62bb3 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/dcfldd-1.8 b/metadata/md5-cache/sys-apps/dcfldd-1.8
new file mode 100644
index 000000000000..147e1f59a05b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/dcfldd-1.8
@@ -0,0 +1,12 @@
+BDEPEND=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=prepare
+DESCRIPTION=enhanced dd with features for forensics and security
+EAPI=8
+HOMEPAGE=https://github.com/resurrecting-open-source-projects/dcfldd
+INHERIT=autotools
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/resurrecting-open-source-projects/dcfldd/archive/v1.8.tar.gz -> dcfldd-1.8.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=128ac3aae93e5dfc651042fd18479683
diff --git a/metadata/md5-cache/sys-apps/openrazer-3.4.0-r3 b/metadata/md5-cache/sys-apps/openrazer-3.4.0-r3
index 8b8ebc13a78a..12048b555534 100644
--- a/metadata/md5-cache/sys-apps/openrazer-3.4.0-r3
+++ b/metadata/md5-cache/sys-apps/openrazer-3.4.0-r3
@@ -13,5 +13,5 @@ REQUIRED_USE=client? ( daemon ) daemon? ( || ( python_targets_python3_8 python_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openrazer/openrazer/archive/v3.4.0.tar.gz -> openrazer-3.4.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b70f5553e28a7c938a6a42a0da77b6a2
diff --git a/metadata/md5-cache/sys-apps/smc-sum-2.8.0.20220126 b/metadata/md5-cache/sys-apps/smc-sum-2.8.0.20220126
index 25c8eb561b4f..bbb2edbc1199 100644
--- a/metadata/md5-cache/sys-apps/smc-sum-2.8.0.20220126
+++ b/metadata/md5-cache/sys-apps/smc-sum-2.8.0.20220126
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib sys-power/iasl module? ( !sys-apps/smc-sum-driver ) kernel
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=sum_2.8.0_Linux_x86_64_20220126.tar.gz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=e0aa21237859e01bb634a81525ed7f0e
diff --git a/metadata/md5-cache/sys-apps/smc-sum-2.8.1.20220506 b/metadata/md5-cache/sys-apps/smc-sum-2.8.1.20220506
index 3829d2e24158..601a383790b3 100644
--- a/metadata/md5-cache/sys-apps/smc-sum-2.8.1.20220506
+++ b/metadata/md5-cache/sys-apps/smc-sum-2.8.1.20220506
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib sys-power/iasl module? ( !sys-apps/smc-sum-driver ) kernel
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=sum_2.8.1_Linux_x86_64_20220506.tar.gz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=e0aa21237859e01bb634a81525ed7f0e
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index c85a9d469990..c95401bf71c9 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/knem-1.1.4 b/metadata/md5-cache/sys-cluster/knem-1.1.4
index b1d60fd7f870..22e7518be5f8 100644
--- a/metadata/md5-cache/sys-cluster/knem-1.1.4
+++ b/metadata/md5-cache/sys-cluster/knem-1.1.4
@@ -11,5 +11,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc:= sys-apps/kmod[tools] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://gitlab.inria.fr/knem/knem/uploads/4a43e3eb860cda2bbd5bf5c7c04a24b6/knem-1.1.4.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=00729ef3c5c5ba1ae23e86b9f48994e0
diff --git a/metadata/md5-cache/sys-cluster/knem-9999 b/metadata/md5-cache/sys-cluster/knem-9999
index b4ad87bcba39..7acbac7e0c84 100644
--- a/metadata/md5-cache/sys-cluster/knem-9999
+++ b/metadata/md5-cache/sys-cluster/knem-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
 RDEPEND=sys-apps/hwloc:= sys-apps/kmod[tools] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=ae64150b3ad640ef09aa4d78c8a41218
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 553e0f32ff76..170b16b35c5c 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/ct-ng-1.24.0 b/metadata/md5-cache/sys-devel/ct-ng-1.24.0-r1
index 159252bdfc2c..7df4a2770a48 100644
--- a/metadata/md5-cache/sys-devel/ct-ng-1.24.0
+++ b/metadata/md5-cache/sys-devel/ct-ng-1.24.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 SLOT=0
-SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.24.0.tar.bz2
-_md5_=283ba30ebd9db3cab297f144443765c8
+SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.24.0.tar.xz
+_md5_=9b86f7aea4e865500593cbee807c683a
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index f95faa548678..8f24769866df 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7w b/metadata/md5-cache/sys-fs/loop-aes-3.7w
index d0205d5e0034..490b38aa21f2 100644
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7w
+++ b/metadata/md5-cache/sys-fs/loop-aes-3.7w
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7w.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d6b343d2c8f34dcc89c5d6a09069c077
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7x b/metadata/md5-cache/sys-fs/loop-aes-3.7x
index 69928ec8f1fb..ea1739eb6a4c 100644
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7x
+++ b/metadata/md5-cache/sys-fs/loop-aes-3.7x
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7x.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d6b343d2c8f34dcc89c5d6a09069c077
diff --git a/metadata/md5-cache/sys-fs/lsscsi-0.32 b/metadata/md5-cache/sys-fs/lsscsi-0.32-r1
index 788e81709268..96811b9ded18 100644
--- a/metadata/md5-cache/sys-fs/lsscsi-0.32
+++ b/metadata/md5-cache/sys-fs/lsscsi-0.32-r1
@@ -5,5 +5,5 @@ HOMEPAGE=http://sg.danny.cz/scsi/lsscsi.html
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://sg.danny.cz/scsi/lsscsi-0.32.tgz
-_md5_=5a54fea561ac8ccef79623bcccb64c18
+SRC_URI=http://sg.danny.cz/scsi/lsscsi-0.32.tar.gz
+_md5_=276913011fc6a2fa5c670703d8c26065
diff --git a/metadata/md5-cache/sys-fs/vhba-20211218 b/metadata/md5-cache/sys-fs/vhba-20211218
index be48dd8842cf..a4a6434c5cf4 100644
--- a/metadata/md5-cache/sys-fs/vhba-20211218
+++ b/metadata/md5-cache/sys-fs/vhba-20211218
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/vhba-module/vhba-module-20211218.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=96e4878e379e030c732d3f9e50fe4f0d
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 1c0d03306508..f258986a16c6 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -13,5 +13,5 @@ RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:=
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/5
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	e5770280638737f3eac32f8066a985ca	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	e5770280638737f3eac32f8066a985ca	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d01091fec796de485d76c8d9153193e7
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.5-r1 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.5-r1
index 15ef14c8a0d6..6dc21aa692d9 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.5-r1
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.5-r1
@@ -13,5 +13,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=debug? ( strip ) test
 SLOT=0/2.1.5-r1
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-fs/zfs/zfs-2.1.5-patches.tar.xz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	dist-kernel-utils	e5770280638737f3eac32f8066a985ca	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	dist-kernel-utils	e5770280638737f3eac32f8066a985ca	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9e64752a89e34be9b70db0c4ced24995
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.6 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.6
index 9f828caf8f1a..db2aaff25242 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.6
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.6
@@ -13,5 +13,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=debug? ( strip ) test
 SLOT=0/2.1.6
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.6/zfs-2.1.6.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.6/zfs-2.1.6.tar.gz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	dist-kernel-utils	e5770280638737f3eac32f8066a985ca	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	dist-kernel-utils	e5770280638737f3eac32f8066a985ca	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2bb81fefa6f82b3e38ae13b2d30abf7f
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index f1dd63aa64f1..7293cfff7b0f 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=debug? ( strip ) test
 SLOT=0/9999
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	dist-kernel-utils	e5770280638737f3eac32f8066a985ca	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	dist-kernel-utils	e5770280638737f3eac32f8066a985ca	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e97e9ec1d1798903580a014056b3e370
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 561dd251dfa1..2c8faf47a63a 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-1.11 b/metadata/md5-cache/sys-kernel/cryptodev-1.11
index 29fd43339ce4..63ddfd76cac0 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-1.11
+++ b/metadata/md5-cache/sys-kernel/cryptodev-1.11
@@ -11,5 +11,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cryptodev-linux/cryptodev-linux/archive/cryptodev-linux-1.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=196f68d751106c3912e66af73e531658
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-1.12 b/metadata/md5-cache/sys-kernel/cryptodev-1.12
index 2828cb8da439..ab8d9451c223 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-1.12
+++ b/metadata/md5-cache/sys-kernel/cryptodev-1.12
@@ -11,5 +11,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cryptodev-linux/cryptodev-linux/archive/cryptodev-linux-1.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4671274b1c6bbc42a6bc339c0077d970
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-9999 b/metadata/md5-cache/sys-kernel/cryptodev-9999
index b9ea4d400c99..e4d8cccef0f7 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-9999
+++ b/metadata/md5-cache/sys-kernel/cryptodev-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a63ac6e762c33048f8484829a3e757ea
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.148 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.148
index 545649a0d3e2..6c59f886025e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.148
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.148
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.148
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-157.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-157.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=98b6b100a3b6e3e7457bf50748465b2b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.149 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.149
new file mode 100644
index 000000000000..9c630e0f5f4b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.149
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=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 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.149
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.149 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.149
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=98b6b100a3b6e3e7457bf50748465b2b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.74 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.74
index 5790605a3351..e2228f6c91dc 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.74
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.74
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.74
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-78.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=3c0a9a345a7aba91c0d17740cb6d2435
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.19.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.19.16
index 0c92802af749..abef892d2838 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.19.16
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.19.16
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.19.16
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-18.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.19.13-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.19.13-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.19.13-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.19.13-gentoo )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=372181c62e2f5df5e9b2ac8b79ed483d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.218 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.218
index dcc9db88ec3d..62b2c9bbb78b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.218
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.218
@@ -13,5 +13,5 @@ RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.218 virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.218
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-223.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-223.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=9b928db3d49ba10fa170b9c5fdf74687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.219 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.219
new file mode 100644
index 000000000000..80cca1f867df
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.219
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=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 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=amd64 arm64 ~ppc ppc64 x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.219
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.219 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.219
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=9b928db3d49ba10fa170b9c5fdf74687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.149 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.149
new file mode 100644
index 000000000000..2ca75fcaf6d9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.149
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=amd64 arm64 ppc64 x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.149
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.149 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.149
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149-1.gpkg.tar -> gentoo-kernel-5.10.149-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149-1.gpkg.tar -> gentoo-kernel-5.10.149-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149-1.gpkg.tar -> gentoo-kernel-5.10.149-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149-1.gpkg.tar -> gentoo-kernel-5.10.149-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
+_md5_=56f41fe54f9ae4f924ac77e39f7a5b52
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.219 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.219
new file mode 100644
index 000000000000..9f9fdc97e663
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.219
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=amd64 arm64 ppc64 x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.219
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.219 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.219
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219-1.gpkg.tar -> gentoo-kernel-5.4.219-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219-1.gpkg.tar -> gentoo-kernel-5.4.219-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219-1.gpkg.tar -> gentoo-kernel-5.4.219-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219-1.gpkg.tar -> gentoo-kernel-5.4.219-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
+_md5_=e2c98952f63273e21ceea95828a379a1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.149 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.149
index dcb3f3d22b25..068194199a87 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.149
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.149
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.10.149
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-158.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-158.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-158.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-158.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-158.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6eb8fe11eed639772b74a1d818b7d375
+_md5_=6b947f100de5ad16243bd359b71dbe74
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.219 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.219
index f339c7a2aabc..d08de52746a4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.219
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.219
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.4.219
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-224.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-224.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-224.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-224.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-224.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-224.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=143cf6f2fc5cdb2f7ad9f759414c391d
+_md5_=48aebcef724e5e5c89a8c712dcd96820
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.9.4 b/metadata/md5-cache/sys-kernel/kpatch-0.9.4
index cc1afa83df04..4b5178b27f15 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.9.4
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.9.4
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( sys-app
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.9.4.tar.gz -> kpatch-0.9.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5c8ea600d4b14d04025597338c550438
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.9.6 b/metadata/md5-cache/sys-kernel/kpatch-0.9.6
index d16c60b60dcc..e346060c1ac8 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.9.6
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.9.6
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( sys-app
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.9.6.tar.gz -> kpatch-0.9.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5c8ea600d4b14d04025597338c550438
diff --git a/metadata/md5-cache/sys-kernel/kpatch-9999 b/metadata/md5-cache/sys-kernel/kpatch-9999
index b8c57693bac2..c880b1fd72a3 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-9999
+++ b/metadata/md5-cache/sys-kernel/kpatch-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a25433b28f077894415b8b4d5562f956
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.148 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.148
index a2768c6241f1..8f857353adf5 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.148
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.148
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.148
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.148.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.148.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=730bb5890cdabd4c99a71541ebcebb0d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.149 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.149
new file mode 100644
index 000000000000..904e701f5146
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.149
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=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 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.149
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.149
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.149.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.149.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=730bb5890cdabd4c99a71541ebcebb0d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.9999 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.9999
index 5b9cd74693e3..d4c39551a543 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.9999
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.9999
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.9999
 SRC_URI=https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=066c68b0dca48ffd2c89430d9934461a
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.74 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.74
index 8070c60a1440..d7ebd4dad3e1 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.74
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.74
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.74
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.74.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.74.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=3e4f9b1f2db82487ca5d21a388b5ee08
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.9999 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.9999
index 4b47d4571bb1..90d86fa8d817 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.9999
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.9999
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.9999
 SRC_URI=https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=4ff1f3c1f3cc9f849346d537a1f0292b
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.16 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.16
index f00a1d078881..e95584443499 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.16
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.16
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.19.16
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.16.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.16.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.19.13-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.19.13-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.19.13-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.19.13-gentoo )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=e8868bc49dfad531ca20884c3bfa62f2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.9999 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.9999
index d02613622d15..671ef1eeb13f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.9999
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.9999
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.19.9999
 SRC_URI=https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.19.13-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.19.13-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.19.13-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.19.13-gentoo )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=0086b7f67c9f3ef8cad37d8756fd643a
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.218 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.218
index fd2be8c140da..940df09c71ce 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.218
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.218
@@ -13,5 +13,5 @@ RDEPEND=virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.218
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.218.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.218.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=5ec332f71bc9a665a347424e0d1e624c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.219 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.219
new file mode 100644
index 000000000000..3949f86703de
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.219
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=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 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build verify-sig
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.219
+RDEPEND=virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.219
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.219.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.219.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=5ec332f71bc9a665a347424e0d1e624c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.9999 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.9999
index 3902833d1fce..42c74f4db18c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.9999
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.9999
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.9999
 SRC_URI=https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	kernel-build	108fdf77d5e8188b999578d77d2ba3ad	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=dist-kernel-utils	e5770280638737f3eac32f8066a985ca	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	kernel-build	7828c6aa17eeb607ae01b5df68cf7b03	kernel-install	74f21ec056c1a9ee7d7425221931f11a	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=4a17fba1ea8c341e7a94afff5e2b35e9
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index f08ad5f2a581..65ad4452ed85 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/musl-1.2.2-r8 b/metadata/md5-cache/sys-libs/musl-1.2.2-r8
index 451059f1866d..16f684744ad5 100644
--- a/metadata/md5-cache/sys-libs/musl-1.2.2-r8
+++ b/metadata/md5-cache/sys-libs/musl-1.2.2-r8
@@ -10,4 +10,4 @@ LICENSE=MIT LGPL-2 GPL-2
 SLOT=0
 SRC_URI=https://musl.libc.org/releases/musl-1.2.2.tar.gz verify-sig? ( https://musl.libc.org/releases/musl-1.2.2.tar.gz.asc ) https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://gitlab.alpinelinux.org/alpine/aports/-/raw/93a08815f8598db442d8b766b463d0150ed8e2ab/main/musl/getent.c -> musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bc9a191cd4f3b86422b53af4c413d97e
+_md5_=3829928b9a20dfa6235cfb45b278aa6e
diff --git a/metadata/md5-cache/sys-libs/musl-1.2.3 b/metadata/md5-cache/sys-libs/musl-1.2.3
index 84ece8fb951b..ce74d6a4852d 100644
--- a/metadata/md5-cache/sys-libs/musl-1.2.3
+++ b/metadata/md5-cache/sys-libs/musl-1.2.3
@@ -10,4 +10,4 @@ LICENSE=MIT LGPL-2 GPL-2
 SLOT=0
 SRC_URI=https://musl.libc.org/releases/musl-1.2.3.tar.gz verify-sig? ( https://musl.libc.org/releases/musl-1.2.3.tar.gz.asc ) https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://gitlab.alpinelinux.org/alpine/aports/-/raw/93a08815f8598db442d8b766b463d0150ed8e2ab/main/musl/getent.c -> musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bc9a191cd4f3b86422b53af4c413d97e
+_md5_=3829928b9a20dfa6235cfb45b278aa6e
diff --git a/metadata/md5-cache/sys-libs/musl-1.2.3-r4 b/metadata/md5-cache/sys-libs/musl-1.2.3-r4
index 5f984da22fd7..3ea9e3d77ad3 100644
--- a/metadata/md5-cache/sys-libs/musl-1.2.3-r4
+++ b/metadata/md5-cache/sys-libs/musl-1.2.3-r4
@@ -11,4 +11,4 @@ RDEPEND=crypt? ( !sys-libs/libxcrypt[system] ) !crypt? ( sys-libs/libxcrypt[syst
 SLOT=0
 SRC_URI=https://musl.libc.org/releases/musl-1.2.3.tar.gz verify-sig? ( https://musl.libc.org/releases/musl-1.2.3.tar.gz.asc ) https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://gitlab.alpinelinux.org/alpine/aports/-/raw/93a08815f8598db442d8b766b463d0150ed8e2ab/main/musl/getent.c -> musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=eabfc4c4e06fc5f8ba9977fd93bf3794
+_md5_=681f7dd32da352d708ae7c2d53c503a4
diff --git a/metadata/md5-cache/sys-libs/musl-9999 b/metadata/md5-cache/sys-libs/musl-9999
index 7477b4367016..45dc084f8684 100644
--- a/metadata/md5-cache/sys-libs/musl-9999
+++ b/metadata/md5-cache/sys-libs/musl-9999
@@ -11,4 +11,4 @@ RDEPEND=crypt? ( !sys-libs/libxcrypt[system] ) !crypt? ( sys-libs/libxcrypt[syst
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://gitlab.alpinelinux.org/alpine/aports/-/raw/93a08815f8598db442d8b766b463d0150ed8e2ab/main/musl/getent.c -> musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=eabfc4c4e06fc5f8ba9977fd93bf3794
+_md5_=681f7dd32da352d708ae7c2d53c503a4
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index a6fba94e6129..a0c09b1dc14d 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/acpi_call-1.2.2 b/metadata/md5-cache/sys-power/acpi_call-1.2.2
index cb68744d07ec..1cfd19879046 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.2.2
+++ b/metadata/md5-cache/sys-power/acpi_call-1.2.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/nix-community/acpi_call/archive/v1.2.2.tar.gz -> acpi_call-1.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a59142345a0c4170a6e5bf87144b38e0
diff --git a/metadata/md5-cache/sys-power/acpi_call-9999 b/metadata/md5-cache/sys-power/acpi_call-9999
index 155337e3a4bc..370d30e50cd8 100644
--- a/metadata/md5-cache/sys-power/acpi_call-9999
+++ b/metadata/md5-cache/sys-power/acpi_call-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=44f3263fe4c9b633d47006925fbb1dbf
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129 b/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
index 14393cff48e8..661a02a2ac34 100644
--- a/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/23891174a80ea79c7720bcc7048a5c2bfcde5cd9.tar.gz -> bbswitch-0.8_p20211129.tar.gz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=15155a7919a51f01ecc835fbd704af0e
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 0aea22ced912..8b0c0470fe74 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/atop-2.7.1-r1 b/metadata/md5-cache/sys-process/atop-2.7.1-r1
index 4c43db7cecbe..442d87586064 100644
--- a/metadata/md5-cache/sys-process/atop-2.7.1-r1
+++ b/metadata/md5-cache/sys-process/atop-2.7.1-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=sys-process/acct-6.6.4-r1 modules? ( sys-libs/zlib ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://github.com/Atoptool/atop/archive/v2.7.1.tar.gz -> atop-2.7.1.tar.gz modules? ( https://www.atoptool.nl/download/netatop-3.1.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9f6ea0ca834100880309ca761aadf913
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 8da27117dd09..78145ee1d806 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.149 b/metadata/md5-cache/virtual/dist-kernel-5.10.149
new file mode 100644
index 000000000000..c6762da53cdc
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.149
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.149 ~sys-kernel/gentoo-kernel-bin-5.10.149 ~sys-kernel/vanilla-kernel-5.10.149 )
+SLOT=0/5.10.149
+_md5_=8e04478c89d67837ed02a4ebab2037e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.219 b/metadata/md5-cache/virtual/dist-kernel-5.4.219
new file mode 100644
index 000000000000..2e6520e7be0d
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.219
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=amd64 arm64 ~ppc ppc64 x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.219 ~sys-kernel/gentoo-kernel-bin-5.4.219 ~sys-kernel/vanilla-kernel-5.4.219 )
+SLOT=0/5.4.219
+_md5_=2efd2e23ef65c3ee0fb3f77c654bb35e
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index c59c7b267d7b..3944f665b2d2 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-390.154 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
index b01e0f711563..db930be820a8 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
@@ -11,5 +11,5 @@ LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT
 RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( || ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/atk ) dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.154/NVIDIA-Linux-x86_64-390.154.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.154/NVIDIA-Linux-x86-390.154.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.154.tar.bz2
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	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_=f56a7646ad689ec5f2db49edb3ab03be
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03
index f8f94a887a1a..d406d8e544b3 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03
@@ -11,5 +11,5 @@ LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
 RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( || ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/atk ) dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( ~gui-libs/egl-wayland-1.1.7 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/470
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/470.141.03/NVIDIA-Linux-x86_64-470.141.03.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.141.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.141.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.141.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.141.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.141.03.tar.bz2
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	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_=f6b6f29f78a2579e4d558443f8cb785f
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-510.85.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-510.85.02
index 500628bbaaa3..d1236b6c9ab7 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-510.85.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-510.85.02
@@ -11,5 +11,5 @@ LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
 RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( || ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/atk ) dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm =gui-libs/egl-wayland-1.1.9* media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/510
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/510.85.02/NVIDIA-Linux-x86_64-510.85.02.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/510.85.02/NVIDIA-Linux-aarch64-510.85.02.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-510.85.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-510.85.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-510.85.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-510.85.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-510.85.02.tar.bz2
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	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_=e1da40bb171f6afe89f2ed350226efe9
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
index ce01b03c13af..a90b5358cf06 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
@@ -12,5 +12,5 @@ RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistence
 REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/vulkan
 SRC_URI=https://developer.nvidia.com/vulkan-beta-5154919-linux -> NVIDIA-Linux-x86_64-515.49.19.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.65.01.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/515.49.19.tar.gz -> open-gpu-kernel-modules-515.49.19.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	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_=49a4eeaa16b882e01b247ab8257f36ac
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01
index d4cff2c74765..332a2b336ad7 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01
@@ -12,5 +12,5 @@ RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistence
 REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/515
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/515.65.01/NVIDIA-Linux-x86_64-515.65.01.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/515.65.01/NVIDIA-Linux-aarch64-515.65.01.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-515.65.01.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	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_=1efd028476b2610cb471fd4942aa4c7b
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-520.56.06 b/metadata/md5-cache/x11-drivers/nvidia-drivers-520.56.06
index 56b4c27d1d02..f3caffbed559 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-520.56.06
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-520.56.06
@@ -12,5 +12,5 @@ RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistence
 REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/520
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/520.56.06/NVIDIA-Linux-x86_64-520.56.06.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/520.56.06/NVIDIA-Linux-aarch64-520.56.06.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-520.56.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-520.56.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-520.56.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-520.56.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-520.56.06.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-520.56.06.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	307bcf019944558ccd609b21a07712d1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	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_=0204e9a4b47e1f9648f6d6d02d2bc1af
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 3d6f2f67600a..54d3db8c5896 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.4 b/metadata/md5-cache/x11-libs/libXmu-1.1.4
new file mode 100644
index 000000000000..180e1242469e
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.4
@@ -0,0 +1,15 @@
+BDEPEND=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 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/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/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(-)?] x11-base/xorg-proto
+DESCRIPTION=X.Org Xmu library
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXmu
+INHERIT=xorg-3
+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 doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXmu-1.1.4.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	38a663574d97f06b6b729046865c8fb6
+_md5_=beb4f3af0016663e540e12e755c20426
diff --git a/metadata/md5-cache/x11-libs/libXpresent-1.0.1 b/metadata/md5-cache/x11-libs/libXpresent-1.0.1
new file mode 100644
index 000000000000..5d85be37e2c1
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXpresent-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=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 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[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[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/libXrandr[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-base/xorg-proto
+DESCRIPTION=X Present Extension C Library
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXpresent
+INHERIT=xorg-3
+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 doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[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[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/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXpresent-1.0.1.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	38a663574d97f06b6b729046865c8fb6
+_md5_=90a9074b7a4101d234393a5f163fcf51
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c842aee54099..ce783d0d773e 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-10-17T18:09:57Z
+TIMESTAMP 2022-10-18T00:09:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNNmnVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNN7tVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCTKw/+JgpPCJbv1yc+pB1XMZUW7v8ylPfCxolVSUjqtvt1EB51zkYb1RSo68sV
-jKYP70o0gnjwvcV2oEC8ICxe7g0K+4sahfVrsjuzkAZ+/W04h7/DSLT5rIUgg8YO
-YL2qoqcop9MeZiBfS7ZT3ivHl/4ABpQQsT6oWwKZJXRK2I28w8ZUDzbnsqBPbPyl
-8AIbkeC0F4nbidUjfKvvzNU7EN5G7SkgY7OndmQrGU7iQ6l/9b+JBTIMzr/HTuPS
-Z6O9Cyc9cTEaeg4b+df61dmG80yp5nMhVdwkkfw5/DqKkF2bxF5XugJE+5O1nYJz
-4UrdHXRcz2OmzS9XO6zvHVEk9NCGDbMwbCsU4EZa0kU1f0uhsO7/FU8S08H+kdbU
-eUYeBrYSLUAHeQzp66KkPcJ1b23uEBl4uoCXOh/jGeuP9M6CNBDFFNcucb28mAqF
-V3XZ84spG0t4mP3l10wT84Vim2U3c/byQsYJZSn95xdlUoop/JJk+byXgVSJVx5V
-WMOVNzG70MLFJ/tpD8GPmkadfI4KLAk5/KeQelbrzD5UkIcY+kauhwrIrrRL/9IW
-oSzm+njZiSvLBCVmYaO2ZejCtWelNLXcOO5RAJw2hkZyQEl1GdZhs6MEb92tZM1z
-OVXyANbzjM/WyFAqMAoZPHN3/S9cxlG51OgUQxGCd0JL3XGzvmU=
-=eFdv
+klBU9xAArDpGWdpUXzCgs3fLMSp3kyeyUvLUIpSAA1qCiOHwFbN32RSqPxF0HA37
+Ay1SCHsPWXd3pu1TExIpcyGZvre+YVdtaPYxk3dnrkRrByglpWfUxdEV/o5bWX+e
+ZbBncDbI9lMUc96qS9NPVZkDXMMQGZ0c6UjYQ0dKScqBKjXyVOGncV0XZKj5T+41
+TX6mn8suMo2H8elFpgOzeX/b9EHnQoAYufcqsyDs2fNa/CfioVq8gEaiKoACuzBP
+GPyFXM6e0wUe0hUMOwSNRZLqUq8M0gxRpxOjA4kmR4+SarfqiTxsVX8FDw0CKZn7
+RLK+LEDZizkNPyJxnIPI47wSjD6kKLCJjijS24e+gBojhNwgWF7O5rWJOshIRLdk
+BqknS1R+vskZLd3XLOtTBjMKmh/H36tLKrnRlE3u8pAqH+vN3iVEpRMRMavJLXr8
+BIxZAlGy6O6P/wjx7lnKFbO2MGe4sL8rJ4os5n5ClyScbbF0dHZLZthabynqQjGB
+/cOgPU33nbeP2gF7vFnXA7bgRlyyuWurnh9VLng5xpCNmCRDu1j5byfrv72pSnEb
+x2q6rIqaF5QrUS2kqxvDg6Qfn/1R4AJf1h1rb6IvoNnOBU4ys+zCN3k3trCFQWSJ
+Qbv0Eg0jM1uIyml9ZKj88uvPzzlJJu7hIOSRF8uDDMODvFgKDE0=
+=0SIo
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index dfa190a28c29..3c51513809ee 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 17 Oct 2022 18:09:54 +0000
+Tue, 18 Oct 2022 00:09:53 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 3a6bcd685a35..69df72f1499c 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -1670,6 +1670,10 @@
       <name>Michał Górny</name>
       <role>Lead, core LLVM/clang</role>
     </member>
+    <member>
+      <email>sam@gentoo.org</email>
+      <name>Sam James</name>
+    </member>
   </project>
   <project>
     <email>lxqt@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index f1d7292bf5a2..bd2eac3fc3e2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Oct 17 06:09:53 PM UTC 2022
+Tue Oct 18 12:09:53 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d50463c10616..f3315745b731 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 17 Oct 2022 18:15:01 +0000
+Tue, 18 Oct 2022 00:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d3ec83a45037..13a7565e86eb 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-fd91d2400ef73319a0028f09cd473656c14014b0 1666029025 2022-10-17T17:50:25+00:00
+094d13c500f3517ab9a6991c693d16e95b6c0306 1666050935 2022-10-17T23:55:35+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1b09099e5eac..7c8f0fa4466d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666030201 Mon 17 Oct 2022 06:10:01 PM UTC
+1666051801 Tue 18 Oct 2022 12:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index dfa190a28c29..3c51513809ee 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 17 Oct 2022 18:09:54 +0000
+Tue, 18 Oct 2022 00:09:53 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 9a94e75ee40c..c8c7c26fbea1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index e1b1e988024c..ce7b9d2b5bcf 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -2,4 +2,4 @@ DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0
 DIST axel-2.17.11.tar.xz 279964 BLAKE2B d2a740b6a9471cc384ddb8556c3dce946edffc3ef7b2740306040cb22d4cbabea92064ed3b0f351235f004b1017cefb5b0fc8a427691a74f29880eec7e3f5b85 SHA512 111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1
 EBUILD axel-2.17.10.ebuild 987 BLAKE2B 501a8487c3c9ee7dc1259684e4b786cd2d85c7b54f770410278b431ae59b14f2ba3d337e49f152e9e8805b54f2d07baf3b88ea71fe6393d4b30cf9eebeaf66c9 SHA512 06300c333d23f5060f559694990429223884a79a77f6f13d51f2ba84842a5f2de01ea5de13fa6bf47751098beddaff9ab4edc31615e41a770034b3e2c4b256eb
 EBUILD axel-2.17.11.ebuild 992 BLAKE2B 3b66e241379fb0b083194d798a08a6473662c7a3319edc962fc3d44fd091010dd89f79d81f935408e8faf68cf4dddf35f58e1c998af04747d6ad504389f2b675 SHA512 0285dd384a68585cdda2b2ee446fd01e1a03856bacdfb12c027c6352cc6b5079af42e74b535a64c4f09935c4bd8dbb1c11649b0d12d01fc09af0794cdc8901f8
-MISC metadata.xml 335 BLAKE2B 8de02303ead90809cd34dcc7fed0a845e137b3ae3338ca44c10a9339da0ee5391ac183f17f0b59fbc9515eefa8daa0030bc009feef7f1400b0a76d4f2f6d5900 SHA512 41e63e21afcb123fbe05f43fe1958e4883d37eb2a1df38b013f95d6eb6cce6cba9819d4843b5a267f123bc145325bc09bb4f2f8ceac1000b750812fb367398ac
+MISC metadata.xml 348 BLAKE2B 417259b2a3d63e0899cf47ec52efdc08d68435ec74d36171b5d1319275d9c28ca35950eee29ba159e3804345e35ae9ad7ab929a53857eb53fc508a576dba65d3 SHA512 745097df6e7ba8b00e0b5214d10c9f413d9e83b1bb45ccaadb86cee54d6244a2614b6fa682bf6e8673e51de45d06fe6a5ba97981a423cb1ec28c7b3d918ae66d
diff --git a/net-misc/axel/metadata.xml b/net-misc/axel/metadata.xml
index fd7fe267b0a6..c6cbe71355c8 100644
--- a/net-misc/axel/metadata.xml
+++ b/net-misc/axel/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Piotr Karbowski</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">eribertomota/axel</remote-id>
+		<remote-id type="github">axel-download-accelerator/axel</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/electrum-ltc/Manifest b/net-misc/electrum-ltc/Manifest
index 1996b428a627..08d8eba0b837 100644
--- a/net-misc/electrum-ltc/Manifest
+++ b/net-misc/electrum-ltc/Manifest
@@ -1,3 +1,3 @@
 DIST electrum-ltc-4.2.2.1.tar.gz 5109859 BLAKE2B b3327f6bcf23b5caca6196e380e62f154a9f56a5b636a8d0cc49e08ed0ab5a05b4b1a81d9869b92125526339924ccb9b555a704eb7fa98bce59eac6088c7ebfe SHA512 1ac44a29cd0db7de9570e339892ff42bd72abbe3eeb9f8106eda7be67dbb492cc830881d52f915ffde776892d461f9cff1b88a9ee20bf3c64139c407118e4eb9
-EBUILD electrum-ltc-4.2.2.1.ebuild 2141 BLAKE2B 0d571921cb2ce2f21356f96f2aeba0064707cc5d0aabc4403a1596e3730c172e029ca668762d51b0b79435445047cc986e0edc84be26b4b53d125c107f733499 SHA512 189afa494510b182f2b42c31b6c9d66c2afaca3646420baa81ad0bdefb084dd56ba3055e0ef9d564dcff00ee7cefe576d65b8f07a3f807c94f24926389992f29
+EBUILD electrum-ltc-4.2.2.1.ebuild 2148 BLAKE2B e239da11aa720e9b21e6c47b80cb2b4e631264cfcb28a2505188f6120394c03c6505fbcf212d0f4450d36673a2162050662de362591680a241d94522c30196f9 SHA512 bea4f79847362cffaa3eb26679e296214fd067e10c1d99cdaf05820beaed7f32f499d992753249f765bf06a763b626bb8cf2faeef7fc7c45f690e3be9a2f4b3b
 MISC metadata.xml 396 BLAKE2B ae73f628edff16f2ece36d07099999e60c3be01aead2ea4bd87d5c4818797163c4a504d37dc2d308df911660d90574fc2618fde12307e5b1fd1dad3afa032b73 SHA512 76c2dbd807089a10313270fb3067880bac654dfc44e376234e3724018bd96c7879ad89d1f6c92ed1aacd8695f9d388eaa9adea4ed8acff69bb5e953e0f4ae508
diff --git a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild
index a6a1b078e2ee..43ff09aeef74 100644
--- a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild
+++ b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pooler/electrum-ltc/archive/refs/tags/${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
index 3e83f521ba76..298487beac74 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,3 +1,3 @@
 DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37
-EBUILD nyx-2.1.0-r3.ebuild 656 BLAKE2B 48d773c75726eeee76d53fdb9f62cf79bb9931e55b8bc3ed441f0eff4dec512e1d13390b27344705b9d14361f64212c03da9a27215ea53834fb72d32ac4a2795 SHA512 80063200b3ea7180a25a293370a02a7dcb68f23a66adf32d1a2b4dc6c0533f9133c265fec7cb1080c063265685264f79c303119edd352d1ea15b441f532ed171
+EBUILD nyx-2.1.0-r4.ebuild 744 BLAKE2B 294c76a8b12394cc63d59be2aa6693a3efe54572b87a8d29a79bfc4e9e28a064a27636da91f5ad6e57c9b78bb3792c4ce53784d68bd36fbf5d3f72bbc400c806 SHA512 a2ed693eaec4ffddc11e9659e96e63b55b8b24d46907c0118d440fc7e08edbdcdfba17c1f2babb398ed505ebcfbc930c04f658d9dde00bd3f2c60a087665fd5f
 MISC metadata.xml 329 BLAKE2B 089c30db84b27384d6b7814fa6f8a5ab3ce4c40cc0c95538fd45262b79df25520c0780013548ed6dc7511fc815c25401d38d37f60ce4ee0e2a53bfbe99f6b183 SHA512 d969896fb35aa789b119ad623b7d4e63518cfb2ff0f46cff3f299db828a0918646b6634c94c901ffd847b1c1e0e4b722f2b0015034354886eb94fc8bc29071e6
diff --git a/net-misc/nyx/nyx-2.1.0-r3.ebuild b/net-misc/nyx/nyx-2.1.0-r4.ebuild
index 9037fbfab9c0..8ee0f57fa585 100644
--- a/net-misc/nyx/nyx-2.1.0-r3.ebuild
+++ b/net-misc/nyx/nyx-2.1.0-r4.ebuild
@@ -26,3 +26,10 @@ RDEPEND="
 	net-vpn/tor"
 
 distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# bug #645336
+	doman nyx.1
+}
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 7c5c858be58d..4e9fd18a88a5 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -2,6 +2,8 @@ AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305
 DIST whois_5.5.13.tar.xz 87384 BLAKE2B 6ce90ad907c4ea79301adbcda5a402344df9f283ac258a3186f5c405e0abfb97f603f3f163652f1cf03a1fc60290b8f9f54b509bf7d9fd3cec12189eeeaaffe5 SHA512 b4a70cc6d58133287d70775ecd8173c255f800362639a3e2dea0d3d56c35405b7fc93c4c220cc50cbd15ae5ae402a59bd15f99e98a7cccb314f82a205aa7ee61
+DIST whois_5.5.14.tar.xz 87480 BLAKE2B 868c9dc968581535ee2b56a6293f634e2c8dc6c00703a45d4ca4f0ce6769786ee4921bd66f3a470b2a7f31808db2971b284c23b76b608bff1edbb7bbe37f892a SHA512 f190d488d7bd68717c0a83ca85709fad09c33b619c46d7e0dd12e79621fdba56b9d43480c25ef3c9df2f6ade0ee72d692bfc5d0bd96839ef92194004313d1cc6
 EBUILD whois-5.5.13-r1.ebuild 1803 BLAKE2B 34e8b346355983a98f296cae86cfa97640bf013f9782b175a5b4600debc18013f6b1fd0c87344549e00ba5d23b353674164b9689146819bafa6b31a0ed01acbf SHA512 18a4d7d29ac3bc975e14fb3fc29ca82173aa1bd095994fb8032be234f37b2c2f4f4de27f67e997e3874381f694e3a6b5be68fe2c965d410af7065920be43b504
-EBUILD whois-9999.ebuild 1955 BLAKE2B f1dc35b6b4907d25dc09adc21331b7b7af947f19de70541d477cd88fd59fa650145dce37748cb4c03baa3c69835e7c7f29e7cbbd7b5f1132c83038a535b3f70d SHA512 8e51c9fd5d12a919e77ce82c1a3f477976ca250dae9c6bd7cb32dcd940e9506c77da1342a3f3fbee25419de356de612b1f62cc8ace2f77c645286b253ebc3524
+EBUILD whois-5.5.14.ebuild 1815 BLAKE2B 7aad1ac7a3eafa9dd02db50a74ba8b8ec0d274aace166656d860147170c709efbabf6cd8dde78d90b6805322501c9366d0fa90364ee16a9cf8e1be6dfdc6df33 SHA512 e7fa376bcab2a5f009b1134952a3848d922c6704af16479da171ae92c7ea6a608b84db22795ebfd60d7a24379dd8c83aa71f7b53380bddaf8b16b0d5046f37c5
+EBUILD whois-9999.ebuild 1815 BLAKE2B 7aad1ac7a3eafa9dd02db50a74ba8b8ec0d274aace166656d860147170c709efbabf6cd8dde78d90b6805322501c9366d0fa90364ee16a9cf8e1be6dfdc6df33 SHA512 e7fa376bcab2a5f009b1134952a3848d922c6704af16479da171ae92c7ea6a608b84db22795ebfd60d7a24379dd8c83aa71f7b53380bddaf8b16b0d5046f37c5
 MISC metadata.xml 439 BLAKE2B 609f61e31ef22ab28f06d9f0b6542a0efbcb8a006b05f14ff6339a332bb3f04996d13c9a62b55765ce4611df0e9efe021b6f5b5060b13d00d72eae71eb9f9e3e SHA512 05bf067e25586b2032b137dae008a4c59aed9e633f37b545d6ccdca6dc3d69d8614d8ad26c34e87d956b93d24b7962c3fe908070dcfd6826c8fe916b51f29d2f
diff --git a/net-misc/whois/whois-5.5.14.ebuild b/net-misc/whois/whois-5.5.14.ebuild
new file mode 100644
index 000000000000..4c1dfcda83b9
--- /dev/null
+++ b/net-misc/whois/whois-5.5.14.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P=${P/-/_}
+DESCRIPTION="Improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	#SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls xcrypt"
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	xcrypt? ( >=sys-libs/libxcrypt-4.1:= )
+	!xcrypt? ( virtual/libcrypt:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
+)
+
+src_prepare() {
+	default
+
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	use xcrypt && export HAVE_XCRYPT=1
+
+	tc-export CC
+
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+}
diff --git a/net-misc/whois/whois-9999.ebuild b/net-misc/whois/whois-9999.ebuild
index 8330f6ba0af9..4c1dfcda83b9 100644
--- a/net-misc/whois/whois-9999.ebuild
+++ b/net-misc/whois/whois-9999.ebuild
@@ -5,21 +5,24 @@ EAPI=7
 
 inherit toolchain-funcs
 
-MY_P="${P/-/_}"
-DESCRIPTION="improved Whois Client"
+MY_P=${P/-/_}
+DESCRIPTION="Improved Whois Client"
 HOMEPAGE="https://github.com/rfc1036/whois"
-if [[ "${PV}" == *9999 ]] ; then
+
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
 else
-	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	#SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}
+
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="iconv idn nls xcrypt"
-RESTRICT="test" #59327
 
 RDEPEND="
 	iconv? ( virtual/libiconv )
@@ -43,6 +46,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	if use nls ; then
 		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
 	else
@@ -58,21 +62,20 @@ src_configure() { :; } # expected no-op
 
 src_compile() {
 	unset HAVE_ICONV HAVE_LIBIDN
+
 	use iconv && export HAVE_ICONV=1
 	use idn && export HAVE_LIBIDN=1
 	use xcrypt && export HAVE_XCRYPT=1
+
 	tc-export CC
+
 	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
 }
 
 src_install() {
 	emake BASEDIR="${ED}" prefix=/usr install
+
 	insinto /etc
 	doins whois.conf
 	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
 }
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 379b79227b05..d83bb403f3ba 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index b0a802cbdca5..1b54d7bbf6c9 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Bernard Cafarelli <voyageur@gentoo.org> (2022-10-17)
+# media-libs/libheif not keyworded
+media-gfx/geeqie heif
+
 # Sam James <sam@gentoo.org> (2022-10-16)
 # dev-cpp/notcurses not keyworded here
 media-sound/snd notcurses
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 1a39191790c9..151471cc6032 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-10-17)
+# Needs porting to musl
+# https://github.com/rr-debugger/rr/issues/2236
+dev-util/rr
+
 # Sam James <sam@gentoo.org> (2022-10-04)
 # Packages with dubious sys-libs/glibc dependencies (non-binary) but
 # masking for now to allow musl profiles to graduate from exp->dev.
diff --git a/profiles/package.mask b/profiles/package.mask
index a60d30b63e17..f15ea2e6211e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-10-17)
+# Hostile takeover ongoing, integrity of the live version
+# cannot be guaranteed. Use the release version only if you
+# change the meta server setting.
+# Use games-action/polymc-bin instead to be completely safe.
+# https://bugs.gentoo.org/877495
+games-action/polymc
+
 # Michał Górny <mgorny@gentoo.org> (2022-10-17)
 # Unmaintained since 2018.  Requires dev-python/nose.  No revdeps left.
 # Removal on 2022-11-16.  Bug #877375.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index fe1593f72a95..9c2066a27a52 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4021,6 +4021,8 @@ media-gfx/freecad:tux - Build the Tux module
 media-gfx/geeqie:ffmpegthumbnailer - Enable video thumbnail support with media-video/ffmpegthumbnailer
 media-gfx/geeqie:gpu-accel - Enable GPU acceleration support - experimental
 media-gfx/geeqie:gtk3 - Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2
+media-gfx/geeqie:heif - Enable support for ISO/IEC 23008-12:2017 HEIF files
+media-gfx/geeqie:jpegxl - Enable support for JPEG XL image format
 media-gfx/geeqie:map - Enable items map display - experimental
 media-gfx/gimp:heif - Enable support for ISO/IEC 23008-12:2017 HEIF files
 media-gfx/gimp:jpegxl - Enable support for JPEG XL image format
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 95f6d6448c40..ec0847fcad5b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index 42a397c4ccd9..808d0e6210c5 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,5 +1,7 @@
 DIST dcfldd-1.7.1.tar.gz 89413 BLAKE2B ad7572d6df51116ea71647363d50fcb03e389cbf52fc327c97ae50357290ce1aefda0ba229e167bac322edf73009fe8dc72378dab07090321e41eeaf249433c0 SHA512 d1120ef9b50e379015d50d00b6c8b24978ec58c05434580d67a1707f5e1d41d1e294ca5a7f9d1e7bfeabcb9fd7976b384db93a78f70421870d26391404ee4ae6
 DIST dcfldd-1.7.tar.gz 81892 BLAKE2B bf34dcd3e0430421c36dbd9d6b3f5ea2d4a4cb41151db8f14deb48d4169d1008fee2776f2ae821ea40ca7743f2354db62520bc919206e02a6e525ed6a38a0fec SHA512 e1dc4773438914a8102a692c7b7cbf486a9b03111820facb0134b4b9d058751695d1a7c64481852026412aacbb0fa04a18f833ff77ca30f154d5067a07057f31
+DIST dcfldd-1.8.tar.gz 89853 BLAKE2B c4c492500962bbe5329b2b67387424a99fce9853a9ab8788894e981e8327f5945f9f9ddf8a7bf219e1ff2a506725e2bcee7180e862be09023bef961842b989f0 SHA512 68b1d5806a723a3b499220a007faafb60fd1baa1924511a2e56be41828e2ac517d40e4f53160feb67d5202b25abdf6d304a1e8f100b49594f31dcf0198aaf7da
 EBUILD dcfldd-1.7.1.ebuild 540 BLAKE2B 1142ca0cb9a04295291509a4a353ea3846265f2ea834fa11c0da3d42db36dd3176ef7b2aa6b5d03f2383f5e3d97dbb668c97123cbc27677cb1a61a3f92b9ac41 SHA512 35f8f27bd66f8583d48a87e6ab346fa0a19cbd8187e73fb2dd65c741e1b1802b021f0d2e5df5193035f767b6822a00c6e7256d0504d9f2d7958e4e7d4a73b453
 EBUILD dcfldd-1.7.ebuild 502 BLAKE2B 3e16b7123b2fd9c9d7b5e9fb187aef04226cf8f13521864b38615b5a8ab0f4f2dc6098b21b669cfe93d9288ff8efa5442cd9dad7910d83e11e28e54ef86deb2e SHA512 65a14bc441a7c9b0841ab895ebad8773bda6ad67a11966b9031c173e664f0ff45fbb4e59e73b9f2e96df822afba40a34acbe5cdf3b30ea639c1c3a1111c9dc8f
+EBUILD dcfldd-1.8.ebuild 540 BLAKE2B 4b95efd9dd9312dca5df9924fb74e008bdd5c3c2de9a277e9fd20ae156031b3a71bb23e5f7f414e8a85177c0e72e7e9909d56c7a605cd8496f5dc5ca17305d74 SHA512 b7f01cb81e571dc729daed0bd8505f08c4648284af2ab30590b1250549a40d538938162b96ec9adf6209d007b3dbfe8165ef32164f4c7c031729d0964c327e93
 MISC metadata.xml 326 BLAKE2B e0415cead27edbf546822569f2b36339bac12b1ef132ccbfb3fc542ef2836768bbf4ceabc2cddd17e956d9e955d517302681f3ad3408b935c57e1737c752a30e SHA512 66aa2e95ad62d77367bf2860fcc2e266495b485de8cbbfb0c16b6eacf548e946b2075f7de6cc6617dca977d03b25a693c887ec4ff8be28ec9cf86dea52075352
diff --git a/sys-apps/dcfldd/dcfldd-1.8.ebuild b/sys-apps/dcfldd/dcfldd-1.8.ebuild
new file mode 100644
index 000000000000..c294c5f36e94
--- /dev/null
+++ b/sys-apps/dcfldd/dcfldd-1.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools
+
+DESCRIPTION="enhanced dd with features for forensics and security"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/dcfldd"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	ChangeLog
+	NEWS
+	README.md
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest
index 23c8fc971669..6a8c6cc13dc3 100644
--- a/sys-apps/xdg-dbus-proxy/Manifest
+++ b/sys-apps/xdg-dbus-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-dbus-proxy-0.1.4.tar.xz 122112 BLAKE2B c7d2898b703c51d6b53838996a0ae74e7a4e163b9611e28dfded54ab1a44c0473fa25daa13e94977c918544e0741bf0dd4747dfcae858468bc4abd288613cb8b SHA512 d50fa916d07f23e080ab53cf290b5d6db73cfd8262253a48b9f012ce6c182e201d0a67efaeb7f28a844d3ef146aa48936dfbe4279a59b909a6dc4419d5f15b04
 EBUILD xdg-dbus-proxy-0.1.4.ebuild 702 BLAKE2B 3a316103ea412d5b159ed6ff78427594554d368eb88e6fbb82586608b4be792506982ca7f0b76cf2145c3d1c0c7b74992d0e8ce5830d7adbc2a1416de6ce674e SHA512 d998300d9020c63e576af65424f026cec5b087313a3de0dc299a569d52366e9056988444d0e5c829d9c7990dec804adadc14f3163fad567171ec547fa7c13490
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+MISC metadata.xml 341 BLAKE2B 4bf518fc7deed5c52f79f3dcac23bacb777ffb758ce4d7aeefa9c17b7631cea92730ac133b22717866075c0e087c054a570cbfad63b6e90a28439ea884e69b72 SHA512 2fdb239af65e50174d60d74d9069c3a1577ee9de45e41b1b2f8ef5df28d05b2e44f41b4ec9a4559246525d2fbaafe88b631ce7f994695e3043bc97367605b494
diff --git a/sys-apps/xdg-dbus-proxy/metadata.xml b/sys-apps/xdg-dbus-proxy/metadata.xml
index f453528b934f..36943d4c555f 100644
--- a/sys-apps/xdg-dbus-proxy/metadata.xml
+++ b/sys-apps/xdg-dbus-proxy/metadata.xml
@@ -5,4 +5,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">flatpak/xdg-dbus-proxy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index b5e1649555d0..acbc29bdc1d4 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/ct-ng/Manifest b/sys-devel/ct-ng/Manifest
index 9d9c1b528c37..d36703bcd2be 100644
--- a/sys-devel/ct-ng/Manifest
+++ b/sys-devel/ct-ng/Manifest
@@ -1,3 +1,3 @@
-DIST crosstool-ng-1.24.0.tar.bz2 2058069 BLAKE2B 4108e9546acd6c0660552595d41164ce9c4f07985851a911c260fcc9e2ec70e80136b6cb2090290ca2aa2ceeb4ebc61fca183340de88eafd800bc2bf18d0cfbb SHA512 379e668365628f0ab359ae119213bed44960870093f64f0fbb12e92bbe2a3b82bfed77f5ab33f2e2f17c1977e7a63f2151c46ad8d0e6208220fb7fa8726fae33
-EBUILD ct-ng-1.24.0.ebuild 685 BLAKE2B 1d82e82fb7bd5395565b9d489fe2fa54362ead3dd0cbeca803c2428663fac1729d755155e3ed288940d2c6f75f28c928339c5237d253deda794588e365312964 SHA512 b1436032340019596c30b864add1d4196f7065f7006c1c3209fde5039eaa3a4b654dccf014689b8ef05c0f112a5a7a774f2ba139953c941604c4c4fe0c2938dc
+DIST crosstool-ng-1.24.0.tar.xz 1622432 BLAKE2B e0f3f26083dd10a35ac79fc78debe98db7914f5d7fd710ed6b4c788a7a0d56e22d22966f186e8315ae99a6141d1d5b80686e86ad8b0549514a07dfda5913a348 SHA512 89b8794a4184ad4928750e29712ed4f194aa1d0b93768d67ff64f30c30f1b1e165647cafc6de94d68d3ef70e50446e544dad65aa36137511a32ee7a667dddfb4
+EBUILD ct-ng-1.24.0-r1.ebuild 684 BLAKE2B d5217dfd27417d62af9dcc549a74431bfb7efd6931c99952684da9586b73046c605c7f4867a031c3a7188cb12b788303e28ba39269251710bc43c90ff763345d SHA512 28e2d8fb765ef8e61380836dab079629f5ff21ab2eae3a2fe2244f58571e6c680b2069c625ba550fad53d778318224d161844672c60d9496fbf26491e2eb35a7
 MISC metadata.xml 595 BLAKE2B ac85a4aa12f630c8e18ff5537f305a0d2f8f73c83a148d64589d73c6b710fc74487a38e62638620606ba90dd0e895645adafaecc23c0d4e6da6ff10d9e946637 SHA512 e608f6c2b304b5034ea2ca6c5688a9bdac1582866110f647f8ed525644ad1ad932b1428bde46c48bfdd7ca1abd07299a5f9c3baf6a14765be8442d9b632ec0ff
diff --git a/sys-devel/ct-ng/ct-ng-1.24.0.ebuild b/sys-devel/ct-ng/ct-ng-1.24.0-r1.ebuild
index c43e112be440..f9859d8ffd57 100644
--- a/sys-devel/ct-ng/ct-ng-1.24.0.ebuild
+++ b/sys-devel/ct-ng/ct-ng-1.24.0-r1.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"
@@ -6,7 +6,7 @@ EAPI="7"
 DESCRIPTION="crosstool-ng is a tool to build cross-compiling toolchains"
 HOMEPAGE="https://crosstool-ng.github.io/"
 MY_P=${P/ct/crosstool}
-SRC_URI="http://ymorin.is-a-geek.org/download/crosstool-ng/${MY_P}.tar.bz2"
+SRC_URI="http://ymorin.is-a-geek.org/download/crosstool-ng/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index a5484d2cb44b..cd0f88b41295 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest
index ce19a60d4895..93634e59ce66 100644
--- a/sys-fs/lsscsi/Manifest
+++ b/sys-fs/lsscsi/Manifest
@@ -1,3 +1,3 @@
-DIST lsscsi-0.32.tgz 195376 BLAKE2B 8ca0eecd5e0a0a60b9871d955daa05a92e33a8c0c799a0293c58c7882a5c0d9ba06df070ffac8bbce4183e0e5081087cd4b39a6e3c51ff30faac58d0aae67f94 SHA512 96cb87be53eae9fa3a7defa0065f4dee8ccc23805a9ed1dc93d101c5e0610b78765b61449bf6ce58c13de8aae8400e4ac6a60ad64f840d092b9d7293106c5145
-EBUILD lsscsi-0.32.ebuild 350 BLAKE2B 317760ff1d123e0aa7b68c0716788956c2cb3d692b24de68068f228e9b60373a14da171c223e1ac60334078c09fbec8f46c9e479e43bd180ad03ed8c4261448e SHA512 4e7917d4f4ac9415a7e45e8b84c0fcf7e8a68eaf93b7be474534cac56820d017e8f7ac242acdd0b785299a73a72f2114b5abd440a92bc66cdccab9037fe0ecc5
+DIST lsscsi-0.32.tar.gz 195376 BLAKE2B 8ca0eecd5e0a0a60b9871d955daa05a92e33a8c0c799a0293c58c7882a5c0d9ba06df070ffac8bbce4183e0e5081087cd4b39a6e3c51ff30faac58d0aae67f94 SHA512 96cb87be53eae9fa3a7defa0065f4dee8ccc23805a9ed1dc93d101c5e0610b78765b61449bf6ce58c13de8aae8400e4ac6a60ad64f840d092b9d7293106c5145
+EBUILD lsscsi-0.32-r1.ebuild 353 BLAKE2B cdb113ba23a97ef2b980b3b4d139513f134db3fa6bcdec2f313d66beb679583de5063742ace8c096c0c5fbe0ae2c084ff66be8d8199bb21573651a545bde2816 SHA512 48ab5557af4e99ca603b88df718292048d5c1500d12d83339cdd204e896be1f99000f47eac5199042d97a47a61a9857d0283d6775f8b0d892755f3c0f428ee7b
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-fs/lsscsi/lsscsi-0.32.ebuild b/sys-fs/lsscsi/lsscsi-0.32-r1.ebuild
index 9a99652c015a..1007c26f9bac 100644
--- a/sys-fs/lsscsi/lsscsi-0.32.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.32-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="SCSI sysfs query tool"
 HOMEPAGE="http://sg.danny.cz/scsi/lsscsi.html"
-SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
+SRC_URI="http://sg.danny.cz/scsi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index b69b40349e35..183f23fe78f4 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 767d072ba74e..d38cd63a8e17 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,15 +1,23 @@
 DIST genpatches-5.10-157.base.tar.xz 4210372 BLAKE2B 607d4005190d4b623126ad644508f471cac783a365a0b1f15983eed50a1a594be6c473840c0d79a9c0847afb221a4b95e6dd954f6f7b57cdec6f53651a5fc9a0 SHA512 fd176ed3f4af5e4f3ecb37f553a9ceb034cb8d9602106818edf1deab8ecc34ab4e08009cb4608578fa4892bd5cc76952fa8ab9a010c9159680f860a23775d6bf
 DIST genpatches-5.10-157.extras.tar.xz 3868 BLAKE2B 6662b3d2ab7179cd186061ac684324834a5322c0d6132cb61ba31098f360302534f9f59357c0044eccdb262a6c9f973a21c071c1e27fada967119fe793a7e6e1 SHA512 d85943c5b389d3b4966dac77bfd2abbb9e85c039dd365990cca40bebc82ee35d58a3a24a9a3a15a40eb36ee8671dcac9a43f9753ae48a7d19ac7a7e5013c7cc7
+DIST genpatches-5.10-158.base.tar.xz 4211444 BLAKE2B 0dc1d053275d080f7e61a280f8311c3da1a1497b929e6d1d4f24a15b7e6b5f4bebd4fdd49fe90137b7a01b5d1f4df60ed7c7bbe0089505a54632618d90b5fa63 SHA512 6630ede665881b848a768b0f959820be4370ea5ecc897e6fe819a186568d11d58373056266c62d858d004153fb894dbc64df48e03098bba4f68b560a5e273b70
+DIST genpatches-5.10-158.extras.tar.xz 3868 BLAKE2B c2cb0c011084012b46fede2333a7022bb78a4c92e675fdba5ba2c44f37cef35e6f0334dbfdf69b6b6c0602793a5821660aba29236d011eaed808f8db9b42c876 SHA512 85dc76fbfcc1cb8064faf012b8bb40eb1c6b7e2ab0adbf2af191b5c3ea0c6f57a685dd53d1e3c6266de4b88c414516371001d8b95648b02adb5c4f25d7ca1049
 DIST genpatches-5.15-78.base.tar.xz 3076864 BLAKE2B e868bff991ca299fe186380ef4e7222029fadf1eda5adf66ac6861fba5febcb222c69db93dedc3280c45a4a222f5800a497c12dd47425071b7dd5263ee680c3e SHA512 5018436394bc934ee2f0b50a3b012fbf86a615108bbf16d18d636b202d66d2bb75d9b04cabb87e75fbc7360c137ea52961609e90643caa2d9779628fd3292b60
 DIST genpatches-5.15-78.extras.tar.xz 3932 BLAKE2B b971f35cd6b525ea2fa675909790f489b66a1bd96403d12acf47ac2cb00218181ad267649d143e37f2cc775f4892c0e3a24817c9270c27c7b937b69ad002000e SHA512 6973da0d4dc2d48c5c481a45581ca51449957bb662dc8520ae00a23056dc25f2b9d419cd2ccf9fd5244313ee2eee0b907cd367259ae1d27cbd226bbe8bbced32
 DIST genpatches-5.19-18.base.tar.xz 911172 BLAKE2B db20a811ffc927b01dc389fc3d959809442fa4065fc2951b992561fbc102e854b5fd8dd17833604458e95f8bcec23c75ae94095df90745b489628e52661b5878 SHA512 4e9b9eb22f6a3b634964c35241a9a50517228787f6bd7f25f2de3ff82336c8d0acd8b2fe703a9595ed32776d64bb66ba518919f597948922db6791c10c572b67
 DIST genpatches-5.19-18.extras.tar.xz 3808 BLAKE2B dab7e5596066c9b70ebc2b7413ec7dc9c35bddc29f230dfdc74a9594706713a6807e0ded167eea3ec6a4bcf0c901404bb4fe1a71fa1c8aa265c599b6a1dac8fa SHA512 f39d76551328f9e8d1aa646e819282096bbcea1cb22902fd087dec878a7d673aacb517441a9c213e85a03f2f15768e1a252f103ca89f1b84ef994a0998416bb8
 DIST genpatches-5.4-223.base.tar.xz 5119600 BLAKE2B d2ad667a58be0061e5e94a885f3cafd7c0d99b108f129a5d7bdc18d0d77b99d52b2dfd0067f6d4657dadcc73f371555949c9ae70f71c1b457c9487179db25070 SHA512 0e58903a7e78f1a50a961a27929f3a936f07ee45343d079389cf9e8b9e78a1b542ec58bbba49ced2e0873d86d28ef2ebf3501a70a5cc8465298c267d95a09899
 DIST genpatches-5.4-223.extras.tar.xz 1812 BLAKE2B e0ebc78506b6ca3d8bc09164b26f15a8cc94495797fc17a36381a3f031dd81bf7870915a48b0deb4f58cfb43e5ec4a64e18e6ca6c00837bdfc5e4fab913752b8 SHA512 ce01405cfc355d6230e687c407c9a5e92d88c6f0837eda19d2bc23d3517df4c5159332d491459867841827e0dc3976c8229cf0d0cb1c9d39360ba67ea616a734
+DIST genpatches-5.4-224.base.tar.xz 5119576 BLAKE2B 3f5fa9712da6376491d9903759334ca4981a6fc9b24919ba6acb5114ce805333a26052570df1a192dc8e062ee77667b45dac62c309d37b02190e4f8a07640aea SHA512 d433e356e47f0a6be0ba3b41172618f0b9cce634e4227924d62a8487cb74af3ea0c4d3245ee4fd2936d39ed5eb839d52985866b9d796f7e7a84415a6b60f9b50
+DIST genpatches-5.4-224.extras.tar.xz 1812 BLAKE2B d28183946e63eedcde3ccc19d84baad11b74349abbba19501c0763ae4597150f2ad7397c19396ce07627643cae526e6ef216dfa2166d217e8452719887e7f2bd SHA512 6505c71e0da13992e0abf5ffd31b414b4bcbde4be78abee6e9d402c14eb329e212e85cca77cb79591ba6d66b3f3b4ae2014e57cd8a88b39373a5dc2403f37d26
 DIST gentoo-kernel-5.10.148-1.amd64.gpkg.tar 66600960 BLAKE2B 8aa2a893602b1f1b9b94e462c8e6588d04515e78f7ab41ce124db79ca46e890674bf2faff1245170cf27df0a8130b3229c9fa6b70975555b22f98c275216753e SHA512 eaed6a7c5a3f993d8023a05ce701303d2a3af7e4acf038a96ef90ff2fd05c1f1ff3b7ce58fc075758625fe0e3bddef69bc119b32717ba30bb65c30e85f69639f
 DIST gentoo-kernel-5.10.148-1.arm64.gpkg.tar 59760640 BLAKE2B 133644550ff4c86ab62eaef3dac0377d568765e0e5d25d2fe392b0950ac94e536ca9dca73bdf192d8994bcc326448529b76dcc8c55f4161c1960cd153b711470 SHA512 07b91fa83c509d62d05e1e6beb9ee80d0f3c68cbb2edf66b70d9646e190b5ea1bf162592c6d091c1699600285891f7abb8807d3d281086eb14c49ec3da457d3b
 DIST gentoo-kernel-5.10.148-1.ppc64le.gpkg.tar 55121920 BLAKE2B 764f413d2c48d9b1a6825ba7dc88ab24933fc08d5e949a41ade557d794a8f92a827b9211d76a0cfc67728490e2a9ba7152f0b2d0d27daf6bebcb13c9625834cd SHA512 0f469b0902d7849c9f77c489f005d64b1ff8ba6e26335188e9ab919732f9111733f603a5a86a22edee5c4e20738140f79e457a8631772ccf8c908f689a3c77f7
 DIST gentoo-kernel-5.10.148-1.x86.gpkg.tar 56412160 BLAKE2B 8d69943d38991f778a710de5d0a525a70140cc93f842ba7c40caa6d883143e1e5154068236c649d4bd251a3dca038934d2a3bda63dfa41da39d4978a486696b0 SHA512 bf0ef66534187ba3fdc8e805a28c4de5220db8ef89b1b2afd48712a035fbe2179504a2bf4a811e62aff3a2244aec9288b1d993bf550d08bca7a25363f423a961
+DIST gentoo-kernel-5.10.149-1.amd64.gpkg.tar 66478080 BLAKE2B 2955f0fc44ae5e4882eb4a5d36f355a0e5106316bb81452d0cd81bf965cfec2ef0e316e6afd4f482bfb9573dec2f0afc0a393ffe8994651b43db56c381bb7902 SHA512 930ed59473c59d81fc4f47f34228c263d124da16badd64f780f69cb8a32dfa78beee8120176e835fe06ce42420982beee57fe725f655e2d071c8cdface353d82
+DIST gentoo-kernel-5.10.149-1.arm64.gpkg.tar 59648000 BLAKE2B 558a92f3d10e556e445422ae9a2a62e52b41b4bac9496764b015a0e211fde3528e1e60195bd811dbd7d3878cd66ca0055bcf382eb2bae9c837d29a03e6004931 SHA512 a1e75fa85d528aa46ac121e927ec90a7db4e3a7b7d88d77111727b3758e0b5124eb717a89ff43fd052f41f67a78fa0c0868e145af2fc0d6e2cfb4a94524b203f
+DIST gentoo-kernel-5.10.149-1.ppc64le.gpkg.tar 55019520 BLAKE2B 41fd10f6cbacc44de60dcfbc48600c849fffe13b3220ea008fd998bcbdee08fb5c8957ef1ab870286636ffd660898306085364eca246ef02da27be79155bc10b SHA512 725e811649fcc122bf389256ece51468f635508acb9dfd8bceeb24bb7c4878192eb46417b2a01829527153073b0552fa7217794d0201963200ca362a9615e609
+DIST gentoo-kernel-5.10.149-1.x86.gpkg.tar 56412160 BLAKE2B c79880a0435020b7e069c683b79ecb2f5f945e3abe63c744fcde4fbcd8afe0e72c39618308b640729312635a9bd31f482bef73bd62eae8c53086ee911d7665d9 SHA512 5e7bdcf867a84dcc0da78c4825e85d52b4458a4710381bea021a7f986dfe09b1105d410525b031d2adfc22676399dfbe945c945cf0fadcccaa020c4c8e9ccc69
 DIST gentoo-kernel-5.15.74-1.amd64.gpkg.tar 69908480 BLAKE2B 377403f3eae31f8ab48a167f7b2fd292c5fed9972263078a5eae8a0b66807aaa2b4f8e3fa2bedfb07865892c2701cf41111746591e58c794d1bd76ac187ee178 SHA512 a1651e79575406d2f3fb75c1f342de21be603fb3fd08b531b3ec7ac59d11cadaaf4dc857d693285bc300e0b0f1b0c755a369ae37ec67909c6627d5938f5ba666
 DIST gentoo-kernel-5.15.74-1.arm64.gpkg.tar 62986240 BLAKE2B 48394734bd5b23bf44535f41ece63640da5cfe7268d3e186074cd416dfb8dca2ce887758c436525c1ac8fe4e198ae3d74402953e64e86b09367bcd6230292180 SHA512 5155ba03a4067bbbd580e0ab50c82df032dac4ab410e7261c70738643bf66be3754f3dd5114c31fc740d315b1aa7882a16228fccf3bf72c91cc24eccc1a6e5c9
 DIST gentoo-kernel-5.15.74-1.ppc64le.gpkg.tar 57333760 BLAKE2B 1b0f791484aaae6016ee4f4a4afa93fad2bd96fd98defaa41c5a04190170b5b348ec5a8aaeabba688cd484394311eb207009c776a9850376a133d1b5ea0219a9 SHA512 b8c1cbfb173298fcc58895f9c2d843a1b344beaf8ce6901a76314dee909c65fc2e943f1100b29897cd7c230ad52fe170a5beb2881bff11fac6ca03ecabfad73a
@@ -22,12 +30,18 @@ DIST gentoo-kernel-5.4.218-1.amd64.gpkg.tar 60733440 BLAKE2B 1db4e1f0b0452173ef7
 DIST gentoo-kernel-5.4.218-1.arm64.gpkg.tar 56934400 BLAKE2B d68cfa0d046ba6d161d3be877e79d46672933f88cdf1cc0e0cfc274a0b6c043b4c7bd3a673eac29fd7f3e395822e9709c475e8b67167605ecb507bbebf9ce7c2 SHA512 a06f40f330e4e0972cba8e8061d8099866a35a1f97e4989b82cff0fd70104e15a1c5fc2495ba2c19be00ffb61345c21d38b55bee1fba6188fc3e12fd1e32ae48
 DIST gentoo-kernel-5.4.218-1.ppc64le.gpkg.tar 54466560 BLAKE2B 5dbe9d43266feafb3403829532caab9b9b5c8165a1e80752dd876626b9208ce1dda990d9b010ab6a1d9d0937728ba59643612587e071231d76ed3d06298976f5 SHA512 60940c07de6dc71d659276e0a6d7688822de2bf5c355e2fd2045ac08b1f5724fe3ed97e61b3b48325e93cadf73086073af2baf8377a34591b6684d06750bfaa1
 DIST gentoo-kernel-5.4.218-1.x86.gpkg.tar 52387840 BLAKE2B 935c3fe381ac9b57ba131d6ff5fd19d4308da390c73a25b7a77f2107f43ab7e776a46eec64c454b2e7ecd3f6b6e84680fb549a3c865ddb501fea9762072bb01f SHA512 f8732561256ce0946b45f5f3cfcca6110c1c13005179344acaffe8d9aaab4bccfc1966e4a2092f3b420539bd9c03a0d32b2af5bc37077ba31c59ebac4322b3cf
+DIST gentoo-kernel-5.4.219-1.amd64.gpkg.tar 60631040 BLAKE2B b50c065ca4259719a0ee74bef71d6d9fce9cab18dd8a8d2544ada311d5a84b381e1483b16bbfc6316ecf2595373b1efa9dfbe8e27e58ea95c02a200602882023 SHA512 405186861b275b3606b561d976969f35b4112a229b2e3757530c3ec3b6e5cac17a5836d5c5f53a570322271e5bb9d90fffa1b9b97d0bba4b0e36f6ba33bae06d
+DIST gentoo-kernel-5.4.219-1.arm64.gpkg.tar 56832000 BLAKE2B 75250e0407ea8b846658a59b0e53d9293112c7e109a004783ea9ac8e54534065a50ebfa22bd9f1f059f55129bb39ba8948cc53e5afab1527ca97ec23902738ee SHA512 2e55538b7f10def530abb3ced3dc042e0b6b4de173dea949610353e3e719136860bb7271e6164eb2dcf410486a2c249e4898f0bdf24bed3140d29963dba0e229
+DIST gentoo-kernel-5.4.219-1.ppc64le.gpkg.tar 54343680 BLAKE2B 28888b569baaca609212ac382b1a3ee11bf518587d00d3553118340e847c7a3e7f814bb4727a1931daa6c39afa8567579781fd05726b759f2df8d3a9b44f7ab1 SHA512 93a8bf9453f19222cf8c0e0ad399f3bab7aeaf0ebc1c8802fb53fa2277e150584203050aea9d0e549d1bbb96a88178b891552dfdba4c460b54e20f3629cf4435
+DIST gentoo-kernel-5.4.219-1.x86.gpkg.tar 52387840 BLAKE2B 9a91a823ff95ef19a88cba5d2c2992632edf2f8a8f88c42b43c0b7dc36bb67d4ac273b0661d96520caf92f69c871aab7a7d9db1dd2cceb2f628fe88557e600ad SHA512 aa1572341d40f80ed3136bb9efc1b0519cd67d71fee6a39307a1dbeda1c086b6eeed661ea5216a3f52125d3e4e89ecc421338d40d164520301747ae5b8f0e94b
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-bin-5.10.148.ebuild 2999 BLAKE2B 93c1a0cf84370f61fe9ec23bcccad5e2421ac6206411610653a1d8484c835de9def37872c3838f875767032d4331a245beff6cd619ccf53a43312c8331d86d3e SHA512 e4ced34e4d178d478f71d3199615f6b4b6d28127783ece7b7a04bbf376427c533539d75b07baa1692edb43a53a71c0a738982f34d68f6de1e0ef9a3c4260f4d9
+EBUILD gentoo-kernel-bin-5.10.149.ebuild 2999 BLAKE2B 93c1a0cf84370f61fe9ec23bcccad5e2421ac6206411610653a1d8484c835de9def37872c3838f875767032d4331a245beff6cd619ccf53a43312c8331d86d3e SHA512 e4ced34e4d178d478f71d3199615f6b4b6d28127783ece7b7a04bbf376427c533539d75b07baa1692edb43a53a71c0a738982f34d68f6de1e0ef9a3c4260f4d9
 EBUILD gentoo-kernel-bin-5.15.74.ebuild 2999 BLAKE2B bf50105e6cc148a793b36139a419ac66f4f14b4a73394b21af62803ab61347d87f800f066ccf7c9e33951c2efbb6d6dd77e7b7f296293cee6b0b7f17f3d1e7e2 SHA512 85bce161a2af46e8b9a2a005200e29e30e1bffc8c2263b7db2a756a73d411168dfc0e7720df907e58ccafe059f72558a47d8c93d9240222c093990de08d7500b
 EBUILD gentoo-kernel-bin-5.19.16.ebuild 3003 BLAKE2B 4ab34ea587fa8ccd865b3e236c492fb68a9d0f39c17503fe507107af52934cc14ec4dcf1afe08b92a78f6e4515da77cee078872b631e0711126b8c5b5661ef74 SHA512 6face53807c8ee8f1c1f9129d692514344491fed96102dd6579fd1ab3b0bcd02a730487a50b6a64da5f64050879231696c4d35b0d9862dbf98f4166ec1d55c4d
 EBUILD gentoo-kernel-bin-5.4.218.ebuild 2999 BLAKE2B be5c5e139ee4da605dd15cf02c6251a762426d0da46ac2b75d46b79226e7c41c57429ed847e2e646735545fee33cb7ac45d62039158c0004380197255477be12 SHA512 b0ee61606614ca61b655b50a578efefd7fb49437014df935c4ea312ab1257dc415425684a05c6dac1e5dbeac5b1eac81071bf7cae4fec7bd68f8cae985b1c969
+EBUILD gentoo-kernel-bin-5.4.219.ebuild 2999 BLAKE2B be5c5e139ee4da605dd15cf02c6251a762426d0da46ac2b75d46b79226e7c41c57429ed847e2e646735545fee33cb7ac45d62039158c0004380197255477be12 SHA512 b0ee61606614ca61b655b50a578efefd7fb49437014df935c4ea312ab1257dc415425684a05c6dac1e5dbeac5b1eac81071bf7cae4fec7bd68f8cae985b1c969
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.149.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.149.ebuild
new file mode 100644
index 000000000000..dcef0abe1c6b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.149.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 arm64 ppc64 x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.219.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.219.ebuild
new file mode 100644
index 000000000000..7d29184e6c6b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.219.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 arm64 ppc64 x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 9e968955392d..09c69159663e 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,11 +1,15 @@
 DIST genpatches-5.10-157.base.tar.xz 4210372 BLAKE2B 607d4005190d4b623126ad644508f471cac783a365a0b1f15983eed50a1a594be6c473840c0d79a9c0847afb221a4b95e6dd954f6f7b57cdec6f53651a5fc9a0 SHA512 fd176ed3f4af5e4f3ecb37f553a9ceb034cb8d9602106818edf1deab8ecc34ab4e08009cb4608578fa4892bd5cc76952fa8ab9a010c9159680f860a23775d6bf
 DIST genpatches-5.10-157.extras.tar.xz 3868 BLAKE2B 6662b3d2ab7179cd186061ac684324834a5322c0d6132cb61ba31098f360302534f9f59357c0044eccdb262a6c9f973a21c071c1e27fada967119fe793a7e6e1 SHA512 d85943c5b389d3b4966dac77bfd2abbb9e85c039dd365990cca40bebc82ee35d58a3a24a9a3a15a40eb36ee8671dcac9a43f9753ae48a7d19ac7a7e5013c7cc7
+DIST genpatches-5.10-158.base.tar.xz 4211444 BLAKE2B 0dc1d053275d080f7e61a280f8311c3da1a1497b929e6d1d4f24a15b7e6b5f4bebd4fdd49fe90137b7a01b5d1f4df60ed7c7bbe0089505a54632618d90b5fa63 SHA512 6630ede665881b848a768b0f959820be4370ea5ecc897e6fe819a186568d11d58373056266c62d858d004153fb894dbc64df48e03098bba4f68b560a5e273b70
+DIST genpatches-5.10-158.extras.tar.xz 3868 BLAKE2B c2cb0c011084012b46fede2333a7022bb78a4c92e675fdba5ba2c44f37cef35e6f0334dbfdf69b6b6c0602793a5821660aba29236d011eaed808f8db9b42c876 SHA512 85dc76fbfcc1cb8064faf012b8bb40eb1c6b7e2ab0adbf2af191b5c3ea0c6f57a685dd53d1e3c6266de4b88c414516371001d8b95648b02adb5c4f25d7ca1049
 DIST genpatches-5.15-78.base.tar.xz 3076864 BLAKE2B e868bff991ca299fe186380ef4e7222029fadf1eda5adf66ac6861fba5febcb222c69db93dedc3280c45a4a222f5800a497c12dd47425071b7dd5263ee680c3e SHA512 5018436394bc934ee2f0b50a3b012fbf86a615108bbf16d18d636b202d66d2bb75d9b04cabb87e75fbc7360c137ea52961609e90643caa2d9779628fd3292b60
 DIST genpatches-5.15-78.extras.tar.xz 3932 BLAKE2B b971f35cd6b525ea2fa675909790f489b66a1bd96403d12acf47ac2cb00218181ad267649d143e37f2cc775f4892c0e3a24817c9270c27c7b937b69ad002000e SHA512 6973da0d4dc2d48c5c481a45581ca51449957bb662dc8520ae00a23056dc25f2b9d419cd2ccf9fd5244313ee2eee0b907cd367259ae1d27cbd226bbe8bbced32
 DIST genpatches-5.19-18.base.tar.xz 911172 BLAKE2B db20a811ffc927b01dc389fc3d959809442fa4065fc2951b992561fbc102e854b5fd8dd17833604458e95f8bcec23c75ae94095df90745b489628e52661b5878 SHA512 4e9b9eb22f6a3b634964c35241a9a50517228787f6bd7f25f2de3ff82336c8d0acd8b2fe703a9595ed32776d64bb66ba518919f597948922db6791c10c572b67
 DIST genpatches-5.19-18.extras.tar.xz 3808 BLAKE2B dab7e5596066c9b70ebc2b7413ec7dc9c35bddc29f230dfdc74a9594706713a6807e0ded167eea3ec6a4bcf0c901404bb4fe1a71fa1c8aa265c599b6a1dac8fa SHA512 f39d76551328f9e8d1aa646e819282096bbcea1cb22902fd087dec878a7d673aacb517441a9c213e85a03f2f15768e1a252f103ca89f1b84ef994a0998416bb8
 DIST genpatches-5.4-223.base.tar.xz 5119600 BLAKE2B d2ad667a58be0061e5e94a885f3cafd7c0d99b108f129a5d7bdc18d0d77b99d52b2dfd0067f6d4657dadcc73f371555949c9ae70f71c1b457c9487179db25070 SHA512 0e58903a7e78f1a50a961a27929f3a936f07ee45343d079389cf9e8b9e78a1b542ec58bbba49ced2e0873d86d28ef2ebf3501a70a5cc8465298c267d95a09899
 DIST genpatches-5.4-223.extras.tar.xz 1812 BLAKE2B e0ebc78506b6ca3d8bc09164b26f15a8cc94495797fc17a36381a3f031dd81bf7870915a48b0deb4f58cfb43e5ec4a64e18e6ca6c00837bdfc5e4fab913752b8 SHA512 ce01405cfc355d6230e687c407c9a5e92d88c6f0837eda19d2bc23d3517df4c5159332d491459867841827e0dc3976c8229cf0d0cb1c9d39360ba67ea616a734
+DIST genpatches-5.4-224.base.tar.xz 5119576 BLAKE2B 3f5fa9712da6376491d9903759334ca4981a6fc9b24919ba6acb5114ce805333a26052570df1a192dc8e062ee77667b45dac62c309d37b02190e4f8a07640aea SHA512 d433e356e47f0a6be0ba3b41172618f0b9cce634e4227924d62a8487cb74af3ea0c4d3245ee4fd2936d39ed5eb839d52985866b9d796f7e7a84415a6b60f9b50
+DIST genpatches-5.4-224.extras.tar.xz 1812 BLAKE2B d28183946e63eedcde3ccc19d84baad11b74349abbba19501c0763ae4597150f2ad7397c19396ce07627643cae526e6ef216dfa2166d217e8452719887e7f2bd SHA512 6505c71e0da13992e0abf5ffd31b414b4bcbde4be78abee6e9d402c14eb329e212e85cca77cb79591ba6d66b3f3b4ae2014e57cd8a88b39373a5dc2403f37d26
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7 SHA512 44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
@@ -29,7 +33,9 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-5.10.148.ebuild 3598 BLAKE2B 08ce2dc5719f68b0359e131864a5b4d27a9cd1ca35d5ac0e1f9092958d8923015f99da9361104fa0fb45649c2422c2d204f89b9f66a38214d83ead29aa7f9f06 SHA512 b054a9e9858f23ef6f7ba77e6bf19abd9aec489661718107e5c3562362fbf1353319be98a7d6d551f9f998ee60ab2554ea6baadc744ce4527fc0695b4f05dff3
+EBUILD gentoo-kernel-5.10.149.ebuild 3598 BLAKE2B 08ce2dc5719f68b0359e131864a5b4d27a9cd1ca35d5ac0e1f9092958d8923015f99da9361104fa0fb45649c2422c2d204f89b9f66a38214d83ead29aa7f9f06 SHA512 b054a9e9858f23ef6f7ba77e6bf19abd9aec489661718107e5c3562362fbf1353319be98a7d6d551f9f998ee60ab2554ea6baadc744ce4527fc0695b4f05dff3
 EBUILD gentoo-kernel-5.15.74.ebuild 3595 BLAKE2B 3f9177ab76f55b26f0b9785ca179df92d66c3faf2a875ea90c996834670cb22a0b0076549390f48058b71d5b3e352e2ab7c01003b1224f3b1380c5cb20ab6b47 SHA512 d2b6b3aecc1b3571043b19deeb89ae32c07cc62e81bb9385628de7fe7506d277cadcdab5d75a6af07c9f62a0bb88e9c80ec6e467b3ded7a9468ad858ffa4cd8f
 EBUILD gentoo-kernel-5.19.16.ebuild 3860 BLAKE2B 83a9eb6186ac31ddcfcbb80401e078c150f2e1e1141e962e7f1891beae412391087764a48eab5ce0fc2f9b8bd00225e9122a95b2a15b320bf0de63622d98310e SHA512 345a88aa98de549dcba361e5def145e25eae6d715523cfc6b5adaa1782a5efbda2b415bb84c9541bae7ffb8cbe36f20ec41d11da72117122eb9d5303a95d4e0e
 EBUILD gentoo-kernel-5.4.218.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
+EBUILD gentoo-kernel-5.4.219.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149.ebuild
new file mode 100644
index 000000000000..b20535df0df0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219.ebuild
new file mode 100644
index 000000000000..cad009d01a7b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 31573973c16f..d0f920aedc74 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -68,10 +68,10 @@ EBUILD gentoo-sources-4.9.321.ebuild 667 BLAKE2B 444003c6649801be27c4571babb82c7
 EBUILD gentoo-sources-4.9.329.ebuild 735 BLAKE2B d8bdafd9ae65b5160e244cce0781e1e91beec4f923c116fa978cf230162ec21babf8e970bb6d2e62853c0b189cc7f3fe355923a2e97d711f1246efc8110d8ee1 SHA512 6a1df6636f09fa5ab4aa121b3303e2a346d24e6d626310cda7005d848150d216ae124b4728baf2790824320e954daf2acd825c07b88bb9d4f8dc348ccc8bcb21
 EBUILD gentoo-sources-4.9.330.ebuild 742 BLAKE2B f08b8f1e4d1402a75d8cbfefe9c0b92b135f51a936dd5d43523200fe2247908d5818f1e081fb3e1a94edb8aa0f7b84f0491671e5c39dc54d8477b0211a495541 SHA512 a8c90a1b2be46603442b17bab686c9d4b5c355502b443261c3a0ab3f7381ac75c2838931c7bd7df982f0d8c806566d7d250a969b91ed25cdc2931d3d62c379da
 EBUILD gentoo-sources-5.10.148.ebuild 741 BLAKE2B 4ca3d5a54e1435aa8be20b812bbe78546701a3b703f4bf6a20982ed8e5be0b27ca9a6e255502cafb1f396c608b8e3d8132efb8bf1194518d649903288442a189 SHA512 21089249e06ec75f8dca2b8c9e5a26f78da743056505a9c0cde4c9bb4368cad725d28f73559e7e86f06570fc91e35f978c64ddcf3f5b71c0beff1d0143ff436c
-EBUILD gentoo-sources-5.10.149.ebuild 749 BLAKE2B d963b023c453119d8cffd8d8a593fe54c96004fdf672e2f1bfe483c1a0d13c5081bff0a53d5ce4530473c7d1bcc906b76aee9e06e6429c5a2b56e50e934d3d32 SHA512 d2dfc04c80461f445561a040757c22ca9f2baa0aab68b53dd21f9c7dcd5995512e3e6c7210dc9659eb2742f1f228fccaf4b9475f500cf506439023f8afa79191
+EBUILD gentoo-sources-5.10.149.ebuild 741 BLAKE2B baab5ce976169f3307165030922df507b491967ce5620006e8d32cade5197ef9f0304bbdd0042e52fe6cfde2fd4666f7288651aead223444301e12dda4e66bbc SHA512 054e5c9a4b30fc8c1a39810b8f31ea7fe126b2ccd62204b2d78c3251fd78d1de3e012c31fb6a826353e33590b3532bcc18ff3d9a5bf4f512bc3e857c5fb94fee
 EBUILD gentoo-sources-5.15.74.ebuild 740 BLAKE2B fb89c3c7a6e33ab5c8fdb37e9ddf9f9c7cfc3c15baf505c5036b14f12d876b497edaba51723ce85283d9734b53ebb84b5ae089e65eacbef748253f7ee7bd78cb SHA512 517c90929232ffa17c783ca4243d7f955a6a19d5da244770d6739596df4929a7ee0462c5cca76565e5287fb35f950c6f1f5a85a905a0acb21787aaa9038cb923
 EBUILD gentoo-sources-5.19.16.ebuild 757 BLAKE2B cfc2252c4bcf62293d8b11b83bc30795a4b67e7043f4475cde3b9efc5c2492066e67349aac2f0273aaeab5d98aa112707c04f0440932fda1e57a2956c41d7999 SHA512 4ca50642fede28d712da30c7a267521f9df2e4176212af039d9704452ba0d497cfb4cb518f58da5bc15528a29aae57307282fe7da4a54a0165e96bcfe314b287
 EBUILD gentoo-sources-5.4.218.ebuild 734 BLAKE2B 4afa20bec6dece3cfb6651821c8878635233ce0e7dfd4156b2617f7c4615581c940ee7524ae68ef790d395542f8f570c754bcbf65cef4fccea5d60d91da0ed59 SHA512 2b239b2129ad5271438fccb1632c7231fc4b8cb846c731970d5508887d625788a9679faa1d0df6489f86358aad48e4da80d905b1e9f277f42bb7d0c5bd2bcc93
-EBUILD gentoo-sources-5.4.219.ebuild 742 BLAKE2B 84e3c41e5f2bce1f6bf1bbb2022a6845acd0bdf9f18121eedaad84ce1314d00120cff1b4a097ae97eea8497a79eb5b2b52c2f72db9e2ef745b06a3bbaa8c1074 SHA512 1327e71cd0a5d466780468220cb73002fc6e44ecc949fd1ab180746ab4cb265375495bcf93bd76a539febf0bab406bcab1176b047e8f48783cc640a0e243e861
+EBUILD gentoo-sources-5.4.219.ebuild 734 BLAKE2B c19c0cd5d15ea9f6ebed81a797d6994a434dfbafe3be4634fb059fa4bd11a54160d7f334c4845dae40461b6c24ac5c40ec2741c9b5cd2466c81ad38c347921fa SHA512 978fe7cb95044c363b8609ba3ddd76cd185ca87c1a763d814f3941099629737a083a532f58c138a1fb9b9a46d20ca512ca677980622a41de7520b0a200aa4d61
 EBUILD gentoo-sources-6.0.2.ebuild 741 BLAKE2B d7cc73a7e5bd4a201e540683366f944b5e6da10f5502b73717871b6da04c552b9a8c4191bae054b9285ab2508b6f7d7e450ce70ad5896a6e7d271c20be410085 SHA512 8fbb04ab8751f268974607acba538391a68df12f9db90b32c99770efd3690acc042ff5fabad499d2cba894e6cd8b2c14819e4a51b73bce5ba300d685b96b3745
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.149.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.149.ebuild
index f48d691a9a17..05e6263e4036 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.149.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.149.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.219.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.219.ebuild
index b6851b45d220..f729fdfe2950 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.219.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.219.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 815f3d97390b..1c900134c486 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -18,18 +18,24 @@ DIST kernel-x86_64-fedora.config.5.19.13-gentoo 224246 BLAKE2B 6dd95fc7a8bd38387
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.148.tar.sign 993 BLAKE2B 980955d55989336130219d93c49555ea5942c9922fdfb0b11243914a3749cb088c4ff21c7b9703cfaff9a4bd3caaee3bdda76b8f376f42787a37b8c687a5fcff SHA512 37f74ad7ab87ef35dfa11391aba91d635fa5479bf5525721e9fd3e5a8bf2cdf39cc583b6095ebc523e791773326254b125a5f8a2a599c3eee44df9188d657ab3
 DIST linux-5.10.148.tar.xz 120497176 BLAKE2B a2d356139a2549ed9f1bfc56cc0b2d61efea87f3a6e4a369c222820c0f5f36f99c0962fe52754f5d897566fa69cdea739536d2f98fa483ae1d7c7d04f25d3d89 SHA512 9cc354a14eac22cc41a0bcaeff0f6ef0a734713df45b15aefa120fa3eb5d7a6baf0e262cd702113ce37a2440ef826ee9b54117ec3976ad58bc6f5ba5286f755f
+DIST linux-5.10.149.tar.sign 993 BLAKE2B 040884b3760aec4b52262d43f9564ccd140fc04713a8ac9962e751e6667e146d1d9b093bca89954964995dabaebf0d460f53153833487126feec3f58119b8da8 SHA512 8376831fb40a38b89fde56d094bb99fa8f2426e24e1d159f9dfa4bd345eddeca4564b3bcefa934a11189e367cd230d236090e347c1d192306401f564085ef4f0
+DIST linux-5.10.149.tar.xz 120485608 BLAKE2B 8dda48d365c100e65757b51fada6764ea83c6ab2b521c16ba2dd32f545bd77d2d4c5dc946b02243f56f2fcd4e0df6edba68ce50fc95c93306e96a5c94353b8b8 SHA512 25344d9da8f7504c5ecc579506de418dd5e35f9029c27d7e0085d4510c4ac37dc4c6e6bca173446986fbefcf92f3a3fc40b586952a81a16d0118f79a66238b68
 DIST linux-5.15.74.tar.sign 991 BLAKE2B 5f7a422d394ed9942d08569927d746ec5f7ae7d21f99977623bad6816f7a45c2ad940c5cc61f554e17efb57321ef67d0389198f4ebdfc97dbba214b9bd55579c SHA512 d97e81f7a037435f91527f4ca057ae62c2d9f391b14df5dce65fabcb68b0feab2db6724acf1b3a3c56d57014c6f52050cd8fbe8a8248656eb81337ab53e10b22
 DIST linux-5.15.74.tar.xz 126457328 BLAKE2B bfff9c714c2073444b64ed295293fe98b92a34631826da4c378f2ee15cf866ca844ae9bf659457bb9c4b135803b2db12a1edd68e64134506850748ce24ff0733 SHA512 fe65228eacf7ed9ccbcd96c84a11d5f9c62aee9eefaf7cdbc05bac2d700a4356a8a856d4d756358c28068505903ea419fc03a12a5add1a5890c9adf61fe80b80
 DIST linux-5.19.16.tar.sign 991 BLAKE2B eed8ba71c0c0247a125d8f9babec75d0f9ead0b034123862e0c1ad8a5513ff1ce045cdb3fac7c822bd97b5926c068849aa647fd8d414f3f236baca8825ccd4d0 SHA512 f89d029af39a5b70b37465f91f04915493d3b1a0f2fa42160e7b63261b1639d2b75e395200c5443676b3f2f619014e46fd715ea0f2a1f2f9a2a6c22df73fc972
 DIST linux-5.19.16.tar.xz 131631784 BLAKE2B 401e87fc4172c597228a3d58d95d89a8ce015662928a60bd527e2040786ab368b5b6d9d7f3dfa177f7608baea3b49f786c1d0efd93bb25d642d557b93f3d29c8 SHA512 1ff662424830fbd48ac1d8c1aabd4d11a8eabc284c4fe3fdf803064d4f56d9c1b631a0fb60679bac40a4e05b77d5e6706a8fd52a5e025ef4f1231a6cc84bbbde
 DIST linux-5.4.218.tar.sign 991 BLAKE2B 821db66087ca8264ce3499cae2113868341f8ee176964b8dac7a156a62ce399b3dfc1ea4a199a7bb3e2f8d509087397dfb3981bde83226557529af835fcab512 SHA512 3eb5ec1f2ee535c3c6ec9c9ac021d3339a953cbc97bddba178491267a7ff19f2c73d89aa9b7c1dc2b851e27e83e4c5bbe1c67b66ab8a1059bb851cf178fa4af6
 DIST linux-5.4.218.tar.xz 112926060 BLAKE2B 4900ba1d0aabe61d2877d1b6ebda695e8ee5e1a4fd9ae3dab7010435f21a3cbd98fd36b8994f10eee1816b6a6561b958a2da176eeaf67309bf24fd90ff190df4 SHA512 51adf248105706eb30b611496baa7cc35be16857f890ac5ffb031373bf0538b6fdf3440c8b753b0d33aad6ec84ab2ef859585e79e65c470f5b4c9d728763aab4
+DIST linux-5.4.219.tar.sign 991 BLAKE2B 59380b43b19ae0521ea49ffb8aaf275e9b7f6b1317c31f9f8c8a179aedf32a053b8d9bbf4a424dd531dfe48e83c577936eb8968782c4d56a4909111d46054a69 SHA512 71141118cfbfd48a7b3e401bda0e75006efb5c4b935aa201fce2a0a94520ff30680e2db6852d89613d85b17f54e3073f8b6147be2cac27f69b01686759e202d5
+DIST linux-5.4.219.tar.xz 112952984 BLAKE2B 169d050a65f671467c2b874f0049789fe1fc15aec2654abdadc63a23e857408bb029beee6ce36c6048b87e1ed65f41573a56eeb92bb7f1b770aa15c022c5a440 SHA512 3eeffc922a154c44226f87bb55bf80fa24a1d9f5c3b7d58f6da07066795e757344c92c6e2351a30d2f6b5b63bd1f96648b745a1259e7fb9b70e81e069d6e2b43
 EBUILD vanilla-kernel-5.10.148.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
+EBUILD vanilla-kernel-5.10.149.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
 EBUILD vanilla-kernel-5.10.9999.ebuild 3234 BLAKE2B d1ae98cbcc1aa58bb90e787f61a60a3a1f5936fc7667d2ccf9d441c1445bedeec835e40609c28b586e199adb2ea75b68b01b1422d712eeef6d8129c516afa935 SHA512 304afe6d49b898671901bf8d8ebb380a4adb774d3263ddb19b8797d97708badb281e5cff02ef95392057be52e13004902d59fe5d91f5a2d7db0a734ec91a321b
 EBUILD vanilla-kernel-5.15.74.ebuild 3715 BLAKE2B 5f9721371b3ba0e5498b275fa2ed31fdb6f640e2506d4d246076460f085f33f1850adca9db07260deccd65b92c94488f60625b0f8fdb66d9294ae2a697f16493 SHA512 84eae31a460385f9508ced76a7f3f02be83a2283e6691fe94b56a8e68bacaa4c97604dde3691903195fef01ab5e1f55063421c895aa8d1737adca071aabd9477
 EBUILD vanilla-kernel-5.15.9999.ebuild 3234 BLAKE2B 996eac76e626ce6dc0a984e1edd9a0c0b7e5676c1a7537ec30f49041658600daccef70fbf325611dc1001ab5e73c24f5e107f7d78bc7460b911636c38c13e0f2 SHA512 505cee407fde3af7ba4cd631f743df29a1770396828de0090b1fb371eae3f811754bef70f8f6f61bf8eb2505285fdf93dbfe600d8fadaf5f0878a557388060e8
 EBUILD vanilla-kernel-5.19.16.ebuild 3835 BLAKE2B ba5aed4f0630a972dc9204da9b67184ff1ce8362ff445f469405e05e90a16db3d3dcb79fbbc2ae9867a62ecd518208472024673bfc0fe27b5758fd00d6bf43c2 SHA512 c5567b4c47a5cacd755ceff2d35ca716751f5759d7b13eafd83a4868fb144586bc20393ec2cec3298f19f8e98f9c53670e0692ad792bce507245c84089b25f6b
 EBUILD vanilla-kernel-5.19.9999.ebuild 3354 BLAKE2B 7d153d91d316f3f1a27a4f44d3b0d455182b046d0db44bf34adc00bcee00cda1e23cdd359bc655d8b67c74763cad8364a582c28fc57626e0ffb836ce4eeef369 SHA512 de41900154fc4c6e44b63e68caa6d87c60934acf4453b122103f1e655b10b23c601365af65d1af45246c4fc3cd763ab73bfd828e118398ec5b09d0c5b69d3f08
 EBUILD vanilla-kernel-5.4.218.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
+EBUILD vanilla-kernel-5.4.219.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
 EBUILD vanilla-kernel-5.4.9999.ebuild 2574 BLAKE2B 6a8f6619bc9a88b8076a80ad6158b8996544b2608a78571107ba0b7be09b5f35add48d99d54ab6a2232f110156df1cbf6f325da036be23c793b4f84bc0f995e5 SHA512 c95bf760e931180ca9cf09c91e7fe05039f2aa2d743ddc8aa3e14d765928d40fcea628754e0177cc66df3fddc0fa2fed54d962e8682c5aaa7fa416f0fe3ac323
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.149.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.149.ebuild
new file mode 100644
index 000000000000..beb11365e70a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.149.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.219.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.219.ebuild
new file mode 100644
index 000000000000..ae90752d5ab5
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.219.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 72bac7575a25..68c76b6ea3ac 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 745bf510fb5b..bf39897f5445 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -7,8 +7,8 @@ DIST musl-1.2.2.tar.gz.asc 490 BLAKE2B 8eb21bcfcbaf9d567c0a2bba468055d4ed86a9fb3
 DIST musl-1.2.3.tar.gz 1058642 BLAKE2B b7f667eeb6b9f612c086cb44e69b34da4361b8cb76819fb65f10ef7dd55f48d2f37a32d698dcada965c7c76c3c1cd5621447c4240b6ab2e5b39b2d214e7e302b SHA512 9332f713d3eb7de4369bc0327d99252275ee52abf523ee34b894b24a387f67579787f7c72a46cf652e090cffdb0bc3719a4e7b84dca66890b6a37f12e8ad089c
 DIST musl-1.2.3.tar.gz.asc 490 BLAKE2B 4de3d2b2f4e748795b71e144df3ac073c68b0b1b5d40c7a4c3507cc3700c1f47a4ec745f644fa78d82de4cd1915b80be7ac1071fdfd6d468e01361c49ded065d SHA512 01a857dbc3981c90244d4d1d883efe51986652ca5734a741c9d1a4d06c5a22831e85520ac67212268b70c22049317a8f39b3219be182e7e67741add428ac5bc6
 DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
-EBUILD musl-1.2.2-r8.ebuild 4761 BLAKE2B 6ba61072504bdbef329aaafa0e6c86f5420dc3340bd5949ccfc1ddf7961b0b3b8648a8b881cc3d585de028fc9ec4a92515f5a1fe7d66e039179d89a06dfa3718 SHA512 62c88c3ca65c4b954d82ad57b28535c2d80cf0d3bb670ebfca0af5503ab9e34ab2023defbf57591d1a4a40e2a6954e38eadf0cb458e22b94a9689bed7348ca08
-EBUILD musl-1.2.3-r4.ebuild 5440 BLAKE2B 91f227cabc6ec8ff8831c6e2bf17cd20e458808996506484ee7de17a13303cd7fb388247d5a57932ec60a78d4eb73aa03853fddd550ff5019654f1063380569c SHA512 d86a09a27e1953ff2515fde8d5ef760926fe86e591edfc6271290ec7c8f3573af98abff84cf413dcf9879438680892f41a02c714e8d9d893c5b6819823a9ab3e
-EBUILD musl-1.2.3.ebuild 4761 BLAKE2B 6ba61072504bdbef329aaafa0e6c86f5420dc3340bd5949ccfc1ddf7961b0b3b8648a8b881cc3d585de028fc9ec4a92515f5a1fe7d66e039179d89a06dfa3718 SHA512 62c88c3ca65c4b954d82ad57b28535c2d80cf0d3bb670ebfca0af5503ab9e34ab2023defbf57591d1a4a40e2a6954e38eadf0cb458e22b94a9689bed7348ca08
-EBUILD musl-9999.ebuild 5440 BLAKE2B 91f227cabc6ec8ff8831c6e2bf17cd20e458808996506484ee7de17a13303cd7fb388247d5a57932ec60a78d4eb73aa03853fddd550ff5019654f1063380569c SHA512 d86a09a27e1953ff2515fde8d5ef760926fe86e591edfc6271290ec7c8f3573af98abff84cf413dcf9879438680892f41a02c714e8d9d893c5b6819823a9ab3e
+EBUILD musl-1.2.2-r8.ebuild 4787 BLAKE2B 048b36d28099f2d74db013228629c6a3312e50afe9f77b4fe9e8086a40de85fc4e87d3c7312c437f4963c667344898247c82b5125d758470119409b40000e66d SHA512 57c04462e36c492e770b226c589253e9d7defad921bbd48112c7c616b93ea44cef21e7cbf8078b153c8d5d33d36236fa762395fe988d4bf8f4e37229342104c6
+EBUILD musl-1.2.3-r4.ebuild 5466 BLAKE2B f0aed036a4d14caac5585df27a85da67705e05226fbc0626bf8bb78b42253eb29fbfbef7c835cc367fdd4a4605250862dfc2cb2122a96591872ce1365031494d SHA512 b7073b5333cba2140232c6becdf660744ee967cfee6baa05a2b41af9db21852805a753f567792a929501f1b27c0f4d805b4a1cdf9ed287a72e1446621dd635fd
+EBUILD musl-1.2.3.ebuild 4787 BLAKE2B 048b36d28099f2d74db013228629c6a3312e50afe9f77b4fe9e8086a40de85fc4e87d3c7312c437f4963c667344898247c82b5125d758470119409b40000e66d SHA512 57c04462e36c492e770b226c589253e9d7defad921bbd48112c7c616b93ea44cef21e7cbf8078b153c8d5d33d36236fa762395fe988d4bf8f4e37229342104c6
+EBUILD musl-9999.ebuild 5466 BLAKE2B f0aed036a4d14caac5585df27a85da67705e05226fbc0626bf8bb78b42253eb29fbfbef7c835cc367fdd4a4605250862dfc2cb2122a96591872ce1365031494d SHA512 b7073b5333cba2140232c6becdf660744ee967cfee6baa05a2b41af9db21852805a753f567792a929501f1b27c0f4d805b4a1cdf9ed287a72e1446621dd635fd
 MISC metadata.xml 559 BLAKE2B 8b1093a5278f716b8e21467b325e373a790f54c8ab71b92adc4c87dd569a92b20e08009372065f0f27ced39e3361c9e5e5a2e1bff271753d280439fabbddd3a4 SHA512 a35c13ea32ac8f26984bdb0d70d28a4285f34e32a2b0b17ad98fe3f357fb46c87a1e853377630d4da58fd5953de3fdeb02ee89181394e1815f5e0bbba4cd9f92
diff --git a/sys-libs/musl/musl-1.2.2-r8.ebuild b/sys-libs/musl/musl-1.2.2-r8.ebuild
index a7b1acd0c36c..2c16357eb55f 100644
--- a/sys-libs/musl/musl-1.2.2-r8.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r8.ebuild
@@ -88,6 +88,7 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-lto # bug #877343
 	tc-getCC ${CTARGET}
 
 	just_headers && export CC=true
diff --git a/sys-libs/musl/musl-1.2.3-r4.ebuild b/sys-libs/musl/musl-1.2.3-r4.ebuild
index 1d60464d46a4..6f2527e85a39 100644
--- a/sys-libs/musl/musl-1.2.3-r4.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r4.ebuild
@@ -104,6 +104,7 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-lto # bug #877343
 	tc-getCC ${CTARGET}
 
 	just_headers && export CC=true
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index a7b1acd0c36c..2c16357eb55f 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -88,6 +88,7 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-lto # bug #877343
 	tc-getCC ${CTARGET}
 
 	just_headers && export CC=true
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 1d60464d46a4..6f2527e85a39 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -104,6 +104,7 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-lto # bug #877343
 	tc-getCC ${CTARGET}
 
 	just_headers && export CC=true
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index eef01a086d8d..1575209bcdce 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 5b0cc034a022..50a9e22cb832 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,5 +1,7 @@
 EBUILD dist-kernel-5.10.148.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
+EBUILD dist-kernel-5.10.149.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.15.74.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.19.16.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.4.218.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
+EBUILD dist-kernel-5.4.219.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.149.ebuild b/virtual/dist-kernel/dist-kernel-5.10.149.ebuild
new file mode 100644
index 000000000000..a8bfe038d31a
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.149.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.219.ebuild b/virtual/dist-kernel/dist-kernel-5.4.219.ebuild
new file mode 100644
index 000000000000..cbaab94293d4
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.219.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 7c0a07cae046..de02c2d1868f 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 0ffdbf30c75d..38d1e3d6cf6b 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,3 +1,5 @@
 DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762
+DIST libXmu-1.1.4.tar.xz 349264 BLAKE2B fe78cd3f529402394c19842b31b2451da2b16dc768b5aac1d157feea0af06b04dbe2be879d17c7ccff08630c0bdab0abbb853bc5672340f55da0cd1412db9df6 SHA512 3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1
 EBUILD libXmu-1.1.3.ebuild 770 BLAKE2B b5ac9331167dfd10ed20674cec210b87bbf603ab6048baf9f47635a581b545137fed0f7183d1057e13b9d33230c0787fb7d2ac2f3b2a6e80b37f12ef891c49a2 SHA512 a1c7a3b8583c3b9a4bcb57642990cc355c881a84fce80eda0bebe9e5801c5d39da0bdcd2928f2c20c6dd9ee1807cee065e3857f1dbc3f22d4b21d9687c629a94
+EBUILD libXmu-1.1.4.ebuild 770 BLAKE2B 4bba6afe39cbccc58af54c51fcbc23ab783528bd6be7da248834bb06cb0a896a68b1a795f396fa5ab3da4e56f4cd4cc627337a048d0ba3034e42b1135cf7b713 SHA512 d11b739f8ca65d5b727fb4e08980be412780b9cfdf09be987f76bf0c4b90dc9bfe6cb022b214d20c38de86dcd9339081b82ea5968ad89560434ac47d242e744d
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXmu/libXmu-1.1.4.ebuild b/x11-libs/libXmu/libXmu-1.1.4.ebuild
new file mode 100644
index 000000000000..5b4b3ad145ec
--- /dev/null
+++ b/x11-libs/libXmu/libXmu-1.1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org Xmu library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index 7931931163d2..fb3300778b7a 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -1,4 +1,6 @@
 AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4
 DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
+DIST libXpresent-1.0.1.tar.xz 257136 BLAKE2B 22c66f595f8f42ed8a7bcf60c4ae5689e590e443d9e99785fc8747dabe7aa20031f303c72950c8fdd64b347776f84d17156d539cb83900d60a11dae3b6c21df8 SHA512 a4551f49a68f4487eb70dc5b50b7f745fbc8b6842cfa60422afe3834af41c504a37bcfddb4e7e9ee084b250df256034290776c8eb7d8838e392eb626fff55d25
 EBUILD libXpresent-1.0.0-r1.ebuild 613 BLAKE2B b5bd0e821c72f5ef6a08e4e20f623dbe3e3e6f15a6f5cc388fe198c1baef04a83c7360c62c46b3d5175521989f127de0a3bbde4662d080f579a175d6bfd92ece SHA512 2c83556a69460223df78b019a9002e60edf3050b023c2e90fb16708e392db9efb81459e9f3d08e83884a873024d435ee3e63e643d12af85186ac258797f4581e
+EBUILD libXpresent-1.0.1.ebuild 581 BLAKE2B f3466888f20a39fb6e81097825d344a9fd8378268792a42d234658d8eb454b2dafed830725bb54144c63718d4184f64d7b36dc7341f093743ee654e990db7b0c SHA512 fd83d2407e2a5e1a032316999450d74333c66f1c6c6f2b9f55b519ed6843b6190b1110ba3e222441455ff754af9197184a9200d2ff6ce1af93f14799fec9118d
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXpresent/libXpresent-1.0.1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.1.ebuild
new file mode 100644
index 000000000000..157f788c92db
--- /dev/null
+++ b/x11-libs/libXpresent/libXpresent-1.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X Present Extension C Library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
author	V3n3RiX <venerix@koprulu.sector>	2022-10-18 01:55:31 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-18 01:55:31 +0100
commit	5fa0e0c7e62842b1491426c8c6e506f51b6c78e1 (patch)
tree	c494340a21568e82965da87fb559b9133375e762
parent	d941e0a66c717c1f67ae35cf31afdfcbf7f7acbb (diff)