gentoo auto-resync : 02:08:2022 - 03:17:18

91 files changed, 629 insertions, 2110 deletions

diff --git a/Manifest b/Manifest
index 72b898ae1a60..c265429c5b65 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29631 BLAKE2B 4087c88e4c0089e76a9b3050ef77adf8afadb52af944c17ae8502555f7e4b6dca3cb782448115b2d38617a24cedaeb5b5b65468ae2cdcd3e82f9efc714b5ef54 SHA512 723938c9ba6bb3bdc97e54653257321018df2f7deb6bbbf9e6856912ce061d18231139f142d6fb69fd429ad191959996631c5bb271bfb2397905ac441880f5a4
-TIMESTAMP 2022-08-01T19:39:46Z
+MANIFEST Manifest.files.gz 29635 BLAKE2B f7ea719bfbfbb2077ebcd5dd8b26103aa39fe6081357efb23d406879ff517db52511103a988c1416f9e2de08b9617d7c6616cb36209731f1c466189a74265363 SHA512 4e6845ee213b7cc067bd42ba105c3c007102230854dbd4926e2b56868d0a3101ef0af957ee1f507c8a4887481b83b6d9768fc7bcc07cfb538ff1a5440822d87c
+TIMESTAMP 2022-08-02T00:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLoLAJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLoclJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAMgA//eWC9mw5Qvl+HaufHnFxtAoq6Xw8FQOJP6I2xpykS5l7ME7iCEcvVrCIs
-8cDv3k1HUCART/7nNkQcCga4YahXMIpBfgckI7Bck1qQUEOzzKAn48huUp47pNL/
-f3NWq7Tl2fhNEKsv6Ar1dU9mP4kX/QYtlm7NvzDCNqrIXeSjEBYnsdgLsyLV61h1
-ki/QWjcgdhNulLoW7KVuHkhcWxzZGJ/OURyExuP9MHGBVM6OLfd1IA+Srksjmg3h
-PvfKwsL9zWzR0j0eLwNEoxcRkuzYCSnJJhj6zyqrQJwdsrn9LV87oXGQv0Nm3kan
-ePvFagjEanUeU0LSVYodmvTdEUVeaqs/SRLSminZKdoIEZDVjlviXCGC6Gp3f3BP
-SjSsEH1KswQNQlHVxZ8F0UaRxcBZbWmz5MEn+hK8EmsKq/UhRAnB+iD1Vpo349nM
-r8cchlHF7nQiJ1d+J3WCibDF+nctmdn68y0RKk2kZxD43nAP9WeuCi9Y1Gf9pAzo
-NwX36dzt7EWWGgKFpbTW90KlDwJCPEVJWDfKMHgYo9EJue7UcOgWaLmrOpSFat88
-/87EeRyJnpCT6IGGoWNKvPTyqE6XCMKNvTNXUUgYneJm62HphzvyCWNFJ9Pi2LDt
-83uIlTYlmwywfQ3FhuIWHiXAyQizeIvVT+n8rWbRJvbj7NeUcV4=
-=6jnV
+klBeEg//TTVEgSzFnozGfWVK4loN7Ye4UL+halZXreZki2ZLEZZKVxehd0z9fsLm
+iE6Hrfyd08fDvg9Z1tP+Pn4dAAqPonfcUwsSl5b8pv+eEWeAV6hHmHnVoQP/Q4AL
+cq/1kvtHB4SikUvlayTjAL+YFkZOljSOSjEQUGaR4M27AHVYVl4BpKfY1LqkWs+P
+fcNnoNPcSSKY3Oy+lDzVzWHbQMDLv5Mmz0xdlpp0nn4ubV8FTVhdXnHoqeOvIbHm
+YYK4BgPnDvos+SlrpRMBl7Fhqj19ctfPoTRtiKZ8hf5uoTVdrinqKo1Pm+FItypV
+OxYPb1FS6uZ6WJ1vBsa8osq+CLEBDWOVWJ9D3VXxSkn/T+Itb400IY6YC7aevnFt
+J9rIGo7jmQmU61uVqOQ784rp5njS+gwDxXd6nnYTB352X5g7mGLb3MBKQDySdWuB
+Rq25mAtOxBOftowdZPytZs5myfM4Alh3oexGbm0sefktoV3FLi7BA61dzwmXNYRm
+OUtRu40V57fXR78YsoFfOGIBHWBHCNnemRuMmoIpMW6fiQgliiyA7I/sMczlPAEx
+7p5+p9LuIIWTHYXZv19ppf28CQmjpAFxmad6fbG7Hxpb8sPSKedrCNaiS1UakW4f
+WlrzSSSWMz6o/3S4h+Oyp7oqwTAVeP9gAEpXqHruRkqDVqWLmDE=
+=HqWN
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 522c499d1411..dfb70df36e38 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 1689fc4e4dfe..aedbce80aabb 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/lkrg/Manifest b/app-antivirus/lkrg/Manifest
index 42ccaf13e012..b28b5d1b6fd3 100644
--- a/app-antivirus/lkrg/Manifest
+++ b/app-antivirus/lkrg/Manifest
@@ -1,12 +1,8 @@
-AUX lkrg-0.9.2-systemd-coredump-umh-whitelist.patch 1052 BLAKE2B 6cf0af6b59026b1526f85f6db4a6c6b936add6b0f612a38a06eefb1de9363e57417c03c69e770be1c5e3da0fdb1f0382e862154e84c9828526dbca7c813bdadb SHA512 daba60c48e68ea8c0102424fd20c1eca360ffb1ce8eec25bd52935b5f2b5c0b6936fb3476fc941a27cef7fe4dc3be3446a8424f48e3bedf856e70fb56bd267c8
 AUX lkrg-0.9.4-gentoo-paths.patch 717 BLAKE2B cd30d1390ee9df058b93b8c7cfb4f5620084ddcbd7d3bb7c0f8db4b66e16e476314f55dd80ebe1084ea408d516e4857fb1ba5c9767b47255a3b76c756bc35bfa SHA512 5b510e93c676d9ff5c8b0176856dc319302e58e8a45729af0767faffd0189e6fccddbecb656d08926281b35da810e10d8f2c4434b1032e99a31375041374acaa
-DIST lkrg-0.9.2.tar.gz 125976 BLAKE2B c3da2d4599c9dd5b7d6fbec426fd93d802715f6c8566471f82c8f1c7d31621ebb4a2cc4c285d076aad6a6ee6b1bb790debbb365cfc6220192df049ac1d3c67a9 SHA512 5fec807618817bcb516e1a6779def6979badbdac6fe9b38fcce8425a0c7ebe3fb55c05d3080d8cac2d67cac6e8b7d2d77b3a1be450227299e2a02a311e223331
-DIST lkrg-0.9.2.tar.gz.sign 801 BLAKE2B 0cd8b18c8a0fbcca61ffa868b406d048461ddf9189fb08f15faa45e01b8731906a6b14105dfcf92bb5124373860f6695594063ee8d138c94c70adf471bc15e0a SHA512 18b547ca84a7fd2957484857e17983408e92fd005d58b77b399c5156ecb09fc5e9e6c910337654a2655883d103098c1769b1993017eec753bd21e63d6491ad04
-DIST lkrg-0.9.3.tar.gz 127986 BLAKE2B 5d059247c9a8a5abe4795d22b3806544dbb4c332947012ec33ceace27747663375acf68a4e859fae293eead5f7d9540b4261d3fef149d1e5c6ee8714a2df28d6 SHA512 9b441b93ff28b733afc513643a5d843c1707ac5a05adb359a3142b9ca7cba6a4790ebca4f9e6ca88a6ddf61f2b06aa242e02f288e9295e74999ed534794fb45d
-DIST lkrg-0.9.3.tar.gz.sign 801 BLAKE2B c054522f281d09a008821f92c7b43b5384241100c68ef0b0ea7171b8c492772a5d668b425089e1aac990bf6a675215dd5861f3f2598995e31a8db82a8b2ec7e9 SHA512 87c2bfe8d342b85f3c6c8226be5b698527a507369603a03eefead89ea8635b5ba95f3cbbe1d84cd77ac42bb8a773a7133917e0c87132b4851ff4017f77bc683a
 DIST lkrg-0.9.4.tar.gz 127462 BLAKE2B 4085d517e0a6360739a031e8afe4540354d35a8a59d33c96900c2def0c80bf81bef76b84322bb4beca649917693fd6a121ce81ba8caf652adbe406757729083d SHA512 7dd88a3071bbc7a1e6ca725a339f8a93544bf97f1b73e6a4b424895810a4f094d056b644120ad6df14650cd7e5678a356063b1e40113d770e059a7ca4d3e461c
 DIST lkrg-0.9.4.tar.gz.sign 801 BLAKE2B eb7c6f1aa925f73bbec7cad5da9f6676b3b6b2691151455ff240f8c6af844f61478df7050b73d3144877b2ad64bf9a25e13e8ea9fcbaf85988c02438b82893ab SHA512 6bec0699b15ba42dc7a7afc18a91d77668b3404b9e069db69634ff1e1af33b96eb4ffa5e25ce46cd012acdfdce7535d3cd2eb05ac55ae3bb4134f27f45712ce8
-EBUILD lkrg-0.9.2.ebuild 1028 BLAKE2B c1a49d95862433aa5defcf44feaa5357c983ca4edb49bc0b539a0ab604191f19b9b67115672c6f0b01e5572a47ac2b2d6f3f19d662b7d503e753f29ab02b5137 SHA512 6f9d9bd00296f8a6cd122c57b1e738a70c031c59888c8017a79cc7e3e4b3097e0592f9aa1a42baa9c181308bed6c141e337b6dbe97a62c2b4833ff53119b05f5
-EBUILD lkrg-0.9.3.ebuild 952 BLAKE2B d28b8a8b1cb5040250afbd0f8d33911b6ad07112759ee00cc9c8e06c885d8631f136a130c399246daa5cc673501864e326fa708f724f4b967329315864aef15e SHA512 9744b5e47787760ae12604d2da1b627a5e908061b0b845279ad5e610b5a9a2b6f18ef5c1523397cc87ca721a3715f6999b00ca1ff703fbfc507e0c95de88ef22
+DIST lkrg-0.9.5.tar.gz 128061 BLAKE2B 2b8a462033123e310761f84e1ab9e6c914c34a437957566f9a054a625aca2e90aea8c00673b67e178b98b27078f71870f16a7308b38a8e5506cc421af3065648 SHA512 ae735f14bcb92e964a2a1d4cf11f44d8589ebf7b09634799ce38f2b27e9df9eb53e6dc00818df743a20de947ea402dcdcd8bee274b0954addf742547333d939a
+DIST lkrg-0.9.5.tar.gz.sign 801 BLAKE2B 126796abbfe30914910634a31699bc1a2f3889c3569e79610a802a6a6312fda0e388552932bcdc58f9366f790a14c139bafe4443de4ad3dfd66003c3d75f4c71 SHA512 b1ef470962ce45f01d8f26d057ba8fff794c72cbf93cd1559af138a4fa82ebd80c127536c1d50a96365c433246c832f18f2924584bf533f8dcd247d1d38090a8
 EBUILD lkrg-0.9.4.ebuild 1222 BLAKE2B 9a7e8ece6aad6d4071304ec04b70b3b58cf9f9f402340b83fc5ec9a075d39ee4bae3f795c10075faab558078f998c18aec5362c522be0043ad623fbc794fe8a2 SHA512 2e276a86ff311ae88f474959b14feca0a005daeab5623c871042cf20c8cdb65e849e218204041bd2b322a5ac0eaad743c37d7d8381eb8088fd5b3277e6eec646
+EBUILD lkrg-0.9.5.ebuild 1229 BLAKE2B 5f4e9d01eb643abf6a66a7365317cff9ff0d125408e0eaefa504e53cf2421534851859a685eae19408955074a4eb27f6c52114046411f2af3306f47373962ec1 SHA512 65ba0f718f1eb096564a0338126b157f61737d2354d2831de40b29a94e32bbd869597e270d4aed405f95419a82df635e805011a8472773f3a0d0b8acdade29d4
 MISC metadata.xml 326 BLAKE2B 01848278e317c44c65d36ffb73d68b87981796f69301447a32ea47f93bc1fda9ca82e7b8036310e733bf1f0ab67a4e31868e48e0c720023a016ae9f743b72f59 SHA512 afa115a36eeb4290c82de2be302f5432294beb26e3d4709de0c67df693694bcdd73573ca24b404493af492e958698c257f4b48395c29d4ab46a9796e871bcc3a
diff --git a/app-antivirus/lkrg/files/lkrg-0.9.2-systemd-coredump-umh-whitelist.patch b/app-antivirus/lkrg/files/lkrg-0.9.2-systemd-coredump-umh-whitelist.patch
deleted file mode 100644
index 438784aff16e..000000000000
--- a/app-antivirus/lkrg/files/lkrg-0.9.2-systemd-coredump-umh-whitelist.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 7939aa03e00e7e48781d405743e2f2d31fca113b
-Author: John Helmert III <ajak@gentoo.org>
-Date:   Fri Jan 7 01:46:35 2022 -0600
-
-    Add non-usr-merged systemd-coredump to UMH whitelist
-    
-    Some distributions haven't merged /usr yet, so add the alternative
-    path for systemd-coredump.
-    
-    Signed-off-by: John Helmert III <ajak@gentoo.org>
-
-diff --git a/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c b/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c
-index ac2a737..7387135 100644
---- a/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c
-+++ b/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c
-@@ -45,6 +45,7 @@ static const char * const p_umh_global[] = {
-    "/etc/acpi/events/RadioPower.sh",
-    "/etc/acpi/wireless-rtl-ac-dc-power.sh",
-    "/lib/systemd/systemd-cgroups-agent",
-+   "/lib/systemd/systemd-coredump",
-    "/sbin/bridge-stp",
-    "/sbin/critical_overtemp",
-    "/sbin/drbdadm",
diff --git a/app-antivirus/lkrg/lkrg-0.9.3.ebuild b/app-antivirus/lkrg/lkrg-0.9.3.ebuild
deleted file mode 100644
index 465af99f681d..000000000000
--- a/app-antivirus/lkrg/lkrg-0.9.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod linux-info verify-sig
-
-DESCRIPTION="Linux Kernel Runtime Guard"
-HOMEPAGE="https://lkrg.org"
-SRC_URI="https://lkrg.org/download/${P}.tar.gz
-	verify-sig? ( https://lkrg.org/download/${P}.tar.gz.sign )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-openwall )"
-
-MODULE_NAMES="p_lkrg(misc:${S}:${S})"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/openwall.asc"
-
-pkg_setup() {
-	CONFIG_CHECK="HAVE_KRETPROBES KALLSYMS_ALL KPROBES JUMP_LABEL"
-	CONFIG_CHECK+=" MODULE_UNLOAD !PREEMPT_RT ~STACKTRACE"
-	linux-mod_pkg_setup
-
-	# compile against selected (not running) target
-	BUILD_PARAMS="P_KVER=${KV_FULL} P_KERNEL=${KERNEL_DIR}"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sign}
-	fi
-
-	default
-}
diff --git a/app-antivirus/lkrg/lkrg-0.9.2.ebuild b/app-antivirus/lkrg/lkrg-0.9.5.ebuild
index 17e26904008f..121872fefc44 100644
--- a/app-antivirus/lkrg/lkrg-0.9.2.ebuild
+++ b/app-antivirus/lkrg/lkrg-0.9.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit linux-mod linux-info verify-sig
+inherit linux-mod linux-info systemd verify-sig
 
 DESCRIPTION="Linux Kernel Runtime Guard"
 HOMEPAGE="https://lkrg.org"
@@ -16,11 +16,11 @@ KEYWORDS="~amd64"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-openwall )"
 
-PATCHES=( "${FILESDIR}/${PN}-${PV}-systemd-coredump-umh-whitelist.patch" )
-
-MODULE_NAMES="p_lkrg(misc:${S}:${S})"
+MODULE_NAMES="lkrg(misc:${S}:${S})"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/openwall.asc"
 
+PATCHES=( "${FILESDIR}/${PN}-0.9.4-gentoo-paths.patch" )
+
 pkg_setup() {
 	CONFIG_CHECK="HAVE_KRETPROBES KALLSYMS_ALL KPROBES JUMP_LABEL"
 	CONFIG_CHECK+=" MODULE_UNLOAD !PREEMPT_RT ~STACKTRACE"
@@ -38,3 +38,13 @@ src_unpack() {
 
 	default
 }
+
+src_install() {
+	linux-mod_src_install
+
+	systemd_dounit scripts/bootup/systemd/lkrg.service
+	newinitd scripts/bootup/openrc/lkrg lkrg.initd
+
+	insinto /lib/sysctl.d
+	newins scripts/bootup/lkrg.conf 01-lkrg.conf
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index a813fceeb601..1034aa52c4f8 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/epl/Manifest b/app-emacs/epl/Manifest
index 06e8fb0024c9..c2a72388413c 100644
--- a/app-emacs/epl/Manifest
+++ b/app-emacs/epl/Manifest
@@ -1,4 +1,4 @@
 AUX 50epl-gentoo.el 70 BLAKE2B 43d1e89c72988397c7ef15e37b0be47e9c09a9db248980f8d084ae4a8eecf225e86f9b2d0ad9d8b4b8d876f16913f93555d14a63e740d3835e2ce7a21367534c SHA512 1e12936fb71296f6410a3d9c515043bcb37adf1109abcae7879f75a9feac1e6facec190986f2c2a847155714f5448a4a1e9d2045848cb74dbb5f26be3b352998
 DIST epl-0.9.tar.gz 23448 BLAKE2B e403066139223445affcea2dd6a5bb0d4a5a4523235b787d45605c692301625ed784f0f3c338f0154c2f2188a29a565ba287e0958f8f95297556aaeb1e25c0eb SHA512 64d55790e7d34c575cc19786830b5cb795a162fc04356caf4122ce0796d57d94a50e90a4288218a697394ec3bd36c5ab5ddb98d1618411f9fe5eeada44bfd70f
-EBUILD epl-0.9-r1.ebuild 575 BLAKE2B 14f1f2d9bb11a656665cf7d87eacc7e72f70268a0a3dfe5176b354d69811cd1fedf3daf37cb505b9746b6eca0c248b2ea40652608d844f33bded5fc78df567fe SHA512 6c955f21e1a916d3a07465176121fa79012a8afdb24df4497392e2ea841f7996d9087e8f561bd87f69c320944a65c66258bfc5ebc26bb368f090528f9df5d052
+EBUILD epl-0.9-r2.ebuild 624 BLAKE2B 805806397068ad281c3880fefcfea64e07f5c91c1afde4879018e8c5060eb588e2b719640215c8799f444de5b784110e649e21e99c6f830c535ba6e37fb2c965 SHA512 6e2f7713d35c9b6755ddf56ddc98535cfe29f00fced3d86a898fbb26e58bf67fd7124c630b60f02f1d66e1df37677639fe589450f0295a41a173c45abe36e958
 MISC metadata.xml 857 BLAKE2B 4e88bbce5ec198fcdf4a82af30e464343e77594e5982d6e1e66ce338757382c670e9d9dd76d446c8ab74745d232edd6eee52b2041fde3b46a512106544911d04 SHA512 f0c361fde0f64ac34d653a30eedbb10b95bfc0d6fb18540c19a96793d406dd34f196967bb55794a1a9c460245a7bf9045dcc9605ed00a96e8f128b890d792d41
diff --git a/app-emacs/epl/epl-0.9-r1.ebuild b/app-emacs/epl/epl-0.9-r2.ebuild
index c81cc69e6cb7..377b6330fda9 100644
--- a/app-emacs/epl/epl-0.9-r1.ebuild
+++ b/app-emacs/epl/epl-0.9-r2.ebuild
@@ -17,11 +17,12 @@ KEYWORDS="~amd64 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="test? ( app-emacs/ert-runner )"
+BDEPEND="test? ( app-emacs/f )"
 
 DOCS=( README.md )
 SITEFILE="50epl-gentoo.el"
 
 src_test() {
-	ert-runner --reporter ert+duration --script || die
+	${EMACS} ${EMACSFLAGS} -L . -L test -l epl.el -l test/epl-test.el \
+		-f ert-run-tests-batch-and-exit || die
 }
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 0bbea3c12a13..362fb3c092ad 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 8fd1b6f1f4ed..140222971de6 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,11 +1,5 @@
-DIST sqlite-doc-3380200.zip 10620764 BLAKE2B 81f7e7b9aef37bdae133c4d7dc517d2040d8202a7e0cdf00180d3abe3fb677c80dbc1987e437f0d0f34f47c61f09a7c9d664ba42af976ecfb24555590bb22087 SHA512 b54372ff788aa42b2138c6de91c42c4f6a6440623de3679f08b0519c5c20d9d865c60fa63223c60f4374ff5badb800d6f209e75abb280b9815902757424faf0b
-DIST sqlite-doc-3380500.zip 10640188 BLAKE2B d831b672879a07e700c4d19bb97435cfc3aabc2371fd1b7f9e2257d1d53edaba72d974816d509fa60dbc7feaddf4b4f64c6bc061da4945aecab7be463951cb0c SHA512 1f8520e8b06cac97a3cd532d105be847b864d4d51ff2d8ab92c62b369e2e662aa477808e566e334a9103e31b84c119050b92ab6f0ef6d5d68db4d49bf2dd8182
 DIST sqlite-doc-3390200.zip 10683207 BLAKE2B 745aedf0c71da6c0d802aed2b64b6e10ef57f4a72210b12276a3019ccc5408bef537ad93c64eb972a7f24117df5780e35f75246d2ba9cd74c4537588eb6cba3c SHA512 54b9e632244b95ebf35fcaa5ce9c02381601eb442eec2ec2a809a7fe24d2cfed751581bb82fd243aaede2c935864da39fd1f1685e762826dd76fc754c7f79c0b
-DIST sqlite-src-3380200.zip 13242285 BLAKE2B a07f895f57c355e2ec1c96fc857b63d774ff52f7e49c22b1c936b260e6e7787ec656059c02cc6d38845c4368507067d86dac493559541fbb914a3da9cbc67cce SHA512 fd457602db4577b31bc6053fd3cceb220337275e3fd26976f4270fb8a7da4fa047ca23dd18e2795cdfd894d05bad4c53954a81391d71507d359fb224995e420a
-DIST sqlite-src-3380500.zip 13245057 BLAKE2B d2deefbc918ab593146950c21047dbd94168d09150ffe00da20e4ee6b02f69516b496b14e1925b00ace8a4148b87bfb263a97d75ab48990e29e12796387fee5f SHA512 d91f060165354ff4b32a72627c16b6d2310d478768794a49eef57229d7199d83f951444fdc0725acf8d2565ef61a9c7921e9c965f429b018b6fd23d129b6e630
 DIST sqlite-src-3390200.zip 13403722 BLAKE2B 24ab8cfe5fda267c7a90939875e87bc9f9914f2690f195c21ff2b774ba83a7d6914f57648cf618fd79b37e54ad85121f86310a733a87e6c76bf729716a937d02 SHA512 a838386a48654391590ea0e1cb355d29f6f93033c3e582df7c63139adaf5119dd5a1550e913dbad0d3eafb0bfa03c4fc6dc48a334d9c45ffb8a7205a528b38f1
-EBUILD sqlite-3.38.2.ebuild 13252 BLAKE2B a11cf6540941038ac710c9bf6bce657da353b520f44119c6a68ace2d73ef9f8ea26062d8fa8bc6008bec0917a45597ae1dd1a35c9c4b7a162993e59b51df89b3 SHA512 df3d005656e2e4447cbf0beb950859870e33867d86716af2b92174ad0e40afa43c7efdba40bde85f3aa72cac8405dcf64688a3eb6e16a93a0441c661b1561e18
-EBUILD sqlite-3.38.5.ebuild 13253 BLAKE2B 476079498bc4172c2eac6500bee865ca793d5ff938353b28636fccc4a77ec067f558c39d7d96e9288dc87f05040852ac37f0ec61433cd550c10f0cd0f3c3366c SHA512 aead89b187f93f7529e07f55868390784ef2a499ae7c942227a8300467ac1415e48c24a9a2d6aa8800dc96cd018f9f834a796ce998171b657aa9d49a54dd7629
 EBUILD sqlite-3.39.2.ebuild 13252 BLAKE2B a11cf6540941038ac710c9bf6bce657da353b520f44119c6a68ace2d73ef9f8ea26062d8fa8bc6008bec0917a45597ae1dd1a35c9c4b7a162993e59b51df89b3 SHA512 df3d005656e2e4447cbf0beb950859870e33867d86716af2b92174ad0e40afa43c7efdba40bde85f3aa72cac8405dcf64688a3eb6e16a93a0441c661b1561e18
 EBUILD sqlite-9999.ebuild 13254 BLAKE2B 70c6c1f542340b97a48d1742acb9d1b1f804ce711fe7bfaa8feb5c3fe164d1cb5535e7451f598d810463e4dd7c2640d42179a03c5670475f20195f076617d7d0 SHA512 188c4356483f4031a1e6dfdb9e4b36c999916bbda4608e58cd70abf845f8a1bc366a24535d8d47c5d96041656df1b66a2b817df9d8d1e99e298598e532229f77
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/sqlite-3.38.2.ebuild b/dev-db/sqlite/sqlite-3.38.2.ebuild
deleted file mode 100644
index a2eb7c1e987f..000000000000
--- a/dev-db/sqlite/sqlite-3.38.2.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
-	DOC_PV="${SRC_PV}"
-	# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-fi
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/"
-
-# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
-		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
-fi
-
-LICENSE="public-domain"
-SLOT="3"
-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="debug doc icu +readline secure-delete static-libs tcl test tools"
-if [[ "${PV}" == "9999" ]]; then
-	PROPERTIES="live"
-fi
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
-	BDEPEND=">=dev-lang/tcl-8.6:0
-		dev-vcs/fossil"
-else
-	BDEPEND="app-arch/unzip
-		>=dev-lang/tcl-8.6:0"
-fi
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
-	tools? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
-
-if [[ "${PV}" == "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-else
-	S="${WORKDIR}/${PN}-src-${SRC_PV}"
-fi
-
-_fossil_fetch() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local repo_uri="${2}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	mkdir -p "${T}/fossil/${repo_id}" || die
-	pushd "${T}/fossil/${repo_id}" > /dev/null || die
-
-	if [[ -n "${EVCS_OFFLINE}" ]]; then
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-		fi
-	else
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
-			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
-			echo
-		else
-			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
-			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
-			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
-			echo
-		fi
-
-		(
-			addwrite "${distdir}"
-			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
-			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
-		)
-	fi
-
-	popd > /dev/null || die
-}
-
-_fossil_checkout() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local branch_or_commit="${2}"
-	local target_directory="${3}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-	fi
-
-	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
-		mkdir -p "${T}/fossil/${repo_id}" || die
-		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
-	fi
-
-	mkdir "${target_directory}" || die
-	pushd "${target_directory}" > /dev/null || die
-
-	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
-	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
-	echo
-
-	popd > /dev/null || die
-}
-
-fossil_fetch() {
-	local repo_id="${1}"
-	local repo_uri="${2}"
-	local target_directory="${3}"
-
-	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
-
-	_fossil_fetch "${repo_id}" "${repo_uri}"
-	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
-}
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
-		if use doc; then
-			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
-		fi
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	eapply_user
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
-	local options=()
-
-	options+=(
-		--enable-load-extension
-		--enable-threadsafe
-	)
-
-	# Support detection of misuse of SQLite API.
-	# https://sqlite.org/compile.html#enable_api_armor
-	append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
-	# Support bytecode and tables_used virtual tables.
-	# https://sqlite.org/compile.html#enable_bytecode_vtab
-	# https://sqlite.org/bytecodevtab.html
-	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
-
-	# Support column metadata functions.
-	# https://sqlite.org/compile.html#enable_column_metadata
-	# https://sqlite.org/c3ref/column_database_name.html
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support sqlite_dbpage virtual table.
-	# https://sqlite.org/compile.html#enable_dbpage_vtab
-	# https://sqlite.org/dbpage.html
-	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
-
-	# Support dbstat virtual table.
-	# https://sqlite.org/compile.html#enable_dbstat_vtab
-	# https://sqlite.org/dbstat.html
-	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
-	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
-	# https://sqlite.org/compile.html#enable_deserialize
-	# https://sqlite.org/c3ref/serialize.html
-	# https://sqlite.org/c3ref/deserialize.html
-	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
-
-	# Support comments in output of EXPLAIN.
-	# https://sqlite.org/compile.html#enable_explain_comments
-	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-
-	# Support Full-Text Search versions 3, 4 and 5.
-	# https://sqlite.org/compile.html#enable_fts3
-	# https://sqlite.org/compile.html#enable_fts3_parenthesis
-	# https://sqlite.org/compile.html#enable_fts4
-	# https://sqlite.org/compile.html#enable_fts5
-	# https://sqlite.org/fts3.html
-	# https://sqlite.org/fts5.html
-	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
-	options+=(--enable-fts5)
-
-	# Support hidden columns.
-	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
-
-	# Support memsys5 memory allocator.
-	# https://sqlite.org/compile.html#enable_memsys5
-	# https://sqlite.org/malloc.html#memsys5
-	append-cppflags -DSQLITE_ENABLE_MEMSYS5
-
-	# Support sqlite3_normalized_sql() function.
-	# https://sqlite.org/c3ref/expanded_sql.html
-	append-cppflags -DSQLITE_ENABLE_NORMALIZE
-
-	# Support sqlite_offset() function.
-	# https://sqlite.org/compile.html#enable_offset_sql_func
-	# https://sqlite.org/lang_corefunc.html#sqlite_offset
-	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
-	# Support pre-update hook functions.
-	# https://sqlite.org/compile.html#enable_preupdate_hook
-	# https://sqlite.org/c3ref/preupdate_count.html
-	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
-
-	# Support Resumable Bulk Update extension.
-	# https://sqlite.org/compile.html#enable_rbu
-	# https://sqlite.org/rbu.html
-	append-cppflags -DSQLITE_ENABLE_RBU
-
-	# Support R*Trees.
-	# https://sqlite.org/compile.html#enable_rtree
-	# https://sqlite.org/compile.html#enable_geopoly
-	# https://sqlite.org/rtree.html
-	# https://sqlite.org/geopoly.html
-	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
-
-	# Support Session extension.
-	# https://sqlite.org/compile.html#enable_session
-	# https://sqlite.org/sessionintro.html
-	append-cppflags -DSQLITE_ENABLE_SESSION
-
-	# Support scan status functions.
-	# https://sqlite.org/compile.html#enable_stmt_scanstatus
-	# https://sqlite.org/c3ref/stmt_scanstatus.html
-	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
-	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
-	# Support sqlite_stmt virtual table.
-	# https://sqlite.org/compile.html#enable_stmtvtab
-	# https://sqlite.org/stmt.html
-	append-cppflags -DSQLITE_ENABLE_STMTVTAB
-
-	# Support unknown() function.
-	# https://sqlite.org/compile.html#enable_unknown_sql_function
-	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-
-	# Support unlock notification.
-	# https://sqlite.org/compile.html#enable_unlock_notify
-	# https://sqlite.org/c3ref/unlock_notify.html
-	# https://sqlite.org/unlock_notify.html
-	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
-	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
-	# https://sqlite.org/compile.html#enable_update_delete_limit
-	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
-	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
-	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
-
-	# Support soundex() function.
-	# https://sqlite.org/compile.html#soundex
-	# https://sqlite.org/lang_corefunc.html#soundex
-	append-cppflags -DSQLITE_SOUNDEX
-
-	# Support URI filenames.
-	# https://sqlite.org/compile.html#use_uri
-	# https://sqlite.org/uri.html
-	append-cppflags -DSQLITE_USE_URI
-
-	# debug USE flag.
-	options+=($(use_enable debug))
-
-	# icu USE flag.
-	if use icu; then
-		# Support ICU extension.
-		# https://sqlite.org/compile.html#enable_icu
-		append-cppflags -DSQLITE_ENABLE_ICU
-		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-	fi
-
-	# readline USE flag.
-	options+=(
-		--disable-editline
-		$(use_enable readline)
-	)
-	if use readline; then
-		options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
-	fi
-
-	# secure-delete USE flag.
-	if use secure-delete; then
-		# Enable secure_delete pragma by default.
-		# https://sqlite.org/compile.html#secure_delete
-		# https://sqlite.org/pragma.html#pragma_secure_delete
-		append-cppflags -DSQLITE_SECURE_DELETE
-	fi
-
-	# static-libs USE flag.
-	options+=($(use_enable static-libs static))
-
-	# tcl, test, tools USE flags.
-	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
-		options+=(
-			--enable-tcl
-			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
-		)
-	else
-		options+=(--disable-tcl)
-	fi
-
-	if [[ "${ABI}" == "x86" ]]; then
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
-			append-cflags -mfpmath=sse
-		else
-			append-cflags -ffloat-store
-		fi
-
-		# Skip known-broken test for now
-		# https://sqlite.org/forum/forumpost/d97caf168f
-		# https://sqlite.org/forum/forumpost/50f136d91d
-		if use test ; then
-			rm test/atof1.test || die
-		fi
-	fi
-
-	econf "${options[@]}"
-}
-
-multilib_src_compile() {
-	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
-	if use tools && multilib_is_native_abi; then
-		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
-	fi
-
-	if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
-		emake tclsqlite3.c
-
-		local build_directory="$(pwd)"
-		build_directory="${build_directory##*/}"
-
-		mkdir "${WORKDIR}/${PN}-doc-build" || die
-		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
-
-		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
-		rmdir doc/matrix{/*,} || die
-
-		popd > /dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
-
-	# e_uri.test tries to open files in /.
-	# https://bugs.gentoo.org/839798
-	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict "/test.db:/ÿ.db"
-
-	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
-	if use tools && multilib_is_native_abi; then
-		install_tool() {
-			if [[ -f ".libs/${1}" ]]; then
-				newbin ".libs/${1}" "${2}"
-			else
-				newbin "${1}" "${2}"
-			fi
-		}
-
-		install_tool changeset sqlite3-changeset
-		install_tool dbdump sqlite3-db-dump
-		install_tool dbhash sqlite3-db-hash
-		install_tool dbtotxt sqlite3-db-to-txt
-		install_tool index_usage sqlite3-index-usage
-		install_tool rbu sqlite3-rbu
-		install_tool scrub sqlite3-scrub
-		install_tool showdb sqlite3-show-db
-		install_tool showjournal sqlite3-show-journal
-		install_tool showshm sqlite3-show-shm
-		install_tool showstat4 sqlite3-show-stat4
-		install_tool showwal sqlite3-show-wal
-		install_tool sqldiff sqlite3-diff
-		install_tool sqlite3_analyzer sqlite3-analyzer
-		install_tool sqlite3_checker sqlite3-checker
-		install_tool sqlite3_expert sqlite3-expert
-		install_tool sqltclsh sqlite3-tclsh
-
-		unset -f install_tool
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	doman sqlite3.1
-
-	if use doc; then
-		if [[ "${PV}" == "9999" ]]; then
-			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
-		else
-			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
-		fi
-
-		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
-		if [[ "${PV}" != "9999" ]]; then
-			rm search search.d/admin || die
-			rmdir search.d || die
-			find -name "*~" -delete || die
-		fi
-
-		(
-			docinto html
-			dodoc -r *
-		)
-
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-db/sqlite/sqlite-3.38.5.ebuild b/dev-db/sqlite/sqlite-3.38.5.ebuild
deleted file mode 100644
index 296678136915..000000000000
--- a/dev-db/sqlite/sqlite-3.38.5.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
-	DOC_PV="${SRC_PV}"
-	# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-fi
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/"
-
-# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
-		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
-fi
-
-LICENSE="public-domain"
-SLOT="3"
-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="debug doc icu +readline secure-delete static-libs tcl test tools"
-if [[ "${PV}" == "9999" ]]; then
-	PROPERTIES="live"
-fi
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
-	BDEPEND=">=dev-lang/tcl-8.6:0
-		dev-vcs/fossil"
-else
-	BDEPEND="app-arch/unzip
-		>=dev-lang/tcl-8.6:0"
-fi
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
-	tools? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
-
-if [[ "${PV}" == "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-else
-	S="${WORKDIR}/${PN}-src-${SRC_PV}"
-fi
-
-_fossil_fetch() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local repo_uri="${2}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	mkdir -p "${T}/fossil/${repo_id}" || die
-	pushd "${T}/fossil/${repo_id}" > /dev/null || die
-
-	if [[ -n "${EVCS_OFFLINE}" ]]; then
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-		fi
-	else
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
-			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
-			echo
-		else
-			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
-			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
-			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
-			echo
-		fi
-
-		(
-			addwrite "${distdir}"
-			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
-			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
-		)
-	fi
-
-	popd > /dev/null || die
-}
-
-_fossil_checkout() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local branch_or_commit="${2}"
-	local target_directory="${3}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-	fi
-
-	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
-		mkdir -p "${T}/fossil/${repo_id}" || die
-		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
-	fi
-
-	mkdir "${target_directory}" || die
-	pushd "${target_directory}" > /dev/null || die
-
-	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
-	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
-	echo
-
-	popd > /dev/null || die
-}
-
-fossil_fetch() {
-	local repo_id="${1}"
-	local repo_uri="${2}"
-	local target_directory="${3}"
-
-	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
-
-	_fossil_fetch "${repo_id}" "${repo_uri}"
-	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
-}
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
-		if use doc; then
-			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
-		fi
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	eapply_user
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
-	local options=()
-
-	options+=(
-		--enable-load-extension
-		--enable-threadsafe
-	)
-
-	# Support detection of misuse of SQLite API.
-	# https://sqlite.org/compile.html#enable_api_armor
-	append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
-	# Support bytecode and tables_used virtual tables.
-	# https://sqlite.org/compile.html#enable_bytecode_vtab
-	# https://sqlite.org/bytecodevtab.html
-	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
-
-	# Support column metadata functions.
-	# https://sqlite.org/compile.html#enable_column_metadata
-	# https://sqlite.org/c3ref/column_database_name.html
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support sqlite_dbpage virtual table.
-	# https://sqlite.org/compile.html#enable_dbpage_vtab
-	# https://sqlite.org/dbpage.html
-	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
-
-	# Support dbstat virtual table.
-	# https://sqlite.org/compile.html#enable_dbstat_vtab
-	# https://sqlite.org/dbstat.html
-	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
-	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
-	# https://sqlite.org/compile.html#enable_deserialize
-	# https://sqlite.org/c3ref/serialize.html
-	# https://sqlite.org/c3ref/deserialize.html
-	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
-
-	# Support comments in output of EXPLAIN.
-	# https://sqlite.org/compile.html#enable_explain_comments
-	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-
-	# Support Full-Text Search versions 3, 4 and 5.
-	# https://sqlite.org/compile.html#enable_fts3
-	# https://sqlite.org/compile.html#enable_fts3_parenthesis
-	# https://sqlite.org/compile.html#enable_fts4
-	# https://sqlite.org/compile.html#enable_fts5
-	# https://sqlite.org/fts3.html
-	# https://sqlite.org/fts5.html
-	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
-	options+=(--enable-fts5)
-
-	# Support hidden columns.
-	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
-
-	# Support memsys5 memory allocator.
-	# https://sqlite.org/compile.html#enable_memsys5
-	# https://sqlite.org/malloc.html#memsys5
-	append-cppflags -DSQLITE_ENABLE_MEMSYS5
-
-	# Support sqlite3_normalized_sql() function.
-	# https://sqlite.org/c3ref/expanded_sql.html
-	append-cppflags -DSQLITE_ENABLE_NORMALIZE
-
-	# Support sqlite_offset() function.
-	# https://sqlite.org/compile.html#enable_offset_sql_func
-	# https://sqlite.org/lang_corefunc.html#sqlite_offset
-	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
-	# Support pre-update hook functions.
-	# https://sqlite.org/compile.html#enable_preupdate_hook
-	# https://sqlite.org/c3ref/preupdate_count.html
-	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
-
-	# Support Resumable Bulk Update extension.
-	# https://sqlite.org/compile.html#enable_rbu
-	# https://sqlite.org/rbu.html
-	append-cppflags -DSQLITE_ENABLE_RBU
-
-	# Support R*Trees.
-	# https://sqlite.org/compile.html#enable_rtree
-	# https://sqlite.org/compile.html#enable_geopoly
-	# https://sqlite.org/rtree.html
-	# https://sqlite.org/geopoly.html
-	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
-
-	# Support Session extension.
-	# https://sqlite.org/compile.html#enable_session
-	# https://sqlite.org/sessionintro.html
-	append-cppflags -DSQLITE_ENABLE_SESSION
-
-	# Support scan status functions.
-	# https://sqlite.org/compile.html#enable_stmt_scanstatus
-	# https://sqlite.org/c3ref/stmt_scanstatus.html
-	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
-	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
-	# Support sqlite_stmt virtual table.
-	# https://sqlite.org/compile.html#enable_stmtvtab
-	# https://sqlite.org/stmt.html
-	append-cppflags -DSQLITE_ENABLE_STMTVTAB
-
-	# Support unknown() function.
-	# https://sqlite.org/compile.html#enable_unknown_sql_function
-	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-
-	# Support unlock notification.
-	# https://sqlite.org/compile.html#enable_unlock_notify
-	# https://sqlite.org/c3ref/unlock_notify.html
-	# https://sqlite.org/unlock_notify.html
-	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
-	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
-	# https://sqlite.org/compile.html#enable_update_delete_limit
-	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
-	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
-	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
-
-	# Support soundex() function.
-	# https://sqlite.org/compile.html#soundex
-	# https://sqlite.org/lang_corefunc.html#soundex
-	append-cppflags -DSQLITE_SOUNDEX
-
-	# Support URI filenames.
-	# https://sqlite.org/compile.html#use_uri
-	# https://sqlite.org/uri.html
-	append-cppflags -DSQLITE_USE_URI
-
-	# debug USE flag.
-	options+=($(use_enable debug))
-
-	# icu USE flag.
-	if use icu; then
-		# Support ICU extension.
-		# https://sqlite.org/compile.html#enable_icu
-		append-cppflags -DSQLITE_ENABLE_ICU
-		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-	fi
-
-	# readline USE flag.
-	options+=(
-		--disable-editline
-		$(use_enable readline)
-	)
-	if use readline; then
-		options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
-	fi
-
-	# secure-delete USE flag.
-	if use secure-delete; then
-		# Enable secure_delete pragma by default.
-		# https://sqlite.org/compile.html#secure_delete
-		# https://sqlite.org/pragma.html#pragma_secure_delete
-		append-cppflags -DSQLITE_SECURE_DELETE
-	fi
-
-	# static-libs USE flag.
-	options+=($(use_enable static-libs static))
-
-	# tcl, test, tools USE flags.
-	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
-		options+=(
-			--enable-tcl
-			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
-		)
-	else
-		options+=(--disable-tcl)
-	fi
-
-	if [[ "${ABI}" == "x86" ]]; then
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
-			append-cflags -mfpmath=sse
-		else
-			append-cflags -ffloat-store
-		fi
-
-		# Skip known-broken test for now
-		# https://sqlite.org/forum/forumpost/d97caf168f
-		# https://sqlite.org/forum/forumpost/50f136d91d
-		if use test ; then
-			rm test/atof1.test || die
-		fi
-	fi
-
-	econf "${options[@]}"
-}
-
-multilib_src_compile() {
-	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
-	if use tools && multilib_is_native_abi; then
-		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
-	fi
-
-	if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
-		emake tclsqlite3.c
-
-		local build_directory="$(pwd)"
-		build_directory="${build_directory##*/}"
-
-		mkdir "${WORKDIR}/${PN}-doc-build" || die
-		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
-
-		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
-		rmdir doc/matrix{/*,} || die
-
-		popd > /dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
-
-	# e_uri.test tries to open files in /.
-	# https://bugs.gentoo.org/839798
-	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict "/test.db:/ÿ.db"
-
-	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
-	if use tools && multilib_is_native_abi; then
-		install_tool() {
-			if [[ -f ".libs/${1}" ]]; then
-				newbin ".libs/${1}" "${2}"
-			else
-				newbin "${1}" "${2}"
-			fi
-		}
-
-		install_tool changeset sqlite3-changeset
-		install_tool dbdump sqlite3-db-dump
-		install_tool dbhash sqlite3-db-hash
-		install_tool dbtotxt sqlite3-db-to-txt
-		install_tool index_usage sqlite3-index-usage
-		install_tool rbu sqlite3-rbu
-		install_tool scrub sqlite3-scrub
-		install_tool showdb sqlite3-show-db
-		install_tool showjournal sqlite3-show-journal
-		install_tool showshm sqlite3-show-shm
-		install_tool showstat4 sqlite3-show-stat4
-		install_tool showwal sqlite3-show-wal
-		install_tool sqldiff sqlite3-diff
-		install_tool sqlite3_analyzer sqlite3-analyzer
-		install_tool sqlite3_checker sqlite3-checker
-		install_tool sqlite3_expert sqlite3-expert
-		install_tool sqltclsh sqlite3-tclsh
-
-		unset -f install_tool
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	doman sqlite3.1
-
-	if use doc; then
-		if [[ "${PV}" == "9999" ]]; then
-			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
-		else
-			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
-		fi
-
-		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
-		if [[ "${PV}" != "9999" ]]; then
-			rm search search.d/admin || die
-			rmdir search.d || die
-			find -name "*~" -delete || die
-		fi
-
-		(
-			docinto html
-			dodoc -r *
-		)
-
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3911492e3d43..b76ed03ce5f9 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
index aff5d12831ca..11dd5279ff38 100644
--- a/dev-java/assertj-core/Manifest
+++ b/dev-java/assertj-core/Manifest
@@ -2,5 +2,5 @@ AUX assertj-core-3.10.0-java11-compatibility.patch 18385 BLAKE2B b746dd9d80a06ff
 DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3
 DIST assertj-core-3.10.0.tar.gz 1100495 BLAKE2B 4050060e027588d9c62abd5f4c6b77affd96d94a6474c4acc750a946cd3906787f9b2194627abff6d2e0849d590f5a74bbc702b41de6cbfaa09fae951a1012cf SHA512 3763768c5572e133de69735b01fd64432c4330723aa7e6cc0de42e5948cb2d455ae52d9ada66391fb41e47c261816fe12a00d07962e253f0da13ef49255fc5c6
 EBUILD assertj-core-2.3.0-r1.ebuild 817 BLAKE2B 185e0e988f59a0c512c762176f83e5fbb5005ae950cdb9fab78ee4e80b222f23b203504f32f60d96648efb06c6ab23516cb30570672d6c7a89bede1037303ed9 SHA512 1c8356ce2314bc8e956092e2e8a0c849d9fb0d29bc24256e461b554ae1b5d18bfeafcbb3265f7b83c6281851df12a28b62f6cf8c86dba796d3eda3171752b9d3
-EBUILD assertj-core-3.10.0.ebuild 3865 BLAKE2B e3edf30410828aa8c5f33107908f31204ca0a80c3c565096b471fcfd6f0b150f05d82567d9bd04001be2c749f1d8e7e5e8a4d1c4a604cb44e50c7a37e4dfa9a9 SHA512 14c778f9a34871222874c6c53bd84a177aa1af4db16a03108890dd288212fc643800867e2669859c80f9eb7eac030ca2eb21a0bca1656fd094eb90dee11519c3
+EBUILD assertj-core-3.10.0.ebuild 3882 BLAKE2B ed382cda76a7c31725abd2edd72b1111a6e35c0ad1b7796eff2757d4bc95073552fffc41f933c43d43a30756d1f19c230638a823465c667906c1fc3b8fc0049f SHA512 a3f31bfa691506a4935f05e0853749a9e14c95cbfd0804fe4016fbc4f02a83b63c0572970e16898908e4cfefde7728588b5019413228e2dd01b3f2e1011bc210
 MISC metadata.xml 631 BLAKE2B f2934c7891770eeb763260301acce8af44fc4bcf7b511150b8460fa843f8e1f7afc82602c5282f43b5921424acd6caf2c4d3e0f9dcbd08fdd4954ec0f998db82 SHA512 08016ba465f8b6c87a243bcd0be422b2e0710875c0a8630ce73981615dbe53c8a28cf35fa3c03e11eac6d403c4a82752ca3c271ab939200fa4b96a7b467f48f3
diff --git a/dev-java/assertj-core/assertj-core-3.10.0.ebuild b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
index 16dd0ff3e9ff..aac98e5265bc 100644
--- a/dev-java/assertj-core/assertj-core-3.10.0.ebuild
+++ b/dev-java/assertj-core/assertj-core-3.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/assertj/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
 	>=dev-java/byte-buddy-1.12.12:0
diff --git a/dev-java/jakarta-annotations-api/Manifest b/dev-java/jakarta-annotations-api/Manifest
index f0b01a6b4a4e..df1eeb9193cd 100644
--- a/dev-java/jakarta-annotations-api/Manifest
+++ b/dev-java/jakarta-annotations-api/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-annotations-api-2.1.1.tar.gz 83788 BLAKE2B be9904337199bd8cf9e5748d53b4536b3562446d499992b97c7e413e2e2d9ae0c8ba50d601950a0feec8bce4c4c35093b7b8f87ad60ea407452f502996045e54 SHA512 8a61cb8a9da55efd7c5172aa9a134eae7d94489a66ef749c619a7fc596122fd50f3dda7a954d78f664132c72ce999d2d3ad01b70e1d2cb2072c881327de11d82
-EBUILD jakarta-annotations-api-2.1.1.ebuild 692 BLAKE2B 41f620d7d129efb7b07e96337a95e3627d7b36112b7c8b778d929b4569278b778e4646232bf6a5715a3e4333953f08a4797e8dc6f13a897c3059769d6e128621 SHA512 fd918ec11419fe23afe1e88e3c5ab0c4c315474a4c97057a80ce17e58e380acda78aad2f18fbcffec407bd2934058d3857d9c999f9518f1614e9c630ffbebbf8
+EBUILD jakarta-annotations-api-2.1.1.ebuild 709 BLAKE2B 102216cd435f9b1b800cf4f83f635a5ace5f175adbaf2b8c0f62124aabeb5ed4bbd03d758d2e777d2e144a659e0f7f6de92d921bfb72854e5bc1d33b1b4f37a4 SHA512 cab0b7adeb8c3df4a90a4cc1c352479da848a8e76c79826408b7c1e33f41c6021a9af8824d294c52a870f11153ca4f02759bb2ab69a0d99c7bed125b8d317343
 MISC metadata.xml 317 BLAKE2B 82d85cb4f96a2b03658bd4192ced1de7af9bb2c4be9acef469f2ddd731e27d9c32b03f603cdff91c8be83a99b0b57a9788b9272705dfd6a35f88aaf3ded7c685 SHA512 71166d7552e7b5e73bafb0bfc35cbaded2fdce8d278ca83e7a394251b9e9ca909d36e50302c0e945343838a3b911fb01cf07b5222a08ff41f8f605d482541075
diff --git a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
index c7c7bd8d407a..afe6dfd9962b 100644
--- a/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
+++ b/dev-java/jakarta-annotations-api/jakarta-annotations-api-2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN/jakarta/common}/archive/${PV}.tar.
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-11:*
diff --git a/dev-java/junit-dataprovider/Manifest b/dev-java/junit-dataprovider/Manifest
index 8f34adef069f..e718065c69b7 100644
--- a/dev-java/junit-dataprovider/Manifest
+++ b/dev-java/junit-dataprovider/Manifest
@@ -1,3 +1,3 @@
 DIST junit-dataprovider-2.9.tar.gz 192088 BLAKE2B 4b6650bb2488bb2102e433c48f9c19620e4f60cf222fbab0dd5c8486fb0e64a86cdbf445739e2ad26f6d1e68239805cda7dd48802b556f56c53130b8fd348569 SHA512 78b9c02213e43c05e1896ce740cd177ce728ba00607dd90a029d87abcdb9bf899a285e39d6c69ef8e0b7463fe04159d4e80c405f983059a7a5a349f95767cc99
-EBUILD junit-dataprovider-2.9.ebuild 2213 BLAKE2B 59c4a543aea9c3ecf255e9b5c6b3e5ec71aac6c40174d495a07e7df0c6c6089b080a9acdfc73b550ed956f2fe10d7b829dea6e8f188838447c8efa94cd8ceb22 SHA512 3bb8090e5bd1451ce453cdc0dc928ee6bf04d1fc7734dc035acdf189578c69de66b4af9922c46dd354888466491e53f76230cd0264dd4c42c98b52f34b2b1a21
+EBUILD junit-dataprovider-2.9.ebuild 2230 BLAKE2B b4299b9a9212748f48e835cf930378e74fe1b897c840dbbe43723ff06cdad7adc4f09ab985695efcd83ee3baa13883cd99fd6eec735dce0e869476aa37704dd1 SHA512 65c12061b6600f8d009d7eca171e41c0b8131658883115d50e3685a73a3e8dd68be072bc57b29d0231c0b879656fda91f9b7887bd92a180921fd7db5e62eb14a
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
index e6f316f8c324..a4ededc832a5 100644
--- a/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
+++ b/dev-java/junit-dataprovider/junit-dataprovider-2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/TNG/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="dev-java/findbugs-annotations:0"
 
diff --git a/dev-java/memoryfilesystem/Manifest b/dev-java/memoryfilesystem/Manifest
index e9c3b440c2fe..19dc6776c29c 100644
--- a/dev-java/memoryfilesystem/Manifest
+++ b/dev-java/memoryfilesystem/Manifest
@@ -1,3 +1,3 @@
 DIST memoryfilesystem-2.3.0.tar.gz 127429 BLAKE2B 74ce26328db840d3fce6aebc089cbe6921c2ab7b7448c63aedcffc7358890785ec10f7823d7bd686e3a82bdfb84b9c7c796f49f377f577473a98b298cd04848d SHA512 1aac6b19fe0f6f6c950f13fff3507c61e3307d8d400cba664ae7907c0b4fab03166482ab6515bf355fe27498775ac8ee2850eca8c510e3e72a481b00fec63078
-EBUILD memoryfilesystem-2.3.0.ebuild 1314 BLAKE2B 5de133d3e8c1d2e50ddb3a9974a29f47e235e6731dedca445e3d8f6a379523d0902eccc2a0ca1923a2e3f067e32ddb23ab3c5629927ddc3cbe387aa88c48ca9f SHA512 e3a9ab583bf6df34046dd8df992e0a1e0af599d89842ee66101a5af45b6dacfc95ec6bd6d08feb9b5958b2b938fc3e0d7ade65b244fa81dc059e1f12bcad69f3
+EBUILD memoryfilesystem-2.3.0.ebuild 1331 BLAKE2B 4329e05d33085632c72a7d48d79bccfa6f3c1dfbed5c247ea43475fd005e4d1ad75f0f7114a295fd7aff20df7c0af8052ddb931481f7b804cf2ce7e05c07cb45 SHA512 87c7892aecc4f6344edd1c9df219d8af1f6c4f9605af4da830b8e794a0407c5a649ce5f269fb735138c6198cf96330e033d99d4c638c5f98eb21719c3b125a54
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
index 551207d52233..bb7eb852ea77 100644
--- a/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
+++ b/dev-java/memoryfilesystem/memoryfilesystem-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/marschall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
 	dev-java/jakarta-annotations-api:0
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 018c6bbad84e..d9854fe1cee5 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index dacb2640fee6..448155f9877c 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,11 +1,11 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
-DIST go1.17.11.src.tar.gz 22197784 BLAKE2B d235137e18c3c05ba59540c66e40bab1e9ecd5dc9ac062c66207a117762404c511ccdaf131c2826f3ba7c4ebc25336132b83fb8192ce77844c9bc34734713c49 SHA512 cd08062e3357e8e73ad05572ac575b9d8b15599bdb3ea0ca743b04936fa5cca438886e6a06d6453334b8bb5fbe1ab3512657d11651f9199d2254736a6554e71d
 DIST go1.17.12.src.tar.gz 22205674 BLAKE2B 0770f1979ba9c14779e078638b2d5f9b6af1a62939f863abadc3c84418ce639715e61ed4763674e2e2d0d95219636e59e53a0db658ae02f17e713205789fcc5a SHA512 d2bcea2a33723af5c2ae871f5c44694c69d37c74c62e81eddeaf4bfedf124feea2752997d3a359990071bf01f88942fc66b21cb092385946ad4ae9410854c8b9
-DIST go1.18.3.src.tar.gz 22838104 BLAKE2B 031c34b1b7d45e6b0e357049581972c9f5fc6cabcac6162f27beae1140e03585d85df9d80509a3a64d8d13d691b8ca62f165b0dc782483a9504d46a137300b4e SHA512 bacbc74ab8fa4c8de46847cadbd245124491f960c087d6892e2231a73f689d597b9a992c2948c54c0ab4b6476d86d3a6a9a64e1714cb7b2cdfd0a7bcfcd7b5fe
+DIST go1.17.13.src.tar.gz 22206518 BLAKE2B b227e5197c6466e7dc4594646a6b5f7e2f5e8bc0d44b8ab45b488f5249eb64ff736fccf0e0070d6685a08361e1b3dd1a2ee7050df6395bec519a7ae7dca78630 SHA512 2820bdd679fdb5e37d4c601b26c246bab23d4e8e1b226ac37c38e90a68b693e877bff944275eb25e3296ee772e7b40ef7d71dd49cca524df4cb8e721bfb50c33
 DIST go1.18.4.src.tar.gz 22845866 BLAKE2B 9997100ab5ae8a8ffdf4d2515d45d0bf29decf6d117d8f0079f0ec3fe63b3c5a32181e17c13de2ea656a5e8c87c1ed3f0e00945f717a306d23542bc0425d1d26 SHA512 4872956e31fa5d681021db12e876bc60a1815cf45203e75db83d6c54e9b7138766ae44bf1659db5333eba0b6097aea1990519795fffd2f124e7a78b78df1339b
-EBUILD go-1.17.11.ebuild 4813 BLAKE2B c4f3808ff284d5a6e9cfe43852073002dc204ac3832bd40c7a132f3661c459ff2e4be15e99530787b95844158e11f200d1cabfc2a2d4dbd28c5f3dd79e145017 SHA512 c30ee5f4110c8bbd292cb3d59eb264bb421d8bd78f06d840866fd39682b9b2691ea974e75b18bce58f6f7d9588652dbda3dfe61a58c6e71447df6aaf14998f2a
+DIST go1.18.5.src.tar.gz 22847094 BLAKE2B 8edf133aa5b1fa4076db72bd7c63240db6cbd6b9b4725c2a71384ff302bee77e193bcfad6b55bfd31ee58f08fc59d9bbee5750d9227598fe402d6293863595ff SHA512 4ba69ad49b5c17963fdc39ae7f5360fa38950db39ec1fb9b52744d6a209abf177dab6bd587e7457c83a4fd265589907ec241d8b09d0eac76cf984243a14500ef
 EBUILD go-1.17.12.ebuild 4813 BLAKE2B c4f3808ff284d5a6e9cfe43852073002dc204ac3832bd40c7a132f3661c459ff2e4be15e99530787b95844158e11f200d1cabfc2a2d4dbd28c5f3dd79e145017 SHA512 c30ee5f4110c8bbd292cb3d59eb264bb421d8bd78f06d840866fd39682b9b2691ea974e75b18bce58f6f7d9588652dbda3dfe61a58c6e71447df6aaf14998f2a
-EBUILD go-1.18.3.ebuild 4813 BLAKE2B c4f3808ff284d5a6e9cfe43852073002dc204ac3832bd40c7a132f3661c459ff2e4be15e99530787b95844158e11f200d1cabfc2a2d4dbd28c5f3dd79e145017 SHA512 c30ee5f4110c8bbd292cb3d59eb264bb421d8bd78f06d840866fd39682b9b2691ea974e75b18bce58f6f7d9588652dbda3dfe61a58c6e71447df6aaf14998f2a
+EBUILD go-1.17.13.ebuild 4818 BLAKE2B 906a76bebb6036a5e2d5af8563cc2aa3d8c10d48c8926d5e1368026d97c9b00c65973be3f3937396fa35865f0119d9fd59586c66d2ef137c980695a3b62861eb SHA512 07796174e89485089232edfd712a4540bc8bb138894bfa119f8d79deedb3bb8fe770de018637f81c27629e277ea65fa369721b70fead893b600d0d554efae650
 EBUILD go-1.18.4.ebuild 4813 BLAKE2B c4f3808ff284d5a6e9cfe43852073002dc204ac3832bd40c7a132f3661c459ff2e4be15e99530787b95844158e11f200d1cabfc2a2d4dbd28c5f3dd79e145017 SHA512 c30ee5f4110c8bbd292cb3d59eb264bb421d8bd78f06d840866fd39682b9b2691ea974e75b18bce58f6f7d9588652dbda3dfe61a58c6e71447df6aaf14998f2a
+EBUILD go-1.18.5.ebuild 4818 BLAKE2B 906a76bebb6036a5e2d5af8563cc2aa3d8c10d48c8926d5e1368026d97c9b00c65973be3f3937396fa35865f0119d9fd59586c66d2ef137c980695a3b62861eb SHA512 07796174e89485089232edfd712a4540bc8bb138894bfa119f8d79deedb3bb8fe770de018637f81c27629e277ea65fa369721b70fead893b600d0d554efae650
 EBUILD go-9999.ebuild 4818 BLAKE2B 906a76bebb6036a5e2d5af8563cc2aa3d8c10d48c8926d5e1368026d97c9b00c65973be3f3937396fa35865f0119d9fd59586c66d2ef137c980695a3b62861eb SHA512 07796174e89485089232edfd712a4540bc8bb138894bfa119f8d79deedb3bb8fe770de018637f81c27629e277ea65fa369721b70fead893b600d0d554efae650
 MISC metadata.xml 537 BLAKE2B 8017fd0edeef2ec4b17f75e8686f6014ce3c3e39b7083c347f601de9b15f34896305d6041edd0bc2b6a0687a69827c9dcecb2f07ca5994f29a3c0f8014c0604b SHA512 5f6b42721e1602efab24f33955806c33ace6433e17b41755dbee47abea79a2744292148c330d6e5a04612b0b451545c32241236cc8f211c5e7cf22c8cdebc778
diff --git a/dev-lang/go/go-1.17.11.ebuild b/dev-lang/go/go-1.17.13.ebuild
index 7f1ce9304e51..217891046702 100644
--- a/dev-lang/go/go-1.17.11.ebuild
+++ b/dev-lang/go/go-1.17.13.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.18.3.ebuild b/dev-lang/go/go-1.18.5.ebuild
index 7f1ce9304e51..217891046702 100644
--- a/dev-lang/go/go-1.18.3.ebuild
+++ b/dev-lang/go/go-1.18.5.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c9496f20365c..0ad6fdc1ca30 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 09230f721a8e..2e500457e822 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,5 +1,3 @@
-DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
 DIST libzip-1.9.2.tar.xz 763980 BLAKE2B ceeca4dccbe7552f7f545b00ea44b342398d18eb996e39045b9d6efafe50f8890333ddf220c86b59f5ab2849420eb76761c42b16de8b174629f53e327f9e83e7 SHA512 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5
-EBUILD libzip-1.8.0-r1.ebuild 2444 BLAKE2B adc40f870375d1c3bd5753018108985f34b4e2eebd20b8205c6368086bc9dd0a289b7f3c6484969740712b9ef315d18abb0fbe628256b72ffb8c6f3c789abc1c SHA512 467c9a3a7f17c018384b10e679364ecaf9c41762f155d1da0c3438a2cdcd210426726ea7662a532f44c058bb0958a9b0371c1b6ac776b205949448f9ca3fe4c2
 EBUILD libzip-1.9.2.ebuild 2444 BLAKE2B 51346ce953bcc1dcf87c096eca13dff0f9df40354ba00ca2d7da33df8367e9f819bb159d196609520bf771f0941ca23a7e1a1d36294fbeb72606f4cb678c33a1 SHA512 2f016de22bf84be086435187c90d63d81322e51373694a40e1b1fe160b1cd206108c09a9c7daeda687f048a95b2056e1d9b57b244dc428e3630919d84fe9cc1d
 MISC metadata.xml 510 BLAKE2B cd0e88d175985805badcbe4b6aa771fd65ab9e8e86a3d37e18531e61ef9fac92ba191ba4a3806c37743a51541b1f353f5bf58b7195898de74eb2c389623a6994 SHA512 e073a6f074e9d5dc8abffada8338c608915527ab3c76f693cd261c6a99aef73e18c0e0088d508d62032619f779f1c6d9445cdd0273aeb61e41b9e3b449762337
diff --git a/dev-libs/libzip/libzip-1.8.0-r1.ebuild b/dev-libs/libzip/libzip-1.8.0-r1.ebuild
deleted file mode 100644
index 2da9c9ac1ee2..000000000000
--- a/dev-libs/libzip/libzip-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multibuild flag-o-matic
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="https://nih.at/libzip/"
-SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
-REQUIRED_USE="test? ( tools )"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2:= )
-	lzma? ( app-arch/xz-utils )
-	ssl? (
-		gnutls? (
-			dev-libs/nettle:0=
-			>=net-libs/gnutls-3.6.5:=
-		)
-		!gnutls? (
-			mbedtls? ( net-libs/mbedtls:= )
-			!mbedtls? ( dev-libs/openssl:0= )
-		)
-	)
-	zstd? ( app-arch/zstd )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# Upstream doesn't support building dynamic & static
-	# simultaneously: https://github.com/nih-at/libzip/issues/76
-	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
-}
-
-src_configure() {
-	append-lfs-flags
-	myconfigure() {
-		local mycmakeargs=(
-			-DBUILD_EXAMPLES=OFF # nothing is installed
-			-DENABLE_COMMONCRYPTO=OFF # not in tree
-			-DENABLE_BZIP2=$(usex bzip2)
-			-DENABLE_LZMA=$(usex lzma)
-			-DENABLE_ZSTD=$(usex zstd)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
-			mycmakeargs+=(
-				-DBUILD_DOC=OFF
-				-DBUILD_EXAMPLES=OFF
-				-DBUILD_SHARED_LIBS=OFF
-				-DBUILD_TOOLS=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_DOC=ON
-				-DBUILD_REGRESS=$(usex test)
-				-DBUILD_TOOLS=$(usex tools)
-			)
-		fi
-
-		if use ssl; then
-			if use gnutls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=$(usex gnutls)
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=OFF
-				)
-			elif use mbedtls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=$(usex mbedtls)
-					-DENABLE_OPENSSL=OFF
-				)
-			else
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=ON
-				)
-			fi
-		else
-			mycmakeargs+=(
-				-DENABLE_GNUTLS=OFF
-				-DENABLE_MBEDTLS=OFF
-				-DENABLE_OPENSSL=OFF
-			)
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	run_tests() {
-		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
-	}
-
-	multibuild_foreach_variant run_tests
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d5b8cb8348eb..7338bb76ea72 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index fa8a1ae31ae5..3ab8b4d17078 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,7 @@
+AUX 50pkgcheck-gentoo.el 179 BLAKE2B e2f6ee5f7bbb7371076ec8ca029a4c75ca9c943efb4e1a1d449b4377998000667bb3460d6fbb501e0cd9c3759d274869ed4f39553eae10bdcda382cc50951792 SHA512 b82eb973f9fa37228cfbbe687211678bf75017ad6ef632fd5cf1323dc1d17fcd0b8108a3d02c4ebee3027cf0404bc7f2600c42ea3bec14f9666f61a627874627
 DIST pkgcheck-0.10.11.tar.gz 474106 BLAKE2B 2a3e330d54e421a48e5cd89044b9af37334bf461f47487b8dd62e7fd1c766d162766d0a6c1319c50c3fd6965b56377536743903c265782b2fbef050d4f805d3a SHA512 b47814822599417d0f7030ac444fd4b2bab1f1bea21abc2a4fe1dd679185afd7d5f823aefff1b6830036de5c7db6232c0b6fc6d33f9c2535d88a711e6d49132c
 DIST pkgcheck-0.10.12.tar.gz 477880 BLAKE2B 9d71e6d3312f2c11a722f12c854a14523174b91ca1cf8ea89f6da3463e8aeab1744b083a31eca675e40069b57f4b2b24a83efa0d692d90cd00b9e9c4ec452a02 SHA512 e146dd0533b769078102ff27f90120c459ceb614aed4365a43a36e1a24d1230890c9da7a756b3fcce528806ca1fca10d8d8c283dcc464a7c98368bac0d98a26f
 EBUILD pkgcheck-0.10.11.ebuild 1661 BLAKE2B 7b7f84f3c944a517a3dcc7f18bc12856f97df92a90be68f3b3b59fb574e382ac55f6e52f684e6e49db36a9b40fc7ce7b0d9860a39c13ac48215fef31fa06f733 SHA512 1a88f0f25b4584f3b84c5a04e43695ff8af6ed609e2e85cba141ad2cd43dd7cd40cf0bbec172804e361e4aae21409b424e5aad37e540d1cdef8664c7e0e85463
 EBUILD pkgcheck-0.10.12.ebuild 1669 BLAKE2B a4138f9a6237e810e6d62e0de9a2917dae00ed38ea7c3e28a01cec936efcaf6e289a0933f930cbe33a4de93d9c1339e9b6eb743d91110ed7d067325790a0c78c SHA512 343538d930710fa9f2ac633be577641bfe2424eafb9c8779953dd24d876b006fa460eb415297dd526476ff09f3fe9791abe01d806e03c7c372b0bf56ffc02c7a
-EBUILD pkgcheck-9999.ebuild 1669 BLAKE2B a4138f9a6237e810e6d62e0de9a2917dae00ed38ea7c3e28a01cec936efcaf6e289a0933f930cbe33a4de93d9c1339e9b6eb743d91110ed7d067325790a0c78c SHA512 343538d930710fa9f2ac633be577641bfe2424eafb9c8779953dd24d876b006fa460eb415297dd526476ff09f3fe9791abe01d806e03c7c372b0bf56ffc02c7a
+EBUILD pkgcheck-9999.ebuild 2205 BLAKE2B f2be60125edc166fd8125530885959b32b06186836fcd52c2df20274fa26f66cb0827327cc835ae50887c9d1bd42b77c11e560000f435eb62e29c6bd66f1c848 SHA512 96aada3f50188cdcdbb9006552a11b135948839889c8e563046a24d7256e56cb7dc2be2dfb66e8e047a6cc805be465cadb9a7557fccefd7de9b294d2cd51120b
 MISC metadata.xml 486 BLAKE2B 3fbd43c40601e7edccf11e4335b82d90bd42c9144436529dd6a0c2ffaccbf5febf018c55a336d07c2a86271b43e8da4dafa228a6d2afa7dfd8215eeda5e415e8 SHA512 98c0803dd08976c0f1be543c052a49647d3ec3dbb02667053fee22baec3a05723350cc02d3c0090ff128ba795ed4802b8b73161148f2b790519bbcb881b31105
diff --git a/dev-util/pkgcheck/files/50pkgcheck-gentoo.el b/dev-util/pkgcheck/files/50pkgcheck-gentoo.el
new file mode 100644
index 000000000000..7808713be94a
--- /dev/null
+++ b/dev-util/pkgcheck/files/50pkgcheck-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'flycheck-pkgcheck-setup "flycheck-pkgcheck"
+  "Flycheck pkgcheck setup." t)
+(add-hook 'ebuild-mode-hook 'flycheck-pkgcheck-setup)
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 44a8666a2eac..80366db8e2e5 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
+inherit elisp-common distutils-r1 optfeature
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="BSD MIT"
 SLOT="0"
+IUSE="emacs"
 
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="
@@ -38,8 +39,14 @@ RDEPEND+="
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
 	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+	emacs? (
+		>=app-editors/emacs-24.1:*
+		app-emacs/ebuild-mode
+		app-emacs/flycheck
+	)
 "
 BDEPEND="
+	${RDEPEND}
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
@@ -47,10 +54,22 @@ BDEPEND="
 	)
 "
 
+SITEFILE="50${PN}-gentoo.el"
+
 distutils_enable_tests setup.py
 
 export USE_SYSTEM_TREE_SITTER_BASH=1
 
+src_compile() {
+	distutils-r1_src_compile
+
+	if use emacs ; then
+	   pushd "${S}"/contrib/emacs >/dev/null || die
+	   elisp-compile *.el
+	   popd >/dev/null || die
+	fi
+}
+
 src_test() {
 	local -x PYTHONDONTWRITEBYTECODE=
 	distutils-r1_src_test
@@ -60,9 +79,20 @@ python_install_all() {
 	local DOCS=( NEWS.rst )
 	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
+
+	if use emacs ; then
+		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
 }
 
 pkg_postinst() {
+	use emacs && elisp-site-regen
+
 	optfeature "Network check support" dev-python/requests
 	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
 }
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 5ba56d40c7c0..22e1abe3e97c 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
deleted file mode 100644
index a6dd902b5f33..000000000000
--- a/eclass/cmake-utils.eclass
+++ /dev/null
@@ -1,851 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: cmake-utils.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# @AUTHOR:
-# Tomáš Chvátal <scarabeus@gentoo.org>
-# Maciej Mrozowski <reavertm@gentoo.org>
-# (undisclosed contributors)
-# Original author: Zephyrus (zephyrus@mirach.it)
-# @SUPPORTED_EAPIS: 5 6 7
-# @PROVIDES: ninja-utils
-# @BLURB: common ebuild functions for cmake-based packages
-# @DEPRECATED: cmake.eclass
-# @DESCRIPTION:
-# DEPRECATED: This no longer receives any changes. Everyone must port to cmake.eclass.
-# The cmake-utils eclass makes creating ebuilds for cmake-based packages much easier.
-# It provides all inherited features (DOCS, HTML_DOCS, PATCHES) along with out-of-source
-# builds (default), in-source builds and an implementation of the well-known use_enable
-# and use_with functions for CMake.
-
-if [[ -z ${_CMAKE_UTILS_ECLASS} ]]; then
-_CMAKE_UTILS_ECLASS=1
-
-# @ECLASS_VARIABLE: BUILD_DIR
-# @DESCRIPTION:
-# Build directory where all cmake processed files should be generated.
-# For in-source build it's fixed to ${CMAKE_USE_DIR}.
-# For out-of-source build it can be overridden, by default it uses
-# ${WORKDIR}/${P}_build.
-#
-# This variable has been called CMAKE_BUILD_DIR formerly.
-# It is set under that name for compatibility.
-
-# @ECLASS_VARIABLE: CMAKE_BINARY
-# @DESCRIPTION:
-# Eclass can use different cmake binary than the one provided in by system.
-: ${CMAKE_BINARY:=cmake}
-
-# @ECLASS_VARIABLE: CMAKE_BUILD_TYPE
-# @DESCRIPTION:
-# Set to override default CMAKE_BUILD_TYPE. Only useful for packages
-# known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)".
-# If about to be set - needs to be set before invoking cmake-utils_src_configure.
-# You usualy do *NOT* want nor need to set it as it pulls CMake default build-type
-# specific compiler flags overriding make.conf.
-: ${CMAKE_BUILD_TYPE:=Gentoo}
-
-# @ECLASS_VARIABLE: CMAKE_IN_SOURCE_BUILD
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set to enable in-source build.
-
-# @ECLASS_VARIABLE: CMAKE_MAKEFILE_GENERATOR
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Specify a makefile generator to be used by cmake.
-# At this point only "emake" and "ninja" are supported.
-# In EAPI 7 and above, the default is set to "ninja",
-# whereas in EAPIs below 7, it is set to "emake".
-
-# @ECLASS_VARIABLE: CMAKE_MIN_VERSION
-# @DESCRIPTION:
-# Specify the minimum required CMake version.
-: ${CMAKE_MIN_VERSION:=3.9.6}
-
-# @ECLASS_VARIABLE: CMAKE_REMOVE_MODULES
-# @DESCRIPTION:
-# Do we want to remove anything? yes or whatever else for no
-: ${CMAKE_REMOVE_MODULES:=yes}
-
-# @ECLASS_VARIABLE: CMAKE_REMOVE_MODULES_LIST
-# @DESCRIPTION:
-# Space-separated list of CMake modules that will be removed in $S during src_prepare,
-# in order to force packages to use the system version.
-: ${CMAKE_REMOVE_MODULES_LIST:=FindBLAS FindLAPACK}
-
-# @ECLASS_VARIABLE: CMAKE_USE_DIR
-# @DESCRIPTION:
-# Sets the directory where we are working with cmake.
-# For example when application uses autotools and only one
-# plugin needs to be done by cmake.
-# By default it uses ${S}.
-
-# @ECLASS_VARIABLE: CMAKE_VERBOSE
-# @DESCRIPTION:
-# Set to OFF to disable verbose messages during compilation
-: ${CMAKE_VERBOSE:=ON}
-
-# @ECLASS_VARIABLE: CMAKE_WARN_UNUSED_CLI
-# @DESCRIPTION:
-# Warn about variables that are declared on the command line
-# but not used. Might give false-positives.
-# "no" to disable (default) or anything else to enable.
-
-# @ECLASS_VARIABLE: CMAKE_EXTRA_CACHE_FILE
-# @USER_VARIABLE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF
-# for econf and is needed to pass TRY_RUN results when cross-compiling.
-# Should be set by user in a per-package basis in /etc/portage/package.env.
-
-# @ECLASS_VARIABLE: CMAKE_UTILS_QA_SRC_DIR_READONLY
-# @USER_VARIABLE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# After running cmake-utils_src_prepare, sets ${S} to read-only. This is
-# a user flag and should under _no circumstances_ be set in the ebuild.
-# Helps in improving QA of build systems that write to source tree.
-
-case ${EAPI} in
-	5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
-	6|7) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
-
-case ${EAPI} in
-	[56])
-		: ${CMAKE_MAKEFILE_GENERATOR:=emake}
-		inherit eutils multilib
-		;;
-	*)
-		: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-		;;
-esac
-
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
-
-if [[ ${WANT_CMAKE} ]]; then
-	if [[ ${EAPI} != [56] ]]; then
-		die "\${WANT_CMAKE} has been removed and is a no-op now"
-	else
-		eqawarn "\${WANT_CMAKE} has been removed and is a no-op now"
-	fi
-fi
-[[ ${PREFIX} ]] && die "\${PREFIX} has been removed and is a no-op now"
-
-case ${CMAKE_MAKEFILE_GENERATOR} in
-	emake)
-		BDEPEND="sys-devel/make"
-		;;
-	ninja)
-		BDEPEND="dev-util/ninja"
-		;;
-	*)
-		eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
-		die "Value ${CMAKE_MAKEFILE_GENERATOR} is not supported"
-		;;
-esac
-
-if [[ ${PN} != cmake ]]; then
-	BDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
-fi
-
-case ${EAPI} in
-	7) ;;
-	*) DEPEND=" ${BDEPEND}" ;;
-esac
-
-# Internal functions used by cmake-utils_use_*
-_cmake_use_me_now() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local arg=$2
-	[[ ! -z $3 ]] && arg=$3
-
-	[[ ${EAPI} == 5 ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
-
-	local uper capitalised x
-	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
-	if [[ ! -z $3 ]]; then
-		# user specified the use name so use it
-		echo "-D$1$3=$(use $2 && echo ON || echo OFF)"
-	else
-		# use all various most used combinations
-		uper=$(echo ${2} | tr '[:lower:]' '[:upper:]')
-		capitalised=$(echo ${2} | sed 's/\<\(.\)\([^ ]*\)/\u\1\L\2/g')
-		for x in $2 $uper $capitalised; do
-			echo "-D$1$x=$(use $2 && echo ON || echo OFF) "
-		done
-	fi
-}
-_cmake_use_me_now_inverted() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local arg=$2
-	[[ ! -z $3 ]] && arg=$3
-
-	if [[ ${EAPI} != 5 && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
-		die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
-	fi
-
-	local uper capitalised x
-	[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
-	if [[ ! -z $3 ]]; then
-		# user specified the use name so use it
-		echo "-D$1$3=$(use $2 && echo OFF || echo ON)"
-	else
-		# use all various most used combinations
-		uper=$(echo ${2} | tr '[:lower:]' '[:upper:]')
-		capitalised=$(echo ${2} | sed 's/\<\(.\)\([^ ]*\)/\u\1\L\2/g')
-		for x in $2 $uper $capitalised; do
-			echo "-D$1$x=$(use $2 && echo OFF || echo ON) "
-		done
-	fi
-}
-
-# Determine using IN or OUT source build
-_cmake_check_build_dir() {
-	: ${CMAKE_USE_DIR:=${S}}
-	if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
-		# we build in source dir
-		BUILD_DIR="${CMAKE_USE_DIR}"
-	else
-		# Respect both the old variable and the new one, depending
-		# on which one was set by the ebuild.
-		if [[ ! ${BUILD_DIR} && ${CMAKE_BUILD_DIR} ]]; then
-			if [[ ${EAPI} != [56] ]]; then
-				eerror "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
-				die "The ebuild must be migrated to BUILD_DIR."
-			else
-				eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR."
-				eqawarn "Please migrate the ebuild to use the new one."
-			fi
-
-			# In the next call, both variables will be set already
-			# and we'd have to know which one takes precedence.
-			_RESPECT_CMAKE_BUILD_DIR=1
-		fi
-
-		if [[ ${_RESPECT_CMAKE_BUILD_DIR} ]]; then
-			BUILD_DIR=${CMAKE_BUILD_DIR:-${WORKDIR}/${P}_build}
-		else
-			: ${BUILD_DIR:=${WORKDIR}/${P}_build}
-		fi
-	fi
-
-	# Backwards compatibility for getting the value.
-	[[ ${EAPI} == [56] ]] && CMAKE_BUILD_DIR=${BUILD_DIR}
-
-	mkdir -p "${BUILD_DIR}" || die
-	echo ">>> Working in BUILD_DIR: \"$BUILD_DIR\""
-}
-
-# Determine which generator to use
-_cmake_generator_to_use() {
-	local generator_name
-
-	case ${CMAKE_MAKEFILE_GENERATOR} in
-		ninja)
-			# if ninja is enabled but not installed, the build could fail
-			# this could happen if ninja is manually enabled (eg. make.conf) but not installed
-			case ${EAPI} in
-				5|6)
-					if ! ROOT=/ has_version dev-util/ninja; then
-						die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
-					fi
-				;;
-				*)
-					if ! has_version -b dev-util/ninja; then
-						die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR."
-					fi
-				;;
-			esac
-			generator_name="Ninja"
-			;;
-		emake)
-			generator_name="Unix Makefiles"
-			;;
-		*)
-			eerror "Unknown value for \${CMAKE_MAKEFILE_GENERATOR}"
-			die "Value ${CMAKE_MAKEFILE_GENERATOR} is not supported"
-			;;
-	esac
-
-	echo ${generator_name}
-}
-
-# @FUNCTION: cmake_comment_add_subdirectory
-# @USAGE: <subdirectory>
-# @DESCRIPTION:
-# Comment out one or more add_subdirectory calls in CMakeLists.txt in the current directory
-cmake_comment_add_subdirectory() {
-	if [[ -z ${1} ]]; then
-		die "comment_add_subdirectory must be passed at least one directory name to comment"
-	fi
-
-	if [[ -e "CMakeLists.txt" ]]; then
-		local d
-		for d in $@; do
-			sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${d//\//\\/}[[:space:]]*)/I s/^/#DONOTCOMPILE /" \
-				-i CMakeLists.txt || die "failed to comment add_subdirectory(${d})"
-		done
-	fi
-}
-
-# @FUNCTION: comment_add_subdirectory
-# @USAGE: <subdirectory>
-# @DESCRIPTION:
-# Comment out an add_subdirectory call in CMakeLists.txt in the current directory
-# Banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead.
-comment_add_subdirectory() {
-	[[ ${EAPI} == 5 ]] || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead"
-
-	cmake_comment_add_subdirectory "$@"
-}
-
-# @FUNCTION: cmake-utils_use_with
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_with. See ebuild(5).
-#
-# `cmake-utils_use_with foo FOO` echoes -DWITH_FOO=ON if foo is enabled
-# and -DWITH_FOO=OFF if it is disabled.
-cmake-utils_use_with() { _cmake_use_me_now WITH_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_enable
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_enable foo FOO` echoes -DENABLE_FOO=ON if foo is enabled
-# and -DENABLE_FOO=OFF if it is disabled.
-cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_find_package
-# @USAGE: <USE flag> <package name>
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_find_package foo LibFoo` echoes -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=OFF
-# if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled.
-# This can be used to make find_package optional.
-cmake-utils_use_find_package() {
-	if [[ ${EAPI} != 5 && "$#" != 2 ]] ; then
-		die "Usage: cmake-utils_use_find_package <USE flag> <package name>"
-	fi
-
-	_cmake_use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ;
-}
-
-# @FUNCTION: cmake_use_find_package
-# @USAGE: <USE flag> <package name>
-# @DESCRIPTION:
-# Alias for cmake-utils_use_find_package.
-cmake_use_find_package() {
-	if [[ "$#" != 2 ]] ; then
-		die "Usage: cmake_use_find_package <USE flag> <package name>"
-	fi
-
-	cmake-utils_use_find_package "$@" ;
-}
-
-# @FUNCTION: cmake-utils_use_disable
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on inversion of use_enable. See ebuild(5).
-#
-# `cmake-utils_use_enable foo FOO` echoes -DDISABLE_FOO=OFF if foo is enabled
-# and -DDISABLE_FOO=ON if it is disabled.
-cmake-utils_use_disable() { _cmake_use_me_now_inverted DISABLE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_no
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_disable. See ebuild(5).
-#
-# `cmake-utils_use_no foo FOO` echoes -DNO_FOO=OFF if foo is enabled
-# and -DNO_FOO=ON if it is disabled.
-cmake-utils_use_no() { _cmake_use_me_now_inverted NO_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_want
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_want foo FOO` echoes -DWANT_FOO=ON if foo is enabled
-# and -DWANT_FOO=OFF if it is disabled.
-cmake-utils_use_want() { _cmake_use_me_now WANT_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_build
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_build foo FOO` echoes -DBUILD_FOO=ON if foo is enabled
-# and -DBUILD_FOO=OFF if it is disabled.
-cmake-utils_use_build() { _cmake_use_me_now BUILD_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_has
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_has foo FOO` echoes -DHAVE_FOO=ON if foo is enabled
-# and -DHAVE_FOO=OFF if it is disabled.
-cmake-utils_use_has() { _cmake_use_me_now HAVE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use_use
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use_use foo FOO` echoes -DUSE_FOO=ON if foo is enabled
-# and -DUSE_FOO=OFF if it is disabled.
-cmake-utils_use_use() { _cmake_use_me_now USE_ "$@" ; }
-
-# @FUNCTION: cmake-utils_use
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_use foo FOO` echoes -DFOO=ON if foo is enabled
-# and -DFOO=OFF if it is disabled.
-cmake-utils_use() { _cmake_use_me_now "" "$@" ; }
-
-# @FUNCTION: cmake-utils_useno
-# @USAGE: <USE flag> [flag name]
-# @DESCRIPTION:
-# Based on use_enable. See ebuild(5).
-#
-# `cmake-utils_useno foo NOFOO` echoes -DNOFOO=OFF if foo is enabled
-# and -DNOFOO=ON if it is disabled.
-cmake-utils_useno() { _cmake_use_me_now_inverted "" "$@" ; }
-
-# Internal function for modifying hardcoded definitions.
-# Removes dangerous definitions that override Gentoo settings.
-_cmake_modify-cmakelists() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Only edit the files once
-	grep -qs "<<< Gentoo configuration >>>" "${CMAKE_USE_DIR}"/CMakeLists.txt && return 0
-
-	# Comment out all set (<some_should_be_user_defined_variable> value)
-	find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec sed \
-		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE\([[:space:]].*)\|)\)/I{s/^/#_cmake_modify_IGNORE /g}' \
-		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_COLOR_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
-		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_INSTALL_PREFIX[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
-		-e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_VERBOSE_MAKEFILE[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \
-		-i {} + || die "${LINENO}: failed to disable hardcoded settings"
-	local x
-	for x in $(find "${CMAKE_USE_DIR}" -name CMakeLists.txt -exec grep -l "^#_cmake_modify_IGNORE" {} +;); do
-		einfo "Hardcoded definition(s) removed in $(echo "${x}" | cut -c $((${#CMAKE_USE_DIR}+2))-):"
-		einfo "$(grep -se '^#_cmake_modify_IGNORE' ${x} | cut -c 22-99)"
-	done
-
-	# NOTE Append some useful summary here
-	cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die
-
-		MESSAGE(STATUS "<<< Gentoo configuration >>>
-		Build type      \${CMAKE_BUILD_TYPE}
-		Install path    \${CMAKE_INSTALL_PREFIX}
-		Compiler flags:
-		C               \${CMAKE_C_FLAGS}
-		C++             \${CMAKE_CXX_FLAGS}
-		Linker flags:
-		Executable      \${CMAKE_EXE_LINKER_FLAGS}
-		Module          \${CMAKE_MODULE_LINKER_FLAGS}
-		Shared          \${CMAKE_SHARED_LINKER_FLAGS}\n")
-	_EOF_
-}
-
-# temporary function for moving cmake cleanups from from src_configure -> src_prepare.
-# bug #378850
-_cmake_cleanup_cmake() {
-	: ${CMAKE_USE_DIR:=${S}}
-
-	if [[ "${CMAKE_REMOVE_MODULES}" == "yes" ]] ; then
-		local name
-		for name in ${CMAKE_REMOVE_MODULES_LIST} ; do
-			find "${S}" -name ${name}.cmake -exec rm -v {} + || die
-		done
-	fi
-
-	# check if CMakeLists.txt exist and if no then die
-	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
-		eerror "Unable to locate CMakeLists.txt under:"
-		eerror "\"${CMAKE_USE_DIR}/CMakeLists.txt\""
-		eerror "Consider not inheriting the cmake eclass."
-		die "FATAL: Unable to find CMakeLists.txt"
-	fi
-
-	# Remove dangerous things.
-	_cmake_modify-cmakelists
-}
-
-# @FUNCTION: cmake-utils_src_prepare
-# @DESCRIPTION:
-# Apply ebuild and user patches.
-cmake-utils_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	pushd "${S}" > /dev/null || die
-
-	if [[ ${EAPI} != 5 ]]; then
-		default_src_prepare
-		_cmake_cleanup_cmake
-	else
-		debug-print "$FUNCNAME: PATCHES=$PATCHES"
-		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-
-		debug-print "$FUNCNAME: applying user patches"
-		epatch_user
-	fi
-
-	popd > /dev/null || die
-
-	# make ${S} read-only in order to detect broken build-systems
-	if [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then
-		chmod -R a-w "${S}"
-	fi
-
-	_CMAKE_UTILS_SRC_PREPARE_HAS_RUN=1
-}
-
-# @VARIABLE: mycmakeargs
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Optional cmake defines as a bash array. Should be defined before calling
-# src_configure.
-# @CODE
-# src_configure() {
-# 	local mycmakeargs=(
-# 		$(cmake-utils_use_with openconnect)
-# 	)
-#
-# 	cmake-utils_src_configure
-# }
-# @CODE
-
-# @FUNCTION: cmake-utils_src_configure
-# @DESCRIPTION:
-# General function for configuring with cmake. Default behaviour is to start an
-# out-of-source build.
-cmake-utils_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ! ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]]; then
-		if [[ ${EAPI} != [56] ]]; then
-			die "FATAL: cmake-utils_src_prepare has not been run"
-		else
-			eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
-		fi
-	fi
-
-	[[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake
-
-	_cmake_check_build_dir
-
-	# Fix xdg collision with sandbox
-	xdg_environment_reset
-
-	# @SEE CMAKE_BUILD_TYPE
-	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
-		# Handle release builds
-		if ! has debug ${IUSE//+} || ! use debug; then
-			local CPPFLAGS=${CPPFLAGS}
-			append-cppflags -DNDEBUG
-		fi
-	fi
-
-	# Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.)
-	local build_rules=${BUILD_DIR}/gentoo_rules.cmake
-
-	cat > "${build_rules}" <<- _EOF_ || die
-		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
-		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE)
-		SET (CMAKE_ASM-ATT_LINK_FLAGS "-nostdlib" CACHE STRING "ASM-ATT link flags" FORCE)
-		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
-		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
-		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> <INCLUDES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
-	_EOF_
-
-	local myCC=$(tc-getCC) myCXX=$(tc-getCXX) myFC=$(tc-getFC)
-
-	# !!! IMPORTANT NOTE !!!
-	# Single slash below is intentional. CMake is weird and wants the
-	# CMAKE_*_VARIABLES split into two elements: the first one with
-	# compiler path, and the second one with all command-line options,
-	# space separated.
-	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
-	cat > ${toolchain_file} <<- _EOF_ || die
-		SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
-		SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
-		SET (CMAKE_C_COMPILER "${myCC/ /;}")
-		SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
-		SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
-		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
-		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
-		SET (CMAKE_SYSTEM_PROCESSOR "${CHOST%%-*}")
-	_EOF_
-
-	# We are using the C compiler for assembly by default.
-	local -x ASMFLAGS=${CFLAGS}
-	local -x PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	if tc-is-cross-compiler; then
-		local sysname
-		case "${KERNEL:-linux}" in
-			Cygwin) sysname="CYGWIN_NT-5.1" ;;
-			HPUX) sysname="HP-UX" ;;
-			linux) sysname="Linux" ;;
-			Winnt)
-				sysname="Windows"
-				cat >> "${toolchain_file}" <<- _EOF_ || die
-					SET (CMAKE_RC_COMPILER $(tc-getRC))
-				_EOF_
-				;;
-			*) sysname="${KERNEL}" ;;
-		esac
-
-		cat >> "${toolchain_file}" <<- _EOF_ || die
-			SET (CMAKE_SYSTEM_NAME "${sysname}")
-		_EOF_
-
-		if [ "${SYSROOT:-/}" != "/" ] ; then
-			# When cross-compiling with a sysroot (e.g. with crossdev's emerge wrappers)
-			# we need to tell cmake to use libs/headers from the sysroot but programs from / only.
-			cat >> "${toolchain_file}" <<- _EOF_ || die
-				SET (CMAKE_FIND_ROOT_PATH "${SYSROOT}")
-				SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-				SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-				SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-			_EOF_
-		fi
-	fi
-
-	if use prefix-guest; then
-		cat >> "${build_rules}" <<- _EOF_ || die
-			# in Prefix we need rpath and must ensure cmake gets our default linker path
-			# right ... except for Darwin hosts
-			IF (NOT APPLE)
-			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-			SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)"
-			CACHE STRING "" FORCE)
-
-			ELSE ()
-
-			SET (CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
-			SET (CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
-			SET (CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
-			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-			SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
-
-			ENDIF (NOT APPLE)
-		_EOF_
-	fi
-
-	# Common configure parameters (invariants)
-	local common_config=${BUILD_DIR}/gentoo_common_config.cmake
-	local libdir=$(get_libdir)
-	cat > "${common_config}" <<- _EOF_ || die
-		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
-		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
-		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
-		SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
-		SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
-		SET (CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules")
-	_EOF_
-
-	# See bug 689410
-	if [[ "${ARCH}" == riscv ]]; then
-		echo 'SET (CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX '"${libdir#lib}"' CACHE STRING "library search suffix" FORCE)' >> "${common_config}" || die
-	fi
-
-	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
-
-	if [[ ${EAPI} != [56] ]]; then
-		cat >> "${common_config}" <<- _EOF_ || die
-			SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
-			SET (BUILD_SHARED_LIBS ON CACHE BOOL "")
-		_EOF_
-	fi
-
-	# Wipe the default optimization flags out of CMake
-	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
-		cat >> ${common_config} <<- _EOF_ || die
-			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-		_EOF_
-	fi
-
-	# Convert mycmakeargs to an array, for backwards compatibility
-	# Make the array a local variable since <=portage-2.1.6.x does not
-	# support global arrays (see bug #297255).
-	local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
-	if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
-		if [[ -n "${mycmakeargstype}" ]] ; then
-			if [[ ${EAPI} == 5 ]]; then
-				eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead."
-			else
-				die "Declaring mycmakeargs as a variable is banned in EAPI=${EAPI}. Please use an array instead."
-			fi
-		fi
-		local mycmakeargs_local=(${mycmakeargs})
-	else
-		local mycmakeargs_local=("${mycmakeargs[@]}")
-	fi
-
-	if [[ ${CMAKE_WARN_UNUSED_CLI} == no ]] ; then
-		local warn_unused_cli="--no-warn-unused-cli"
-	else
-		local warn_unused_cli=""
-	fi
-
-	# Common configure parameters (overridable)
-	# NOTE CMAKE_BUILD_TYPE can be only overridden via CMAKE_BUILD_TYPE eclass variable
-	# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
-	local cmakeargs=(
-		${warn_unused_cli}
-		-C "${common_config}"
-		-G "$(_cmake_generator_to_use)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		"${mycmakeargs_local[@]}"
-		-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-		$([[ ${EAPI} == 5 ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF)
-		-DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
-		"${MYCMAKEARGS}"
-	)
-
-	if [[ -n "${CMAKE_EXTRA_CACHE_FILE}" ]] ; then
-		cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
-	fi
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-	debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}"
-	echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}"
-	"${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed"
-	popd > /dev/null || die
-}
-
-# @FUNCTION: cmake-utils_src_compile
-# @DESCRIPTION:
-# General function for compiling with cmake.
-# Automatically detects the build type. All arguments are passed to emake.
-cmake-utils_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	cmake-utils_src_make "$@"
-}
-
-# @FUNCTION: _cmake_ninja_src_make
-# @INTERNAL
-# @DESCRIPTION:
-# Build the package using ninja generator
-_cmake_ninja_src_make() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage."
-
-	eninja "$@"
-}
-
-# @FUNCTION: _cmake_emake_src_make
-# @INTERNAL
-# @DESCRIPTION:
-# Build the package using make generator
-_cmake_emake_src_make() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
-
-	if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then
-		emake VERBOSE=1 "$@" || die
-	else
-		emake "$@" || die
-	fi
-
-}
-
-# @FUNCTION: cmake-utils_src_make
-# @DESCRIPTION:
-# Function for building the package. Automatically detects the build type.
-# All arguments are passed to emake.
-cmake-utils_src_make() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_cmake_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	_cmake_${CMAKE_MAKEFILE_GENERATOR}_src_make "$@"
-
-	popd > /dev/null || die
-}
-
-# @FUNCTION: cmake-utils_src_test
-# @DESCRIPTION:
-# Function for testing the package. Automatically detects the build type.
-cmake-utils_src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_cmake_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null || die
-	[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
-
-	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
-
-	set -- ctest -j "$(makeopts_jobs "${MAKEOPTS}" 999)" \
-		--test-load "$(makeopts_loadavg)" "${myctestargs[@]}" "$@"
-	echo "$@" >&2
-	if "$@" ; then
-		einfo "Tests succeeded."
-		popd > /dev/null || die
-		return 0
-	else
-		if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
-			# on request from Diego
-			eerror "Tests failed. Test log ${BUILD_DIR}/Testing/Temporary/LastTest.log follows:"
-			eerror "--START TEST LOG--------------------------------------------------------------"
-			cat "${BUILD_DIR}/Testing/Temporary/LastTest.log"
-			eerror "--END TEST LOG----------------------------------------------------------------"
-			die "Tests failed."
-		else
-			die "Tests failed. When you file a bug, please attach the following file: \n\t${BUILD_DIR}/Testing/Temporary/LastTest.log"
-		fi
-
-		# die might not die due to nonfatal
-		popd > /dev/null || die
-		return 1
-	fi
-}
-
-# @FUNCTION: cmake-utils_src_install
-# @DESCRIPTION:
-# Function for installing the package. Automatically detects the build type.
-cmake-utils_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_cmake_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null || die
-	DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died running ${CMAKE_MAKEFILE_GENERATOR} install"
-	popd > /dev/null || die
-
-	pushd "${S}" > /dev/null || die
-	einstalldocs
-	popd > /dev/null || die
-}
-
-fi
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6353f6f7ace7..b7ec4f6d83d2 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index f523478a5f38..8286e20ff757 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -2,6 +2,6 @@ AUX liblscp-0.9.6-conditional.patch 350 BLAKE2B 5354ef415e5905d3dd03879372f6a434
 DIST liblscp-0.9.4.tar.gz 697219 BLAKE2B f1824c75237e478888ffcd95c15b72e4746cbc8997924f70cced966baddb68877526cbbcd56ff419fa1eb5f1ca6a1537ce5db368ba41cac39e51813921720e9b SHA512 6aa9b15d538925edf3327ca05023bac8285611902703fec20572416dde5cd7300ed429a7db464d92b9f6c1d524b89066888f8cbd0d56283ff3c78074605f396a
 DIST liblscp-0.9.6.tar.gz 100811 BLAKE2B a86a5e9e6d52dfd2449274e1c800e40887094dcea3e39d257670dded8b3805f2cdf575b41f640b0df95cd008656d3e7c8ca93d5bc5360c8727b80d6d2695ed83 SHA512 51c3b0b3dfe3947ac5d7cfec18fec597a4282aacc489cdda5a30d5853c3a43778e207ddf2f211c28ba04386fd6f30a09eed62dc2a33177e5aeccd7f77b4ef520
 EBUILD liblscp-0.9.4.ebuild 637 BLAKE2B 8f259597f3b0360dba84efbae838531fdf0524f7a962717ba691f4cc324a2a24d07163afd1efa0641db6fcc3a8bbb754bbef6c83580d703c52e1dd91139a39ae SHA512 659b7dfa673a2b07220b56e58ab84f9fa008a9727dae2bacdf5644e5453c49708cbc3491851f88d86977a90d7df74c9ad4b8f52158c7c1ae3e8e8b93bce7d374
-EBUILD liblscp-0.9.6.ebuild 749 BLAKE2B 8c21ef8adab8b13b6f6fc134d5dd9abd14e5a67be8d01729761a849a48304db9f4a78896b77e2849b68bec783ac4c2ab6755a68a48e7fc23c8f7d75fc0536c86 SHA512 bccc5ddd3f2807d8ea3c94ee074bb3789128f7376deda30e4e51cd39c548d777c223072e6e25f312d2274c4bbf2fe5655f4ba2c6c5cdc9d61263f1bf4f4597a5
+EBUILD liblscp-0.9.6.ebuild 748 BLAKE2B 91cdd739be37cafa76cb6241f8b89ee2053f5d03518381acab1ac106f8d816c6a9001acd03bdf3f380e3529e25e5c100e16a9ededb3e427135f1c27cc9b874f0 SHA512 c37f1f6ea1e27fdc5f573dc8745a6aadc9aadbee8ce496c78631b13af7317f72f1f57e84dc043938b81ee63c261228528d4c13dfe7ca78a6d5f6c106d55e2478
 EBUILD liblscp-9999.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/liblscp/liblscp-0.9.6.ebuild b/media-libs/liblscp/liblscp-0.9.6.ebuild
index cf2d9a96da83..a68cc47b641b 100644
--- a/media-libs/liblscp/liblscp-0.9.6.ebuild
+++ b/media-libs/liblscp/liblscp-0.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
 		https://download.linuxsampler.org/packages/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index edbc2efd623b..488fe2b0eeaf 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,7 +1,7 @@
 AUX libmtp-1.1.19-fix-docdir.patch 462 BLAKE2B 5c23a2b98a138fb6bc51d49c07d556cff17357ce604cc7e11bf652e180d560cfc1befb2957629a5bb9e46876721fa62d186dd7e0a4dc0e95b74f41a3d5620f9c SHA512 50e15c26fe110d551c350ec11e9fc2309f8dfb26039e824e7d59aa1e5b5250e012397ed30278578524eb579132b0206fae8d5c40f387dd71b93ac7fc261ac2e7
 DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044
 DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018
-EBUILD libmtp-1.1.19-r2.ebuild 1706 BLAKE2B 0fa26cf22568d2b66249ba3a6452fbafaa813f5c9990d0b26e7b3ffaec5f154d2a7ea46b062bc007909101369933f5417f7048c550712161e5f7aa66cf9ac8db SHA512 437eefb3c22e99cb6e81b89a1f68016399515c1383e7a8b9bb657210cf5f9dd8f0975c129c40480713d47f3937f9a8e986902b471064a1b28733b6a2846cb81f
+EBUILD libmtp-1.1.19-r2.ebuild 1705 BLAKE2B b8a2231e68ecc3afd4bd66894b9940f099ad151bdcf9c5bd777d62c239badaf18089607fa7db935ad12fe97f797c44f72ffac41a8b8536e7afdef2aa69ac5d75 SHA512 692dbba0b3a8b629dee534f1dd3ac36b2f813a5b4d5c6e8c1b8116844078e794b6a57d15492d634d2bc89d5b16fa424b72caae933f4ba48a7bba193c81155507
 EBUILD libmtp-1.1.19.ebuild 1671 BLAKE2B 10bfcb9527fb3590bf8ad6daad17804abe282dfdd8662024029663fddf3101664b7083d282a5e8ee4eb42bb6f3a2e2ca3d018f8a6d7257447500f1d123754d4d SHA512 13aa3c4a74af67858b0a57f5f754dbc1654a9d83e63a29aecf72e1f887106722ae126fd8a9adc434659e966d9dfb5f9d182c0640e921edf17230a2c464b77976
 EBUILD libmtp-1.1.20.ebuild 1917 BLAKE2B bf554526e729ba781513545d5aaf2de97a5fdf66bc8fdfbc7805998de09d4bd6913c3f74439a179a92f73b773f1ce9d13b8c37138fc73d304b9e48cf4839c510 SHA512 c5491c946f3cfb5cfba7eea99ef4d9b007af034163fb91812075d9ed2e9581d7e78dd4357ba3fcec9c83e4e8384b252823948541b0d2c055c9b02043ae738fa5
 EBUILD libmtp-9999.ebuild 1859 BLAKE2B d6c4d0516b3028951494178b3823090a56e03b1777871134a3b6152709ebf6c00e0e6caee12d38a00453245402ce5499ee7b568880195f6cf45256bd76255e3c SHA512 f102aba2ae7d1b10997dd3dc2676f1463b5dd14890fe74796c4490524acd6d706a2cb3709f876c2ffb3e035a9599a027ca2b76519c61663185bef663f00a6f0f
diff --git a/media-libs/libmtp/libmtp-1.1.19-r2.ebuild b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
index 3daa860ef5ef..37ef02006caf 100644
--- a/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libnjb/Manifest b/media-libs/libnjb/Manifest
index 6ff274257726..c4a27a979392 100644
--- a/media-libs/libnjb/Manifest
+++ b/media-libs/libnjb/Manifest
@@ -2,6 +2,6 @@ AUX libnjb-2.2.7-exclude-samples.patch 288 BLAKE2B 8d9646562a8b7a07460577a563ae5
 AUX libnjb-2.2.7-fix-docdir.patch 462 BLAKE2B afc0ea3f8d8a776ed37f93fb2430f931cd154f1f88ed1a28fe8c5ebbd9b5501bf63de0999ed01fe79c72133f5e76c4e0cf7d4876e40fdf7f93ef1a5bac964c8c SHA512 f85f5ab0a628850cc2db04ef4beae79448bcd144002dca5552999c9487cb65ece8ca4bbcea9135b892cb813e8bfa28dd94c09e7d08ba562807f329217bef58d5
 AUX libnjb.rules 1773 BLAKE2B 3fdc3a8ceaec9b065e5ea174738642311b57f4cf41f2759375160ef0cdd6044434427f82dae8dc4cad167bfd4578b51bb019a3e4924883f8a6f9efc06a7fe6be SHA512 21d9aa5b0d0c170c3f8071a81981590714f6bbf203d5b6f973aea6a2365f69cde5008969748a2136b9791db327fc476d33fe8937cc7c7d26168ac1803738419a
 DIST libnjb-2.2.7.tar.gz 497862 BLAKE2B e6b7ba77d99f2f4e777ebdca6793d6a348073d9696b9b38b51bc7e29ddacff9a5d19116ca538416ef068496a8827700ed4f740e8ce0c0c1402751c97eb45ed58 SHA512 d217beb772024ec122739327dae9f1e991ace4c3dfe79a4960d1d7421c3d663f924304331025a1790ea7b697ac84d8926f3ab507c6d919e781e90ca82ef6fd06
-EBUILD libnjb-2.2.7-r2.ebuild 940 BLAKE2B 4d1b703dffdbb26991b00483cd7427f8ca9a06f7ee5551ad4497c92e8034ad6a842a2ca1c2e81d16dd750fe5078c811f6856b5c533179c6a7069226e310b5159 SHA512 a5192c07434007d40d30418793cbdb7f0e692b601bd9851b4e021cb5d620f301317e0fcc2cecda8061b6717cfced901959de324f3639498606bd914c4aa58bd7
+EBUILD libnjb-2.2.7-r2.ebuild 939 BLAKE2B 208c9fec9bd49ab4add35dfd24276576e26ac47b8776cb513e9d1de1a5a25ece3474b5227017b09d95d921a54250add17b0ebe5beaad1717be986cc6384bc1dc SHA512 8c9abdf0dd2f4883785eddcb5033b5a92fdd223e26d6531728c5028ef3e24bdc7f6771d39772af63b4ab03e66f7a497815d356f5b1d297b3d18df09261562c27
 EBUILD libnjb-2.2.7.ebuild 901 BLAKE2B 6a80b5cbd83f412b2d266ced3351089b015b2b5236ced0ed8fffc159ffa55fe3c01490058f86d771fc8e486f24ceb23a246bf743ba733d2147be8cd5de3b7711 SHA512 8c9d7564228c4910c37caabb1803cff80603f7ca932f8bd0781a55a60e7eb25c47bd6e0195d18ad8445c1e79881042122bacdc00347188ec855bfce01e6392fc
 MISC metadata.xml 330 BLAKE2B 39ec86a9bd0ff38039476fcd261ba7c73f76e5fc753eef58396595adca1c3222ee7f0d84b2d13834448334b89641ad4b0d3d18d73052272e3d733138e3bfc019 SHA512 d01d952928c34e77ebc9b00e3248fce151c2d0bdef18a9e60512fbdeb76d473a57fd26ae3891bad2fe747e7d016a4cd84ce3029db6ad2918fe14f63dc7555dbb
diff --git a/media-libs/libnjb/libnjb-2.2.7-r2.ebuild b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
index 56d8228e195f..c09267b64f99 100644
--- a/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="virtual/libusb:0"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 74e41330d6b4..2aa823735ad1 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index ceed736f7e26..347f3024943a 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -8,6 +8,6 @@ DIST Csound6.17.0_manual_pdf.zip 9930889 BLAKE2B c0210f2fb97a6707ae6cd0a0cf38cd3
 DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d SHA512 b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
 DIST csound-6.17.0-distributable.tar.xz 25231984 BLAKE2B 9767aae3368f33340d80abb84c573e6ceb91bb16448e961f62c679742377e62f611b36341ce7dfb32a2daafc9440c3dff84fe031c9d52b7d86491c383cf79d61 SHA512 b7c5b2f70e82d9dc37074cb217bc146d66293cfea2d69ffd3b0eab9aca302e431eb82b906c8d6494969374988edd6a9c7d04d7676efd085a2dce235988400caa
 EBUILD csound-6.16.2.ebuild 7132 BLAKE2B 57e7c2b61574635fb261142d6439df9984a8f8f9b163477d5f580c476c16e32343296e4182bf0c70be958357a9d1d7f360806c903d1f66e44779b44ef1047170 SHA512 5b3321f90a936f577b7a794de2f4194f2d0939cc18a8536e0b2216b0ade193b01ec3651d8d405229497c0550e234f941e0442b41a10494739d6223bb3a6f9652
-EBUILD csound-6.17.0.ebuild 5433 BLAKE2B 7d190fea3ed2b5966297fc14b8488a79a92411e3130708705be305fdfb08e70d85e93c713a0c915a9250b04c6ff20e097e86606280094fa4545476449c503853 SHA512 749ecba18aacd1ecc9108e9e0ace83ab626e715973582bee25c8a4fd620a1c09abbe71b52caefa6201817891fcfe049517bfcd1ba7824e9e711bde086c7cbc07
+EBUILD csound-6.17.0.ebuild 5432 BLAKE2B 79a80485022b7cd742d93af2aad6a122c549c8b76815e1718351876ecc76a17114fcb7d7e5506598a479b07f854fed3147c3aa8b064ba860a439d2fae714a9c9 SHA512 74f2470b6b432886ce806574df2ec51be21b189b0c0442cd875036e6872212c6e7664e9be794d316962d307dcc850812903751f5f87f9977b4188d0692b5b8c2
 EBUILD csound-9999.ebuild 5191 BLAKE2B 7a6d621f017b4785480fbe72cc9d377060152e5cfe107e5d3e49b329acea363c20d932b1766dfc5d6a6f28c67dae49a577bc5c2c174b3c2b0cffb82496faec86 SHA512 41aa47513261bba2779f41b625cb8e29101bc7e0f2c4eab17a4ef7f73981bbaa396c56ae1273bbd46291f679b72fd1d47c70b0bf09e3cdcbf768ebafaadae2ec
 MISC metadata.xml 1244 BLAKE2B cd28c168f6625c7ab090f3b3812fbdcb8a7f2e17d649083c54761ea3a109d4ec90f9d6241cacf8502f386d10fa682e5c2d0be1a77a6f19d94820d80115b290a9 SHA512 96e697c02828da5fa3ca22a3a564f76ad06b55d8479f5bd2c207aa2427675b814f351fd5d9e5ec61e9c3b88d2e803137288a11e15dc92c149c015a2dcd315cbc
diff --git a/media-sound/csound/csound-6.17.0.ebuild b/media-sound/csound/csound-6.17.0.ebuild
index ff2a0f274e57..cc3c316eca91 100644
--- a/media-sound/csound/csound-6.17.0.ebuild
+++ b/media-sound/csound/csound-6.17.0.ebuild
@@ -22,7 +22,7 @@ else
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
 		)"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and performance"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 089fc111cc0b..3aaadefa7f86 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e800822e105e..1b9fd9eb5687 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Aug 2022 19:39:42 +0000
+Tue, 02 Aug 2022 00:39:40 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 8322d6eb11f1..18c373e5aff7 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518764 BLAKE2B 800d8c605261a8d2ca31eca4bde7d3bb3f684de4f3181019daf03f289f18680c6d96f494d58f96fe4ad07cdd9e1d88375337c122e7b8e08a991332389d887299 SHA512 aedc41e29d7be49299b1cb0ff40f391a2deff64b9b55c25130ff0d38269f249b737b1d372d346ecfc163d0044fae33a0e164e57a26c205b60f17269607a8117b
-TIMESTAMP 2022-08-01T19:39:46Z
+TIMESTAMP 2022-08-02T00:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLoLAJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLoclJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB7YBAArLMY7VswukN6d7NilVZakHYhgfNzVB5rSvFdFPi8VNw0ytyV3bmi6jsk
-vsXRcO3dJGZkPvDHUFckhGudSdBXpq7ZfPKMIjzhUFoWrg5Xn0EqbMua6s6/sToQ
-B9C20f8HHqoC04QXe3b40gB0kZmhiPJI5RUWT4NcYsUXAd33Duj2bXnD+ibDUiGb
-kOH3tFm8507uIDuIAwKvm2xTZc836fCQnYmWnaUaEp8Vhc5EUj18tSjnbGkn02WH
-fycjE6RelHAISeeQyL6fbCbhPN0MZr7oz7JiNGkT/Y1t8pb8dyGo0xvKmv5TcXyt
-m5YwruY+td5R9jPERDP3dtVha4vQ9ThzaqZ5pJUOI2SCOD11kYYhNF6tuVEk1F6M
-tUBA7zPQJWmSoFvKJTJRjXgEJMMva4PzC4nXBfi/mzaEBZykf8dgPiyFlnc4jqsy
-p2adi2y3nGtpDTyXv2qIJfmSHUKJe8tdMvaS51d0ZQ+99F5tlGrZlRfhbpOuSZSB
-2emw/8sMHyY8oODbXF32w1INGIRfOxjZlK7wRL9NVZUPC2E6XqRNCH4toPPrimFV
-unT88VV5aqVl/ssOjAPa6UP30QN53U91ScZLd1FpCTmtooZaquU/if+nJ4gmC3UY
-zB/z0UVtQFJKkz6SOZ1lVybvE9G1zbWXvnHPOpk3ZLpay10LY/k=
-=TUxA
+klCfuA/+La0PangGVk7cRpmYyQiTZmUdY9VJ77XR3lNVwzWaUIYF+QI4xz8/S12U
+nMZYyaccvcNzYttm9qRJAlti+FDg9wgk3abgwqdtMPj/wvND/6+8h8GnxKx/NRC+
+mbhjg0snkfQ1Inzl2m/8bGERw8RRen160epLZ/kcqXnO4759mj5MuHFENkupytwN
+95AOXKg2EqIDvjyni21Vmr+mYlRNavCj17noTqAIiro8aXmmMagEyx5YhFEJwazY
+tdTaRCsej/Kv6OTRiaV/i8SWt+/t3V/f0mU6gfKyBnVHxHMjTz50IBXTwOcriCVh
+WC2D742IsllDHpRIxactkWI1AJdm2rWptjuqWuJ7dPDCb/hfz2VArITXWFjl6VUc
+qZVufPgtXYSCeLk1GBh5P78I11qso3mzdqGMy5Cwx/fez28ixu6xKZzQbjQpfsDo
+KV8B14/NGC8nuUxsc35/cHh5wKFn7RJjRgyk5Bz3JD84r0204Hhs3xRgixuEk/lX
+GbaOZIw9c/QS3MlYXocCaRd3NV4WgijRL8LeZu+U5YaigS83L4dSEKBg8d459/b9
+F5vhYf8KYulxSY2ce1xsivnUyDcZ6SKi3msPv/QEApEY3j6OQpAEnWpQrLc4B7cR
+PztBj1UU3U2XeGP/v++4PT6jx7RVz6kPjkV+7mdGXuLAadyJl5I=
+=3WIO
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e800822e105e..d8853d87d734 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Aug 2022 19:39:42 +0000
+Tue, 02 Aug 2022 00:39:41 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b7bb15ead9b7..a6f403e83add 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 2b656441d778..ba1d082d4252 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.2 b/metadata/md5-cache/app-antivirus/lkrg-0.9.2
deleted file mode 100644
index 8cbe11384e6c..000000000000
--- a/metadata/md5-cache/app-antivirus/lkrg-0.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-openwall ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux Kernel Runtime Guard
-EAPI=7
-HOMEPAGE=https://lkrg.org
-INHERIT=linux-mod linux-info verify-sig
-IUSE=dist-kernel verify-sig
-KEYWORDS=~amd64
-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.2.tar.gz verify-sig? ( https://lkrg.org/download/lkrg-0.9.2.tar.gz.sign )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0f3a8ee08ddd7e19d3ceb2805fb3ea67
diff --git a/metadata/md5-cache/app-antivirus/lkrg-0.9.3 b/metadata/md5-cache/app-antivirus/lkrg-0.9.3
deleted file mode 100644
index aa89e87cb1c0..000000000000
--- a/metadata/md5-cache/app-antivirus/lkrg-0.9.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-openwall ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux Kernel Runtime Guard
-EAPI=7
-HOMEPAGE=https://lkrg.org
-INHERIT=linux-mod linux-info verify-sig
-IUSE=dist-kernel verify-sig
-KEYWORDS=~amd64
-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.3.tar.gz verify-sig? ( https://lkrg.org/download/lkrg-0.9.3.tar.gz.sign )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d6ef989d64dc9f8739daae434275e078
diff --git a/metadata/md5-cache/app-antivirus/lkrg-0.9.5 b/metadata/md5-cache/app-antivirus/lkrg-0.9.5
new file mode 100644
index 000000000000..97f807df5dc3
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/lkrg-0.9.5
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-openwall ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install postinst postrm preinst setup unpack
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Linux Kernel Runtime Guard
+EAPI=8
+HOMEPAGE=https://lkrg.org
+INHERIT=linux-mod linux-info systemd verify-sig
+IUSE=dist-kernel verify-sig
+KEYWORDS=~amd64
+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	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=b3654a36dfb34cf3a4e5f085c125c87c
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 1b22d1a1d165..5afeb0ba4f90 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/epl-0.9-r1 b/metadata/md5-cache/app-emacs/epl-0.9-r2
index 639bfe04d72d..8ffb64d8d683 100644
--- a/metadata/md5-cache/app-emacs/epl-0.9-r1
+++ b/metadata/md5-cache/app-emacs/epl-0.9-r2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( app-emacs/ert-runner ) >=app-editors/emacs-24:*
+BDEPEND=test? ( app-emacs/f ) >=app-editors/emacs-24:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=A convenient high-level API for package.el
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cask/epl/archive/refs/tags/0.9.tar.gz -> epl-0.9.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=37f24a7fd2ccb8ba480456b76d5e581b
+_md5_=3bfef452434dab34dbfa969405001ac1
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 072d892001c6..ccf98bbbd009 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/sqlite-3.38.2 b/metadata/md5-cache/dev-db/sqlite-3.38.2
deleted file mode 100644
index 5985bf453d07..000000000000
--- a/metadata/md5-cache/dev-db/sqlite-3.38.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip >=dev-lang/tcl-8.6:0 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=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= ) test? ( >=dev-lang/tcl-8.6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=SQL database engine
-EAPI=7
-HOMEPAGE=https://sqlite.org/
-INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
-IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://sqlite.org/2022/sqlite-src-3380200.zip doc? ( https://sqlite.org/2022/sqlite-doc-3380200.zip )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=339b959b8330ade3b4b855e5d2e86fa7
diff --git a/metadata/md5-cache/dev-db/sqlite-3.38.5 b/metadata/md5-cache/dev-db/sqlite-3.38.5
deleted file mode 100644
index 9b25236cec4f..000000000000
--- a/metadata/md5-cache/dev-db/sqlite-3.38.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip >=dev-lang/tcl-8.6:0 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=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= ) test? ( >=dev-lang/tcl-8.6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=SQL database engine
-EAPI=7
-HOMEPAGE=https://sqlite.org/
-INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
-IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://sqlite.org/2022/sqlite-src-3380500.zip doc? ( https://sqlite.org/2022/sqlite-doc-3380500.zip )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bf6f04d2fd658e3e27a554ea38c07bde
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 3bbd15d10b7c..24546bd33399 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/assertj-core-3.10.0 b/metadata/md5-cache/dev-java/assertj-core-3.10.0
index 1fc16b07b3a2..69db353101d7 100644
--- a/metadata/md5-cache/dev-java/assertj-core-3.10.0
+++ b/metadata/md5-cache/dev-java/assertj-core-3.10.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://assertj.github.io/doc/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/byte-buddy-1.12.12:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/assertj/assertj-core/archive/assertj-core-3.10.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	cc510ad15292e222d436a547adffe6a9	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=a754a210fa687a5fc657db447521eb87
+_md5_=ff1780090e94e0dcc8cd0ef6afae3ca4
diff --git a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
index beda9fe10e79..c83e31cce6c0 100644
--- a/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
+++ b/metadata/md5-cache/dev-java/jakarta-annotations-api-2.1.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.ca
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/common-annotations-api/archive/2.1.1.tar.gz -> jakarta-annotations-api-2.1.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	cc510ad15292e222d436a547adffe6a9	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=694e9fc5ced3ff195bb75e4a7a7808c3
+_md5_=fde929874b4a0955484ef45cd087b090
diff --git a/metadata/md5-cache/dev-java/junit-dataprovider-2.9 b/metadata/md5-cache/dev-java/junit-dataprovider-2.9
index 4adb1109148f..586aeb8e5c45 100644
--- a/metadata/md5-cache/dev-java/junit-dataprovider-2.9
+++ b/metadata/md5-cache/dev-java/junit-dataprovider-2.9
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/TNG/junit-dataprovider
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/findbugs-annotations:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TNG/junit-dataprovider/archive/v2.9.tar.gz -> junit-dataprovider-2.9.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	cc510ad15292e222d436a547adffe6a9	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=de1b3cd2fe5ec750bd64c31446ed778b
+_md5_=a2ddcf9cc89f4c82354e27b3a30c55a7
diff --git a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0 b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
index 1ed9f3d13de2..5ac6efbd6dc2 100644
--- a/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
+++ b/metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/marschall/memoryfilesystem
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/jakarta-annotations-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/marschall/memoryfilesystem/archive/2.3.0.tar.gz -> memoryfilesystem-2.3.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	cc510ad15292e222d436a547adffe6a9	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=5973100a5b3a15227d7696068530585b
+_md5_=9f793e0e65c062c658850c5b86ba8e87
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 1d8177f22ffb..351a02ceb58c 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/go-1.17.11 b/metadata/md5-cache/dev-lang/go-1.17.13
index fed5aa0afcd4..96c8f9ee42e5 100644
--- a/metadata/md5-cache/dev-lang/go-1.17.11
+++ b/metadata/md5-cache/dev-lang/go-1.17.13
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RESTRICT=strip
-SLOT=0/1.17.11
-SRC_URI=https://storage.googleapis.com/golang/go1.17.11.src.tar.gz
+SLOT=0/1.17.13
+SRC_URI=https://storage.googleapis.com/golang/go1.17.13.src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ac3453c815991c44ecf86884873769c6
+_md5_=fc24210a0aa57f21008ae4e77fc81606
diff --git a/metadata/md5-cache/dev-lang/go-1.18.3 b/metadata/md5-cache/dev-lang/go-1.18.5
index 16d173cb3cbe..7f735296655a 100644
--- a/metadata/md5-cache/dev-lang/go-1.18.3
+++ b/metadata/md5-cache/dev-lang/go-1.18.5
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RESTRICT=strip
-SLOT=0/1.18.3
-SRC_URI=https://storage.googleapis.com/golang/go1.18.3.src.tar.gz
+SLOT=0/1.18.5
+SRC_URI=https://storage.googleapis.com/golang/go1.18.5.src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ac3453c815991c44ecf86884873769c6
+_md5_=fc24210a0aa57f21008ae4e77fc81606
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 37e5ebb300ff..b066a47927f9 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/libzip-1.8.0-r1 b/metadata/md5-cache/dev-libs/libzip-1.8.0-r1
deleted file mode 100644
index 278e2b46c716..000000000000
--- a/metadata/md5-cache/dev-libs/libzip-1.8.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-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 bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/xz-utils ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( dev-libs/openssl:0= ) ) ) zstd? ( app-arch/zstd )
-DESCRIPTION=Library for manipulating zip archives
-EAPI=7
-HOMEPAGE=https://nih.at/libzip/
-INHERIT=cmake multibuild flag-o-matic
-IUSE=bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/xz-utils ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( dev-libs/openssl:0= ) ) ) zstd? ( app-arch/zstd )
-REQUIRED_USE=test? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=https://www.nih.at/libzip/libzip-1.8.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d604dfdbe124ab975bd572423363b90e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 5678de8aa46d..2208db7986f0 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/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index c9613ab2ce7a..59e85e1a7ea0 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-9999
+++ b/metadata/md5-cache/dev-util/pkgcheck-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest[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-vcs/git ) test? ( ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare test unpack
+BDEPEND=~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) test? ( dev-python/pytest[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-vcs/git ) test? ( ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DESCRIPTION=pkgcore-based QA utility for ebuild repos
 EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
-INHERIT=distutils-r1 optfeature git-r3
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+INHERIT=elisp-common distutils-r1 optfeature git-r3
+IUSE=emacs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD MIT
 PROPERTIES=live
-RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=70f289b3393556447386b12ddb6e9af9
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1d9287f3499cad802fe83de779c30dae
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index e96e28055060..67d9ddf7849a 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/liblscp-0.9.6 b/metadata/md5-cache/media-libs/liblscp-0.9.6
index 993a41bd56e4..96bfe2197415 100644
--- a/metadata/md5-cache/media-libs/liblscp-0.9.6
+++ b/metadata/md5-cache/media-libs/liblscp-0.9.6
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.linuxsampler.org
 INHERIT=cmake
 IUSE=doc
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.rncbc.org/archive/liblscp-0.9.6.tar.gz https://download.linuxsampler.org/packages/liblscp-0.9.6.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1708f034c898004f1a33af01bf2410d1
+_md5_=d573ac5cdbe5b327e2207e633fadc859
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.19-r2 b/metadata/md5-cache/media-libs/libmtp-1.1.19-r2
index 519c533a1318..387f9510ea55 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.19-r2
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.19-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://libmtp.sourceforge.net/
 INHERIT=udev
 IUSE=+crypt doc examples static-libs
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( dev-libs/libgcrypt:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.19.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=fc2a0c2b03a58348a1b159a5190712f9
+_md5_=02c3ae60df13f6ed19ea2c7407036094
diff --git a/metadata/md5-cache/media-libs/libnjb-2.2.7-r2 b/metadata/md5-cache/media-libs/libnjb-2.2.7-r2
index 6611e19a3aa4..0d31dd831b60 100644
--- a/metadata/md5-cache/media-libs/libnjb-2.2.7-r2
+++ b/metadata/md5-cache/media-libs/libnjb-2.2.7-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://libnjb.sourceforge.net
 INHERIT=libtool udev
 IUSE=doc static-libs
-KEYWORDS=amd64 ppc ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=mirror://sourceforge/libnjb/libnjb-2.2.7.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=3c3177f0bc56654df8fee629ca1036bf
+_md5_=8d0f48b65c88ddb4ebe7ac1d57272afa
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 9e70116c4282..d933836ffd2a 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/csound-6.17.0 b/metadata/md5-cache/media-sound/csound-6.17.0
index 2c037eb3acc0..1659f1ca74da 100644
--- a/metadata/md5-cache/media-sound/csound-6.17.0
+++ b/metadata/md5-cache/media-sound/csound-6.17.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://csound.github.io/
 INHERIT=cmake lua-single python-single-r1
 IUSE=+alsa beats curl +cxx debug doc double-precision dssi examples jack java lua nls osc portaudio portaudio portmidi pulseaudio samples static-libs test +threads +utils vim-syntax lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
 RDEPEND=dev-cpp/eigen:3 media-libs/libsndfile media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) utils? ( !media-sound/snd ) 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_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) alsa? ( threads ) java? ( cxx ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) cxx )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.17.0-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.17.0/Csound6.17.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.17.0/Csound6.17.0_manual_html.zip )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8288949ef5a5dd256c3e05e7b65d9067
+_md5_=5f24f9c0fd6d143538ff898b39f351d2
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 6c038f476368..31d95e95c661 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/genkernel-4.2.6-r7 b/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r7
new file mode 100644
index 000000000000..dcc6fc961486
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DESCRIPTION=Gentoo automatic kernel building scripts
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
+INHERIT=bash-completion-r1 python-single-r1
+IUSE=ibm +firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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 ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) firmware? ( sys-kernel/linux-firmware )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.2.6.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.tar.xz https://www.busybox.net/downloads/busybox-1.34.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.43.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.26.tar.gz -> libxcrypt-4.4.26.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.14/strace-5.14.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.13.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz https://gitweb.gentoo.org/proj/genkernel.git/patch/?id=8c9de489290dc470e30f8c7d0aaa3456eb124537 -> genkernel-4.2.6-s390x.patch
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ef9c626cfd31ee5b622ee1d071fd4435
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 61eccd8375bf..8f148114db8b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14056 BLAKE2B 384ab1fa4a7f7fa60fa28f388fbf17530d39a6a06420e8f2936adf788e39eff3c93c062d5abaeeace41227318964140accd449e95c6b1abd99c33790b571a5b3 SHA512 8d70434ca6fc690e5e14608a138b2f6fb2a9f2975dd32475ff2d0054cfb0c075931ec146e77d9d54dd1c6888e2f888a3336c54a7e220c35ae2be9f9ad9b47b52
-TIMESTAMP 2022-08-01T19:39:46Z
+TIMESTAMP 2022-08-02T00:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLoLAJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLoclJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBUEA/9EUMWQnc+f882LaoT37KBuHiQ5YU/Qle5SVU6x/inJHDEXkSI/Z9Zy2PE
-T8Az66SgHG07gadu4MgCdKZc6Bwq+X+7seANXsgmXWURD97cPFqGj+Ax0pK//w/a
-SbpdbGZzj2bwBvbh0GniYR/QdAVMV2qKyiTzwAOWQdotdd7FyjZfNAfAmZwyOjMu
-0+3ie5Dg5ghsiSY7cf9X32pFXDouDipppjMCZ9ojA92+mawpnrhQloQTvYLwyK+C
-UEdPfz6HvMiYB0C9Uj7kVn3O+DTFe00hkNcpzg39stmwfryLUkhoeqLVe7QOlVyA
-QrY4Z97cUVSoAqkddlH0E1BN3NV5FHHD10m4VnxPoUaZtUOqs1SuYMU450bYNtcV
-bE6S5j3Fb9RBdRo08eyCI3dlYjsR0iBSr81j27HMFNCQgp85iZjmtS99jpWJLp/9
-ngceY+XvnIBXjiig312dZ3DFpINz3i+Mm4UEo7FhQhV2k9Kec47rKyIZTHz8AVEw
-UQ8MWS8KVhTkUE9NPun9zu75UBSZLwQUjsQ54dBFpzaN6innvOEF/FHQ2vu3BHuc
-gnDwZRp8yjKHh/YGQug4LlcMp6tgPjOlDNemisaUQOo78ZSGAf+UCvLBARpzarmf
-Lvx20TEAxjeJV06SrtmYy6JRs4iH0rKPKmBRB6ECQ2ziZm0a944=
-=bfnu
+klDAcQ//S58lnkJyROkLfUkmSgp2uffBN4CRyVfc1nJCANI6IGrbIr6ScOGnqng8
+rt12aVBW1VsQqQZTGPMqlZQhDEgV4gwP4nkxc4FQxg5SAiJalXvXL2+hiZtuKTuk
+tMlI9cKArqzp/XQ3q548FjfCa7WB5OoIzMk3zIxZ0PDczSFsznsbRTZ1B7P79IUe
+QreQMrnh9x5LJiwbAxxwL7pYaFfwc4CcRVlEbOhWvApmNoM2ELtPVmFHJH8FMvjE
+vmKwI4q9Xb26xXx3yaG1pqCsw1EZknk4axkgIqrkFVOuu7kr6+Rmd3DRO9DFwOZ3
+h9n9wQZjNO8GjZD3aCietvRYj3r1wR/z1lSHAvemXwxlsjbiaWN2PA7RkEpVXK73
+bThDyuOSgICEBcOB3tR+8PIXzf4l60wymxNwjbasWl3LALnda02eY5Tju1Ox2rN9
+tOckVHg9mwpbAFXid5mYZ3TOI4Vh09QSilYBzIDJECOtRh8TpZMR+Tq3DwIpc/oo
+0HcSywMoF9u8e4CUT1nc2Inpml5qxVPlkOO2fEVPLIhNQrMSTRrJF25VwFLVtt+f
+nOpZ983G1nZP47CqP/8Jf7FsDadylCtxb6okVXlavX7+9MLE5/FEpp2lZtR8wb7F
+lY5UQFl1gUWwt/AnVv58Bw5+GbkIW9zzSXcEi/xdj+ffRnSF1dg=
+=WES0
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e800822e105e..d8853d87d734 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Aug 2022 19:39:42 +0000
+Tue, 02 Aug 2022 00:39:41 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d5b10c8622b9..65692b07fd09 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Aug  1 07:39:42 PM UTC 2022
+Tue Aug  2 12:39:40 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a8a05a77f6ba..8a0bba6ef82d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Aug 2022 19:45:01 +0000
+Tue, 02 Aug 2022 00:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index a2a6f2c05648..46bfbfb5c583 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8e3c95e355fa72c7172d6180952b318074d3b8e6 1659382064 2022-08-01T19:27:44+00:00
+0693a3b58cd9a217b11f6a3f09fd635f88e661c5 1659399700 2022-08-02T00:21:40+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7d3e65a1f639..e49f154745ec 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1659382801 Mon 01 Aug 2022 07:40:01 PM UTC
+1659400801 Tue 02 Aug 2022 12:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e800822e105e..d8853d87d734 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Aug 2022 19:39:42 +0000
+Tue, 02 Aug 2022 00:39:41 +0000
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index d266e1a531a1..43a7e9414a87 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index da3b743d9ffd..2a3f8470fa6f 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -3,6 +3,7 @@ AUX genkernel-4.2.6-devicemanager.patch 1714 BLAKE2B 2241709b08d95fc63c7f0143636
 AUX genkernel-4.2.6-fix-btrfs-progs-deps.patch 1167 BLAKE2B e2f77467921adeb2d6e00a1f3415a7ed351b2f300164572bab5f649d917e671f51ea1d43df9d692d15d520940341b2f71261a3c4f9cee841a2408a39d8b109c3 SHA512 85ba228df6970c0f0aded2b33fdde22f15568d2258be4089ff46077b78541ba9469d509ae1779c3726685a2d9eba953d46f4e07808d4e4fdf98f22949648b400
 AUX genkernel-4.2.6-fuse-glibc-2.34.patch 2344 BLAKE2B a3406c0dedfc4742134abec909c29e517637ad89097ed5d3ff10b439186bbd41afc77571b8f74baf8357b18e96fc02ac00e2b53589de7cd3a8b537a172e7413f SHA512 bcd927a12a9f035e3eaa8496bcdc29a003dea3f7aa687b1fa9cc48fd68baca77426651f325a1db5788e25c583c13e4649e5cb293302f286908fa54ec212c4528
 AUX genkernel-4.2.6-gcc-12-boost-1.79.patch 1185 BLAKE2B 8290c7e7ca3222f459318d3fbd65d673ee5fb9207d0d9438227da698c56193bfdca7acde59aa348e3db5c7468d3f7db6161daaf9de65e068cb3ef2cc843e6c1b SHA512 7f783d1ebed3eec371ef73c2a2c6ca409ea1ef2ffae34d162e0a39665a522e0586e3d4ee51edd45455b2e3b79241d639350b42cd3e31c6d2c40698e07a1adad8
+AUX genkernel-4.2.6-slibtool.patch 3511 BLAKE2B 69e022509b923b8bc540103310ce7b8c09f4df6e1402d0584a9bea34e1a89e4c2725c1890bd930d93e605f83494bf751626a3d013cf24b089319cef8daf178f3 SHA512 7a7cc339e52abecd86ec9f105eaadda5b17b5c03d3f9ead0e564c38030f606f5c0279002a0502fa90736446c2cfa9f15b75874e7c599466b657232b6f2a88e82
 AUX genkernel-4.bash 2479 BLAKE2B e5504698ab49bb62623fcdfdd4a54b19ee6d88f96a682f08dc282e46ec26bd22d9c54bcdc9b2bdcc6a96295de1ab96351d35b304eb176f5d177c221cd8d82180 SHA512 6a5709a410c5c07b7a343ecc141aa72de73d3b4acd0a69c05c61c801835a59dd17d9a528f6b68f12ac00ff4b6e5954b03237472501383aa390eb1365dd69c281
 AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
@@ -73,5 +74,6 @@ DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434
 EBUILD genkernel-4.0.10.ebuild 9583 BLAKE2B eb8f46374b3dd8a2f51db002e666ce64b32acc63f8c02a3ffe4ea85c3129bb19c904624382758e97662979b0eddddf0b0ebfdd8d3df66420cef569ccc92fd946 SHA512 1f24bee85516973b5652fe9ac354445504fdd82edf75683dfdc38559cd68048c87c9635af7047286575ff9cb95f69b4f7bc02fc49d9fe29e6a7199c76086a3c7
 EBUILD genkernel-4.2.5.ebuild 11468 BLAKE2B 44a9a5e824574e14f036b2964b325367f3abbbe904098ba35b98b4717c7e285366595863a1282d05a36c7f4bdc61f40b0bb6e052372f72c6a4a7b12575f1ece7 SHA512 8a0c4c90e7d132cd338465f7557ab34ceeb2649dc54e23876c90e396e3e3c2fa4c5d178234ede1057a143e116989552279996a14792463800612cd6a72a18c08
 EBUILD genkernel-4.2.6-r6.ebuild 11948 BLAKE2B 5c2281ee1a0caeea8950ff16d573b95e2590bcc1a5c866c65126ea34880c24d704bcf2eecc3855f04b151283094357d958117574eee515088c31b5d2ee7b0bf5 SHA512 93e7b2018151c954130e9fd89e34c488f9c65131c283bf62d062f86d6a8e6b2e533dba092f347a39249e20215becd8736dfc18d285482db2d789468eb8051f2a
+EBUILD genkernel-4.2.6-r7.ebuild 12000 BLAKE2B 597e01ea3bc091091c3c60e4042f7f122ef710bb52cf707f233dfaa9b39cf149fcc09269c02f81996d72f32d8640debc2429b2ea6ea4807230d48d6766cdbe90 SHA512 dcbba0833c7cccbe82ff3828ef1eab559c857721fcba58315ef5ff55dd6de572d56ea80a0d3a4cd555ba9fea23116f147812accff49ce5ad2770a681ab496893
 EBUILD genkernel-9999.ebuild 11726 BLAKE2B 4cef124c5b87c6908482f4ab2277cdbb8cac5f8d05a59d6059336166a48ee8a4c6d9ee7af08bda0d0eebe1faf384b2830a044b838ba742c7fd539f86e29a5db2 SHA512 be55599bb6a61bf5e5938c9f61003d5f52e2f42e3eb7b9dd1dd756d914dd54d39aacda37d6f3a281c1096f1d9ccd72c9def17decc71cb119eae8570811e061e5
 MISC metadata.xml 473 BLAKE2B 7d2bf14ca0bd4ba5bf05d0ac1529c0c8eae3655a4f52eba56ddb6865e8a44978366b3abad6f334c99b5ad30332113761ea0b7afd76a9eb274c536a7c23aa3983 SHA512 49c916ec4e0690ba17dbaf363acacf3cfaa69f180e0d48644eb742875c55cb409f51123f1e055ecfcffda0f18604208cc61fd2372c2b1aaa6d949dec9edc80a5
diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch
new file mode 100644
index 000000000000..0f0bd2619ae2
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.6-slibtool.patch
@@ -0,0 +1,106 @@
+Bug: https://bugs.gentoo.org/836012
+Upstream-PR: https://github.com/gentoo/genkernel/pull/33
+
+From 1bb3cc10d51026ad500bc9cec883f1f2f0c445ec Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 15 May 2022 15:49:21 -0700
+Subject: [PATCH 1/3] gen_funcs: Add an install_exe function
+
+This helps when the build uses slibtool where the compiled binary output
+path differs from GNU libtool.
+
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ gen_funcs.sh | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/gen_funcs.sh b/gen_funcs.sh
+index 500caf2d..a4dc0e44 100755
+--- a/gen_funcs.sh
++++ b/gen_funcs.sh
+@@ -1974,6 +1974,29 @@ check_distfiles() {
+ 	fi
+ }
+ 
++# @FUNCTION: install_exe
++# @USAGE: <file> <destination>
++# @DESCRIPTION:
++# Finds an executable binary file and installs it in cases where there may be
++# similarly named shell wrapper scripts. This happens when GNU libtool creates
++# an executable named 'foo' while slibtool creates '.libs/foo' and 'foo' is a
++# shell script that should not be installed.
++install_exe() {
++	local file="${1##*/}"
++	local dest="${2}"
++
++	local dir
++	[[ "${1%/*}" == "${file}" ]] || dir="${1%/*}/"
++
++	[[ -f "${dir}${file}" ]] || gen_die "File '${dir}${file}' does not exist!"
++
++	# Ensure only the binaries are installed and not a similarly named wrapper script
++	find "${S}/${dir}" -type f -name "${file}" -print0 |
++		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
++		xargs -I '{}' cp -a '{}' "${dest}" ||
++		gen_die "Failed to copy '${S}/${dir}${file}' to '${dest}'!"
++}
++
+ # @FUNCTION: expand_file
+ # @USAGE: <file>
+ # @DESCRIPTION:
+
+From cfc9ff455e2473e4322bd18c5fa21370d9c0702e Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 24 Mar 2022 11:43:40 -0700
+Subject: [PATCH 2/3] gkbuild/util-linux: Install the correct binaries with
+ slibtool
+
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ gkbuilds/util-linux.gkbuild | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/gkbuilds/util-linux.gkbuild b/gkbuilds/util-linux.gkbuild
+index 40ea1fbb..5addbb1d 100644
+--- a/gkbuilds/util-linux.gkbuild
++++ b/gkbuilds/util-linux.gkbuild
+@@ -47,11 +47,8 @@ src_install() {
+ 
+ 	mkdir "${D}"/sbin || die "Failed to create '${D}/sbin'!"
+ 
+-	cp -a blkid.static "${D}"/sbin/blkid \
+-		|| die "Failed to copy '${S}/blkid.static' to '${D}/sbin/blkid'!"
+-
+-	cp -a switch_root "${D}"/sbin/switch_root \
+-		|| die "Failed to copy '${S}/switch_root' to '${D}/sbin/switch_root'!"
++	install_exe 'blkid.static' "${D}"/sbin/blkid
++	install_exe 'switch_root' "${D}"/sbin/switch_root
+ 
+ 	local sbin
+ 	for sbin in \
+
+From 2d2e91f288679e272f731917feb58f3768ea586d Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 24 Mar 2022 13:17:07 -0700
+Subject: [PATCH 3/3] gkbuild/cryptsetup: Install the correct binaries with
+ slibtool
+
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ gkbuilds/cryptsetup.gkbuild | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild
+index 007874d1..816df609 100644
+--- a/gkbuilds/cryptsetup.gkbuild
++++ b/gkbuilds/cryptsetup.gkbuild
+@@ -34,8 +34,7 @@ src_install() {
+ 		"${D}"/sbin/* \
+ 		"${D}"/usr/share/
+ 
+-	cp -a cryptsetup.static "${D}"/sbin/cryptsetup \
+-		|| die "Failed to copy '${S}/cryptsetup.static' to '${D}/sbin/cryptsetup'!"
++	install_exe 'cryptsetup.static' "${D}"/sbin/cryptsetup
+ 
+ 	"${STRIP}" --strip-all "${D}"/sbin/cryptsetup \
+ 		|| die "Failed to strip '${D}/sbin/cryptsetup'!"
diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r7.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r7.ebuild
new file mode 100644
index 000000000000..ac31e20d2652
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r7.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 python-single-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BCACHE_TOOLS="1.0.8_p20141204"
+VERSION_BOOST="1.79.0"
+VERSION_BTRFS_PROGS="5.15"
+VERSION_BUSYBOX="1.34.1"
+VERSION_COREUTILS="8.32"
+VERSION_CRYPTSETUP="2.4.1"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2020.81"
+VERSION_EUDEV="3.2.10"
+VERSION_EXPAT="2.4.1"
+VERSION_E2FSPROGS="1.46.4"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_HWIDS="20210613"
+VERSION_ISCSI="2.0.878"
+VERSION_JSON_C="0.13.1"
+VERSION_KMOD="29"
+VERSION_LIBAIO="0.3.112"
+VERSION_LIBGCRYPT="1.9.4"
+VERSION_LIBGPGERROR="1.43"
+VERSION_LIBXCRYPT="4.4.26"
+VERSION_LVM="2.02.188"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_POPT="1.18"
+VERSION_STRACE="5.14"
+VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_UTIL_LINUX="2.37.2"
+VERSION_XFSPROGS="5.13.0"
+VERSION_XZ="5.2.5"
+VERSION_ZLIB="1.2.11"
+VERSION_ZSTD="1.5.0"
+
+COMMON_URI="
+	https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
+	https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
+	https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
+	https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
+	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+else
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
+		${COMMON_URI}"
+	SRC_URI+=" https://gitweb.gentoo.org/proj/genkernel.git/patch/?id=8c9de489290dc470e30f8c7d0aaa3456eb124537 -> ${P}-s390x.patch"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="ibm +firmware"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note:
+# We need sys-devel/* deps like autoconf or automake at _runtime_
+# because genkernel will usually build things like LVM2, cryptsetup,
+# mdadm... during initramfs generation which will require these
+# things.
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	app-arch/cpio
+	>=app-misc/pax-utils-1.2.2
+	app-portage/elt-patches
+	dev-util/gperf
+	sys-apps/sandbox
+	sys-devel/autoconf
+	sys-devel/autoconf-archive
+	sys-devel/automake
+	sys-devel/bc
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	elibc_glibc? ( sys-libs/glibc[static-libs(+)] )
+	firmware? ( sys-kernel/linux-firmware )"
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-devicemanager.patch
+	"${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch
+	"${FILESDIR}"/${P}-fuse-glibc-2.34.patch
+	"${FILESDIR}"/${P}-gcc-12-boost-1.79.patch
+	"${FILESDIR}"/${P}-chroot-path.patch
+	"${FILESDIR}"/${P}-slibtool.patch # 836012
+	"${DISTDIR}"/${P}-s390x.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		local gk_src_file
+		for gk_src_file in ${A} ; do
+			if [[ ${gk_src_file} == genkernel-* ]] ; then
+				unpack "${gk_src_file}"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
+		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
+		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
+		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
+		-e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
+		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
+		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
+		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
+		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
+		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
+		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
+		-e "s:VERSION_GPG:${VERSION_GPG}:"\
+		-e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
+		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
+		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
+		-e "s:VERSION_KMOD:${VERSION_KMOD}:"\
+		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
+		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
+		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\
+		-e "s:VERSION_LVM:${VERSION_LVM}:"\
+		-e "s:VERSION_LZO:${VERSION_LZO}:"\
+		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
+		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
+		-e "s:VERSION_POPT:${VERSION_POPT}:"\
+		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
+		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
+		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
+		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
+		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
+		-e "s:VERSION_XZ:${VERSION_XZ}:"\
+		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
+		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]] ; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	fperms +x /usr/share/genkernel/gen_worker.sh
+	fperms +x /usr/share/genkernel/path_expander.py
+
+	python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
+		ewarn ''
+		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
+		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
+		ewarn '*default* boot entry in your boot manager could still point to last kernel'
+		ewarn 'built with genkernel before that name change, resulting in booting old'
+		ewarn 'kernel when not paying attention on boot.'
+	fi
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+
+		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
+			elog ""
+			elog "Please remove 'emerge @module-rebuild' from genkernel config"
+			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
+			elog "instead."
+		fi
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	if [[ ${n_root_args} -gt 1 ]] ; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "If you are appending non-persistent device names to kernel command-line,"
+		ewarn "next reboot could fail in case running system and initramfs do not agree"
+		ewarn "on detected root device name!"
+	fi
+
+	if [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to be causing problems for any UDEV-enabled service."
+		fi
+	fi
+}