gentoo auto-resync : 27:08:2022 - 02:53:16

author: V3n3RiX <venerix@koprulu.sector> 2022-08-27 02:53:16 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-27 02:53:16 +0100
commit: f1aa825b8483db57bf28d0772acfa10aeebe83c3 (patch)
tree: d56ade77461ea49cbbb4943bd2e100eb6b97bb76
parent: 0e83ee97d831abe38c8e764fb9bbfef9de04daf2 (diff)
249 files changed, 2534 insertions, 802 deletions
diff --git a/Manifest b/Manifest
index 0a612d121f2b..2a44b5a32239 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29617 BLAKE2B 3221e206b23c8a97b2a1aa2b7471b474403e422e766fd37c4ad42ecdb4742fbadc6f82dacfedbb3fed7007fd2456c7becf1825798de3a3fcebfa7d80e5ab3503 SHA512 c323bdfcfd248368dec709868daf006196225c26411c8ed15a4f9d89e16befa38685e26a210b309c6814ec3e5cd7bdea6c38acb3e4d785c70db90b9df99af729
-TIMESTAMP 2022-08-26T19:10:39Z
+MANIFEST Manifest.files.gz 29627 BLAKE2B 7acf366dc28b5439a1b638d7f66e8257e021ee19911ca85258770be51acb20700b7a7042ef2a1446ecf73458f7483c87a76887fa983fdb46b9eaafd6e43334b0 SHA512 9b82a06fb782eb7669353bed886ced72b2a82fb192fc6864d7d65833581fb7d563f6d22e1c08f3300ff7b049542f4e369963ae9fb7a20b84f37d42c1ac3ba4af
+TIMESTAMP 2022-08-27T01:10:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMJGq9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMJbu1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC1HQ//R+F9/eNZAjJKwSkpo1iGuetPbXA3xh7rph07CZxrzDMacD/r85xARuQi
-wuweXayRLvxBNC8HGH5oT53jpUp6GPN5J1XTQkRI+AuHxQrbSbwGy2/uZcCf1oqj
-lr8AF48sqApZIWJmz1th2mGuMpPurLJACDYfsuAZjuN8bJKqxoqltqaG6Mrr3zz9
-7hxFlvtWL/f1turZPM0o7IUwF7vF4yf0agJD+CADbWJ+jbWmKRs6KpW8Wr7l+Hsr
-EqOE+CjkJV48PYPpiSz2QpNfBD+D61oWcgr9DJ0xRemm53Atfa+Onq00I4idsiWG
-mcTRuUHGJwUc8PtRdj4TfEAtUT4JrCmWW1eFmYTLICguLEKzLQKj5lvZD+I4aYCt
-AnYIEYjfx1Wf6M8WMNIRFSqKl+09Fhq2OlIKf7+t9S6O8hN5iGkOH8WdgvHtIr9J
-DlhRHmOD81l6ywQ/6ad93f6YS1tPYnEp2FHMDA6vkJQtzxZaHu2la5SO54p3Jq0C
-U3Ks7ZxgAwF2HJl8WqNFhpl6D12501jDQg9bgxRxXIGk46G73BTgQy4zb3grTdoy
-kkl2wS2q3b1mXWFY0EgsdbZmxDUs/Z+W2YXgmIq9ZOjAwOcEkPyjeZAigazZNQH5
-975TE4cR1LIpcUNQm7AXCsG9+unFJb/HPqxOBX1ye3MtYPKQfUg=
-=Fxrg
+klARWw/+K2gdpFdVvuXIbJZ4Z2dEnFbSQYVhYZzNWZcZB8TSK8MiaOGoxjEX3iWm
+a52wAwBE6s0bBpIPhawrZZAPtnaSQoqVC9cAlZY6/BESbrZ3y8byrOavN3+AZzIf
+dc9veFVrgy90s4R2ug/+LPZmUSLC5efJryO4igcQckLcRs4PF4tU0XrJenAItzDk
+o+0Cicb6K5Z6ZFFSf2WuZ9/ZVf9DC9rI55tav1sk2iVh26qp/y4U91ZEcIh9qAMk
+EFzWjnzj366JrjXmICITK8TawreRvOMgc+n7LlhBNQi+yyIPb6u00VrcnL0UuySM
+1Zvlx0sdsjA/pdprzFTHI7FwqfESCkvtJM3SQ5UWekvJEZTLj36QVKmPCWwhp40n
+bxtH8/GoQ2DPOI0TkwS8EG6AZut51B1lqbw8LezuoOw/k/Ji6H965iM5nssvGhkq
+ULJRa9cQRizCoFvOSaMO87JV2c9VgC4VwoJMVh+c6Zeg5eZ2E3/2DBhrlpkXrVLl
+fvCEf2/TtF2u9zf+W3NBg56GxXiFriks+Hpd98/Yv+7yEAVH/8Iot+GjYuTXC+mS
+IvGoCpcz9Dqcvs8+/v2d3cUQF1NdeWEyBMxnrMyuT4p9iAZiUzoRqV42uxv1sCmF
+q4ByHMx7q6YudMPAV5eN6Md07rrhlAmsj7dsyAGkKvK9RA4uySE=
+=mNQn
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e50b32c9e1d3..fb028f9a463b 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 557ecca94970..57dde970dae2 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
index 8fdf242a4964..83639e27d2c1 100644
--- a/app-admin/serf/Manifest
+++ b/app-admin/serf/Manifest
@@ -2,7 +2,10 @@ AUX serf.confd 240 BLAKE2B 1eda4261a82a35e8b70cd0192180b4f3cf534656fc96092643b52
 AUX serf.initd 683 BLAKE2B 3e6fcda3250eabcec44daa3b51b36fff0cdb49b4b232123d69b1e29b8100874c4e126f5e3aaffebcac898651f4f84a8515308422b867e55a79f189c4d9a322b9 SHA512 a223d1e002eae3f91b941eb75a2741bb5fc22c78f4ab8ada430ee5e34f85f28410acc26e503eae672911161fab6847c6a7733b51cdad29fa4b4f67cfdc879597
 AUX serf.logrotated 81 BLAKE2B 7f09c81d7efa52d1e970b0603fa2c89809aca99166efb1026e0794957dfd4229a961a345e27da045c2f34ab1785e6e2bd5e796d32814787244656e97ad5cb518 SHA512 9d3664c123e846de81a2f574a9c2610e254d5ddad1c23b67ef7b8841e933c7aea93a419becaf45af9594ea98ac36d23883bebf3d344205c4756f3e1df9e87518
 AUX serf.service 286 BLAKE2B d0a7157101e18f80047688318a16995d24f0d06d444104ace3aaea9cb4c43b3ea164804f105dc94a03aa8e800228db9d2007510885cddb82e50b41d7aa8927ed SHA512 928dfca39afd79b113b299e4de25635fc9f68c64c77951d690797ed5796515d060fc36286f0dc1da63923042e3d8612ca8b1696dd511cb2fbd06550151d2a05b
+DIST serf-0.10.0-deps.tar.xz 24363004 BLAKE2B f0fed10ffa8ff536263f6fde5a87e9584c35a681e7821a91d123aa8bd149ca1b9024d454f8163de458e4b928e887736c3247661afbc3f46b2ba38bef09d4516d SHA512 73815e512fda8aa00241bff84e1ee2414106a4b1a6189e66aa80967152acafde56eeafd15b87cbaefcbedc093f1c42cfb19b9d5776473c4c580416c2b671931a
+DIST serf-0.10.0.tar.gz 446394 BLAKE2B 627e9ee776e217db09dde4bb22d1f317c884f887d918ba69de9bb65160eb00280c1ae5f53119570732f462c35381bd24a81405761b8ec63193295b6245298049 SHA512 53cb42b4a5f94fbb9e099739af0e31bb00cc261ea16325c3e5b9f081bb31299b5b8e42bc92d0f83ae78e511854589a95ab011930f373c1ad148c152b73adf485
 DIST serf-0.9.8-deps.tar.xz 24178272 BLAKE2B 6a82fa025245f0c393b55d87a10195a9ed5f314b3cb772b54b01b858b9f6b393991cc206f269b39efe9a9061aeff948191ae48070eb7c1e5bf77781c97173952 SHA512 ec12d4b27044f58e897984adb3855413e2d3a624f62dffe981353bb5bfbbcbe64501080ef543bc446633716bbfe3ef29c3c93c44db8599b5639e2ef8d20d8eee
 DIST serf-0.9.8.tar.gz 444968 BLAKE2B 023413f75444f8e785bd7c5029e84ef58abca1c227f69dd8c16111c30afb38ff331e39cd8c30539f133229829bb9517516ff0e18e49b2dc9fb53df2ed40224b3 SHA512 1501ad6587f77840f7ad95d2886aafa3c28ffa533e862df0ebe5a4822078de09370c2ca1826d47dc6ff84e8598fb3711125a16e399a935ac39bad887e532c402
+EBUILD serf-0.10.0.ebuild 1218 BLAKE2B 688658ba3bd985aab9d20a3313b74709db937fdba88020bdfd14c641787072889c17c27b5eda4cde9cfc580edcb33bdd0d226ca89004a130b9e58aeb14bb1791 SHA512 f1a5912546200c3812bc075104f1abdb5d0a59611f66b3f52c41f4be6c5bc1113e2d380a4bf64dbebe36139db21dd9ce58762333c8bdd1ed364d402a1d9d76ec
 EBUILD serf-0.9.8.ebuild 1218 BLAKE2B 688658ba3bd985aab9d20a3313b74709db937fdba88020bdfd14c641787072889c17c27b5eda4cde9cfc580edcb33bdd0d226ca89004a130b9e58aeb14bb1791 SHA512 f1a5912546200c3812bc075104f1abdb5d0a59611f66b3f52c41f4be6c5bc1113e2d380a4bf64dbebe36139db21dd9ce58762333c8bdd1ed364d402a1d9d76ec
 MISC metadata.xml 298 BLAKE2B d9e0f6a71fa3a3fff0fa469d70032a93dbd2dbe50903a687d77880a555ca7d4d007fcc95466804045a2610f1ce2c1d17ceb6796767f14bb80549d596eb1f03c3 SHA512 9830254ed456b995d7c06bedc27d4c2fd9eda67038b8dd7756bc5a6ea2b0317849f9c4ec66759a7335d099a6de168e48d726e9537a7b182253574ae45b6ce941
diff --git a/app-admin/serf/serf-0.10.0.ebuild b/app-admin/serf/serf-0.10.0.ebuild
new file mode 100644
index 000000000000..540d5af97180
--- /dev/null
+++ b/app-admin/serf/serf-0.10.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/serf"
+DESCRIPTION="Service orchestration and management tool"
+HOMEPAGE="https://www.serfdom.io/"
+SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+SLOT="0"
+LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
+IUSE=""
+RESTRICT+=" test"
+BDEPEND=""
+RDEPEND="
+	acct-user/serf
+	acct-group/serf"
+
+src_prepare() {
+	default
+	sed -e 's|\(^VERSION[[:space:]]*:=\).*|\1'${PV}'|' \
+		-e 's|\(GITSHA[[:space:]]*:=\).*|\1'${PV}'|' \
+		-e 's|\(GITBRANCH[[:space:]]*:=\).*|\1'${PV}'|' \
+		-i  GNUmakefile || die
+}
+
+src_compile() {
+	mkdir -p ./bin
+	go build -o ./bin/serf ./cmd/serf || die
+}
+
+src_install() {
+	local x
+
+	dobin "${S}/bin/${PN}"
+
+	keepdir /etc/serf.d
+	insinto /etc/serf.d
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners serf:serf "${x}"
+	done
+
+	newinitd "${FILESDIR}/serf.initd" "${PN}"
+	newconfd "${FILESDIR}/serf.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/serf.service"
+}
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index c0d83a68f87f..beb7e6fab858 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 2e8883407f67..9737b176fe39 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -3,9 +3,11 @@ DIST buildah-1.26.1.tar.gz 14159554 BLAKE2B bf17a51653bb07591c19fca449d6f4eeb876
 DIST buildah-1.26.2.tar.gz 14155439 BLAKE2B 3f858f86221b64623d94783c0ef3dd15fa14cef730b30cc5f0554e37f9e3e609a6381842b90b7614b6708434ee5c109497ee89f2da89bb9cc5360e2f8b345adb SHA512 f50a7ee787d10a8f8d1a7e0ff9f86990de975df427af894be5bcc84bceafd2eb87dfe75c1b967ae57056299893c942df257aef1e9aaeb712022a8abceeaebba9
 DIST buildah-1.26.3.tar.gz 14468210 BLAKE2B 1ec44501e63bf3594c72575d7460c6478a9d996977659b9fb466fbc658e4923892a77bea9f48a503f02a6101615be9a663f9701ee343436d140d580d8ab01875 SHA512 5d8ea60246085ba27795b52152765fc3c85c92c5caf4515c1b2973aec17844eb9da2ffff82f6c503e36f675089c998b9ee51c4b4b899104ccd9fa771308c8048
 DIST buildah-1.26.4.tar.gz 14471666 BLAKE2B ddedadc8f5eac161bc98ab2460abf356ebef9d09bffb1e681db822ed273d9e424e1d638171fcff667efd956e415f988668e6d9fdb3d15db6ed900441c40736eb SHA512 39425ee3f40f1cfd2c76749b43f07efe19c90dff56d9b2024a69e092a328cf526f6bbb23b6f38536e7df11a465219f8f344aa643a82f6511fbb0253e5729d71a
+DIST buildah-1.27.0.tar.gz 14821814 BLAKE2B e9d1ffc05024c3ae520e6436372a9eb592111c0e634d736853f7c84b225ad5e2ebf1a1d5de799a77828cc348a2b82d9fd17e720b149b55966172481155c3c6ae SHA512 7324c85b6f5169522f0cde2cbd0d55b61a2e2fc53d7f03f24ecf606fb564ee6da82cadc493520b4105501124c6c8a1e03aa67b56fb32570f303e849630286afe
 EBUILD buildah-1.25.1.ebuild 1196 BLAKE2B 3f0e2e2cb09af594cac29666ef4c9b1f3b7721659f6fff2ff29fa9ebc30f841cb2703d5fd3ce41b4dcc32a30841372ae3b3d36af791423bca05c4f70f2ce655a SHA512 ec2aa76c2ba6676d828534e2ceb7a5e12f800d44b382c35ca2bd76f24631084103ba6e94f519252d90bf4511e47ac0d341dfab3c2f5206781096e87203d51fe7
 EBUILD buildah-1.26.1.ebuild 1198 BLAKE2B 7e9ccc06d48faa040cca405dcc77d031852f903b0246cbc5678271df37c9a977e095a0787b8ef29fbc2d1cb83170252dab4787c3060150167d9e713503776e74 SHA512 62effe1025136327f5f94b3d34213a545d05cb8eb7e778f259317f4c0adbc90b442d3b0eac833439d16efe5c40bd32c58e09a2b75c346d743e191fa008409437
 EBUILD buildah-1.26.2.ebuild 1198 BLAKE2B f78c35be3ea11e7ba619cb672b8ee9be5a0a93119d81aece756a3112e437704b751b953e0cd9c75abcfe93e281ad39f29eedf8d42e4147bd80affdc78625cf10 SHA512 bf3f00632b547a3c8824e76cce3021442a1556a563fef43237b7e061c3284bed9340703b10c1b1bbc94d233ee8302a2893afe338edc1ab3b3256b681231dcdcc
 EBUILD buildah-1.26.3.ebuild 1198 BLAKE2B 7fb6c618e0789b389c9bc0f9bc64c4491e6ec5b3d3fe26913d363a37bda2fd0c8c87221f453a7d28491a4ce39c5fe2f0aadd1b6354ee0f70f8d2280c3c47566c SHA512 eda025f7e065ec0ba6d5e4ffab07c47c1e5cd0dc5d7b1331bbccc6355e93f23700665c170d374777ac1097af0727279bdcd937f7a41da427808a62ed6e1ed5a4
 EBUILD buildah-1.26.4.ebuild 1198 BLAKE2B 7de216f4a417a670bc3bda68939ce926263af2080eeb6673b17c170f453a9ce37532546e1a05b974ff2598083cdcaba1d5b870e4eefe2a0d1fc6e734b3a62195 SHA512 0ab4523efe4ecb9e77a5721180bc16e4489c4fa3832e896343304b7e10006fe75d72b140beb0718b3179e63b78cf185841dfb678191709ed8b31ddadf8af165d
+EBUILD buildah-1.27.0.ebuild 1198 BLAKE2B 62ef809576a3b390e336f845596f2a22edccbfe6ae72ad24aee52e8d8de78ec8364e72c42656adf0de189b1d0ecaf3bca88e10a88491459f6a766ca34d7687cf SHA512 3fdaaa6cd1bd0a82b4c74300536a3210c56d0c896f2a1f9e50644ea46e9ff38351b560c2295ff2fd79221b9543834f1b20e3a709fea79502078ca7b233664947
 MISC metadata.xml 328 BLAKE2B 55d2d2b5cc972b7e6b6fb77d14e79e304adcbc7056ff351f5ee3cac6cf5f83b4ef2a10c70754d1d30a5ecd88e652abc07cddd8005c3767e7f709c0c5cb61d068 SHA512 7520f5745909da195d4bfdd750e4c716c461a3789adfde56dd9be46b91dfb789653d642c0958b5a2950eea220cc00143bfcd5db402fcc2578c8fe5f8ff69275f
diff --git a/app-containers/buildah/buildah-1.27.0.ebuild b/app-containers/buildah/buildah-1.27.0.ebuild
new file mode 100644
index 000000000000..76b4d6de3789
--- /dev/null
+++ b/app-containers/buildah/buildah-1.27.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=db8d5921
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="selinux"
+
+RDEPEND="app-crypt/gpgme:=
+	app-containers/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin bin/{${PN},imgtype}
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
diff --git a/app-containers/cri-tools/Manifest b/app-containers/cri-tools/Manifest
index 9da8e72f606a..80806bcad146 100644
--- a/app-containers/cri-tools/Manifest
+++ b/app-containers/cri-tools/Manifest
@@ -2,8 +2,10 @@ DIST cri-tools-1.23.0.tar.gz 6823865 BLAKE2B 75d394ec1f9ccf2122476c9b845499212d6
 DIST cri-tools-1.24.0.tar.gz 5868141 BLAKE2B 281c397bb60bb5075d2b99cab11a44cf8746c1f744dfafc4f051dd6c2344a53eba948a35d90f814105ef3cb2b0bef3e7e1723408069a2ab4293801f906ec48b0 SHA512 5c7468c15b9f030d5cf93112abc28f8024e1d1b46f85459cb0a10c84ab63d07f5dfa830d019f8ed1a31bf04ea14c5e200b11d85ae7573be44860b74312e66dbc
 DIST cri-tools-1.24.1.tar.gz 5928557 BLAKE2B 42d2f0fc8227fd704c3884f1e8a195952aff1a64fb85629bef4122c011f76d0c7eb94ddcec7d56df610af6b3599b345676efa416249ce292725ec2bb35e8da66 SHA512 d36fda28e733fbf29a53c0384da86abf56373f4471797aaa030dc3d63a2f4682dddb0a5fd9a54ae74ac20c76e8acc5244781d8688ae03f8e930e56bcbe896fb0
 DIST cri-tools-1.24.2.tar.gz 5968560 BLAKE2B 8dce8d16d5218aa73705b4a49b31391eaa25b21deb97f3dfe553f43d7371adf58206d9198f3e22e1c9cbcb7f41b832b0600b324d7c0f943ef313dc89900da46d SHA512 9b5907b37bb5f00295eff4fa4207ae55d930feae7e0f48fa130c7ecc936bcd259a11d59ed240684a3e12c8bcee40f2c67d7f4af52c2a76df3d7bf82e5e388a75
+DIST cri-tools-1.25.0.tar.gz 7905707 BLAKE2B 79595f31fc22aff608406bad4319a60dddcabda5f4dab8706305f11500b3db43f1d7021a340a096227d4580212953f32a95b05bbf81c1236f8fa8cf635017abb SHA512 dc04359320d59d6b3789e4e81fb613f3795b7e82dbad681393eaeff2c876e5b0393dd9384d7857d24ada5de34d03e151f7cf121367cc20e71d0b78607372b3a1
 EBUILD cri-tools-1.23.0.ebuild 857 BLAKE2B bf93d04d671c1b42ed9cb8e0ff6e77c5c2bb123513e10814ca45d2a439fd237fddc91d62c54321009d62afb3f175eea2345f3178fa2f595c5d9a0b018ed9fa7b SHA512 cbac966a3e496779a52d98d495e5d82a2402114de10390313a8fc6d9a4f2ff1a80eeb8dcd5f7d5ab64a456427212600c65daa9a06114a6359e090323949bc504
 EBUILD cri-tools-1.24.0.ebuild 858 BLAKE2B 502603915b37de1a2d861fc65f3531a257866fffdfa0c6397758fddb5ccd92b39b860d4f990bf0e19b2f4b688d3d1af2ebe113d47259bee9eb47a68fae42c1b9 SHA512 eb8e260618b408936d88608d54c4e247075971aaf99b36ac99d7b5cc59541e75b98b7cd2d02433bf774a2d0ba8facfcbbfe0adff111941120cd8718d4f0464c4
 EBUILD cri-tools-1.24.1.ebuild 864 BLAKE2B 7ebfdbcbf2d25fc0b7f57b4e4901a61014c771d96128ef0cd7cfa1237245181c0e31b57d91e6540da1b1cc3feedc95946f9a99ba7af9f0169d0c079cb94d57e3 SHA512 cb0c92161fde44266e721b864007f4d6850db1c808ca2573a5e47f6cb64da58366f6c1435e81a62447d8886f13260a13f9f290ba8e50467f6b105685f9354cba
 EBUILD cri-tools-1.24.2.ebuild 864 BLAKE2B 7ebfdbcbf2d25fc0b7f57b4e4901a61014c771d96128ef0cd7cfa1237245181c0e31b57d91e6540da1b1cc3feedc95946f9a99ba7af9f0169d0c079cb94d57e3 SHA512 cb0c92161fde44266e721b864007f4d6850db1c808ca2573a5e47f6cb64da58366f6c1435e81a62447d8886f13260a13f9f290ba8e50467f6b105685f9354cba
+EBUILD cri-tools-1.25.0.ebuild 864 BLAKE2B 7ebfdbcbf2d25fc0b7f57b4e4901a61014c771d96128ef0cd7cfa1237245181c0e31b57d91e6540da1b1cc3feedc95946f9a99ba7af9f0169d0c079cb94d57e3 SHA512 cb0c92161fde44266e721b864007f4d6850db1c808ca2573a5e47f6cb64da58366f6c1435e81a62447d8886f13260a13f9f290ba8e50467f6b105685f9354cba
 MISC metadata.xml 335 BLAKE2B 2144a466f521028b7bc93b372ec9b8f81f6ef5317285dede88a71736bff65aa0908bd1c8ed18b2b7b0563f14a24b10862efc81985e78c75b5c2a786d501331b1 SHA512 ae1cb972ec7ddc298a8e1747503400f52b27e899ed51b1aeba877a66c8f883248ca782b437ffea4d06cb1ad80ff6e8f071445ba848f98240e48ef5814c866c2e
diff --git a/app-containers/cri-tools/cri-tools-1.25.0.ebuild b/app-containers/cri-tools/cri-tools-1.25.0.ebuild
new file mode 100644
index 000000000000..0ae021d25349
--- /dev/null
+++ b/app-containers/cri-tools/cri-tools-1.25.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
+HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
+SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-lang/go"
+
+RESTRICT+=" test"
+
+src_compile() {
+	emake VERSION="${PV}"
+	./build/bin/crictl completion bash > "crictl.bash" || die
+	./build/bin/crictl completion zsh > "crictl.zsh" || die
+}
+
+src_install() {
+	dobin ./build/bin/crictl
+
+	newbashcomp crictl.bash crictl
+	insinto /usr/share/zsh/site-functions
+	newins crictl.zsh _crictl
+
+	dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
+}
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index a84d1ac12cfa..d40733245814 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,6 +1,8 @@
 AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00
 DIST snapd-2.56.2.tar.xz 6740504 BLAKE2B e8bf0ab85038b5127fd81f434ef369ac53ec7915a454f8fd24046b6e3a5303bf3924fce04fb2400b0ccdc1a8939809ca20e091ac99a04fe6899dfacdfd3cf299 SHA512 16a57ea828ea875ebe5073cca0975ef74562f095823e980be7096ea6b9e83f6a3f434373065781d6342e805c18ee5adadaab29074440759ed3891691441472b0
 DIST snapd-2.56.tar.xz 6737568 BLAKE2B 662fa682895501df71396095e22fb4587a97cfe4e156b998118ff524ef3a22bf4e60420111167c263c2815ff34a05b026180e41e926324756450e22a1571fc92 SHA512 d2e9949b449ff65122f1202b2048ed63e3ff404aebd71d9877030c7b23130b6be2f1ef62f47b8b0044344fb4826b2b0c81dbcf5cd464ca16f5b3b170735b6039
+DIST snapd-2.57.1.tar.xz 6817444 BLAKE2B 9d3d5a3ad510997a43256ef4755ccc98f6ef0550247721657877089d9e2ba20d87b43a0ea6b806e2c21a9ad4b1b171f228499b9814df0dab1a8a6ba4cf4ef39c SHA512 ded93e2ede0a940960d090686fe4f9128b83401592ab9cbf3f7cb200264e67602e4ea56da2f64950316119c4014eb105711c1f6323cb950f14cc4832db16b53f
 EBUILD snapd-2.56.2.ebuild 5139 BLAKE2B 20516cbcae2220067ff8a8c344d92896d3fced3b857938c4742673663ecddf9aac2131da305bcaee57e954073da7d17dc7df286147882409d9f5299134dc6cf7 SHA512 8f188d7671940c9dd2af180e6bdd08430111641255a7a4c44cd2221dcd5878d3a8c7846372be091a9ef65282e486ea94e8a17447bb764aec93b563efcf8020fe
 EBUILD snapd-2.56.ebuild 5139 BLAKE2B 20516cbcae2220067ff8a8c344d92896d3fced3b857938c4742673663ecddf9aac2131da305bcaee57e954073da7d17dc7df286147882409d9f5299134dc6cf7 SHA512 8f188d7671940c9dd2af180e6bdd08430111641255a7a4c44cd2221dcd5878d3a8c7846372be091a9ef65282e486ea94e8a17447bb764aec93b563efcf8020fe
+EBUILD snapd-2.57.1.ebuild 5139 BLAKE2B 20516cbcae2220067ff8a8c344d92896d3fced3b857938c4742673663ecddf9aac2131da305bcaee57e954073da7d17dc7df286147882409d9f5299134dc6cf7 SHA512 8f188d7671940c9dd2af180e6bdd08430111641255a7a4c44cd2221dcd5878d3a8c7846372be091a9ef65282e486ea94e8a17447bb764aec93b563efcf8020fe
 MISC metadata.xml 520 BLAKE2B cdca3f5b58c81ddf5796b174756e1497382390ea4f7411b2aa7a3c794fcafd7fbd919cae00c7cf5ff2251f4c837f5188026d0f5f61986834aee661724afb050d SHA512 2c26112a8808cd73c5575b525eb33129ab5fab8a5fdefba5de3760e568659264a864bf80c2397cf70bb2f9b0e6709e953185af9048cddde9082b040e4a0ee00f
diff --git a/app-containers/snapd/snapd-2.57.1.ebuild b/app-containers/snapd/snapd-2.57.1.ebuild
new file mode 100644
index 000000000000..7e134a2b558e
--- /dev/null
+++ b/app-containers/snapd/snapd-2.57.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~NAMESPACES
+		~SQUASHFS
+		~SQUASHFS_ZLIB
+		~SQUASHFS_LZO
+		~SQUASHFS_XZ
+		~BLK_DEV_LOOP
+		~SECCOMP
+		~SECCOMP_FILTER"
+
+RDEPEND="
+	sys-libs/libseccomp:=
+	apparmor? (
+		sec-policy/apparmor-profiles
+		sys-apps/apparmor:=
+	)
+	dev-libs/glib
+	virtual/libudev
+	systemd? ( sys-apps/systemd )
+	sys-libs/libcap:=
+	sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	>=dev-lang/go-1.9
+	dev-python/docutils
+	sys-devel/gettext
+	sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+	if use apparmor; then
+		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+	fi
+	linux-info_pkg_setup
+
+	# Seems to have issues building with -O3, switch to -O2
+	replace-flags -O3 -O2
+}
+
+src_prepare() {
+	default
+	# Update apparmor profile to allow libtinfow.so*
+	sed -i 's/libtinfo/libtinfo{,w}/' \
+		"cmd/snap-confine/snap-confine.apparmor.in" || die
+
+	if ! use forced-devmode; then
+		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+			-i "sandbox/forcedevmode.go" || die
+		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+	fi
+
+	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
+
+	./mkversion.sh "${PV}"
+	pushd "cmd" >/dev/null || die
+	eautoreconf
+}
+
+src_configure() {
+	SNAPD_MAKEARGS=(
+		"BINDIR=${EPREFIX}/usr/bin"
+		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+		"LIBEXECDIR=${EPREFIX}/usr/lib"
+		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+	)
+	export CGO_ENABLED="1"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+
+	pushd "${S}/cmd" >/dev/null || die
+	econf --libdir="${EPREFIX}/usr/lib" \
+		--libexecdir="${EPREFIX}/usr/lib/snapd" \
+		$(use_enable apparmor) \
+		--enable-nvidia-biarch \
+		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	export GOBIN="${S}/bin"
+
+	local file
+	for file in "${S}/po/"*.po; do
+		msgfmt "${file}" -o "${file%.po}.mo" || die
+	done
+
+	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
+
+	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+	local cmd
+	for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+	for cmd in snapctl snap-exec snap-update-ns; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+}
+
+src_install() {
+	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+	if use apparmor; then
+		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+		keepdir /var/lib/snapd/apparmor/profiles
+	fi
+	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+	fperms 700 /var/lib/snapd/{cache,cookie}
+
+	dobin "${GOBIN}/"{snap,snapctl}
+	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+	exeinto /usr/lib/snapd
+	doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+	dobashcomp "${S}/data/completion/bash/snap"
+
+	insinto /usr/share/zsh/site-functions
+	doins "${S}/data/completion/zsh/_snap"
+
+	insinto "/usr/share/polkit-1/actions"
+	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
+
+	dodoc "${S}/packaging/ubuntu-16.04/changelog"
+	domo "${S}/po/"*.mo
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_desktop_database_update
+
+	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2c505ad66abc..c38c2d81b7ab 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index cd724defc2c4..7ff04379e8e9 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -3,5 +3,5 @@ DIST VBoxGuestAdditions_6.1.34.iso 61538304 BLAKE2B 7709ef735fafc7dcb78dba8ce77a
 DIST VBoxGuestAdditions_6.1.36.iso 63803392 BLAKE2B bcd795e4f4ed5b25542011370b0d0ede0a163c89df597d085d731627bf041a5bc8eb8d60c2041bfe1654986751e16bb382680ad487d90def2e8a7d9fab21dd24 SHA512 cf07e77ac882eb9cd6da39c6491f2536ac8c1e4bddb27e50bb6d1016ab7a291746cd59c6966c54ba007bb4cb79b82ebcfacec5984a6e7453f60ad167014542aa
 EBUILD virtualbox-additions-6.1.32.ebuild 772 BLAKE2B 6000f1bed33d03ef878d0fe5eab56add0d30f6c8c5304cd9c02350319a4dc5ac87a25cd66251ac329ba4be6c034629e92aa951b2a80d8f74c378d1bcd4a03b13 SHA512 870f6a6566d2bf68dc7f4a11aff124771c10e8adb67b4dac4d3c08e174555469d377e8db3d2f88209b96666484c5777c15a070ee2480e6fa63e38be6dc90f6e4
 EBUILD virtualbox-additions-6.1.34.ebuild 772 BLAKE2B 6000f1bed33d03ef878d0fe5eab56add0d30f6c8c5304cd9c02350319a4dc5ac87a25cd66251ac329ba4be6c034629e92aa951b2a80d8f74c378d1bcd4a03b13 SHA512 870f6a6566d2bf68dc7f4a11aff124771c10e8adb67b4dac4d3c08e174555469d377e8db3d2f88209b96666484c5777c15a070ee2480e6fa63e38be6dc90f6e4
-EBUILD virtualbox-additions-6.1.36.ebuild 699 BLAKE2B 0893b9ed5284f8b713e828c670ad2a7929e0532f02e1226b97b791e1eb5d9e9cabd22c71360aa3f095f96ff3ef613141c0423a6ff39109588c8ec3448e0b4c83 SHA512 7c24e2216681f62d3f4cc125c26998bcaa04297de7d6e02b8e81d317995eda150813d6fbf4d9cac77b2a5c534cc5e3e710343c4ec128e4d7532d478c3621af4b
+EBUILD virtualbox-additions-6.1.36.ebuild 698 BLAKE2B 964287e281587ca7c9f0be58f785b9ebac268fd1546ae405b325aaafbc1c05d523d3cf0f1bdf0317ce2099810682192f905bb857a3415b14e36285e42000b072 SHA512 e7c0a43549bddf6e5c0bc655c468b093108eaf1e283e2addcbc8aa8f4631f2bc441d504376321d7404392351cb66ecd72c5bd66a4a08fd7084842be5e85ba415
 MISC metadata.xml 415 BLAKE2B 9b88f53744c7399cfd98a2a06bd6a61f9e73214b6cf2c126936ffb608400b49a0328eeb1e226679ffd3b43a0d5dd6c353ea56df549b222a4ca851c0c34137ee9 SHA512 6206d0e6ab3dfdde8e022e630f8598b3ba167c0b532d1ea77f4666d83202ef721a9b07d47ebd1770d01b36e18e8adfc6027a337c4e0415008085c2d9f0495c23
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild
index e989261fd89b..e65627f19d6c 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.36.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 92702e264f7d..c703373d1c7a 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -3,5 +3,5 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.34.tar.gz 11137259 BLAKE2B 81709b2f
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.36.tar.gz 11231896 BLAKE2B 08872189b8be959e13f07b69635b08d41661841cc30bdea1bec73c8fc87f1e374e53658e160cd290b919465bad62ef633cdc79e11d477a6bf0b9a67ae8131f73 SHA512 98ba542fbe60848877c25cf8e8f252081e231687d8b4cc4324283e6e787c00cb83c0570379a50364ee239a10195b25740f9c2e0e559cec28b75f56717623df16
 EBUILD virtualbox-extpack-oracle-6.1.32.ebuild 1064 BLAKE2B 63d4c01cf703966e7c9a98be5df8dd0b81b51ce7781e8014bb8e37585cb4e02401e113cc925d43b494562c13beecf080a107ea10b6a45a5186ce7b91cd93c11d SHA512 61063ee060f2a0352a66de441128c5f21b52f41149067f0f3f544e627e7c2b018e1dcc608b6c228e21323eecbc4ace9eada07bdd8b192d9f785289ebf9c593d7
 EBUILD virtualbox-extpack-oracle-6.1.34.ebuild 1064 BLAKE2B 63d4c01cf703966e7c9a98be5df8dd0b81b51ce7781e8014bb8e37585cb4e02401e113cc925d43b494562c13beecf080a107ea10b6a45a5186ce7b91cd93c11d SHA512 61063ee060f2a0352a66de441128c5f21b52f41149067f0f3f544e627e7c2b018e1dcc608b6c228e21323eecbc4ace9eada07bdd8b192d9f785289ebf9c593d7
-EBUILD virtualbox-extpack-oracle-6.1.36.ebuild 1065 BLAKE2B 692e1eef70426e91903205198e6a46e90a8dc39e34ec7d5a095a98edb47419f71b7e35de75023bb3d9b5dd0b0e101b8bbb833bf2c895e5a35fd438b7230449e0 SHA512 242d3b0bd1ed0d988825acee325c36f2b1754a4281efcb8f6d0d026da8c69815a2d4e561b08558b5df352982ac1f52de9e566f05f381031a426876d3ee77c992
+EBUILD virtualbox-extpack-oracle-6.1.36.ebuild 1064 BLAKE2B 63d4c01cf703966e7c9a98be5df8dd0b81b51ce7781e8014bb8e37585cb4e02401e113cc925d43b494562c13beecf080a107ea10b6a45a5186ce7b91cd93c11d SHA512 61063ee060f2a0352a66de441128c5f21b52f41149067f0f3f544e627e7c2b018e1dcc608b6c228e21323eecbc4ace9eada07bdd8b192d9f785289ebf9c593d7
 MISC metadata.xml 415 BLAKE2B 9b88f53744c7399cfd98a2a06bd6a61f9e73214b6cf2c126936ffb608400b49a0328eeb1e226679ffd3b43a0d5dd6c353ea56df549b222a4ca851c0c34137ee9 SHA512 6206d0e6ab3dfdde8e022e630f8598b3ba167c0b532d1ea77f4666d83202ef721a9b07d47ebd1770d01b36e18e8adfc6027a337c4e0415008085c2d9f0495c23
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.36.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.36.ebuild
index 10b24ce1fc11..3dbb1658be56 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.36.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.36.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 LICENSE="PUEL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 RESTRICT="bindist mirror strip"
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 58d61aa6fd08..945b97ef2d3f 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -15,5 +15,5 @@ EBUILD virtualbox-guest-additions-6.1.32-r1.ebuild 6280 BLAKE2B 68ef78d95ffbc684
 EBUILD virtualbox-guest-additions-6.1.34-r1.ebuild 6282 BLAKE2B 696de6d8cf22409ddae78794d4d3d12f3d8cea49884d6317420baefceb3554354d63234fda6b20027293939aa4629e9d84cc241a343f0bb08a84c7a78d8db696 SHA512 37b29dedd36f3bc43753f910ba2dd57c36f84be2c097ca56c6c1b5b52523645d4a0ceff537716fbf673726009c5e2e40884023458275cc0ee3b2c5c9c00e1419
 EBUILD virtualbox-guest-additions-6.1.34-r2.ebuild 7469 BLAKE2B affb2aeb74ed6ca588418c23ab2febb374ad7ecc532e056c12c6636f4d433e2eb3e59727a2b1cc6c57f0dea0dcbfa20e67260b95b44bc98c9c0cf5903eac93c4 SHA512 8154a867db0bf5da50f66dd4ba53af4586f3e8a90ba5c693c046bf38b2201082a518deb532947b0abcfe70420273bb5eed8c88657d4c6587580108836c22c57b
 EBUILD virtualbox-guest-additions-6.1.34-r3.ebuild 7668 BLAKE2B 331840fbcbf2aa2240fca277830150f6519731c5343e48becf0498d8e3ca6277bced1a99958c37569689eca95c640f8443000db3a1fdcf4e2cd9f393135805e8 SHA512 0c960875f24c56d1214aa4b020b21377c2ed8e8c9ccdb029b780dfb08297d122ecea7b9a58c53a2190d56864fbd6786d84509fdee694fc9abfdb2fae7b618ba1
-EBUILD virtualbox-guest-additions-6.1.36.ebuild 7704 BLAKE2B 01d1b7926be2f9181f2ca5b72beac93842515ffe49d05fdb98d4dec999aab51ddf7f6760885d641efebbc93b379bcf377810f0b5aa9626c2261e6e4ca95d72b1 SHA512 b502f136bc0674929d4c1a4de74891d7fa2e4bc11d28b754266eefc20c9359c8ea84550c92c6c0e71e269fe39eb289031f0af9ae8fc40b2ff76e23ef589d19e4
+EBUILD virtualbox-guest-additions-6.1.36.ebuild 7703 BLAKE2B 31f20a6f3b60b894d0e7ab230ba9af9ccf609f7e05ab48f577d9b32803ecc71ce7c8a31f745cf15241ba98ebc901312ed6ec51ebb49b53b3efbc5bddb2e76667 SHA512 9591204e610340e73af15c85221ddaf8f786e96796f39d793dfe62fad00ffcecb0dc3643266c9317d94514e735b6e76b8e97291adeb5336af933305e24938629
 MISC metadata.xml 415 BLAKE2B 9b88f53744c7399cfd98a2a06bd6a61f9e73214b6cf2c126936ffb608400b49a0328eeb1e226679ffd3b43a0d5dd6c353ea56df549b222a4ca851c0c34137ee9 SHA512 6206d0e6ab3dfdde8e022e630f8598b3ba167c0b532d1ea77f4666d83202ef721a9b07d47ebd1770d01b36e18e8adfc6027a337c4e0415008085c2d9f0495c23
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.36.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.36.ebuild
index 90faf81beab9..0d68efa361a9 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.36.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.36.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X"
 
 # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 99aab7ef91c4..dd46647861ad 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -7,5 +7,5 @@ DIST vbox-kernel-module-src-6.1.34.tar.xz 675236 BLAKE2B 45385b4e60f7f5da8ebd2bb
 DIST vbox-kernel-module-src-6.1.36.tar.xz 678624 BLAKE2B b09a9f4281287dc3a356e2af77fa024f06f64db41eac10efe8cf2b4ab39df292fac13a75247bdfa8b22dc3fbbc3747d217651da11c4788cfd08a2b6d775bb4f7 SHA512 b00c99a2db57c78c538539afc900ffa1e4729727f39ed68565a18c3fcbc28080d1ca340ee16f45e5616f535ce38ba646020a5373acc124a15821287fa29ddd52
 EBUILD virtualbox-modules-6.1.32.ebuild 1892 BLAKE2B ca266c5f8ef7d980b92052f98ef4a8c2d5f087325f88d8cbb0f324a765ebf2cdf1e304bac2544a21204b7cbafc74a1b9052ecae2edc8dcbf6c6a9a2f7623e377 SHA512 7d4fa4bd54f0fe527eca8d98bf09fa8983913ad2dd8d832643abb5933d2ad0b80eb69f5f2ee554ce41dd6d3bf65cf326a8ea7ae1f30253aa612cda9885390b49
 EBUILD virtualbox-modules-6.1.34.ebuild 1892 BLAKE2B 5b6b3ffacf3dddf7113251b6a7e7f7b10249a3b384caf40a5c5612fff8fe7536aec8c632ca06ee3d0ccff788b1fac0a5f36f6fd5551b5886c057e695b430619f SHA512 6e0bcc667cd75f5ccb8eaa5cf188a64db6948fd256b33955b303ad1b585a46a77bd5de2ef2fccc9d18ab0a921a848e6f650fa802a154b2b071122e6acb8c4e83
-EBUILD virtualbox-modules-6.1.36.ebuild 1877 BLAKE2B 331631020f4440c7e008c21cfc634582785583c0198e796d0a4756349c2581d52e0e2aee69caf2ce850440f9c2754124d96b810206dfda1cf10e5a7cb8d75295 SHA512 0d3fedadd583dd16ccc0fc6fd06660339e87d7be5a7e97b40bdd9a52f7bfc23d29e7c56bc693bcef903958ad24a9d32bec34637b1d0e60da43ae206591d4c61e
+EBUILD virtualbox-modules-6.1.36.ebuild 1876 BLAKE2B c6f4531dfa093528ca5adc4048b0d1f062df2be4fc01ae3a450b284b1b35352c95b00287d375c29cd51b2bd9b77b1b2bac84d74ccceedf65ac8e50f95366ea30 SHA512 a5850b902d83366c033d8b005615060910b07d8587d22b2ae93c211ae99e44ae5a73fa77aec0dfc8d7947e9b49d0873d93fa084f9b50a52206c0873c2a0f97d7
 MISC metadata.xml 510 BLAKE2B df97f34230d3350b0f5272ddcb4d5a2ebca06520de69446d83d3a0fc422d1320c202f7fa1603731de14d30001fe92aef830706ccc90b692ca9a6d72eedb106eb SHA512 91e5d17c1f5cd04f08751e8b97bcee1461d32d0a0cda0ab6d9a8307731948b029585d4752c51177003f21396eacbf7cb4ced592b3802ece1d8f795902e1544e2
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.36.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.36.ebuild
index d293415c5d91..b5ac55a89c1f 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.36.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.36.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ceamac/virtualbox-modules-dist/releases/download/v${
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pax-kernel"
 
 S="${WORKDIR}"
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 9088d19abcd6..21250ddc1ef3 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -24,6 +24,6 @@ EBUILD virtualbox-6.1.32-r3.ebuild 14683 BLAKE2B de3ccf98d3f66d8e0e5774e8c1c14de
 EBUILD virtualbox-6.1.34-r1.ebuild 13699 BLAKE2B 01a96acd3f1e734536372baa60f0adca25d0153e5c7dc986ac51fa1bbd67a4e3e6fbf71a0b5865a5ab92f236e598c86dd4755c72e1a83ee95a44f714d6e0c877 SHA512 d647990d450c92d8eba46250e7a9f058c1f887fd0b0bc9b6223197973561a60bbef6f7e8133352baae034ae4014040bd325747644bc2eec286e56f71363ccab3
 EBUILD virtualbox-6.1.34-r3.ebuild 14573 BLAKE2B 110221a46466f9f053b231424840c73a00b665ced4d597fa7807500d65e18b189a8b8336e827d3caf40af251c60ad8b379578a978b7f5cb3c3d81c0cb8ae4da4 SHA512 3bbfd336e3b6306b04137314df32767dead2ba4f1821f1213ea32e5b00ce80e5e4d83df5b2647d846d5f91f9ee1efd2678dd4bd1767adfc7edba2cee856ba0c5
 EBUILD virtualbox-6.1.34-r7.ebuild 17721 BLAKE2B 3ce2d1a5b9dc0f221d8d72ac7dbb56014bbc6ed40abfac3d2f72f03d475a62153e2f18be57e52b76196b87f6d0e36277d328f876ae7f9d1b3e5ab8d376d629d1 SHA512 917ea6bb8a4052d1be1b4b1d3516a4266fa4e3080ea410eeda7f0f3710707d4d6ec95e88bce7ad6e970af5711b467f51dc77fcb505476d0e446b7296c28763dc
-EBUILD virtualbox-6.1.36-r2.ebuild 18103 BLAKE2B f7ade966b4e5cb888614a7a6ed3f14d7ee0ae0c6a3175ab626e347f58feba7e2256146351d415516decd8e727900f5b3526fe969634056f19e864a34fe7a59bb SHA512 f3b466a3632555454a50308aa45d8a84a5feec5055768de9888b5a0fdd90533cb9e84efc363781ef32700feb7faba0cf108715e25f48ab8a9a102bdf9280bba3
+EBUILD virtualbox-6.1.36-r2.ebuild 18102 BLAKE2B 8a6a0b4b10f39f05cdc429052eb61b3c61d6ca0e7eab02b4be928a6a617cde528cd8137b3621ab76eb0f0f74de4c0f6bdbb708c5ec5293b2ea50eb32531f0649 SHA512 67a0e9334adb171d26fadd4c72fbe1c90ec4d8ead561eb65bd2ad0ad5954e105bb9932509453bf3a6635a632d7fb4870e9242786365e30eb50d49ecb9dc644d6
 EBUILD virtualbox-6.1.36.ebuild 17895 BLAKE2B 0e39abc0e54b2b2cc0583c20dc80edcf9498f84137659857344fb94293ad963412a200c4af09d14222221bc8bfcfc2ee78e2e5918a83a2b06317942ebe3381d7 SHA512 d173fdc24864ee3a805b620342bd49b7023639387e8fef09824b9f63195093df9c1e26037397dcdb719c8ffecd0eab35a69bc999054cfbd6b59cbe9c71c5f1bc
 MISC metadata.xml 931 BLAKE2B bda8433410b0bf400bee4795ce53cd85554463417beec3d7f60fe5fe090317b2d75671a2c091718d4d57c5cc8c2961e0e93fbf9f6d70c652f812317ce4fc1b20 SHA512 0d7e309078a5b5c5cf891da6e8581fce8563e9014e822e9c99d6c7c62a88173b2536fe2554ea22f93965dfccd505543fe2022e6c064acc8d836ced0150fe491f
diff --git a/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild b/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
index f0081d49d032..1ecfee53049c 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
 LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
 
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 36ee7abf2b2c..30c6b632edc0 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/redis_exporter/Manifest b/app-metrics/redis_exporter/Manifest
index c6b7bbbe5f81..050a34c16e9b 100644
--- a/app-metrics/redis_exporter/Manifest
+++ b/app-metrics/redis_exporter/Manifest
@@ -5,6 +5,9 @@ AUX redis_exporter.service 445 BLAKE2B 40b006933b7c221171872c7f5f50eb07db0a55116
 DIST redis_exporter-1.38.0-deps.tar.xz 103185452 BLAKE2B a144d70cd20887dca660fc4f4d2d2ce16dc8463ef0906499c730acb11d717d5c5cf8ab9985ffafd4f9c0cf93c677b2e98895a3b48e9f2e1a2813de96e536d89d SHA512 31927c0dfc4c960ad3a91be387fa6b7b2603a6b9c9927b9d50ae9986beae866eb1c04cbcb2699265fecf201bda83e16746e4c8991b8f4560248c19d17c2744e4
 DIST redis_exporter-1.40.0.tar.gz 188796 BLAKE2B f2bb4d05129f4644d58fae005c13737f76222d32c08b9938a4b4fbb8c5000a6a00529204d839b96ae53f489183caf01ecb113535648cd80b0e9d3872ad35a8b1 SHA512 0909f71b32434bd2b47db505cd48cd5d34c4c7cfa04b513ff53c265bbd6b91c15f4e7bcf18e4b4e1c52940dafe53eed43ab9ae4db33071cd827a6d798878736b
 DIST redis_exporter-1.43.0.tar.gz 189579 BLAKE2B 9340ed4710c8d3277bdd562555269b18fd2691b669f507c2306534848815edda8730e0aa718c6b159ba83b91fc89f99dc4480380e950c5f8e662931621a413d3 SHA512 3d2b6d5b58347ddf826de06d60571ef8962078c8ab03647b8f1a91fcdbe2b7e9be015335d09109b21471ee06a59d5e1ad947d9e1bbc681e430c270dc01ae48f2
+DIST redis_exporter-1.44.0-deps.tar.xz 103514884 BLAKE2B 14531f87fa3c19ab791b77b39687534b66da199012337b72817f2624a7a679424f1a279a3b888eacb34c0cd7a5d0d51cc8fe3c63c92036cbc320b7e9d9d70c7c SHA512 ee8ceb663c15e18991903dab3b4a5dbf2981e040694e02bcd0ff81e5690a8fbdefb775e4ccc2bfcbb7bf757f5023f3ed5ae0c918779682c55ef4d9e11181da55
+DIST redis_exporter-1.44.0.tar.gz 190542 BLAKE2B 29228825e796def0bfe54ece2e09277fbdb614171e90f02b11b904a14a114aafe6f6810fafad19b2d56749f2edcab13bf03a0ed376310c39a5855715bfef2d53 SHA512 29dd210c23258c896e227d373b2c380a61b6a031f919b3da40ba2fb926f3fa534a2b1478e064b19496675935772bdad8ff490485625c1de4d470f377293efafb
 EBUILD redis_exporter-1.40.0.ebuild 1575 BLAKE2B ff642968cd0ec940269c50dba3410068333b58b5b1ce5e8345a9755687170f9c29817ee2a5186938599f693daa7f525b696d5d9cfe7149b03eb1bd6b2b75105b SHA512 e886ae485477740d1fec20d8dc325376930bc18e37fd166822048665a43ee20d261b9f1a9f84dfb4798819da072fe3cb4b86a2d7e8bdca7efe9ed40f464d87a1
 EBUILD redis_exporter-1.43.0.ebuild 1575 BLAKE2B aa7d3236fd2a227c66a94d87b1e324ce3fd40b603602f478f174b4c6297d6626dbc7c1d48fe008154161edd41c62eca22861d2aa7918a19ba68e8c8e3c4969b8 SHA512 8ffc1736ccf29459cadacd6e0202786bb7dbd3626ec5f988d566cf7bd644a7f08b2a7a4a2ff20a624efdbb885405da4d1862ace9ba87ee5646485a452e1e21f9
+EBUILD redis_exporter-1.44.0.ebuild 1558 BLAKE2B 3e0a9b08ea3a82f6e7116f58a71b833ba9e3824a911df486e0a0faafe79e20735ec74cc7689eec2f2f3a606af5748fdac101fddb1d4b23a4736d7eee57554e2b SHA512 d3078d0af074f9bc5c4986f5c4d1b47f52c66b956f26fa3cdb151b3c7e66f11a3124908e556cf4420c528d42bc4d2ee22fa5c7935c7dded1af655571445d9412
 MISC metadata.xml 334 BLAKE2B 7d6929da47dbf9ef238ac9274d55f9601753012762d4c8bb3e76b13f09a8d35d14a7ce55a42cbc76414ac3f0ddae29ff886d6b04459c523976f343f494ec3bfa SHA512 68d4a121e99cf1a3cbbb5983b112ffc700025b3db6f13c4dbafec379905c29733443eee0296fdde923b4a3411f880615e35b44a7b574aec5d679159866f3f36b
diff --git a/app-metrics/redis_exporter/redis_exporter-1.44.0.ebuild b/app-metrics/redis_exporter/redis_exporter-1.44.0.ebuild
new file mode 100644
index 000000000000..8713b5d1d586
--- /dev/null
+++ b/app-metrics/redis_exporter/redis_exporter-1.44.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+EGIT_COMMIT=19f7b036bb46869858eec74d8d3fc2186d641399
+
+DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
+HOMEPAGE="https://github.com/oliver006/redis_exporter"
+SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="
+	acct-user/redis_exporter
+	acct-group/redis_exporter"
+DEPEND="${RDEPEND}"
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
+		-e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
+		-e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
+		-i main.go || die
+}
+
+src_compile() {
+	export GOBIN="${S}/bin"
+	go install \
+		-ldflags="-X main.BuildVersion=${PV} -X main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
+		./... || die
+}
+
+src_test() {
+	go test -work ./... || die
+}
+
+src_install() {
+	dobin "${GOBIN}/redis_exporter"
+	dodoc README.md
+	local dir
+	for dir in /var/{lib,log}/${PN}; do
+		keepdir "${dir}"
+		fowners ${PN}:${PN} "${dir}"
+	done
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 1c604fcb1a2f..c23b4816e058 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/dasel/Manifest b/app-misc/dasel/Manifest
index bbd91f11194b..0b2e9ea33452 100644
--- a/app-misc/dasel/Manifest
+++ b/app-misc/dasel/Manifest
@@ -2,7 +2,9 @@ DIST dasel-1.24.3-deps.tar.xz 20531068 BLAKE2B 6cd947a88c54e46300432c2f87c0ef757
 DIST dasel-1.24.3.tar.gz 3052243 BLAKE2B bc6621515781272d45f2b459f99a5c8ab3c51a869d147bf8e0d7ea1f0f3b9e8afd0b80a4091ecccfcaa7e8e5e375d6851400dac9432aa911374d011b8c36ec36 SHA512 fc836413e0e6538102e63f08fb0030ed93fde048d11e98291f22f02ee5d5cff51523f25052b8ef7f268d52c2487086408ddc8547d2e12fb3a672d3a754838ce9
 DIST dasel-1.25.0.tar.gz 3053827 BLAKE2B 2902cddbb2feb4ce3f4d643e26c4b1f82f3b25a2d6e016257767fefe499bc4e52cefa784723ae2c33ff68614501a10e0aea2a8b8f000de3748c3e7f4fb0ff28f SHA512 ec2b1d0ca0acd84dc9465b0f4aa27b054a0897efbcb4dd6a94cf6de73415933e44b857e8dbcb01d3bac266597d2dfe132146d282c168b087dcd77512e5f06e72
 DIST dasel-1.26.0.tar.gz 3054355 BLAKE2B d75b64558abc1ac6f2eeb966badc44de60765a7f216de17dc9d5b4c233b59fe3c7a9113714f7ce6b44a5037a4fa1d1762c710cc00647a40d3dbe00b9ec77b6b4 SHA512 7467c075c84543dc656a2ce5f92d49a23585b65b75179fb31a3c89f859a47d09caf4628c39da2a54aa5625005b6eae16054f1a0203f338d8e9684170c5adbff3
+DIST dasel-1.26.1.tar.gz 3054446 BLAKE2B 760f03ee0feb1b6e0e0da9a92922f13bb3786b90ab01bda040d2be2cf10ed5d8a8c2db69ac146ac2ec64f6c4503eaaa87d32c73068f27ebc9ce87045052b4af3 SHA512 07efcf0bf31573decc856a8b41842af9658dc1a3b968510b8e4c642ec8cfe24e97de64b6ef2c296da7d5623ca47e92d42e3f7bb927a8a25e54f97546fac279f0
 EBUILD dasel-1.24.3.ebuild 674 BLAKE2B f1d497570051729a0c6820c126548f4829f0b8f02cebf03baf74f59a6297144c56e3b1363518af75021b6d974ca03a6c72a9cb7f8d98d01036849d393168fd9f SHA512 d8455abd5890808df6e2c1f8d5e5b714123b4009b62b953e55af24a0ed34df1779b3912b4fc1f64780960c5bb93d39c92b6398aefbfee59b5efa329f5b6a6a36
 EBUILD dasel-1.25.0.ebuild 682 BLAKE2B 4e42f9e1c0b72e2e8e0822edfd2fe2cd143a93e3ef4fd192285a5fb907bfed3764d6b2712a56d681fd0acbb8e224a067eced93c29d17adc58c47f245124a9731 SHA512 c9bb3d0094eec3ab1d9f7e9f0d6eb0622f9cc744b9095a8f26a706121ea645e5349f35651f495d506b03150c233a2dd36d0d1f7a0ec91067e24330d9bbce79cc
 EBUILD dasel-1.26.0.ebuild 682 BLAKE2B 4e42f9e1c0b72e2e8e0822edfd2fe2cd143a93e3ef4fd192285a5fb907bfed3764d6b2712a56d681fd0acbb8e224a067eced93c29d17adc58c47f245124a9731 SHA512 c9bb3d0094eec3ab1d9f7e9f0d6eb0622f9cc744b9095a8f26a706121ea645e5349f35651f495d506b03150c233a2dd36d0d1f7a0ec91067e24330d9bbce79cc
+EBUILD dasel-1.26.1.ebuild 682 BLAKE2B 4e42f9e1c0b72e2e8e0822edfd2fe2cd143a93e3ef4fd192285a5fb907bfed3764d6b2712a56d681fd0acbb8e224a067eced93c29d17adc58c47f245124a9731 SHA512 c9bb3d0094eec3ab1d9f7e9f0d6eb0622f9cc744b9095a8f26a706121ea645e5349f35651f495d506b03150c233a2dd36d0d1f7a0ec91067e24330d9bbce79cc
 MISC metadata.xml 325 BLAKE2B 468cbe90bb22931af07591f3852927393460a119d19acf0a14328ef11682cc1725bb70ef74309a8e106b5cb1fe36a234027050aab84a1a551e881347e12e76d3 SHA512 75eca3b8efbd254410160102d574cd6268eabc197deb3899a4d67fad265f5397b86f85121fd24f269814154e4f6246c320f6befac5cbca840bcd424a9ce0b972
diff --git a/app-misc/dasel/dasel-1.26.1.ebuild b/app-misc/dasel/dasel-1.26.1.ebuild
new file mode 100644
index 000000000000..261c64912713
--- /dev/null
+++ b/app-misc/dasel/dasel-1.26.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Query, update and convert data structures from the command line"
+HOMEPAGE="https://github.com/TomWright/dasel"
+SRC_URI="https://github.com/TomWright/dasel/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_compile() {
+	CGO_ENABLED=0 go build -o bin/dasel -ldflags="-X 'github.com/tomwright/dasel/internal.Version=${PV}'" ./cmd/dasel || die
+}
+
+src_install() {
+	dobin bin/dasel
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-misc/openrgb-plugin-effects/Manifest b/app-misc/openrgb-plugin-effects/Manifest
index f590ee4d84e3..528b9219692b 100644
--- a/app-misc/openrgb-plugin-effects/Manifest
+++ b/app-misc/openrgb-plugin-effects/Manifest
@@ -1,6 +1,4 @@
 AUX openrgb-plugin-effects-0_p20220110-dep.patch 926 BLAKE2B fb1fc3fe50bcd2bd7acc07adcf371ae388185bbd735da695b43ed734b6939c9af7cc982250d6de3441d0cc9d78e7e0556e05076b0cc744a80fa428d41926dc6d SHA512 e458254ced95844dfe5f04e5e82c2f9a02acb6fc1c5302237b32629c12319c8272a89d9d530b8fa98bca702308fb3beda3a83258272d97a6dd1b669ba6d4c731
 DIST OpenRGBEffectsPlugin-a7222bdbcd3c52e13d96993a33c5648f1306aeba.tar.bz2 255129 BLAKE2B 8fc7ee994d80bd9fe8d8a76e26710ed0fec429aa8df835f6a46a64d4034a4fc2352d722c9aed26032bff33781b1f024a893d685f6883e1816872d91cd937c1d0 SHA512 386879a7a1f05cfcbcca792add1b18f2680b4fa7b139f8532e6f32d09a5194c381357d3cbb3883352c2a03280c9b0b0f1e9faef7e140c7535144c0d645832d3e
-DIST OpenRGBEffectsPlugin-a8ea7eef586d9dc341fbe67f60cb8cb4d69a9504.tar.bz2 345726 BLAKE2B e8cf741ba935521c449d3b2a326a44b709c919cb3e3694cbd07939205b8f589dcc00b46cdb1f08684e4e4d3d0a798aade7c051ebc16c3c82368fbeb94ec84fb5 SHA512 134b46090386f94fcf77c4a0a1807ac94ecb8323f318e01098a1edf9b3cf555dbc7f1c5abce484dd4aba9cea32ae7aac5abc0f5f1d26e8edee4afe197f5a254f
-EBUILD openrgb-plugin-effects-0_p20210619-r1.ebuild 1213 BLAKE2B b99b7b31f8121f66d07fd8879177cbae50a37b2845893f15e40adb320da1ab14fc0efd4bba9e4bf128eb37fc332c7b55704537b7a5e61b88370a80790fcea6a4 SHA512 8ac07fe56f39bb7adf9cf92ceddbaa40122435c495f6eaed30024b2d6da86c5ff682c76751ec096fa58933785d29b444987a7e259cb6058ee4bf3e7da4b545b3
 EBUILD openrgb-plugin-effects-0_p20220110.ebuild 1159 BLAKE2B 0cbccd6bdb5bcde75f53fff8bd6ee451687f125c9feb888c2bc9ebf3f90dddc4d35d64e5b8913aee79043188ebae096a5ef724865c9c3ada80eff80c6763e63e SHA512 14d56e6584a835c5b7b5544c0a25ff401ff4130632420389a3f682183017f02b8259ee4590256b865c34b62c41431ee5782175f66011dc1bcdd599cb90e5b11f
 MISC metadata.xml 484 BLAKE2B fd1a7614f29a1040964e8f43b99240608d34b41b1f3904e3a2b8f33c8cae130cc46dc87e9eb51aea1be82c48dd3ba377150a3b39f2a6399c27e422521ab38e18 SHA512 5b43156294061c4ff508d206e7621e31c493b403aacd648120e240c164203fc1508410f732c24b1e9df489d07d28eb21469df6c01111da413f076530838cf778
diff --git a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20210619-r1.ebuild b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20210619-r1.ebuild
deleted file mode 100644
index ed7bf2e31ea5..000000000000
--- a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20210619-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-MY_GIT_COMMIT="a8ea7eef586d9dc341fbe67f60cb8cb4d69a9504"
-SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/archive/${MY_GIT_COMMIT}/OpenRGBEffectsPlugin-${MY_GIT_COMMIT}.tar.bz2"
-S="${WORKDIR}/OpenRGBEffectsPlugin-${MY_GIT_COMMIT}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Plugin for OpenRGB with various Effects that can be synced across devices"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	=app-misc/openrgb-0.6*:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-libs/openal
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/RGBController" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/i2c_smbus" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/net_port"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBEffectsPlugin.so.1.0
-}
diff --git a/app-misc/openrgb-plugin-skin/Manifest b/app-misc/openrgb-plugin-skin/Manifest
index 7cde280d0310..7d9cb1bb8993 100644
--- a/app-misc/openrgb-plugin-skin/Manifest
+++ b/app-misc/openrgb-plugin-skin/Manifest
@@ -1,5 +1,3 @@
-DIST openrgbskinplugin-3d937cf5112a98052f98a106dc0f5de1eafc20ea.tar.bz2 14673 BLAKE2B e9ba7e072882a995d9d37274e612f0ad404c369bafb4e59db379f43242873f08f36adc5521277c2bac4e730c35cde561e535e30e5a37155bfe0fa408d5ba3b45 SHA512 1a23b843230da6778079873949e72280efe46c6c015eb27456283bae5d88b539d8a5f69e6f1580400e1cfa746bcd36b6a1ae597f510b0c331d16f56b6ae28670
 DIST openrgbskinplugin-ebb80f7bd0e1efaa995f60454f3c049a4607bc3b.tar.bz2 22843 BLAKE2B 30c88b143b3df829c543744b20424df24bde9dda10f770fb78d653609111801a4d1d3fe16ed3e3c15ad953f41113db5d4da40bc66f7ec57418b2e934cd9a2e32 SHA512 a70c0157072b6b638a5a4f3f48f41c73f422d0ac356174479901cd3d088faf6fe96e594b2a39b15de305e0355fd0d252dafc4a30b9216d57058ad2cde7f5a3e3
-EBUILD openrgb-plugin-skin-0_p20210601-r1.ebuild 1184 BLAKE2B 68d11b055e4d701819383b78b0183d577ade6824f89e93ff6dbf323cee0aab50ab760bae5b909507a6e7bd749ac3b3ceb3835c9c08ea38685d89585f71242dc9 SHA512 a38494698da3216c653316078fa52341cae429e994f7dd3f94c1d8b2e31384abc8f50c44b354f5088ff8a0d93ba0020f2ff11f9646deca57232d1ea569f0a3d4
 EBUILD openrgb-plugin-skin-0_p20211230.ebuild 1031 BLAKE2B 159cfc98558763303f0709bfa2b86fafe1571edb6aac806c37a76e711220e8b3111a51caea1e76bded0dc6bf97401cf63f8edc14fde78fd50e60f63027383514 SHA512 089258850a1b9b4d6d595358060350a76fc15e7dc8473a587190b1a432d38bb6dc071f28784f9ac7eb5c54ba55f347d76b6e6a11c57368718206080dc8aca124
 MISC metadata.xml 481 BLAKE2B f05f1f16d6180b976f0daa79964c7abe5f9f1caee3aa25c1b328916d810438b7e76fd54297412f02c6fd172d6ca754872cd7d28349c328c8ef9cc8af7069a4be SHA512 9a6815da58c1b372a4af82f96484625334c2977a416e902b824d2be17bc7624cf9d1d69f0bc25ce85b833133b81c10e9257f30c825fdeeb230c7ce8772cf4bfd
diff --git a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20210601-r1.ebuild b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20210601-r1.ebuild
deleted file mode 100644
index 84910baffe1e..000000000000
--- a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20210601-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-MY_GIT_COMMIT="3d937cf5112a98052f98a106dc0f5de1eafc20ea"
-SRC_URI="https://gitlab.com/OpenRGBDevelopers/openrgbskinplugin/-/archive/${MY_GIT_COMMIT}/openrgbskinplugin-${MY_GIT_COMMIT}.tar.bz2"
-S="${WORKDIR}/openrgbskinplugin-${MY_GIT_COMMIT}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/openrgbskinplugin"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	=app-misc/openrgb-0.6*:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/RGBController" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/i2c_smbus" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/net_port"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBSkinPlugin.so.1.0.0
-}
diff --git a/app-misc/openrgb-plugin-visualmap/Manifest b/app-misc/openrgb-plugin-visualmap/Manifest
index ab51760f0378..922f00b81d10 100644
--- a/app-misc/openrgb-plugin-visualmap/Manifest
+++ b/app-misc/openrgb-plugin-visualmap/Manifest
@@ -1,5 +1,3 @@
 DIST OpenRGBVisualMapPlugin-223c5ec67d256c5fa3bf7f3d572213114d93db6e.tar.bz2 54289 BLAKE2B b42b59fdc31f48d3e7be28051ccb02a2ba1befa1b1ed180a9313c8cbc50bad1c358ab5b4d8f249b488d5f32c801426078ef6c0c3c46dbec9695cb7b7cbf21d40 SHA512 eff52debcd027176a761fba71fb33d4a04802dd8f2441a86a825f3afecb268d2768edb8b03ec35ff2d17b5dc6f95dd0642e7d524fa7fcf93f0d215d712e75f3e
-DIST OpenRGBVisualMapPlugin-b603bb994719c765cc52c116c6f9f3983fc2a7b2.tar.bz2 45381 BLAKE2B e289f952a8f6553ff81a557753cbb94fb56111a6724f3141fc44a2f1abe9fa3d8e8b4eb769b54adfcb8ee6580d26378ca0b15fd83c14eb669e4682dad07729b8 SHA512 aab553dff55bc4d6990657ad9f29dbbe5ab78dfb532dba50923b32c2bb86ced8d37fc1190dca1b59f420aba7f0db81fbd0d35d49e499e19b9efa4638269a784d
-EBUILD openrgb-plugin-visualmap-0_p20210614-r1.ebuild 1269 BLAKE2B a8686bceae7030a77568409e3b9a62217e00ba55b1effb60b355fb9ea1a69de8c4becf306e97b895e4660e8a173aa24fa237332d8d9f86a332f05aa67cdce5ca SHA512 5e12191e9fc495b05352ae4ac0c8c14d30899ecabc4f3f6ddf05d20e054a0d82c18f69f87663fc704081c94275e7765e54e707d47fe8dbf0fa7f5c4853659d6f
 EBUILD openrgb-plugin-visualmap-0_p20211230.ebuild 1118 BLAKE2B 8f54089c739a6fb147b306cc3e420604104c5978b3e49e5e4779beadfd46ff0ec681687076cd0252d6f041736f27068d91e9b2f18b0b245a0dae41e92312d701 SHA512 32e7c6e85bb1eed5bb93ae7e68052318f6995627ee648de9f188e0f1455e01d44e3dc7aec2912d7952faa76aa87915f7c764bab9d01901faeef278458f5aa780
 MISC metadata.xml 486 BLAKE2B 01cbd7cbe4d88068db283a3eb33d0a23dc100e6effa5d8eea9970c96d75073053ecc161953c0d1ae08b4400c497fc8668004c217b3dde0a3d066f24f9a8f6e7e SHA512 41e51c4089d9e9648656339df9a4ccf52b8907b22da654331b1bd804fb150e0148c1c325e1e15a1f8e2d282f9568f91a31243e9cc9e4aa688d2dfdb75259c5f8
diff --git a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20210614-r1.ebuild b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20210614-r1.ebuild
deleted file mode 100644
index ea9e72c46ee5..000000000000
--- a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20210614-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-MY_GIT_COMMIT="b603bb994719c765cc52c116c6f9f3983fc2a7b2"
-SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/${MY_GIT_COMMIT}/OpenRGBVisualMapPlugin-${MY_GIT_COMMIT}.tar.bz2"
-S="${WORKDIR}/OpenRGBVisualMapPlugin-${MY_GIT_COMMIT}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Plugin for OpenRGB to create virtual devices out of multiple real ones"
-HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	=app-misc/openrgb-0.6*:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-
-src_prepare() {
-	default
-	rm -r OpenRGB || die
-	sed -i -e '/RGBController.cpp/d' OpenRGBVisualMapPlugin.pro || die
-}
-
-src_configure() {
-	eqmake5 \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/RGBController" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/i2c_smbus" \
-		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/net_port"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/OpenRGB/plugins
-	doexe libOpenRGBVisualMapPlugin.so.1.0.0
-}
diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index 76f777ca28b2..4792c2b9933e 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -1,11 +1,10 @@
 AUX OpenRGB-0.5-build-system.patch 755 BLAKE2B bda13d7d9de39d3dd79245ff7a13e22e09381a62ceaa58413b0aaa28017b6e860d032ab6ceb84f1140dc7f6c23dfecc1cadbcf696c8f872016307ea34d8870dc SHA512 50e110c01833113504a3a64e438a404196ae0af8e75007d6c42f3fcab5c20468f3fcb80f83d1f98ac7e1f4f88b1808ee28d0bf342b416d581c354a2388af32bf
-AUX OpenRGB-0.6-pkgconf.patch 709 BLAKE2B eec83247caac6527f0c0ca80716fc3fc3266cdca9635f643968bb620be3a03f3d3030c97e0c68af8e77a03725eaa46f7393667ceb72a63a665947ae87242afc8 SHA512 0436714eb4e900caa421dba2b3fcba41826ab74ed8f2e42884c48006f4af31fe10a114e84c41212343911b5f52804a27b031410fc55fe234138905779db4cf6b
-AUX OpenRGB-0.6-plugins.patch 1002 BLAKE2B 42bb7a51876603003a8cf84759754201a92ae50b6a1d6c3b234ca7a49ad0ad00a6dd6d8dc9e068cd7d865d90cbde6a4a9794845a200e06ca5cfe530d37505dd2 SHA512 6d590398dcc65db8720577e83fe8a11a46f7b0be485f1caf227148250450d936599b4ccc47df8b6f8676676cccfcfdf5ad7f02ad76ca415eb0a9c40a58970cbb
+AUX OpenRGB-0.7-json.patch 1408 BLAKE2B ab7a3eb14163db51cccebc9daa1d6e8a6373992381c1caadbd512bb184cb1ad6f44dfbb45eeed8b37bbbbed6e9a4670925ad6c42e24576b85b2be65f73c07707 SHA512 8e22c50ef73e238e4d499a8199224c7f5ec3d332ca7754011ecbaaa3a785481ec782c7225bdcd8252e10b30b08e938f406f8ab1d8eefc72fed2dd13921f580f6
 AUX OpenRGB-0.7-plugins.patch 1035 BLAKE2B 46025eea33f9cbef73994ea25284e05a7dc1848a7a9f2d60d9e173a5e6f40d98d1a0346d75fb5bf2bb05803bfafa1f3a94bb15a7feee25743565644370cc58fb SHA512 2a098ff5ec43347ed91ac43971e50872461a23762124ac252573b602236ced309c94e9a58b8667a52c85a06dd85eb519a1ee0aa7c8ecd577713a28d456db1c14
+AUX OpenRGB-0.7-r1-udev.patch 410 BLAKE2B 10e4ba5cc32abed1c5c6bf15426033b03c36929d0d54d247235793193d8e0df26dbd10e1a63edb626a88fbbc5b532f00fac997589afb8885205dad2f53022378 SHA512 0714dc6432fa0d75a8867079d6056f6dc35b98dd62da512643df8649cb2e6bf8de85408485e2b47b2707efef8727789549a216c8adf72447fd084320b1a8e931
 AUX OpenRGB-0.7-udev.patch 515 BLAKE2B c535efa9d6fbc5b0f56eb9914ca9c23d3d431f2d98b7d3bdee60bbb0abdb67eb5e21b75be9ec9226e8de1def3136d89175f0500e83ec97b3a23ad1ec1e5929ca SHA512 11c09942811077134c78fd916ab842c39361214888d13187071a2bbf8112f995915b491fd8e8574a5cb59b02d70477ac0ecf42592d433ec24feffe194f7a0534
-DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32
 DIST OpenRGB-release_0.7.tar.bz2 28053114 BLAKE2B dfab42fca654478ab359e6e46133fc20a4bf32aca35d1b2f475d3e4e5e218f35c7e1f03be15381b0e8d874ea24254b88b8fe21548a4183b29b4c66647aeef516 SHA512 6ee605bfc91da14d34bc89fe75790f99548253e2d6aa088e20d1996577629bf15fe0fae09e65d983aa829f54cfcbd33e13f2c7d493a2776fd1723f8725b62186
-EBUILD openrgb-0.6-r1.ebuild 1831 BLAKE2B 3b56b2846aed9d03f6bbc2338063643ea50df986ed0912abbcebc85c22d44ea4d7fd87bbcc5aa9a16599697e09cc221d1ee4cfacd72317abfcce8b1ac9f66f93 SHA512 49ac7263ac9fe57e160f4743d6f712571305504bfa5a498ea17ef37dedfe48906e989f9d20a86a9d8de7dc9af7010bf6555001699f7821e780c2233cd18c8bb3
-EBUILD openrgb-0.7.ebuild 1864 BLAKE2B ed92c07073ce4286b0d0665365eaf562ee72f06ce4fc866773b214eac6a9ea2f704199eb15f2d76e4263646849c0fbfc311c4e518f3a6e7f938af73c746d2033 SHA512 2610f441cc2c169ea8a80d6055153e1677bb8183140a08e74bbd580fa917e2d8b1daebf8e1e86124928a8dca1fe73426419666f88dd06d3c43292242210e7a2a
-EBUILD openrgb-9999.ebuild 1865 BLAKE2B db8ba0bbc8b78e1d9fb4c375b3e234efda4056e2ea23069ff68d42a3bdb42f1e2b1baf03306aca93e2881605246d10bf52ef364bc3a5366a4a3e00af05cef9b4 SHA512 69782bcb0497ad92b33dda1300b80c4beb178cb7fd058f9d02d962f2eaa8ce53ce39c796ee1de2ec7a14e1356edc4332949a43f6bfdcaf7c55eb03d4be018d21
+EBUILD openrgb-0.7-r1.ebuild 2006 BLAKE2B 953f14e0cc8d84cf10bfcb6a01847498f49c4e3dcfdf364d8f550c74f4c4e05760fa5d43d621b88a04234f544d2de30d0c92ec481a56aea07c5d580436418457 SHA512 691fdbbe73f6cf18644ab30a4843c2bb031519d5b3bcbae6957c38c1b1714280bcb1e9193d677289090707c53e772e136c4158ecf185c757960174db05b6b5e6
+EBUILD openrgb-0.7.ebuild 1902 BLAKE2B 9c8a21faeb59e409f2957a05aaa5d86d79caaf32d80ee15720789cc445e6ad87c8d1c4c2d3dca7be2e714e9d69bee6cd0edc7372e1b8f7ab4266fbdc13a2b190 SHA512 adba8992c77da14cdcd8739b4f0d97eb8581edc6756611091c27decab37182aaa64d4d6c265b32aee942a3dcb8a7972857a7b85b6bf3896731f198a0628f8004
+EBUILD openrgb-9999.ebuild 1968 BLAKE2B 393382b51ae04f6859c5c670fae696aefe1dec28b47ffb2723b7c43355b1cf9f1bc77b91482ed22ce21dc08f87182f6b5a22e5333221e18ccc305dc83b147731 SHA512 7d8ff8cc9929da7cd09de6c2d0526ef3891489b2f560c0a7223c388dcdae6cea586a4c1f38163bb52ef819d1e8860011e034615869852f34d64611b8f349ee39
 MISC metadata.xml 469 BLAKE2B 39e7ed78f80bb0d2123efb9c94032ef7df8c514e29528f658f6865ab80f3734e7767108fc787c153dfc0df6c8ffa413fc1fdddb7da25e68cd2537c3d4ddbfe81 SHA512 de37a252c6697a9dacf486e71619b0f5fe895c67d48c55c71233b0082495662120a141cae683206293781b886526e92f0b48c91c30f2a536502cb6bd1e880c9a
diff --git a/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch b/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch
deleted file mode 100644
index 380b1091d225..000000000000
--- a/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/OpenRGB.pro	2021-06-06 22:51:12.022561718 +0100
-+++ b/OpenRGB.pro	2021-06-06 22:51:24.466105358 +0100
-@@ -837,7 +837,7 @@ unix:!macx {
-         # hidapi-hidraw >= 0.10.1 supports USAGE/USAGE_PAGE                                     #
-         # Define USE_HID_USAGE if hidapi-hidraw supports it                                     #
-         #---------------------------------------------------------------------------------------#
--        HIDAPI_HIDRAW_VERSION = $$system(pkgconf --modversion hidapi-hidraw)
-+        HIDAPI_HIDRAW_VERSION = $$system(pkg-config --modversion hidapi-hidraw)
-         if(versionAtLeast(HIDAPI_HIDRAW_VERSION, "0.10.1")) {
-             DEFINES += USE_HID_USAGE
-         }
diff --git a/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch
deleted file mode 100644
index ccc83de27ebe..000000000000
--- a/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Allow installation of plugins not only in ~/.config
-
-Used by app-misc/openrgb-plugin-* packages
-
-diff --git a/PluginManager.cpp b/PluginManager.cpp
-index b424b8b..991fb75 100644
---- a/PluginManager.cpp
-+++ b/PluginManager.cpp
-@@ -15,7 +15,8 @@ void PluginManager::ScanAndLoadPlugins(bool dark_theme)
-     \*--------------------------------------------------------------------------------------*/
-     OpenRGBPluginInterface *OpenRGBPlugin = nullptr;
- 
--    const QDir pluginsDir = QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/";
-+    for (const QDir pluginsDir : {QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/",
-+                                  QString().fromStdString(GENTOO_PLUGINS_DIR)}) {
- 
-     std::vector<std::string> FileList;
- 
-@@ -54,4 +56,5 @@ void PluginManager::ScanAndLoadPlugins(bool dark_theme)
-             std::cout << loader.errorString().toStdString() << std::endl;
-         }
-     }
-+    }
- }
diff --git a/app-misc/openrgb/files/OpenRGB-0.7-json.patch b/app-misc/openrgb/files/OpenRGB-0.7-json.patch
new file mode 100644
index 000000000000..32474f545dd0
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.7-json.patch
@@ -0,0 +1,24 @@
+Fix build with dev-cpp/nlohmann_json-3.11.2
+    
+https://bugs.gentoo.org/865133
+https://gitlab.com/CalcProgrammer1/OpenRGB/-/merge_requests/1376
+--- a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp
++++ b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp
+@@ -329,7 +329,7 @@ void RGBController_RGBFusion2USB::Load_Device_Config()
+     }
+     else
+     {
+-        for(nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& it : device_settings[SectionLayout].items())
++        for(const nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& it : device_settings[SectionLayout].items())
+         {
+             MBName2Layout.insert( std::pair<std::string, std::string>(it.key(), it.value() ));
+         }
+@@ -380,7 +380,7 @@ void RGBController_RGBFusion2USB::Load_Device_Config()
+             json json_HCL = device_settings[SectionCustom]["Data"];
+             layout.clear();
+ 
+-            for(nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& json_layout_it : json_HCL.items())
++            for(const nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& json_layout_it : json_HCL.items())
+             {
+                 json json_zl = json_layout_it.value();
+                 std::vector<LedPort> v_lp;
diff --git a/app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch b/app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch
new file mode 100644
index 000000000000..54646dc66a50
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch
@@ -0,0 +1,15 @@
+Don't install udev rules
+
+This is handled by udev eclass instead
+
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -1246,7 +1246,5 @@ unix:!macx {
+     icon.files+=qt/OpenRGB.png
+     metainfo.path=$$PREFIX/share/metainfo/
+     metainfo.files+=qt/org.openrgb.OpenRGB.metainfo.xml
+-    rules.path=$$PREFIX/lib/udev/rules.d/
+-    rules.files+=60-openrgb.rules
+     INSTALLS += target desktop icon metainfo rules
+ }
+GitLab
diff --git a/app-misc/openrgb/openrgb-0.6-r1.ebuild b/app-misc/openrgb/openrgb-0.7-r1.ebuild
index b53579dca202..f3ee7086508d 100644
--- a/app-misc/openrgb/openrgb-0.6-r1.ebuild
+++ b/app-misc/openrgb/openrgb-0.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic qmake-utils
+inherit flag-o-matic qmake-utils udev
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -20,13 +20,15 @@ fi
 DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
 HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
 LICENSE="GPL-2"
-SLOT="0/1"
+# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
+SLOT="0/2"
 
 RDEPEND="
-	dev-libs/hidapi:=
+	dev-libs/hidapi
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
+	net-libs/mbedtls:=
 	virtual/libusb:1
 "
 DEPEND="
@@ -38,13 +40,14 @@ BDEPEND="
 "
 
 PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
-	"${FILESDIR}"/OpenRGB-0.6-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
+	"${FILESDIR}"/OpenRGB-0.7-json.patch
 )
 
 src_prepare() {
 	default
-	rm -r dependencies/{hidapi,libusb,json}* || die
+	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
 }
 
 src_configure() {
@@ -62,14 +65,17 @@ src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
+	udev_dorules 60-openrgb.rules
 
 	# This is for plugins. Upstream doesn't install any headers at all.
 	insinto /usr/include/OpenRGB
-	doins *.h
-	insinto /usr/include/OpenRGB/RGBController
-	doins RGBController/*.h
-	insinto /usr/include/OpenRGB/i2c_smbus
-	doins i2c_smbus/*.h
-	insinto /usr/include/OpenRGB/net_port
-	doins net_port/*.h
+	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
 }
diff --git a/app-misc/openrgb/openrgb-0.7.ebuild b/app-misc/openrgb/openrgb-0.7.ebuild
index bbc124653d95..a8ef5e62540f 100644
--- a/app-misc/openrgb/openrgb-0.7.ebuild
+++ b/app-misc/openrgb/openrgb-0.7.ebuild
@@ -42,6 +42,7 @@ BDEPEND="
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
 	"${FILESDIR}"/OpenRGB-0.7-udev.patch
+	"${FILESDIR}"/OpenRGB-0.7-json.patch
 )
 
 src_prepare() {
diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index f9e079015112..44c450e3c857 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic qmake-utils
+inherit flag-o-matic qmake-utils udev
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -41,7 +41,7 @@ BDEPEND="
 
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
-	"${FILESDIR}"/OpenRGB-0.7-udev.patch
+	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
 )
 
 src_prepare() {
@@ -64,8 +64,17 @@ src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
+	udev_dorules 60-openrgb.rules
 
 	# This is for plugins. Upstream doesn't install any headers at all.
 	insinto /usr/include/OpenRGB
 	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 193c12a67989..b58abb943d17 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index e6e7b8995d04..be703f3b80fe 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -3,5 +3,5 @@ AUX libplist-2.2.0-pkgconfig-lib.patch 305 BLAKE2B 67da57f080454e8b01408872ab76b
 AUX libplist-2.2.0-strict-aliasing.patch 1128 BLAKE2B d38552a76f0e098c6df6eb8a4d71c7bf0fe4a41aeff87730d691497203c7057ffd84356ec671041dc02ef3762bbe2cd0cfa27d465a5be0a15ebf86e3ca91d789 SHA512 e00ab3cf2f0d0829c16e1d4b1fd4bce1265a740d872aee4d0112fb45c2919413c493ad70753a7186b27fbfe154f9826ac2024e142e9410c51a69d7e1ea782245
 DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
 EBUILD libplist-2.2.0-r3.ebuild 2659 BLAKE2B dc5c90aa4770d424f161cfcb67a2c0e9da7e0956489d0e60ea593891f01494bd8e196ae4c795a40700c17982896eb0db958afe82cef3edd448aa83d775b44eb0 SHA512 e44f5ed00b475d6c1deb94a97b51b6c9944107c1b7fdaab7ed4293a0e28d5d48bf270f42868bea2ae8b67128538988aa60f26497c9b3a9e75f46e536fd94fdc3
-EBUILD libplist-2.2.0-r4.ebuild 2718 BLAKE2B 5aeb326698ffb4ebf15c91be778b9430316ec25a3a3c3f7b75e0f58aeb2ef451e6d27a9545133ddf9b1718990b3971ccd78e4f35642e7a5f729860bd5c73319f SHA512 2cfd71dc5b7583c04b17745129a29527402c4397dea5e32a590d4ce97080e4f7b6ab237e4c01903f4f335e8c1305f3c421327d89f4f898f1667f86d317163995
+EBUILD libplist-2.2.0-r4.ebuild 2717 BLAKE2B 0e30d17df74d4a1f14c485f921058e684d740bd442585e87eb5757bfcf988ff2bcfcaae8a42eede7749e6544573389830d34a6e62e84417b02d7da4cac77febb SHA512 971c4dabe3089ceb19bb57eb8618255560e6e2683daf02d33bc0a3fc9ef668c361bd48ad72974627ff6015013f3a0fe0e4bdbdeb5b12d5d55bc7f46b98f03dd1
 MISC metadata.xml 411 BLAKE2B 739995675d95e408b7ddd6092af57e2cd39a9aa129271de40119350926a75200962ccc35c463d304cfd3fc396f4a4e04ecdef752a506bbc576365c9b689a8d1b SHA512 82db103987ba57112cd18557114d82be89a1c3cc6da43334b16a1b22023fc5961be3c2abc3213be046ee370d3285717cf9c267ae97309065fe888f39fd75355c
diff --git a/app-pda/libplist/libplist-2.2.0-r4.ebuild b/app-pda/libplist/libplist-2.2.0-r4.ebuild
index 8ee37d36b81e..439f93466025 100644
--- a/app-pda/libplist/libplist-2.2.0-r4.ebuild
+++ b/app-pda/libplist/libplist-2.2.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/2.0-3"
-KEYWORDS="~amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index e1cc586ece3b..46e97983ae47 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index bbf85c340d9f..dfde64e0cc4e 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -29,6 +29,8 @@ DIST bash-5.1.tar.gz.sig 95 BLAKE2B ac9209d6a4ab4436c511a7a195594e9036d7d1aef788
 DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015 SHA512 c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7
 DIST bash-5.2-rc2.tar.gz 10925605 BLAKE2B 839be13e89b679bbcfca19f2e331e471639ceab0187f1b5127fbf647199f565047ed309b9e30ec5efe6c6095acf08959e732d620f260d4c96ad2bc161754535b SHA512 431e13c93f846c16b87d75d63f2b3f7514528e36ae30a2e75866d93a988b87ca1ea05415bc672390fcdb2f94cab9555a0ae5390fa3b908764b906a3c5d58f644
 DIST bash-5.2-rc2.tar.gz.sig 95 BLAKE2B 446d310659eda48ee27f2982609073904e36e64dc439ef79d172b7326199c71d87e13daad8c069e3f9c20a4db4986a76793a5f7bba0ce1827531fa351eb7b47f SHA512 c9c3e218681ec367562b7c55785a18843d40f1c0cbdd27a5f4c07d94d5e797f7d735ed7652f56f6fcb065e9305508b578d64dde3d83f314c86447fc8d537126f
+DIST bash-5.2-rc3.tar.gz 10896868 BLAKE2B 32b3345325f50a1883390403eb77105a9f1aacc5c1991bd47b817e9d86dbefa389281a68b758e898018e734a77e61117e581347ebc1f132003ae8b93239e1ac2 SHA512 a8ac061d6815de74c820081e320634f671ad91dace9e3fbcc5dc4b9ab56208c6207cebd4dd6aaf2379c1ff98f6edcd3333f8ca58c6b07f6b2b490a4a632eea36
+DIST bash-5.2-rc3.tar.gz.sig 95 BLAKE2B b4f87665814943860a64bc3c2102c61147f9047f525e81554c8a46a5366421e13a02052f878f955f775355920ae32af8033a209abf70bd36b64e14177dce5db2 SHA512 e0591d761d2502591edc2e0e330341708104f8d5bdddb7f62d737c5c306c1aa7a4d129d00a197e63d52833a3fc1691a0b6b8060de6e6762afa165a147126d95b
 DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883
 DIST bash205b-003 2356 BLAKE2B b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399
@@ -390,6 +392,8 @@ EBUILD bash-4.3_p48-r2.ebuild 6035 BLAKE2B 408bffd82a0375ccfbe706fd3799a3dc34ce8
 EBUILD bash-4.4_p23-r2.ebuild 6090 BLAKE2B d09c2e76a0766ec38ace27c76b5219a52a6fa5cf2ec87e932950e3d5e3f6dadb84a5e594863b53739314aaad953f5a5fd1427bd9101ab1b4ca69c38e37ba9847 SHA512 9507a94d51dfce866e7ffe36880ad1879cc8a328f941103fb12ff84ab05492edfebee5deab7a19d8f8ff192c2b180656a7e0227f417b771ec32702dc4b549367
 EBUILD bash-5.0_p18.ebuild 7423 BLAKE2B ca28a57b4407a5971bdf25f477e4c6b40b6c2b1f79aaffaf778838f41490dcf7da7eb7dbe4652b47164210c25e764751f8ec60d4dc1c30751373bc0636d9d3ea SHA512 bddcc1a7813ed881f8ba6bf440a890f5ac633335e743ea1393082a6a55d99a3604b36271c6f15c9e2a7b06eefac1820f8f6ee4f92f582afc9ea86181c43ace6b
 EBUILD bash-5.1_p16-r1.ebuild 8047 BLAKE2B 920477ad40a57b693a034c2a526b9769e90d6a8c71a7e956551f198e4cb84605abe32e580df99f78340c183e85590640f213b76a437b825d7710b5c5d755a493 SHA512 d3dba26ef514f9dd93c9743d73dd5ea6041e006bc3f4e5d330898f4579267d08d87cdd0634de57e7f740d065e6f4e518119c141447f691679a0b4a3df7a0a147
-EBUILD bash-5.2_rc2-r1.ebuild 9300 BLAKE2B b7606ad969d6186c9a9d5c156d56a9c2c798cb96589ce30fd9064f184102d91c40c1650b00121ea1ef12dc5a5a81f4b61f91af5ac3c240a3a2428a8e46b36056 SHA512 233119c2e1133bdd194953921b396894dee24a9706a90cd029e36076f0d13298da45ee00d9a5f8b2dadeeca237ca6a995ba9959c07e3d934f5bdd707131c8d26
-EBUILD bash-9999.ebuild 9300 BLAKE2B 42bc50dc775a5c8b08a10a638384b03b30b4efdb42afc192e3149125d40d445857bbe50d6dbecc256199aa839af44e2c2f858e7630437fbd588375c5c6457e34 SHA512 4b1edc976d8fda2df2ffedae43e83ecdcd879432c7c78404e10d92e003c9362878469ac8ff6bfa84e172641c0c855d5d4d21455dac05bad60164eaaa5681ec75
+EBUILD bash-5.1_p16-r2.ebuild 8234 BLAKE2B f5b26b6ad263cd92f91f8c6fe0896b90cb43bb5faa4b92c80e123ec3fa74316f43e441fd50a54d47257fc3e4baec625a4274e5ec58b125a9e899d21c1be6263a SHA512 c848cfea6401643d2517cc18a6018f206e384264728dcc040aa8d5d22ec901c37f0e8a49758933b794d6381770f4549ad4d6fd3521f6db14f91c1798895b03d0
+EBUILD bash-5.2_rc2.ebuild 9468 BLAKE2B 345161999f5ff25b00377bf19737dc8c3f3accb390b47c593bd80519e854577138774894f5a87aa44a5e152133284bd9349950632b865eb4b8d439e79f5c65e0 SHA512 441975afd09054c710e3c8a6d7fd14470caa8d747e7f65046f97dcf120e252dcadd55b9d0af3341cc92a2a78b0828812181fc24e74ed92ac1acc94e47846150b
+EBUILD bash-5.2_rc3.ebuild 9468 BLAKE2B 345161999f5ff25b00377bf19737dc8c3f3accb390b47c593bd80519e854577138774894f5a87aa44a5e152133284bd9349950632b865eb4b8d439e79f5c65e0 SHA512 441975afd09054c710e3c8a6d7fd14470caa8d747e7f65046f97dcf120e252dcadd55b9d0af3341cc92a2a78b0828812181fc24e74ed92ac1acc94e47846150b
+EBUILD bash-9999.ebuild 9468 BLAKE2B 345161999f5ff25b00377bf19737dc8c3f3accb390b47c593bd80519e854577138774894f5a87aa44a5e152133284bd9349950632b865eb4b8d439e79f5c65e0 SHA512 441975afd09054c710e3c8a6d7fd14470caa8d747e7f65046f97dcf120e252dcadd55b9d0af3341cc92a2a78b0828812181fc24e74ed92ac1acc94e47846150b
 MISC metadata.xml 963 BLAKE2B cadf4453d8e9f77353fcae360e6d2b0a254303ba4ee422bd799be1d44733ca2833c1a2cf21c0ce30fdca365e70f0bb295f946669483c1d284ffa89fbffdf6a50 SHA512 51079c00a5d93eed4169a69fdae98c292df842de195bb8880319a582bf37ed1d1574ae57805ccf57baf0880391871c07b794487806257da3eab19744d8090e35
diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild b/app-shells/bash/bash-5.1_p16-r2.ebuild
new file mode 100644
index 000000000000..27cc205c5d91
--- /dev/null
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+	case ${PV} in
+		*_alpha*|*_beta*|*_rc*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
+	esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
+
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+	        patch_url=
+		my_patch_index=
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+				patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
+				SRC_URI+=" ${patch_url}"
+				SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+			done
+
+			MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
+		done
+
+		unset my_pn patch_url my_patch_index
+	fi
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ "${PV}" == *_rc* ]] || \
+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="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="virtual/yacc
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Patches from Chet sent to bashbug ml
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double ; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+		fi
+
+		unpack ${MY_P}.tar.gz
+
+		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/* || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading bug #7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins ; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+
+	keepdir /etc/bash/bashrc.d
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+
+	if ! use readline ; then
+		# bug #432338
+		sed_args+=(
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/bash/bash-5.2_rc2-r1.ebuild b/app-shells/bash/bash-5.2_rc2.ebuild
index 38b23139ba9a..847e52506d7f 100644
--- a/app-shells/bash/bash-5.2_rc2-r1.ebuild
+++ b/app-shells/bash/bash-5.2_rc2.ebuild
@@ -20,28 +20,20 @@ PLEVEL="${PV##*_p}"
 MY_PV="${PV/_p*}"
 MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
 is_release() {
 	case ${PV} in
-		9999|*_alpha*|*_beta*|*_rc*) return 1 ;;
-		*) return 0 ;;
+		9999|*_alpha*|*_beta*|*_rc*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
 	esac
 }
+
 [[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-			printf "${u}/${pn}-${pv}-patches/%s.asc " "$@"
-		done
-	fi
-}
 
 # The version of readline this bash normally ships with.
 # Note: right now, we don't use the system copy of readline for bash for non-releases.
@@ -49,13 +41,34 @@ READLINE_VER="8.2"
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
+
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
 	EGIT_BRANCH=devel
 	inherit git-r3
 elif is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+		patch_url=
+		my_patch_index=
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+				patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
+				SRC_URI+=" ${patch_url}"
+				SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+			done
+
+			MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
+		done
+
+		unset my_pn patch_url my_patch_index
+	fi
 else
 	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
@@ -73,7 +86,7 @@ fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
 DEPEND="
-	>=sys-libs/ncurses-5.2-r2:0=
+	>=sys-libs/ncurses-5.2-r2:=
 	nls? ( virtual/libintl )
 "
 if is_release ; then
@@ -133,7 +146,7 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
 
 	# Clean out local libs so we know we use system ones w/releases.
 	if is_release ; then
diff --git a/app-shells/bash/bash-5.2_rc3.ebuild b/app-shells/bash/bash-5.2_rc3.ebuild
new file mode 100644
index 000000000000..847e52506d7f
--- /dev/null
+++ b/app-shells/bash/bash-5.2_rc3.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO on release:
+# - check READLINE_VER, obviously
+# (presumably there weren't always readline releases for bash RCs etc)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+	case ${PV} in
+		9999|*_alpha*|*_beta*|*_rc*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
+	esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for non-releases.
+READLINE_VER="8.2"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+		patch_url=
+		my_patch_index=
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+				patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
+				SRC_URI+=" ${patch_url}"
+				SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+			done
+
+			MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
+		done
+
+		unset my_pn patch_url my_patch_index
+	fi
+else
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+if is_release ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+fi
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:=
+	nls? ( virtual/libintl )
+"
+if is_release ; then
+	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+	${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+#BDEPEND="virtual/yacc"
+BDEPEND="
+	pgo? ( dev-util/gperf )
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+	# Patches from Chet sent to bashbug ml
+	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double ; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+		fi
+
+		unpack ${MY_P}.tar.gz
+
+		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/* || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading bug #7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	if is_release ; then
+		# Historically, we always used the builtin readline, but since
+		# our handling of SONAME upgrades has gotten much more stable
+		# in the PM (and the readline ebuild itself preserves the old
+		# libs during upgrades), linking against the system copy should
+		# be safe.
+		# Exact cached version here doesn't really matter as long as it
+		# is at least what's in the DEPEND up above.
+		export ac_cv_rl_version=${READLINE_VER%%_*}
+
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins ; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if use pgo ; then
+		# Build Bash and run its tests to generate profiles.
+		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo"
+
+		# Used in test suite.
+		unset A
+
+		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo" -k check
+
+		# Rebuild Bash using the profiling data we just generated.
+		emake clean
+		emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo"
+
+		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo" all others
+	else
+		emake
+
+		use plugins && emake -C examples/loadables all others
+	fi
+}
+
+src_test() {
+	# Used in test suite.
+	unset A
+
+	default
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+
+	keepdir /etc/bash/bashrc.d
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+
+	if ! use readline ; then
+		# bug #432338
+		sed_args+=(
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 3d2370ffe950..847e52506d7f 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
 # TODO on release:
 # - check READLINE_VER, obviously
@@ -20,28 +20,20 @@ PLEVEL="${PV##*_p}"
 MY_PV="${PV/_p*}"
 MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
 is_release() {
 	case ${PV} in
-		9999|*_alpha*|*_beta*|*_rc*) return 1 ;;
-		*) return 0 ;;
+		9999|*_alpha*|*_beta*|*_rc*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
 	esac
 }
+
 [[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-			printf "${u}/${pn}-${pv}-patches/%s.asc " "$@"
-		done
-	fi
-}
 
 # The version of readline this bash normally ships with.
 # Note: right now, we don't use the system copy of readline for bash for non-releases.
@@ -49,13 +41,34 @@ READLINE_VER="8.2"
 
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
+
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
 	EGIT_BRANCH=devel
 	inherit git-r3
 elif is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+		patch_url=
+		my_patch_index=
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+				patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
+				SRC_URI+=" ${patch_url}"
+				SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+			done
+
+			MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
+		done
+
+		unset my_pn patch_url my_patch_index
+	fi
 else
 	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
@@ -73,7 +86,7 @@ fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
 DEPEND="
-	>=sys-libs/ncurses-5.2-r2:0=
+	>=sys-libs/ncurses-5.2-r2:=
 	nls? ( virtual/libintl )
 "
 if is_release ; then
@@ -133,7 +146,7 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
 
 	# Clean out local libs so we know we use system ones w/releases.
 	if is_release ; then
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index d1549ab511e6..e917fe968d61 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
index b3ea087ba2a3..46a470c5f4d9 100644
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@@ -4,6 +4,6 @@ DIST sqlmap-1.6.7.gh.tar.gz 7205694 BLAKE2B 35498643389a8393b4941665d33349b0e0a6
 DIST sqlmap-1.6.8.gh.tar.gz 7205751 BLAKE2B 49fddc4b7c62c9baa5d6732bb9150bd2b3e48a671f9a3601ffc0821d5784fa02fbba37bc057ecd43888c2678ae477cca46b279e59b8a672310836218700df241 SHA512 e8849bb727ca84540fa9e44e580470aa6d853f7fcd1bddc2a51a5e4366a7eceedde80b3bd334f16753d5390ee0ac15fbd81551e79ada817bb11b6964dd439c9b
 EBUILD sqlmap-1.6.6.ebuild 1329 BLAKE2B 758cf03ec727a1e179b4c0bd26247874aa4ac5aeb6f10ab12bebfc0f1a55694d723d8cf0377f48451352f2c369246070647094324f907aebbd80ba94a68aea92 SHA512 f3eedb27fb4fb691591cfa8d7fb4b3e8e21d8aed8bd9cdf1c0d0e1b84fd20cb6bc117d88a84b3c396a12498cf8c68894546152a0170fd347f584bc8591dffa26
 EBUILD sqlmap-1.6.7.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
-EBUILD sqlmap-1.6.8.ebuild 1333 BLAKE2B a07e5cf25771cd2eb721c6aab1b3e62b24f4a43e504439848e0ff4b3719825904808afaff68d739c212543582eb8bba7e9edcb523de64d292c13c702ea7d6f18 SHA512 a1072cab2c61cde8cb6d1667328eeacf05d08e5130e32c43dd27c947771a3627341005ac6392398ed57010b2b9b4f45b0ade9dd15d58b83353c3a019d68f644c
+EBUILD sqlmap-1.6.8.ebuild 1332 BLAKE2B de701fae22dc510d882186d9ccb2b38ffd9159e1ad52408b6bf08994f9a26a83fa335d0a24ca884c3e4f85f54a46f600c7dd39163d63fdba52b14e3a49422431 SHA512 1b6efa626e7c37cfedec7c33bdb48f6c66825c6bf4e41bb61053959753654c6811f424dae6d9750c951bfdbab0f83ae2d798bca731cc771334c781089360184d
 EBUILD sqlmap-9999.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
 MISC metadata.xml 847 BLAKE2B 31fdd4fd94a4b6ad8c775bbbc9cb48b5627f2f5944a7bdaf6c30f3559044dda6cd92be3b50c8baf462b1e2e4ea4aa905bbac88c616cbfbc833a4895a1944b0d6 SHA512 bddfbc5ce988bc1770a2ad1d6952d8ef44010c9e4ef789500f0408c7c5754960804f270bb6e24e4739852cdef07b3f22111ad9da453648730f045d0b2c3deea9
diff --git a/dev-db/sqlmap/sqlmap-1.6.8.ebuild b/dev-db/sqlmap/sqlmap-1.6.8.ebuild
index 7c54e083798c..6f14fb2bc59f 100644
--- a/dev-db/sqlmap/sqlmap-1.6.8.ebuild
+++ b/dev-db/sqlmap/sqlmap-1.6.8.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
 else
 	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # sqlmap (GPL-2+)
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 30ccf432670c..24c6cabb03c8 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/gopls/Manifest b/dev-go/gopls/Manifest
index f6ea6b552907..d329261e3849 100644
--- a/dev-go/gopls/Manifest
+++ b/dev-go/gopls/Manifest
@@ -1,10 +1,7 @@
-DIST gopls-0.8.3-deps.tar.xz 22577604 BLAKE2B 762d0eabc16771439fbd0d8cd2018e201a863563b7717def4b4b45307887b7c01db188d9545b43288145b54e969042d5410d53e93b1aac33a3135f8c42eb15f8 SHA512 9816395c6ffa7f13260d88cd72c2a5072a15a75fc1be3d342f80325603b9bd26cd7486be72887561113c4cd8a59d80ae1a5318d1548294a3d57ee04e6efdc385
-DIST gopls-0.8.3.tar.gz 3036967 BLAKE2B feb8ee9dae8eed6ebccddaa8425db20a2e6964af3a537e6cfe9e1bf71dc62a6301516b7114e4e33470f82afa27041bc20c7362a1cd5840da0168ce43bc356023 SHA512 b5be84e3ce79f98f2109ca421cfa913a5031518a068d673b6eec8ec5f61a7bd204ae6e7e11af7f4bf94a6f60107d4268359ed3b2751b3df5a98e685de78147b8
-DIST gopls-0.9.0-deps.tar.xz 21748784 BLAKE2B dfbe63c2c830548e2c7ed02563d59e0e0c09e3b05da570532d16f9f6b8c9fe4be2c43d6266de69e19b91bbc4f43ff20d768e45b24739e5f6c5e3d0da03ada834 SHA512 60ac489b49812e62cd9758acb6a44adfa8091322684770cbc8fdf048764eda52f9e93bfb4247700cf9480c71e8e16254e9a74102d6ae60a51e647ede5bd5d928
-DIST gopls-0.9.0.tar.gz 3101189 BLAKE2B 11b24db6dca208212444df1e25d65700dd814344bbcf66a9a4d08d5a16f18f5040195dfc27628b3020628d3ad79e9d890e218016b66a473cdbab0b415daf6bd3 SHA512 c0dc0fdffec517115acf8e7ce3de1d5357d467f2ea23e070ea800a43a137be67094e69f5f366613dcbb771379818789c2105b2b59f53c04762146876d12f74ea
 DIST gopls-0.9.1-deps.tar.xz 21987952 BLAKE2B 3279c9bb5223460ea4881ad2d4061a7eaf973682af26f8af3f6a19436310bd7037ec4e31594e019b2cf17e51784945d89808bd9fccaebbf654b4865383fddef2 SHA512 d29177bab21a27c67ea664f7b1264b5a9ce889d597fa150a9c008a10b0609186fccaae3a0cf6330cf0e88e0fb98c010546be7364486696d0ccebbaf9e5256043
 DIST gopls-0.9.1.tar.gz 3101075 BLAKE2B a9e05f28868f733c9ef60bbdf3c6b54f2507eae6b23d18a85d7fd0df69ff3c5fe2806a280a918763aa6e34db7e4d6ca4e3160c7c280e5e9d95511a3ad3846ee6 SHA512 f5a3863dacc5639e1773ee70608d0c22228e348d00cda5303044ad13c6be0d212b64f3866d541459e8e188461bd84e4b2270d5e40baa105f9f0c749db86df9ab
-EBUILD gopls-0.8.3.ebuild 910 BLAKE2B d288d2e2ed305c441e74d300645194d5730b6504b4318326abdb2424658600b3798e7b0ab9ddd5f14543515ccf1df4626494280be04236f09f2281d14897866a SHA512 ffcceba396b2c81eca2d42866591301629f05c7ec4f80d52276b6387342ab4f2cd632b67a4e55911156fd285a0fe9a0ad1057312f907d5c113755d1d02d8358b
-EBUILD gopls-0.9.0.ebuild 910 BLAKE2B d288d2e2ed305c441e74d300645194d5730b6504b4318326abdb2424658600b3798e7b0ab9ddd5f14543515ccf1df4626494280be04236f09f2281d14897866a SHA512 ffcceba396b2c81eca2d42866591301629f05c7ec4f80d52276b6387342ab4f2cd632b67a4e55911156fd285a0fe9a0ad1057312f907d5c113755d1d02d8358b
+DIST gopls-0.9.4-deps.tar.xz 21995720 BLAKE2B fddcc1b1417979baacf1c1d587b835dbd00638a5fc7fb8bafe54dbe0f399d3d6b0f6b48c0ecf682c563f714e6d8adcb74763bf5021a31b7e5ad3138768d1dc6c SHA512 705908bba1ce599b7749704e7a031df9d9a5d22aa0c57a3fd4e3cd591aa0b0c22e351222d6504afbbe2df47e0a939b596550c19e42eaf3700305ec6179cee18a
+DIST gopls-0.9.4.tar.gz 3159131 BLAKE2B f0a317dd23e74682e31e6587eb8e0a1d110472d2c98add5ef29592f9aa45036343da2e5d1f404f88875505ffd13019ff8a25ed8eda379eb8c3104d59e6a98e48 SHA512 3ee97b1090b355f79ae9a5a045a120ea6230b320d5b26fa0c1f42bf2288707922c5f111ef4dbdab7cd893245330eb9acc163cb452a2610941775b06536d921c1
 EBUILD gopls-0.9.1.ebuild 910 BLAKE2B d288d2e2ed305c441e74d300645194d5730b6504b4318326abdb2424658600b3798e7b0ab9ddd5f14543515ccf1df4626494280be04236f09f2281d14897866a SHA512 ffcceba396b2c81eca2d42866591301629f05c7ec4f80d52276b6387342ab4f2cd632b67a4e55911156fd285a0fe9a0ad1057312f907d5c113755d1d02d8358b
+EBUILD gopls-0.9.4.ebuild 910 BLAKE2B d288d2e2ed305c441e74d300645194d5730b6504b4318326abdb2424658600b3798e7b0ab9ddd5f14543515ccf1df4626494280be04236f09f2281d14897866a SHA512 ffcceba396b2c81eca2d42866591301629f05c7ec4f80d52276b6387342ab4f2cd632b67a4e55911156fd285a0fe9a0ad1057312f907d5c113755d1d02d8358b
 MISC metadata.xml 296 BLAKE2B 648d52b08067cb13811211594b39a985916c22bd5f5fb36d695b790061131622dfc0748429340f3a48e5db927bf7f8ad935cf8884c9453fde5780a396a4ef8df SHA512 3f564045b89d59788d47d3d37d4b0d68dd949c225f27cf6be981b3508b34c796e01df6399f444124c679e1a0c9e6aea36a3eb505680dc0ddf1d39f079d2e0a6d
diff --git a/dev-go/gopls/gopls-0.9.0.ebuild b/dev-go/gopls/gopls-0.9.0.ebuild
deleted file mode 100644
index 5952c14f68b0..000000000000
--- a/dev-go/gopls/gopls-0.9.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-ARCHIVE_URI="https://github.com/golang/tools/archive/refs/tags/gopls/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-DESCRIPTION="\"Go please\" is the official Go language server"
-HOMEPAGE="https://github.com/golang/tools/blob/master/gopls/README.md"
-SLOT="0"
-LICENSE="BSD"
-BDEPEND=">=dev-lang/go-1.18"
-SRC_URI="
-	${ARCHIVE_URI}
-	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz
-"
-# TODO: fix test failure with deps tarball
-RESTRICT+=" test"
-
-S=${WORKDIR}/tools-gopls-v${PV}/${PN}
-
-src_prepare() {
-	default
-	rm internal/regtest/misc/vendor_test.go || die
-}
-
-src_compile() {
-	GOBIN="${S}/bin" CGO_ENABLED=0 go install ./...
-	[[ -x bin/${PN} ]] || die "${PN} build failed"
-}
-
-src_test() {
-	go test -work "./..." || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc -r doc README.md
-}
diff --git a/dev-go/gopls/gopls-0.8.3.ebuild b/dev-go/gopls/gopls-0.9.4.ebuild
index 5952c14f68b0..5952c14f68b0 100644
--- a/dev-go/gopls/gopls-0.8.3.ebuild
+++ b/dev-go/gopls/gopls-0.9.4.ebuild
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 301570d5187a..d7823ff9b704 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/angus-activation/Manifest b/dev-java/angus-activation/Manifest
index 3050f60ed0ad..a0b4b8e8932e 100644
--- a/dev-java/angus-activation/Manifest
+++ b/dev-java/angus-activation/Manifest
@@ -1,4 +1,4 @@
 DIST angus-activation-1.0.0.tar.gz 26068 BLAKE2B 45151d8d0bc3c2b1835d2ceab62e9d4ab5294dcfbbf606d3298013f0dd5f27a7bbe950effbd053a6e54ec1179884870c167e8967b3536dd79902dbda506bb8c8 SHA512 e6e7b32f1aab8d293d5855a3e6b155922c18aeddf13b3daab6928c1b95b4af6dd292c5670351a70870723bc80a58ef4366e8b4fe40c5f5b995266751bccfdef6
-EBUILD angus-activation-1.0.0-r1.ebuild 1089 BLAKE2B c3241c19a82b2a98bdf0c8fe92bd7ffd3cd4aeee86c2f04301ae1c17239a36dcb61066c50f8ba31aac7668c21c6c2487f890b5b416bbb342c88b3f1d822d6e5f SHA512 0893842a5f338b8d862ecc74c373fcb4ce6eb0cd0e38321ea1cb490705a12ff0d16bc196fc2e1711a3c15b540bb9a1d62976dd6929d78a30d9bcff441b1d8791
+EBUILD angus-activation-1.0.0-r1.ebuild 1088 BLAKE2B e9588a93839eaf2d1a9d6b4519f06669c2eef8dcc1bbb6a0c8842fe8508c4ac9b703831510b18336628c556ffba606abc8e0154cfe961be02a6220367e4dfb46 SHA512 9e3d59f68fb5fa3af06598e2e78b64d5a6e96f1d00fc1c7f75c1bb43f46d57f702cda2142da758b1e8c9433732fd570347a206bbec4a4bbb02ea780e53ebdab3
 EBUILD angus-activation-1.0.0.ebuild 1319 BLAKE2B 7b7f4c64684f3bb5eb2363288f0271aad1e13f5e66afc000ed09eb61f17d536c504a16eb43bfbbeb60bb6105bb04701b8cb0a56d080d827da40b0e9e5110c322 SHA512 5a8262cc7e11123d18f6d8216999a49d6786b504c857800896541b868aa3066252db2334f9b1c0006ce472af9d24d1877c3d3474f7872a44a4e67e02e91a12ed
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild b/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild
index e9d5341c0a06..9f8f2247f80d 100644
--- a/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild
+++ b/dev-java/angus-activation/angus-activation-1.0.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	dev-java/jakarta-activation-api:2
diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest
index b2acb3c7262f..1b28ad840528 100644
--- a/dev-java/jakarta-mail-api/Manifest
+++ b/dev-java/jakarta-mail-api/Manifest
@@ -1,4 +1,4 @@
 DIST jakarta-mail-api-2.1.0.tar.gz 1072862 BLAKE2B dcfe0cbbd777dfe2bb703ddc67803402a6a617f6956822e574b7f9b01f2541d0e06eacb3cd192b08205a6ff8151c7a93ad0db758a7df0eec0085e3964a3f88b8 SHA512 38d3e0476073b4faa732e6840d251f9ec90c42a7558b1ac628e83dfdad65f74c8cb3f87b6e1964f15354b5bcfee7fce2d0bdee20fa49073985db0e4401bc7627
-EBUILD jakarta-mail-api-2.1.0-r1.ebuild 2294 BLAKE2B 603e4ae312d13ecbf7d8514a87ef15d2bef95b991b97caf96fd7f5df343b66cab2046ac08b445897ca4d567292f43cc248e7b204aa59950ea51a22a98949bfba SHA512 e6f85a905f5354541e8480ada9713d4eafb0c96f5edfe33ca32fcb187fe0f798934764b76d4ca7ce98a4b047c9388e73a1fd5950fa13209a7b2164b3e986ed1e
+EBUILD jakarta-mail-api-2.1.0-r1.ebuild 2293 BLAKE2B 1ec3e487f4e1f8792d0d7c8076d4a13360ebb75fcb7ec2c5f92f2d040b773986be280cf5ed900f63482b6f385d261d38120da6b863d8670f464f480eb95e6d75 SHA512 f3066baed89428e280d1e543077dae08c838714c88e3d7509edbc900f8b03e1b3bf8d3127296ff6ecf9d7456bb28f5e17fc9da847c51175a18ac70d90de5d52a
 EBUILD jakarta-mail-api-2.1.0.ebuild 2502 BLAKE2B 8a1b180c3314aedf822d1342c3fd393d5f6148284d5bea3e6d09627ddf12757124406354d2908003cab8fc6ebca3ddbef740b39d45c2abd3cc6cd1f583df6a56 SHA512 1afcb6e0c78e8bcbc72b64b476c592e45edcdedff930c34a1ba8bd792b4176a330fe42bf2763b668c6da05571aba88a4d973b47ae8e0ed23230de5f03eda180d
 MISC metadata.xml 461 BLAKE2B aee5455f74a9b1f4befdfca703827933b8684cddb067d08298f6c5697c7d958d421be7e23d48e72979420d42b6d77d1880ad96a6bb6630010b2696f145be5839 SHA512 e13f30a91e3e0f825fe9f32c26747af78c3592eb4b08bfd86f40ba346f1d1f9d66c2ae77d49be884b142885d637af52f1922806262719e4c67ea19d077cfbbbe
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild
index 0edbe80e8973..987359f4550e 100644
--- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/mail/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Probably caused by --module-path missing @${test_sources}
 
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index ed4795605aa5..43682ab74605 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1,4 +1,4 @@
 DIST joda-convert-2.2.2.tar.gz 65476 BLAKE2B 9ef8e3b172d31f4e3b748ba5aae807b1d344c3b6bedeb0bf0b84b93009171495f271d03cd9f7b29147a256ddd1081b3fc9640c1df6b45425080ce1d44e2c0f37 SHA512 9660491373d5f7d415ab47cec7164922fc8901803e759bbf8cf7d0cc58040c2c8b245271f33d641a563ffb25b8e42f8197e297da7d1fe68a5c50ebb61536f3ae
 EBUILD joda-convert-2.2.2-r1.ebuild 2001 BLAKE2B b0f8f4c14595af75f6cb2d55b6a540611070199c41f31d8a92447a0ed04d58f6b879de137d2a4cb18d15ed4afac6af497076b80f8b0087e8b7d6569034c7be5a SHA512 cefbd0b9d04591f08c9a5f69e1e0578f3d4f9761c6a7000854b96fbe52e9506355875e6903d1d161d6ceb7792a227995622b25ca2dfb4eccd47f1f06b2d5504b
-EBUILD joda-convert-2.2.2-r2.ebuild 1879 BLAKE2B a623e9d577ce4305ff0eccb64a69ed2a74421cb61e0cf919ab79155f2642e4bb08a899c870d0805cae126305a55bbb5595c4055924d8ba922c41d99d90e6b72a SHA512 ea08338c7d3f922050b1ce5353f6bc8c42580a327242a99dfe468a5517b6d32a05993deb9e38fe807072b18a078fe1459127eff4939745df3477526d0532e86c
+EBUILD joda-convert-2.2.2-r2.ebuild 1878 BLAKE2B 660762269747afcc85cb9c2402d29b0cc2237e219a33501615a32e4ea5f61aeb51566d259dfe22debda1f81ff0bbe4fc46e6be1fbc0b01ddbdd09c8ce3dd2570 SHA512 e08af6537e78ba970b984b95f0ce4d7dcbd82ce1c8cad3159e9819a4b4da0fbf0f2d27032327d46969df13d0ee9314437eee3210c08d999c3d439eaa9d004248
 MISC metadata.xml 390 BLAKE2B 50a8eb1f9935a4b0bc775f4c5f069df312da8aec16f6aeb6fb9c66df41f1af3ad4b3a06697e7a2d660275f6cdb19571b99b6d2a9d7418c7d4d9cb177e7660769 SHA512 da06cf231ded50201b189737b5021486c4ec324f6f7e6eb5df1ed2f1ae67a29bd529d4f108eb904c6820994c960c7c6523d69f70378f5d928286736c4ce78cc0
diff --git a/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild b/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
index 73fd8ba5ce6c..ead8e8b640ec 100644
--- a/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
+++ b/dev-java/joda-convert/joda-convert-2.2.2-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index 0a1df58eee59..9821e66e75bc 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,5 +1,5 @@
 DIST joda-time-2.10.10.tar.gz 1052384 BLAKE2B 656efddf6b98f10ce6729c6fa4c76ddfeb86dd94971c2637af3ddcb8a3a47f83948dbd58b04a6249445ef2857c5c5edb994a6d56349ed4ff4130ce9aaebd57e9 SHA512 e7917fd28cd10d7fbee02016b1f13a15a80af099b952cc0e8978bfc7fa389109553804670492c206f2b49bcf910ea093fc1838cb45ce4b7a3a885aac2aaf5943
 DIST joda-time-2.10.14.tar.gz 1055876 BLAKE2B c70ad0724ad5e6d6f6a158ed05eb9711095cd353bf72a43a3edaa8ce36db1f92e0c18cd2e2b73c34e4126962d0ef97bf83844f9de924df8aadce7d38ffdb7975 SHA512 061c341c35f5187422fe402500384f5933c1eb0c77963f65b5295b8f9b479adf29f944269173d9a93e4a288c583777b21f085afe4c5da6c695f14801636f0fc1
 EBUILD joda-time-2.10.10-r1.ebuild 1966 BLAKE2B 4f7b94c9db701439aaa82d4fd7762181e4e7ca57cf56f5d43fc0c95ad5f252bbb726e66b589041a53ed18b7beaaeb251aa0faef1b25301a75054e1c9d8f07431 SHA512 ee10fa7103410768ddb6f084734f90c2966b692271b1874d9dbe15cdeba6b30fbf532b31534d4d681243a8ed64dd668670e7929a567065d05a63b721b4e68310
-EBUILD joda-time-2.10.14.ebuild 2175 BLAKE2B b0abfdbb80ffca6e60dfe35c114acbd354109762cf963d5640564be3f65891cea23ded66956803f089b94d3e9fe603c3da2eb7e30bd92cf515a65ca9f664f27a SHA512 d1a52f7d957b5bacd1fe1058c167349b40fc91ddb66ee87d6eb80b26e4905ee7346e510fd66e856cbb3feb5157fdc845f036a43c95221faaa99acb3299741b4e
+EBUILD joda-time-2.10.14.ebuild 2174 BLAKE2B c4809145324538d170986b0e14884554837175f39f27a871ee740cf9b2a881fdc453389e298744f28c8c93bda53da12cd28a28c3d089f1dab064e9a8d98b1afe SHA512 0eff6cd6eb595eb2026f0531d74eb02cd0bfab85bfa1253e65a00d09cdb04a6a7e86b3d0189e101e2a15c0382ac91d67b02d874d5c05dc64770965ad5a2cf3e9
 MISC metadata.xml 497 BLAKE2B 96303e9c4ee30156cb9f6dc9260155270fbc3aece7c8dcfb1fd796e69ed4ee2f3ec91030f016dcdd53f411a5c216c3d41dd68ea45079c036e0ee55d529548fd2 SHA512 9f5a300ca1ee6a68e555393879c61c6898c5ba22f0cdd83d83c1411d3009af7478ddb0e1087bc88d695b2bab162c4cc62952d3fc29b4902a857db95c2fc2f130
diff --git a/dev-java/joda-time/joda-time-2.10.14.ebuild b/dev-java/joda-time/joda-time-2.10.14.ebuild
index b9f69d52c776..c1c4f5c954e5 100644
--- a/dev-java/joda-time/joda-time-2.10.14.ebuild
+++ b/dev-java/joda-time/joda-time-2.10.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: ${P}/pom.xml
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 1be51b5448dc..2fb7747a06b7 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 5940d7620a25..eb4d7f8d15bb 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -17,5 +17,5 @@ EBUILD elixir-1.12.1.ebuild 933 BLAKE2B 5393a8e9405e6d12ef8b1980143430a433345a8a
 EBUILD elixir-1.12.2.ebuild 936 BLAKE2B 8e9bfca5e5faf640f947f7715a587457edb147b4c7a6fef399a8bd34cbf9a614e675f4c0f3537928490e76e00085684744c2bba8cb07192ba268904a661fdb73 SHA512 020f6fc50ae4e764fd759df8be748bd813e8183171e705449c55663b0df4777f5d078b4ef667973b659c9481f4723ff114d0f52eecb744e297f799ad22304ce8
 EBUILD elixir-1.12.3.ebuild 933 BLAKE2B 0e11ce540d27904a54643dd76e7d3e1146f1fec96e81c237e9082a54c6b656bc0a63731251b912bfed0bee405548c9d57a5756e0ff5b5743eeb2390746533a1c SHA512 51e9057967268729c7ccd66e08ac50297e01ef9018df3478b7f7d76257712f6d91b40cc6964684e5deb495b2e03de22055fdaa23ff99d131a691a5f66ee2e528
 EBUILD elixir-1.13.3.ebuild 883 BLAKE2B b87948972fcfaa1c0229fe6ffdf4925ba82e92e86987b3d71ff0745b7c0927b1c3f44f5fe845d745a31cc5d8a0f50005de5b09f47212966f9aab431d7e8e4e35 SHA512 a45e5fa9ef66d13846b0a45dde787de8b2f4396f2206d4145a122975cc6a18eb0c80b0f8988a448d98df2f546e2fd22257ddbb0f5964ddb6108455c905f609cc
-EBUILD elixir-1.13.4.ebuild 892 BLAKE2B 0060e2251089f7f9b92105555c73dfaeb38154a3c7c3e1d4451890719c5571618689f75989df5dfc1eb5845da6615ebcf4e1f671b02faf3506bdc385d7d076dd SHA512 a459a268d22f0cfa123fd2a52165efa2e8aaf78d3e9a94f9d84cbfca162d713d98dce2562b4b3dc3744675af1841a8345d6c99cf59d522b7a7a87e8b85caccc1
+EBUILD elixir-1.13.4.ebuild 891 BLAKE2B ef9e540142eab4961babbef37a5f773d9d881c3dae194feaaebd837ce9ec8c116dc885f67602246ebc5b70dfcdc7b72ea6a1d9d44ca7968d8980c47b7b256e5a SHA512 e96d933071d62fa716daab62d068387bf11fb90b920e1745a2dd96e127e4fb512dc201ac7eef0c76b748962b602534161f252f546c5215bf5eb01eaf02cb6b40
 MISC metadata.xml 724 BLAKE2B ae59dba7153a9cdbeb0ed45acf54cf733f07ebc1b43896f88ff09686ecbdd56553e92f7733e5f556d01e622cadb85a24da879799b0f742d7e257425db1f300b4 SHA512 43cc4435aa89e2ba8edaf8f4cead814c514fac07a7c0500f3f7dfe35d2da6f75f835df0d21d862be6dcbffbd9c6e5ea32b21296048ec903c1491ccfd4854316b
diff --git a/dev-lang/elixir/elixir-1.13.4.ebuild b/dev-lang/elixir/elixir-1.13.4.ebuild
index 2c0fdac2787f..e4a3df0b3589 100644
--- a/dev-lang/elixir/elixir-1.13.4.ebuild
+++ b/dev-lang/elixir/elixir-1.13.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0 ErlPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~sparc x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 9686d303f6e9..3c5236e84f13 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index e12663309057..781df2f48330 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -3,5 +3,5 @@ DIST libgit2-1.4.4.tar.gz 5855349 BLAKE2B 2668e351521e1cd9d2998c45c65e2a8c30f343
 DIST libgit2-1.5.0.tar.gz 5893437 BLAKE2B 4108de0e8fc6a02e4172f47cb69cdfe8c85a0a72235432ca58b02d94e0bcb8390caf0c710060772551cc3a392291778ae14b561256c6d88058d0ae5a277f2fbf SHA512 7a32b27cd32bd03ce7be6c127317f82a4ac6f16615c3234699676781f4858d057edb0410b2fe36fd2e634b00748a8b0be17f23809e09a7602ba48185134300f7
 EBUILD libgit2-1.3.2.ebuild 1698 BLAKE2B 2dc3632795ce43e35c4f8f0d8b0a9e6eece80299c6c6cae21f7a6c8fedfc9c2da3021b97495968a17b966f90bbf48072a79c39757e4adf37aa25999a9f2aad7d SHA512 0ac8c62508780fecccf0052c8545afa9fd49dc8ec908cf83ebb064f1257330009fb728c11d7f7bb19b6c59d457b526ed919dd9b1375f8b33e1945d8d8d4d7989
 EBUILD libgit2-1.4.4.ebuild 1655 BLAKE2B 395acbb358de3c8b5f6dc1ebb7194ccc72ce43fee00b40e57cd6510c9019269f544d2838d05df1b0bb565e783fbd3ec6028398b19c52e2e4c6cfaa73cfab2d3f SHA512 5167d46a27a52272c85cfb191c1e8596034ada2e6580e35ae0bf7ea0f5426fd5e8c0eb5b2f6a481885d30dc7621aefc089762b30be41a7231e8d87a979cf072c
-EBUILD libgit2-1.5.0.ebuild 1673 BLAKE2B b5297c647b8cb5f8334aa949c437b70b7e2bd04d8a1735169cfe61fe7f4c085e22f15d81db2b006a2da59ef3c6827a61502933dfda3abb24234a108cf001eb09 SHA512 5675d9726a1ebb74e4bd543b83150ee5d2d77475ec6b81a8a4b5355b550cf2b2ee78306e033c6a79fed70f37f03dcbdd14094abb79df265df03d7e2e12bbdcbe
+EBUILD libgit2-1.5.0.ebuild 1671 BLAKE2B 8757b67c5b88d3cdcb2e5d8417e9e886fdd30b5ff2d50a4a5d61e82a7b8655c01ba08e4124ff73714995c88be88a406a3b98bc6d2833e22adf764ac64c43074d SHA512 04e032593081203c1e72efa03a2261221a1fd8d3b5be91c90c86084ca47a6e3e1c5ca3495f35e501442663f845e0fe6841b457116ba0408be8214ed4b9d0354e
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.5.0.ebuild b/dev-libs/libgit2/libgit2-1.5.0.ebuild
index c6bf49f120a5..7f6cb5990723 100644
--- a/dev-libs/libgit2/libgit2-1.5.0.ebuild
+++ b/dev-libs/libgit2/libgit2-1.5.0.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 82880b7e76df..a64bbcc9b063 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -3,5 +3,5 @@ DIST re2-2022-04-01.tar.gz 380861 BLAKE2B ebb9ac6754382dc3a2b4c6ebab994678d364b8
 DIST re2-2022-06-01.tar.gz 381032 BLAKE2B a4cf937e0341102a3151cd1741d51cae1bdd8ab589dcd4c9ee2f51ca43b325f7604fd5e6ae85db8ddd8fcca615ade6817a45664a037baf9cd14023ae4c4a46ac SHA512 f3d5f2a3aa5eda74bc8f434d7b000eed8e107c894307a889466a4cb16a15b352a0332e10d80ed603c9e2e38bbcbdf11f15b6953cbdf461cc9fb0560e89a8ceb8
 EBUILD re2-0.2021.11.01.ebuild 1352 BLAKE2B 4ad2554b45cee9027bb7fbf9ee731ed1e8b20648613a0a980a260e60c408edeee71208c7e91d3901fc7171bdfb59eb6933b1632c0ceb48bcf0441597706bee43 SHA512 f174c10a29fb1952841a7bd30ba28d03a13fb07423d5a7343c90b04d1b4027ab6c51a57541cb0f5fab24e75c13085362ca77256ba8e47d5f4fab1680862f62d2
 EBUILD re2-0.2022.04.01.ebuild 1356 BLAKE2B cdf5159b4c76e967b204b39a882ce62c217d653b36e1bafac6ff5611817d99b0fe567014efbc347ca1f5d8e987f91555044775ace99b2128f577424cc0bf2a74 SHA512 4db1e770dec298a128b00ab8b6dc42c219a33aef680c3c5ca2af26cd18b02a140ec591d3fb11769eeaa0ef337f88685d1f6edd3873901a51a60b8831edce0f4b
-EBUILD re2-0.2022.06.01.ebuild 1353 BLAKE2B 6ce68420ea7fdef03cd4f3693a00ba42ee05766b566ebcc9517378e4724de11b0651722b72547292a3aa53eb8c8d766e1df7c855dbe3b484f8314917cbc2d26c SHA512 58549dd6e74147062f80ea8e23e19d4946013c36dcbdbe6c9dda7108d3fbe6b011e800e87c7ebac3964e9b80162653a7b3479865bbe12572399a7a5d2f47fed9
+EBUILD re2-0.2022.06.01.ebuild 1352 BLAKE2B 7b9802ecdd00c01e54837c7e45db18a3a2643ae0b9d0648addcf55ab57c43f1a5926882649e5723d9c0a28d8199d593704c33cd8b2bdc963cf2230b406cbe664 SHA512 96aa5bbf51e7a211f1c7afd5a757a48fc4f50e03bc44541e0130b85ce43e68a14b1bef01f3c0070ff020eb5a6e6f986caf74168b1b63ceea662e83cea092570d
 MISC metadata.xml 486 BLAKE2B d99b0956f406a1e5fbfaf9a8516aaa86c328829bbfd6b4c3cfc2e925d2862e08dd31cebb730c957ea38a9b5aa84a3010ddd51760e2db8385f9b5d608b40b4d37 SHA512 e882f04350157da3e0ad7438f2c6a340853f6b589996041931f6686860d61c861e003692f5df616282e498c18266ded4803fd63760c2457dfbd04ca1b5d93391
diff --git a/dev-libs/re2/re2-0.2022.06.01.ebuild b/dev-libs/re2/re2-0.2022.06.01.ebuild
index 9879de6eb598..639e21d00a7d 100644
--- a/dev-libs/re2/re2-0.2022.06.01.ebuild
+++ b/dev-libs/re2/re2-0.2022.06.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="9"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9bbf2b459ab1..f870b9c28ead 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansible-runner/Manifest b/dev-python/ansible-runner/Manifest
index a66967b12396..82472ba55156 100644
--- a/dev-python/ansible-runner/Manifest
+++ b/dev-python/ansible-runner/Manifest
@@ -1,3 +1,5 @@
 DIST ansible-runner-2.1.0.tar.gz 158798 BLAKE2B b6a1a50c1b66210c9a29b0b52e798fc6a922a840664c5924e5234a3f5ec2cea32a137e676bae732115cb10a99155df660281233fe5bd10c10282926d0ec92abe SHA512 c96a7a122e4fdc02d6ebab79bbf3f2d9f96eb6c966789deae5c36e9b4c55aa9fede994b22309bdb18a8a4f1c9a615f9b454f01c4170c4d0c1fb5e447da52cf00
+DIST ansible-runner-2.2.1.tar.gz 172121 BLAKE2B b4bb0917570b2b7ba4a7f44bf0276713eb3842ec8a9db62ec5bec8f90e91603b69cf2651f16dd150c8267b3ff25529d4c1bbcd628a26564b74362325b9c75ba8 SHA512 e9ba5c7afd3d8542af37bd9ef3ba7a417bd7ebb430b2dca6f2bb6289633dc89a14e7beb39236f75b75b802c6fc07501c6e6fa06102c69037e34568c396d6642d
 EBUILD ansible-runner-2.1.0.ebuild 912 BLAKE2B 95ce643c727c0a5926ccb45a0009917e34ba2011d945c42520d8f11caa05bfe589b4c6db154fe2789a21fa19b3cce43bec228ca2196d7755407ef7dd3dcfefb5 SHA512 ac295a9ea095383954127673f4d5dafbfc706185ac8d69fbe91f5cc89c49d1d5fa177e6ded33bf11946af2defed09be66fcaaa97109906f33c1864d36daea039
+EBUILD ansible-runner-2.2.1.ebuild 912 BLAKE2B 95ce643c727c0a5926ccb45a0009917e34ba2011d945c42520d8f11caa05bfe589b4c6db154fe2789a21fa19b3cce43bec228ca2196d7755407ef7dd3dcfefb5 SHA512 ac295a9ea095383954127673f4d5dafbfc706185ac8d69fbe91f5cc89c49d1d5fa177e6ded33bf11946af2defed09be66fcaaa97109906f33c1864d36daea039
 MISC metadata.xml 919 BLAKE2B 4f08236cc9aa2a45279ec971c60e5d4f0a8f3695bc5cf4fac42d704682026b30b2ab0a6b0b408e313b3614da94de873256d146c4602598a762c59072f3c44d27 SHA512 f632561c44dfff6767bad8a8273776efe86b45feb7900ea07be4413f8779bec5c9ea1950a2ca1ebdaf7d17230f6839aafbd3c5fcc54cd6df3085b7e392605a6b
diff --git a/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild b/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild
new file mode 100644
index 000000000000..50bd03e9f739
--- /dev/null
+++ b/dev-python/ansible-runner/ansible-runner-2.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool and python library that helps when interfacing with Ansible"
+HOMEPAGE="https://github.com/ansible/ansible-runner"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+# TODO: fix broken tests
+RESTRICT+=" test"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/python-daemon[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e '/cov/d' -i pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 9e97cd84437b..cd9267f93b04 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,5 +1,5 @@
 DIST dominate-2.6.0.tar.gz 35034 BLAKE2B f3a7aba630e925874da7387a1eed7ca15c353cb6464971d73e86eb259cbabad8b7736a0240d5c1578f84dc828f1ad6cd2e404c323dab9c0305031115e450944e SHA512 1bb690d05a290753cabac045160500717eda8c7610ce88d2b88a490abaa64b2cdb07067c433fa6a27110ec6cb67d884d335663217391e61215ac8eb30003d8e6
 DIST dominate-2.7.0.tar.gz 36351 BLAKE2B aae802626a9e7f6b6f45f39a5b2cd6a6846ca42617e9a5ac5fe8e4a871e8ecfb89124e079313838c6f098ea5107a904d230808eda29cb05293e18ef4bdaa2504 SHA512 8ecca393548bd7c39b5d1800fee94634a60e4e12db44e16df316c9e0f5f04dc6c91e11fbe242d3c6dade3a5e09bec7e3becbfd4f8eaa58f9a8fc7ee15ac3bf31
 EBUILD dominate-2.6.0-r1.ebuild 475 BLAKE2B 6aa96bc695fd8686c18a802d0f38d3203bb0a5ce8ca69081f01fc92372dc33fca12320843052f8aa510b66a75238a7d72f5c35413b8d7709d0245f7b184ce32b SHA512 0c17397614d59527065322d0b7a3624e859f0a31888eb46ddd428ff87fdcd1e264a4abc0a477274646ea9001342a7a9ffe2b4267f6e7a526b63e2973b46eb9a2
-EBUILD dominate-2.7.0.ebuild 517 BLAKE2B 8bde4cf96a9ef1193ff8edaa6fc8dd1e6d4b219bbd99c26dfda95bc568a031f64202a519ef3821c528f6723010491d06c2601e7d1141ff633f66bb92ed21bbf9 SHA512 185105db4706b3f8835e43baaf07d78b9fbcd40c37fb38757070849a76fe2f9b443e0e924c8573d35dc112f8a387ab7407467e719b898080fcd098a717e04a14
+EBUILD dominate-2.7.0.ebuild 515 BLAKE2B 5e19c76991b39bc24a298c0194a59c0edc73ee7dace6182facf15b36991f23241304b91a701d516d97bd0431d5c6ede5686676d3a6bf32aa3be829bb15d6e86f SHA512 a42ee77c47ae0c371c366a840c743e327753fac69dba65bd0f61536a0c51d87bb86c0bf0581410983a6c5b16daa0a076dc502f1f6bd11415001610037c2b74b1
 MISC metadata.xml 796 BLAKE2B a6b8a73d12e14552aed0f4b4f2a4b5ff282829d44da6a3e283a04575bc31069d5e83a0f475d184896c586b416882507fa22ccfb346aec90692a47f28ea54646c SHA512 9a018dd4858f7a89ac7cfd8b1814df9bb24ebe9e811f0f98e2fe52f047b14bf742648de9c0e4ce55ff69434755d8b365297bd41a5909c63697eed925e1a30b03
diff --git a/dev-python/dominate/dominate-2.7.0.ebuild b/dev-python/dominate/dominate-2.7.0.ebuild
index f58f231f6f4e..769aa802a157 100644
--- a/dev-python/dominate/dominate-2.7.0.ebuild
+++ b/dev-python/dominate/dominate-2.7.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 60048c2a6d2c..0d2479d740de 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -5,5 +5,5 @@ DIST executing-0.9.1.gh.tar.gz 506644 BLAKE2B 04d7012a348186c44c892d9f442b33042a
 EBUILD executing-0.10.0.ebuild 1000 BLAKE2B ca7bd149128933574b53d12a35da03384ce17e08ff4e39a140fa04fe8b87e5e9ac8debd508b8dd708823ed81e5bf5396100f90ad5bb3100c4d28dc647bac37d3 SHA512 86c4b923edf75693058a8a218c4c5c665665e69eac5a77d122302706e513d04062bf91ee89ffc2a7d73a122ac2429cb3731ff0a6797fe56a2350ce05f2ffd91c
 EBUILD executing-0.8.3.ebuild 992 BLAKE2B a52d276ea72ec7d34187b09af70d9480c5337927ce4a146ab08e396c0fd25901b2035bab4423ddaed7bcb898d5e43a005821168fbd5ee34f56ed75e4e5a8d000 SHA512 888739c7a6e7f8c656be8ea984bbde47ea8dae2e1469baf8657d2a266e1e34375dc53960da03ab11488f5ab73bc634ec4614770235e88e4f28802498a87d7c10
 EBUILD executing-0.9.0.ebuild 1000 BLAKE2B ca7bd149128933574b53d12a35da03384ce17e08ff4e39a140fa04fe8b87e5e9ac8debd508b8dd708823ed81e5bf5396100f90ad5bb3100c4d28dc647bac37d3 SHA512 86c4b923edf75693058a8a218c4c5c665665e69eac5a77d122302706e513d04062bf91ee89ffc2a7d73a122ac2429cb3731ff0a6797fe56a2350ce05f2ffd91c
-EBUILD executing-0.9.1.ebuild 994 BLAKE2B 70f0a90755ad08c189c408fa1ae2fcc43dd8a9d7068fbb90055406826473c4c423250f00c7f28110cade28e8cfc363784fbf6d60c29b4fe592db8d8bd33d0a3a SHA512 3fa6ba08e47d7c3e38d9f1518bc8d9f49c532cb9dc11dacd085a1538cc047989f2fd5f10a7385c56676cee4cdc064847b1c6fe77828908d5f2302039647e5736
+EBUILD executing-0.9.1.ebuild 992 BLAKE2B a52d276ea72ec7d34187b09af70d9480c5337927ce4a146ab08e396c0fd25901b2035bab4423ddaed7bcb898d5e43a005821168fbd5ee34f56ed75e4e5a8d000 SHA512 888739c7a6e7f8c656be8ea984bbde47ea8dae2e1469baf8657d2a266e1e34375dc53960da03ab11488f5ab73bc634ec4614770235e88e4f28802498a87d7c10
 MISC metadata.xml 351 BLAKE2B 3e64042e3da09377bd27bcf09b9984eef77bbbc18e84f1e849571ff628cd15068fa680560cfc6c3650bf545e5869c6e3d6be0b4d2fc00f35c5fc58dcc3194eb1 SHA512 de199443767adf299da6c7d857c182071746b2ccf7b84015e9649675451ff336fdb7ac1df2d15951ae708ddf0529f2f1c9c19a2959f45c0dc30db1f341fb8d0f
diff --git a/dev-python/executing/executing-0.9.1.ebuild b/dev-python/executing/executing-0.9.1.ebuild
index 8cfb5af3b630..471d3466d941 100644
--- a/dev-python/executing/executing-0.9.1.ebuild
+++ b/dev-python/executing/executing-0.9.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index d74458929c50..6ff763fa90aa 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -2,6 +2,6 @@ DIST fakeredis-py-1.8.1.gh.tar.gz 101586 BLAKE2B a1b123dd482b9b59f401a855ba95a08
 DIST fakeredis-py-1.8.2.gh.tar.gz 96238 BLAKE2B 17fd75d2ca6e929fbbdab87e9a6450d72006a3dc72a2d81a3f381c1918f2ca12f273468bf8015e80df78e9df393d2f7002b13e12989d108f93beb3287472c0c6 SHA512 6a86c0fa41920f4446b66d4d152850227a23f5a031a80d0d9109117de7252965821dc8d9f022b9fd703f8ed66fad207f6542bd6ee524a54f2053bbcd2ed9965e
 DIST fakeredis-py-1.9.0.gh.tar.gz 85475 BLAKE2B 99c5fdf2fb665505f6450a3ec08a401a0a629c62722709b4775ac2752816e6b461579f4a3df6d7a11a07e170e369ee1703294d9ef607a52318a7a8d583ce6264 SHA512 ca379d610a62053bb417aad1cd618356240697d0afdaca0467506d7b1ec38997d46b358a31356cdec8ecd1719386f942fd220f8b0a396bfc8c5316c2143f20f1
 EBUILD fakeredis-1.8.1.ebuild 2026 BLAKE2B 73b422ef6dcfeaa7a2cca7185aedf74151b8370a0299be96ea4a28736f7d1443df158c5cf576122f9f1a4fec2f120a975fff53b564829697e626f42cec96fc85 SHA512 6b94a692b712f93f35192afad91c4db322586066e71460dec028d4f9e0400c32f6bf4a4bbdfeccc58a9b8bd968bac629641c9006de24f2fd94d1fdc1b3e44305
-EBUILD fakeredis-1.8.2.ebuild 2030 BLAKE2B 849282b5abfd842a5f0cdc1efb8c890e6fb852713673f51c29b8281ad829e8dc630fa3231c9d6551521bc4786ac1207cb5eaad1036f7bae9bbfe08738aa08fa1 SHA512 82879cd849e57d2e7f5469da4439bdf7a1903d91b1f2f80ac88475d2913690532e98958bfb7fd51e5f0ee15379b87c83eb43c57d658b675aeb46e5db9b2b4798
+EBUILD fakeredis-1.8.2.ebuild 2026 BLAKE2B e510f01fa10c48b2b71449c6903d50f866afe8557965508eac3b6a5be76844eb0ed9aeadb825ebbb0a85a6cb51713b0c7557059a1c1735c6f939273be1b21ed3 SHA512 4799aa5f4b1923e8f84dfe72f8b8d2ef00ed5e386e46883963f866b960e209944b9f76f4d9452b302c0ab27e82b5c4a2fbd064054eca21d3155b6741f21e0104
 EBUILD fakeredis-1.9.0.ebuild 2061 BLAKE2B 188c6958c9d0db87a7fc3fb898d968beb7bcf8e878a4df515533f7b380a8878a102aee8430f587542b49cc9522a58a0c14c01b006af5d905bed95e8e37ca19ad SHA512 5245a28a5a5dd232caea138fcb7df34dd0866880f0af0a420dbea9721e36c05f9a084e1555d4452364455cd1ccb0c21403cc8adceb09640505b72b20b76cef56
 MISC metadata.xml 380 BLAKE2B a47afb846b4f7d2257f29d6d33ed6a00c8cbf147bc3a74202da79dbed75c0ab48969ff6d9d6a7d508d62aaab2a7e0049e4e38ae357b6c99844b6a78da1a851e9 SHA512 74bff19b3e0ff7e90137e0b90dbe5b2a04b5b2b0b2c621a19cd3c2773fae9ca6673d52628b4bf37c36fd3d7142197fad16e0f0b495b7650545523806234d17dc
diff --git a/dev-python/fakeredis/fakeredis-1.8.2.ebuild b/dev-python/fakeredis/fakeredis-1.8.2.ebuild
index c6cea81c8567..13525468ceb8 100644
--- a/dev-python/fakeredis/fakeredis-1.8.2.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.8.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 401fa4da3f5b..dc148b8a2747 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,5 +1,5 @@
 DIST graphviz-0.20.1.gh.tar.gz 188952 BLAKE2B 65d0b993e01492894b6d245c0869412b4956e5d55f9d8d490505c8f3477dc5ab98739cf0bf1aa1a15c4bacb2db4c2807659ce410ca65503c5876ffdc278e959f SHA512 34d340469856777f03b9c9e6d28f232908797bc1456a5b50104dd2f7dc8b7488afc7b29a564d57707ae96f3291f5ae90b8140ab64e378b82f271b5521763fb55
 DIST graphviz-0.20.zip 255452 BLAKE2B 0bafa3af9d712e30bd6777d55d54c5a8055f8ad4c6e6ee8c9f936a5abf6e025d7179b2b72e9e0926378ae30e9b655d08507e815c67944123c6c222ecbcd4939d SHA512 8b30ac09913ec5860cf26cfc9e008b0feeda8d61274e346ec305087468b655ace115ff28e0ab96eb47d97127410213729d1131dd635771dcaedfae0bae0ca178
-EBUILD graphviz-0.20.1.ebuild 996 BLAKE2B dd460c91a4c813db57f16c29c534c376e1b15d0716f26e26a2ab6a691f00346572c988bbe239d1eb54e530227066b0fe5d0ecb39a9a8caec55f27598d14fe4c8 SHA512 22d9fa27bdab0df97bbf251499f05b4f4ddd09b62615d53a43b150e9b6b9a9cde6c88f383eb18d350c4fd824dee04ddd17c3735dfeace9b6f47968dde1f075ae
+EBUILD graphviz-0.20.1.ebuild 994 BLAKE2B ece3f12addd2c43feda64d46756d2acad87ce6f8feda1701bb29500e0b7c9eac4f2cdc8e9594a5240c7f8c753e893a173119442d2855d6947a4dfbf677b1cf57 SHA512 5f1800156255da538f7f8e3b08219b2671e30c01059f6356630a77f539b30efa0f3f6b4a20e0b1d77d7122981d01c5b5e2a2c48ab6ded275efbb076b41ed6cf0
 EBUILD graphviz-0.20.ebuild 896 BLAKE2B 6dffb177f1edb1a18d6f8396552754e2ad163b8a7a4f20e71e786f09322dfa33d4ccc418596e801c75c3e1b1be425461f5318575d7c9cf0c56eff235fb575372 SHA512 35806a15b42e71cfec6f755dc692547c755f3345b7405a33949e5bb09529caa0bb7da022bbbc2b6ff0001fd09f1e432a12735ed55118d382ef68f8d13e4e7c3e
 MISC metadata.xml 553 BLAKE2B d974f24c488a83d7c1510825d5e157644a4df70113af1283224a847d1cce2535ff4cb0633833a8671f6508fdd38c9079bc21239fdc1d1e9ac85f2ad08ea3a297 SHA512 72d2ce4887aa23136d689bf51b94f17ea3c8803464f623b0f4380381b9639a15a34858f26f129d5db2025d2ccda82dc80f22f5984ef58cffdf4dfcd7b8c51127
diff --git a/dev-python/graphviz/graphviz-0.20.1.ebuild b/dev-python/graphviz/graphviz-0.20.1.ebuild
index a0d7db4398ce..769b0e39a1d7 100644
--- a/dev-python/graphviz/graphviz-0.20.1.ebuild
+++ b/dev-python/graphviz/graphviz-0.20.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index c12a0dceeb85..fab3c23164cf 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -1,5 +1,5 @@
 DIST lz4-4.0.1.tar.gz 164309 BLAKE2B 6338c2d74dedf1dc92f455378ef87c691291fdd16faebff8992aa927bf95c707b346af6bb35c512d8095b60a1878615d1081ba64f99c083e580eeacfb5cf11a5 SHA512 caa08a8a531ca2887ce7e596b7a3d9d8f8f2b93c6ea48c3fb0f8bbe6e6f2a18fb6b3c055e57841f8ce74f70367738a28dbb5fb1f07cbf785434642e6034b558e
 DIST lz4-4.0.2.tar.gz 164309 BLAKE2B ea08c9786ee224aaf668a74269413c836a4288ab1a3c27497012621bdda9c8c1729c4cb6ba49cb74e7e5302fabbfddba94f8ed94a9612fdf21018a5cbdc70566 SHA512 f2fdd133b9c7389cd7d45b41e61944093b65bcbf529146740fa3721e683a9b4554166c2ad719298e6153e61facc4a4cb021ffd969cd16d4a5b6555fd8f14728f
 EBUILD lz4-4.0.1.ebuild 845 BLAKE2B 29d2fb2769362cfabf157882f7c75e790f0ad390a9d1b6c1d51ea7e6421aebe73419a366bc20f717e364d86e4c0854029c31c619e3947f8afcee673c78e9df9c SHA512 e5574d41eae03b184952862dff8cc36b14684358b5ce4a6d30c45449ddd6e499f45e536625b1f04c5ea105b522df87187c37132e29e3561f32fbe2e7330f2a60
-EBUILD lz4-4.0.2.ebuild 848 BLAKE2B 15a540365525d14a6a196470ee3ebccd3d31f0d2a3d8fc3044c08ffd16e593cba316b108275f6381f913786e16aeefc6fddd51b1549cd79e546807505fc26d36 SHA512 55e2cbd1ada2dbf0e50101bbbcc5c088884a838e7e6b7bf2330ffd8708e06d12f6471c4308f663d6121fb2385a270086c89b68e32c7f222783434256a149207e
+EBUILD lz4-4.0.2.ebuild 845 BLAKE2B 29d2fb2769362cfabf157882f7c75e790f0ad390a9d1b6c1d51ea7e6421aebe73419a366bc20f717e364d86e4c0854029c31c619e3947f8afcee673c78e9df9c SHA512 e5574d41eae03b184952862dff8cc36b14684358b5ce4a6d30c45449ddd6e499f45e536625b1f04c5ea105b522df87187c37132e29e3561f32fbe2e7330f2a60
 MISC metadata.xml 454 BLAKE2B b02d4acc9eb7d4fb35bf36371cb660d099c77f807fc08fc351b7e0e1d2e0199fdab82d83bb6bc31a56bfdb9a5b020b2f57aa9b89b59a7e5c22fcce554b6b0859 SHA512 a1b61eb4d3ce636b10abcff25ee3315bf5ecb3bdee58e1c45ff99f0b40717b13e3a8ec33c9abcb926bd716990a31749b1bf6729d8137b7859857318c386a8ec7
diff --git a/dev-python/lz4/lz4-4.0.2.ebuild b/dev-python/lz4/lz4-4.0.2.ebuild
index 01f2c8a282a8..10c11eec6203 100644
--- a/dev-python/lz4/lz4-4.0.2.ebuild
+++ b/dev-python/lz4/lz4-4.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	app-arch/lz4:=
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 879796b95176..40b874163908 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -3,7 +3,7 @@ DIST nbconvert-6.5.0.tar.gz 908377 BLAKE2B a91c6c93e9e33f90c5c7f19743e20aa6cf88e
 DIST nbconvert-6.5.2.tar.gz 910454 BLAKE2B 0c80232697e1ecf31af17f10ae5ad9bcfaec89e06ab5f81c87f231f2abd585c23977d0b154363e72f6066a97d04ec96184b0d8325e5aaa399a1a9335109577bb SHA512 b955bd55bc1f69700652faae12a585230d939877551f792eebee57936a293b9b54caff5eb1bcaf996efa38c737f141069d4af2c2959b8b6318966c9020e8a2f5
 DIST nbconvert-6.5.3.tar.gz 910597 BLAKE2B a6336f2227098caf1d59aafa770fc3dd3466160329d5344dc760425cdde7ca35ad8d1e8839fe3189d1623a682a61ea3feedb7fdfdb2ec349e6ec890d873a936a SHA512 a991d8a66fe7a244d3943974d93eb13769016843d37f6c9dcf4ba84dd16511364f45b5020060bf2c10d35fe52b4df4b678d045eedc883d3156a6cb689a977525
 EBUILD nbconvert-6.5.0-r1.ebuild 2130 BLAKE2B 4aa566ebbaea70b1b416e7d89f6b81cf2441ef06e9b3fbf634a8a3023bdf61623e4ee89a66bdeac1d7a19ac7862b3449d43362b7611356c0ee458fee66363030 SHA512 3e1489bb742474e7458473b29348a11c1684b30c6970a5d441269f8a1b9323a7d7cb607775cbef8ebbe9b21e04e04fedfcd5fa2ff938aa8f576144ee399dccb1
-EBUILD nbconvert-6.5.0-r2.ebuild 2171 BLAKE2B fc2eee68c1088df5f0d47617b8dfed830ed285a825b7f9b7d2b63a0441f30bd901b1efa705febe7b8ff22173488673c180832ac58d75aeb02859c9ea8848783e SHA512 87eeb978f4784884054a67ed04850ddca4c6544ef362db936bdd310bc764deded0c35cba5491a62e5205d8f3e7d385dd0aa2c0795ee2d3090cfa4dc3771237ef
+EBUILD nbconvert-6.5.0-r2.ebuild 2166 BLAKE2B a3a90c058b81a7cc80718b61683ff8159967ab451409330d62be7ce967fa491332e0ffe5d4474dfe5a0d62b710f5532c813a1283a56667ec33c09d4e4e8693a0 SHA512 492f784be57403f35ee0700e3f93c7b724e46232e31f9ea08c12e911f6d68bd70aa312cb2a29c624be81ead688542c09977f817123a30cbd76ea080efd90dd6c
 EBUILD nbconvert-6.5.2.ebuild 2217 BLAKE2B fd177bd1c614657d0328acfed12b1cdfaa016ee1450568f090f0ecdba39919e8d290479c818ebe3b991c6d6d2802eb0c77faea52a14dc2cdfddab091deb5b947 SHA512 6956bd1772b9fbf217ef2fafc1a0a28e8f22e79621ad58902655bb9bb37312b403d1284d52fe849bc32441c95ff72c8423e754cd7b760d4b419cccd7a1bffc3b
 EBUILD nbconvert-6.5.3.ebuild 2217 BLAKE2B fd177bd1c614657d0328acfed12b1cdfaa016ee1450568f090f0ecdba39919e8d290479c818ebe3b991c6d6d2802eb0c77faea52a14dc2cdfddab091deb5b947 SHA512 6956bd1772b9fbf217ef2fafc1a0a28e8f22e79621ad58902655bb9bb37312b403d1284d52fe849bc32441c95ff72c8423e754cd7b760d4b419cccd7a1bffc3b
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild b/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
index 1ff7e9b6c3c5..1285d969a0ab 100644
--- a/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 3b8c8e29ba9f..5a9493009baf 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,5 @@
 DIST pygit2-1.10.0.gh.tar.gz 752095 BLAKE2B ff7759c504f49ed124e0e0504742bad02c4f07d7ebf78de8a8f37dba5344e30ca14bbad30cce8e9035f25525499cee0309bf0660f24ffa4594a5dcb527c105e5 SHA512 e3dd6b90eee43e633e790c066f63782a8f8077fece5d94e6d39ff8f869efdad8360fe52473a5ad0e61adb29a646ea091db6486655199c777df1b1af0e9894aae
 DIST pygit2-1.9.2.gh.tar.gz 750593 BLAKE2B 89eeb56edbb7f823c0439e511e3a525789483a80760f6dcfbbdea7f45f1e16241d9772b54288c0acdb471bfe62a457e8fe82ec520d808d01ee8d079076278761 SHA512 523af14ae418b56efd3c541fb306c3a799224db400053590f1676ace9b53ac4c731a1731081f245cd78ab5d233c9e67fa2e5c13e02b6f62de05123cd47a1a70a
-EBUILD pygit2-1.10.0.ebuild 872 BLAKE2B 4b5a4941a48b1679e7b3347383de167109d4ccc91723dd451b2faf12b1d80043dafd007d66dbb444737fb922f63cdb2dd003d334f1b1945501a60141c4f6f356 SHA512 154df8853386f65754aabb509956e7bd5fa045a182c73c852a04f31bc3bb916a1e49c9ad8adb1b02b42507e38e041e940091720f1b903ad19ed7fe36bf7232c5
+EBUILD pygit2-1.10.0.ebuild 870 BLAKE2B a0d75bd20f9f9b304f54ac7756c55abfc89eac8ec3b231bd079e96dc6e4c99df6b77c659076f27f5a079fead2f72131c7e9b590660146ed3ca39971d7d1b5848 SHA512 55dded03a3e369cd57f058480498c46841a4d916f637109714ff3205a3e312855d4d9cc0221941209a32e301fb0686bd06bc7b8af246f5a45d3c4cbde87afbcf
 EBUILD pygit2-1.9.2.ebuild 870 BLAKE2B d15704061779a3431fd04c42c2470bbbe1eed31232335d0171f679c3c91c96ee666c84aca5bc44dd10f7cebe1dfd2c2ce8bcfeae3713ea88e0ae438bfd542476 SHA512 9faa85311b249d276ad7c33605a3b2fe3284a8284239a3103595960708eb0888fc4cd3e543828523373680f0c96d3370624cf6b1aeb97f5f6aa8055c47c0f271
 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39
diff --git a/dev-python/pygit2/pygit2-1.10.0.ebuild b/dev-python/pygit2/pygit2-1.10.0.ebuild
index 47951e5eef7a..83eb671e30fe 100644
--- a/dev-python/pygit2/pygit2-1.10.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.10.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	=dev-libs/libgit2-1.5*:=
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index bd418b9e96bc..7582b330e941 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,4 +1,4 @@
 DIST css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz 35758 BLAKE2B d834011c3ac774eb79b35e2e74f3854ddc2bb871531a32194041d6f98bde3dc68db67baea25d5463a03e057197144237be69fee4eacfb8edb73167e6e4faf7be SHA512 ef44eb1144a6484f308fabe4187310b2ef0067f328bf5213969d87c475fccae3d716dc66640a0a554ab2a3d7da0efb3a168a288ac6eef7722f3ae46959943b49
 DIST tinycss2-1.1.1.gh.tar.gz 28261 BLAKE2B f86b25be62c4c107dd6dca0b9e49605bc0c04b6ec48c4283fa7a5a33249032dcc3a42bdb9910d6235da4c4ddbf581ef8ebdc404c3bb32eeca7f355c0081e6fb7 SHA512 788b57fbadd299a4d4745bcc1814a2ebf6db76e337f2de2637ffc1610a3dac5a70f01bb9ffbb2afbdb0c638a6b23cc1b2f199eebfbb77d84906a9da5dfecada6
-EBUILD tinycss2-1.1.1-r1.ebuild 1133 BLAKE2B 0f0a48dc3c7a8f34431986688126c2caa006ffd6d109ee01e6c2b8cf162b0814a2edadd2c57709cc874c9de4121504b63e4eb673963df740c2b226ddbc62c948 SHA512 e189267fed6308da25a685863df82e7445f5484d815179876835850cd50ad8a5c2fe06f68b410b74c6409be939de50c103f49e55c1be77f54ad0cd0eed7c6e7d
+EBUILD tinycss2-1.1.1-r1.ebuild 1129 BLAKE2B 22a340478b5220b0dc34b5b590908ebf5ba7f0724bbf3ca7739c44595d99614a245f193e1ebe9939ed368711bbc12cbdf17e307e12733a6914f4e2a62780d8de SHA512 ee7cb63d4cb00fc04bc9134eaa2d49cb19fdc178d1f0c60558e80a223ffcd8d6606bb20c7f34dbace9078be6a72413046b39a8534a63ea9dc24e6cbce5c12cb9
 MISC metadata.xml 523 BLAKE2B 1590e6af6e994f20bd2087eb2ad0d9a05736f983a123cf5a7373d0f8e2608dbdd8886fe90fd62d978e0abcdcb9deef30a9cf9622302fc2d3d20a137ce1d4b563 SHA512 04c0ea9aa7b4d9317a262bda5486c1495a7978b44e6c87c1c67a44f7846807c2ba5dae6a55f32c21237adb8d25426746da0b0c63dba6668ea2e0f35223859a6c
diff --git a/dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild b/dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild
index 112af1b5fe04..1221cf515d58 100644
--- a/dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/webencodings-0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 7c611c0d7a4e..c847094580cd 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -3,7 +3,7 @@ DIST werkzeug-2.2.0.gh.tar.gz 839619 BLAKE2B b6eae91d9a44d030517be5da13c448cf4a2
 DIST werkzeug-2.2.1.gh.tar.gz 840062 BLAKE2B da7c59eb182e2318c291a6d346a2a444cc054726dd3cf47617b82440383a4c1068b4a31adb6f44d1b965e2efbacf7469c1845d3666fe24288e976bc25794ebcf SHA512 466d164f8a5861cd36eaaf3674a8bb6640593981007d1d6bced1abbdaf8c6a39666601960ebfb2dc35b7c9c17a961ea07bf919cd646c282d27fd5e0f36cc3035
 DIST werkzeug-2.2.2.gh.tar.gz 844463 BLAKE2B 84da3dd89375d6925e7e7018701339ddfd2b608acf6b3f126bd56c2020056511de6ab157de9024069d1342f9bce4b481ba91a06089fff1a3b31f4a851af7f935 SHA512 cded6c7e0b00871366b70a41de45e31323c0fc09300413d0efca98f5a2f8207026fd77c7e5670fde727da377fd02b9b636f390a2524d2b5778e9e3bdbdfe3e3a
 EBUILD werkzeug-2.1.2.ebuild 1709 BLAKE2B dedbd7fdb42fd86a9f64e98475e355611f2398075e17b2626821fdb23c87f8cd9aa5d1b7a2be913aecf8b34d5d41536df5bf9f23dbe79c6681f4845a438a9b91 SHA512 2abd65b9097e27f3a848ff9203cf8e8f4528e937ccd648ec8090f940974bee3463f9b079b9cc18caa056fba020908cda9222fce903a8bc1915108c377eef02f4
-EBUILD werkzeug-2.2.0.ebuild 1773 BLAKE2B c780a1cdc7cc436a0635ba3152c6d74073e1f8b5ddb58566c188c9dea5f6a82c3dee914ed22416e31266e1d0c55244adb789cdd56701d4dff3be012f02123e59 SHA512 e2998e00042245b0927f8211b20339f44dcd23871fd520b3ee84b53c51d5f2b041c06914eb306709cd52988f2b27fceebf4037070fddd9c59e203b29db7f3319
+EBUILD werkzeug-2.2.0.ebuild 1770 BLAKE2B a5d65d70e8ca4835a38cc6ffe29c6d10b5f8a0a20ca6a0a23edaaa50981fc8c8dc45008e640ebc33fd2f87a765c521b33f0420f0c6f496e116fd463730e7bad0 SHA512 b3e51e66bc53924f8d3f2e61a08a0d4a6ef8c4434440607a34dfae70109f26f86918b2071d99a6df7f86d64429d48b6ea15bc28b4b912425866c88467b7332b4
 EBUILD werkzeug-2.2.1.ebuild 1778 BLAKE2B e011d2b1360a53bf091ad9e2f524e8cd117fa7bcd3dc2104d8b16c08ceedd5c97d2fd5d9c8b8214d725740e07abb95bbd3ed827fe8d18428f3bc40063f211619 SHA512 e944bbccbe63a1c8cfabc5087668332037e474cf01267c5517b988392fb192fc805c406d20bb0f72a932a28bf7e60c0bae65789889758d3fb0cb0586e97dddb5
 EBUILD werkzeug-2.2.2.ebuild 1778 BLAKE2B e011d2b1360a53bf091ad9e2f524e8cd117fa7bcd3dc2104d8b16c08ceedd5c97d2fd5d9c8b8214d725740e07abb95bbd3ed827fe8d18428f3bc40063f211619 SHA512 e944bbccbe63a1c8cfabc5087668332037e474cf01267c5517b988392fb192fc805c406d20bb0f72a932a28bf7e60c0bae65789889758d3fb0cb0586e97dddb5
 MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/werkzeug-2.2.0.ebuild b/dev-python/werkzeug/werkzeug-2.2.0.ebuild
index 087ba66f5136..8fde10ba7f58 100644
--- a/dev-python/werkzeug/werkzeug-2.2.0.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.2.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index aca528fd4e04..43610c5c5130 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -2,5 +2,5 @@ AUX xarray-0.19.0-riscv_tests_datetime.patch 1832 BLAKE2B bd38f8d95e67d8c44a17db
 DIST xarray-2022.3.0.tar.gz 2943007 BLAKE2B 4c323573835c00275b9c293157c78e42d14f2736c07dc06c61643052992b9c75d624cdf9a93487094fbffd9577662388807b661d388032add3b2e2ca3a63b812 SHA512 c088b985a852c57dcef14d8a5107987c0c33f17bde1d9d639d30ac826d906639ce0ee4fe8345c65a5479b944057af045fe50c2d2ea932356aceb0718f55cd24a
 DIST xarray-2022.6.0.tar.gz 3013166 BLAKE2B 4f2c17595ec904508e5f9c1d6ffead45be527b7f2ab73383126d57c7894712e924b605a86f890b0fec4ff45d1a263ce27fa324febf83f703ad36079e68f69663 SHA512 415bd84246d6d2b8aebf316ac9ef82ca7afeacce718349b75479c0aa693e2866dfe236e6dcaf41cae68afd7a99408f5027c938e6b7f447f5323e076b804f5165
 EBUILD xarray-2022.3.0.ebuild 1162 BLAKE2B 98761fb7a4f9ba8b82c3d95885794b2af8a9c504da44508939df4ffb330d1bee813f08e327811705adfebb49544933f256633a7cc3fbfed2864cfcc229cd3ad2 SHA512 df32f8696bc3710440f18f4c68ee7744a5f063de2a95734895d3d256d83eaef808f7bd43a7a9e1ad35c79ca77e12cec8baa9e206238a2e516401dfb768d81abb
-EBUILD xarray-2022.6.0.ebuild 1105 BLAKE2B 9d4ee3e8386bf2a76de4b954888a0d6da2d2705bd8f884fc4ea7b5df899fb2c73dac83d097292c854cb2834fa047dcbed335ee0db7bc930591a92d914c3ee51c SHA512 b0f7f5c2384deb4ccba4b71681b5aa5554943a589d8f4740529699158de51e923135effb090d408dca3e2475dc357438085bbef60dd6ef9c15a1ddecc9a4fbe3
+EBUILD xarray-2022.6.0.ebuild 1104 BLAKE2B cf3cccf32ecc2bb755c851b1f47513a6f8922f8b716ae8c287e342f1eb8f5ef82c0fe1faa6172862eaf39de77735e066f1566aaf6ce333df1e8562636dcb0e4e SHA512 d6de93a804dce1a62e4ddd66bf3fd03cb3733d04ec067e0c08acacbd4e096dbcd9f3bb407556c77eef992afc1938a763d57b591696897fef98899e701220f439
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-2022.6.0.ebuild b/dev-python/xarray/xarray-2022.6.0.ebuild
index 6baf92eea4b0..c88b5b864d45 100644
--- a/dev-python/xarray/xarray-2022.6.0.ebuild
+++ b/dev-python/xarray/xarray-2022.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 06595e6faab0..6598b427a109 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/jfrog-cli/Manifest b/dev-util/jfrog-cli/Manifest
index e3cf053c986b..0428de30430f 100644
--- a/dev-util/jfrog-cli/Manifest
+++ b/dev-util/jfrog-cli/Manifest
@@ -1,10 +1,10 @@
 DIST jfrog-cli-1.35.3-deps.tar.xz 115342932 BLAKE2B 053c718ca61ba03454b068e5fd34ddf81cc95d41dfa8f445bfff18ad40650704cbb248af54e64429eae6d9053967ee7013dd0151858d3824925ecf834a6c044f SHA512 626f79cdfb393bca4fbb44a925e9263d2f384a6c1e68819a15f94b526be3054a4666dfcc7520796b54f0d202c808082dc6112f602ce2b7ab81f53b74ee23aac0
 DIST jfrog-cli-1.35.3.tar.gz 346736 BLAKE2B 5b88a54c328ae6cf83b72e420a8d6d7224a67226465c7101b817bccb2d6024b283a84a118516c85f8056b5e0b9f2f74cde3322a44b2c8b40ba8fb36932437d06 SHA512 1a0a088611df84dbace620c90e2a51372c7b3b19cf55b0616d5629bd61da190300f38ce2c9db96785bfe871e83cc03bdace9e0fd4161380acda7a2a3dc24df1b
-DIST jfrog-cli-2.21.0-deps.tar.xz 168845972 BLAKE2B 0d9c12f4ea00cb21253f86f7fee066dc0a56f132f089234135fd97e320379eb90fe79a62823061c8532dd2e8088ab752b05a67068fd46b7efa103d21d4bbe94a SHA512 48ebf0096e6bd78ce4a52a066605eb84a42353ee78b45e54c4443b55f9a115fe992b5ed18429acb56f9ca4f9669600f845832531d1e56d3a73bbc5c2a83d67cd
-DIST jfrog-cli-2.21.0.tar.gz 10364644 BLAKE2B 6c1216beda2f1c10119b0a1c6979ba00f866b036eaf9272c177ebf576e24188df7c418cc19e3a0e0a7ae1007cfafa18949ca6c113515d60801e4822afc19b14d SHA512 e8f8c7ed513e60e5b9053673ab0d444b98bd51aa9a6362aaca2965e0deb40e1c5d5b5ac0f63dec9f353854a67575d6e9d02af411e591f77144321cf9f9e9dc98
 DIST jfrog-cli-2.21.4-deps.tar.xz 168791144 BLAKE2B dc405831c66dad14427909d7f2e1d87829a98083f84f9e2aa597f698c0132df46af17edda759d4f23e08f2625194f3a453f705f4f51127ee81610f6358399c5f SHA512 f8f7e4adf5f2ace30f48ef595d0f3137e3755d51e0c2b2ed5d1207313bae7ccca7a8c413ca9920a6835fc02129a96ca2a2c5562519c2ad9e0260a43cb8a6ef96
 DIST jfrog-cli-2.21.4.tar.gz 10364911 BLAKE2B 691bb8e46010bb0cee247452fbf2feb0e325bfc3d4d46e776c37e4e051b3287c405555b50017045c17ea49cf978e304974114795d47ab97e7bafb250e8ae3db7 SHA512 de81f6dfb03494c34439142edd5e2b14a844e47b32576f51fd153a902d63a6bc1d418201d47fc370f6a695f075652549605f342b8d35902f029a2af023d2d854
+DIST jfrog-cli-2.25.0-deps.tar.xz 171748840 BLAKE2B b17c23e58ec16a5e3e58505a9e6f8db31ace203d0514bf658f007a0164a158baaa0c5bed5fbf22b79bde199a93688a715a61cc80d6a284c937e9b3fc70486832 SHA512 8b55109d0bd98ef63cfa20ef4cc864493b25a9b3c59dc2bcf57e86bbb943c590d4155246fe31f14e001c9934c09523cb7b3326836f24fc62dee4ace9b27526b1
+DIST jfrog-cli-2.25.0.tar.gz 10351466 BLAKE2B cef89325ac60fdf68bc8b69cbae1979c7eb74d3af9a6be3a0475afa8fefbcd71cab550b6e7d50f8fa4a0a17df7f15a1fa63559045c176dd387d4eeaa51017ccc SHA512 1fe988a47d89781e6dd42f0a3318fbc551ec94a3a45af39fb1d9012f632856e890193022c54e10aac0e09c12bf51e714f3bdad15dd120bf3008c77840b149bb5
 EBUILD jfrog-cli-1.35.3.ebuild 551 BLAKE2B fed08c16526b5a29fdd8cc41a189fe5108ae73d590c33efeaaf851dbdb6b40cfc63b47dbbc7169f4986efd61578d002f3459fa75f0db47aa1afbf94c3744639f SHA512 1faff85e1f94847650c5ad7a3750aa29e0cb1c3a688b4290a938457a3eac135ab2cb7033322098c1b2fb47c0c5971c09d2537d547c6d6dd141af883917cbe2b1
-EBUILD jfrog-cli-2.21.0.ebuild 563 BLAKE2B 7aebbb97e0f83274522521671da98620d2ec98226993da2f28418cacdc1b428a18e90b8445dee926d4e0b915036e82bc04d4579af1b8c1e2e89b828c6e651237 SHA512 e36f78a0a168b8ba946f565d6f167fed5e10e87c4656151b337de5575f1120bacba301c5bd68e0e6e0eed047b5dbd6a638fb65ef600140b322d4259d5a989edf
 EBUILD jfrog-cli-2.21.4.ebuild 563 BLAKE2B 7aebbb97e0f83274522521671da98620d2ec98226993da2f28418cacdc1b428a18e90b8445dee926d4e0b915036e82bc04d4579af1b8c1e2e89b828c6e651237 SHA512 e36f78a0a168b8ba946f565d6f167fed5e10e87c4656151b337de5575f1120bacba301c5bd68e0e6e0eed047b5dbd6a638fb65ef600140b322d4259d5a989edf
+EBUILD jfrog-cli-2.25.0.ebuild 563 BLAKE2B 7aebbb97e0f83274522521671da98620d2ec98226993da2f28418cacdc1b428a18e90b8445dee926d4e0b915036e82bc04d4579af1b8c1e2e89b828c6e651237 SHA512 e36f78a0a168b8ba946f565d6f167fed5e10e87c4656151b337de5575f1120bacba301c5bd68e0e6e0eed047b5dbd6a638fb65ef600140b322d4259d5a989edf
 MISC metadata.xml 245 BLAKE2B 58d190125b0404884325cc429d9e8e2a7544b673f0e29bb81ef646f5687af2e20b57aeff431ddb97ce959ca6dacd91ae7c75c97a80e7d67161a1d30ba920d885 SHA512 f78a3e6ce5d4b05fdba7daf2e839164668486c74dbd1f1aafcdf99ec61dc037b9988692a5b4b7acd2223948124a496cf51913c0b044a9883891cb5b3bd7fcf30
diff --git a/dev-util/jfrog-cli/jfrog-cli-2.21.0.ebuild b/dev-util/jfrog-cli/jfrog-cli-2.25.0.ebuild
index 8f8fecf94d4b..8f8fecf94d4b 100644
--- a/dev-util/jfrog-cli/jfrog-cli-2.21.0.ebuild
+++ b/dev-util/jfrog-cli/jfrog-cli-2.25.0.ebuild
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index b5edb10b319b..65e45d4ac95f 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kate-addons/Manifest b/kde-apps/kate-addons/Manifest
index dd236681cbe5..a2e9d929883c 100644
--- a/kde-apps/kate-addons/Manifest
+++ b/kde-apps/kate-addons/Manifest
@@ -1,3 +1,3 @@
 DIST kate-22.08.0.tar.xz 7655384 BLAKE2B 7f8ccf67f6e29c3047b3ad4cdbd28d373d35b5d4cb580aa29097229ad5910ed2393fe97acc742c755a4b35711086aaa55c698fc3fe3fbd0d3e64d9df021b15e8 SHA512 637e5314cabe87efdd6f8162b955d9b369a6bc12e77006325dd3038d517208ef5aca457ca2932cd37c1f98301b7a1968f30859e5c7a5cb16ce0b974910d7c5bc
-EBUILD kate-addons-22.08.0.ebuild 2948 BLAKE2B 815359208271f045297341275b11ce4b38551dadeb93999ac7f175795fc16f128e832528317055b295c60dbf7c247e73ad86079fd98eab12dc45df667563ecab SHA512 d13945424d5efc3fddc46d2a3175567f1f94c74906fd424158da0bdb87e093baad8775dbcd87ac7891981b9f637b613a80346774530a47646a49eee8218f912e
+EBUILD kate-addons-22.08.0-r1.ebuild 3168 BLAKE2B 57b81170af6a597f8c75b2bf95f12b348ec8b866fc5c4243a593821aa4b8672e9cd23a1420a31faf9e8c4334345347bf86590b7c56f15793c864cb02dbd78e11 SHA512 90fd73ae0d5c287ac869bf5977c74a303b76ba09ceac6df374ee11fea0c377c7f53f33eb85976639fd1db93dc4fb11e9f47bddb9f03eba61855bb5f282ce508e
 MISC metadata.xml 823 BLAKE2B 8fddae2ff849ebcd8649062051abe298c1381cbc34bdcadc675d4d2ce9829abe6db303c329fe07d4108663e107e7ee84f4408ff9cce8463d9aee30b056130614 SHA512 280c7ca5753dac7ead851fd41458cc185306862f69a38980d8fd5c9f52c4525f70f7970ee2a947c243bce05acf8791b6325c8ad8b31c1e69f87026c066223e0e
diff --git a/kde-apps/kate-addons/kate-addons-22.08.0.ebuild b/kde-apps/kate-addons/kate-addons-22.08.0-r1.ebuild
index eb254e303ee7..84aad14fc16a 100644
--- a/kde-apps/kate-addons/kate-addons-22.08.0.ebuild
+++ b/kde-apps/kate-addons/kate-addons-22.08.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
 LICENSE="LGPL-2 LGPL-2+ MIT"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+filebrowser lspclient +projects plasma +snippets sql"
+IUSE="+filebrowser lspclient plasma +projects +snippets sql"
 
 DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -82,6 +82,12 @@ src_configure() {
 		-DBUILD_kate=FALSE
 		-DBUILD_kwrite=FALSE
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON # docs in kate/kwrite
+		-DBUILD_filebrowser=$(usex filebrowser)
+		-DBUILD_lspclient=$(usex lspclient)
+		-DBUILD_sessionapplet=$(usex plasma)
+		-DBUILD_project=$(usex projects)
+		-DBUILD_snippets=$(usex snippets)
+		-DBUILD_katesql=$(usex sql)
 	)
 
 	# provided by kde-apps/kate-lib
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2a52a903c733..7c5a53c54c78 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index c8cf38991985..a26d23b8c372 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1,6 +1,6 @@
 DIST pianobar-2020.04.05.tar.bz2 48823 BLAKE2B 91e9b96f0a635995ab08bd189b7b6b353f553b6c6cd405be2e95f9c0401b075158df4aa28633854747eced4ac60777724dd265dae62744c773d5f4b4c12aa90e SHA512 40d717693f128da3718c0e1be9c90c269712becf9ac2ffe0669a91ea9417d0fdb0476949df29c1da908e2d78678f26955149dbb8c5a0167161f95835ce76084e
 DIST pianobar-2022.04.01.tar.bz2 52262 BLAKE2B d6f28a893ad94aed2cb7cda55a2b00480bb1319e01561974d75a10559c5ccda45fa6fe216d0b1d130c33d6eb2d7b395a95942a8a62eec0c21912f208799cc8f3 SHA512 9ad60c0048b375d74ad2bab289d75deec6dba46c31bfc1799dabf18661ec0cdef494df72273e6c16989ead21dc034445595a3e2ace43f6b6ca61446449895aef
 EBUILD pianobar-2020.04.05.ebuild 992 BLAKE2B 16aaba26aa09d2ebeff2544644f34e85c6bd1bb2e2ad3a9e4695d5c2c20dadef1dfb88455491be301c21339d191e090d7bbce73d5b9b70d3b61db1467360e5fa SHA512 39a998c14439899b6d3c9856d6f6f4af593c3a3add50b5ff2c55b9fc57f20937e2009e52fc756141772a0cfac2c35ffb1f60af09cda81a628399b57803b4030c
-EBUILD pianobar-2022.04.01.ebuild 984 BLAKE2B 6935a2a12a48409ea28ecebef8ec707e7414f0459f960c35507b9abf1429523b0d8b5bacab8b872ac9f03eeba6aed37f6360b0a8c16443c5352b1f1a64699752 SHA512 71e8bf077d532cff1b6408076b1423af87f838d65f45cdd11e7bd8c2217fe438303ef5c427d8df159254a5e5a5956cd28652ec01c2ee530fee13030d8cf95686
+EBUILD pianobar-2022.04.01.ebuild 983 BLAKE2B ddb92a5d8bfe3c7392ef26cd45219b62eaca3054f0ced080cf06ebbdf85d4dedb182c769c3b1a4c329a609f1aba210bbe3aa7e322c42776d96292338ac691f69 SHA512 4ef051ec17589a08d4a2cae6a8cb1b08e14e27fc36c0d5c742c3c0ef251f94cd2bfe42c87b7b8c53c7d5d462568ff309af80669a78fb894d0054bd2b576aaf3e
 EBUILD pianobar-9999.ebuild 985 BLAKE2B cfbb686d02f0ddc224e2933c2a64d6d3eaa7cb6b6da58c33dd2af3cec591c01e5c4efd48b463ab38f670b7e9e0ea0e83cb382a01621c0e05c8b0da2626514111 SHA512 1d80948b4cd943f4467f6dde9db109b52ff30856c79a2673501e229d39046b85045faaa5f4f0e08d033cefe1cb9550b214c366d1a82dc915041240dfb5bb4e30
 MISC metadata.xml 337 BLAKE2B 776f79004b01138ab0e838d549fd758c5e4d317f4bd85e7ae04c849f84250280aad049a4d7b400fe34c1e3951908d4202081a2434deb3f8389fd9b935ff79f27 SHA512 25323f03258dcc1d819c41ba27f5679167eae2c86896c3705b486569cfdf399cb80820b9fcc5b32d1205bc35eaa50fffa723d0253937ac434835221ae98477a9
diff --git a/media-sound/pianobar/pianobar-2022.04.01.ebuild b/media-sound/pianobar/pianobar-2022.04.01.ebuild
index e48c012bbb33..0e9b523e9e08 100644
--- a/media-sound/pianobar/pianobar-2022.04.01.ebuild
+++ b/media-sound/pianobar/pianobar-2022.04.01.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git"
 else
 	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="A console-based replacement for Pandora's flash player"
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 64f5a7a3b3f5..dfd2fe958f18 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,6 @@
 DIST strawberry-1.0.5.tar.xz 11212028 BLAKE2B 2bb668bc9a4f66a9cdeaa28f47f21bf90f999d5524fa443bc7beaa1d0d7c6dc6727bf4df010fc06989e00fc34d62902add11186908fcf3f1b490c3bf745a9971 SHA512 4c625c75855f87952b274c85b4c5b021b27e75a74d46202ab3ea0aa3c86f510bccdece583483c4ba73e4733f151feb5eac5f5ef5d9a956995979fa307fd8d911
 DIST strawberry-1.0.7.tar.xz 11216436 BLAKE2B f7bc53f33be53fb9d947ea4f4c29827cc4248b0249904f2e48cbd9e4440de1f7f866d83c9fddc92cfb6f56b050c4dc40f0ad5e67a58c2a75e47a9d666847e9b3 SHA512 9bf092c3990ae0c2ce63074c7f6076ccab896ae915c4ee255a7fbb6534d50467648f3e96bc029075acfd50515c45ade867e55518d9a68ec9c10a741e1976d64f
 EBUILD strawberry-1.0.5.ebuild 3068 BLAKE2B ab5f45dc7358f0a6390154c35d241059c3620a47cc0060487f7777c87503d13b8cebafdf7739736844415deffb738ec7797e3ddfa8a471908380075ab07813f2 SHA512 e019a4ce8f3cb9aea5f281d6a07caf24c25e653ece187e8b86b4bd9442b66da7d20dfeaded540298ab7546346e4ee67b7707100ae1ff2e349acad2afe6ec5a28
-EBUILD strawberry-1.0.7.ebuild 3020 BLAKE2B c61c0a3c6b10893b73c69592fd8fa407a670bac51e3592886749c44c5845e3547b70f7f7d0697c83afbec224a030b0314db4b6b2936cf2edff2508ff7df7d5e8 SHA512 aa94b3f853134b4e24dd333161c95d54db5a501410f1a293c31918348aba97c9fbdfacd465cfaf9c955e949d49e53819e88ba1f9980dcc38317ef18127496151
+EBUILD strawberry-1.0.7.ebuild 3019 BLAKE2B f90ce6144be7f24a66d09d114f4ec9b4f28bd6c12e37a423b785973b8391f06dff2c35eca6e344c6b1ce82dd64e65f0d894e8de1e8eb1bf7cb5c08bce72a604b SHA512 6b803a3b98994f7628d2cb8f729ca189c7d72d865a76087f0fda8f00d8922844d3e16516e27bca8c3b547a3608f0074c999707472ecb3c2c2aab37344d04f2e9
 EBUILD strawberry-9999.ebuild 3070 BLAKE2B 1cd56a5ba45ed314bb22257dbde534b3deb9a58861b904c20c94ba9800f8f9d8605c8c7f19d9ecf6bbb809f03197585e5f91e794d80a69e4e09237433900f8a9 SHA512 2276e97036ebbba238b7fd2e477cabebda2faa34db295b802ab84f9a7c8426a96d83b898f35a816bc21b1623c1d9aedd1b8c52944bc15908ada51198ee0dd12b
 MISC metadata.xml 473 BLAKE2B 87bfc0758ce3a886e370384baf5bf4832c0e94f27a1789bce62c73f69c8f6ceda5c2cf36295412b751ae55aeb7c5c52f695e96b363e72d91f4019fe4a81af945 SHA512 88779d17c969b36adc7cc1ead94940643e1842e081d5c370c9190da1bbe1b0b152211d249a1b06d99a9638930a44e48e54a89c6b4139793cb23bcaf136e24813
diff --git a/media-sound/strawberry/strawberry-1.0.7.ebuild b/media-sound/strawberry/strawberry-1.0.7.ebuild
index 3e1c18fd83d8..b14411677be9 100644
--- a/media-sound/strawberry/strawberry-1.0.7.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f1571ee1016f..e9293fb62790 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3ea8731cc59c..8408c19895e0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Aug 2022 19:10:34 +0000
+Sat, 27 Aug 2022 01:09:58 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 675dcfcca1ab..57263874183c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 524322 BLAKE2B 3983f62074c223717c76ae7cd44857f5de5972e245bd5f084c8632e144cf7a950ad3ddd53324db99f9b82eb9e76e49cd3a84bf1f531314d7660db91335a05cb9 SHA512 9b6be0313a2999bb5ad817a373c95ecf8d02d687a3d707b14136357c7bc684ea302f0ccdb228be1e52484b458ecca78cec7150915afe09c096106aa055c4eae2
-TIMESTAMP 2022-08-26T19:10:38Z
+TIMESTAMP 2022-08-27T01:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMJGq5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMJbuxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCQbQ/5AdrvTAWjXpOZOdf9jq9VWgz8jkUVvhCEZz5WPGwooaC+9U7qTmZzmo6i
-xyHjrsQmET1H5be1SSR3goZ7e9NC3ZbDyPnDpaL8yVQpb2tYSlUam9lAcNtXKmaf
-br8GfFEkOLPMLj/COFmYUcg0VLl47LrCYBCYP1PdIOsLMjPUiVLtEc73tXs42QDv
-V8ZRnM9O15dG9bn+ihEUfir9zItWGZuTavkX7Flla9+Cfl4pEkr8YO1hjBneU3j/
-8skRMz7nBYscH6lHCbNtgdxoJz9zy3OQjbd0QnUjdmjaf+DKdUjlKbhpoYf+XQFm
-PIocDaAnWLcB7jgf4X9Q1337eys8uEc0Jr9G7596QK6SAtUqGaU6DBJxwYC6S2nd
-8BqkpBXKtD8D6Lc0l7T6M2ipBfwCWp9x/Amxtg+WNTCEM9TiWHjM3C6h7EZNWxoe
-0YbJ37s1qvFjm4XiErx0tiPiSNQvkr3i8eJ1WCpl6nuEIOMkU1Rbn7rh5PIsrVk9
-ySnjTFLWBXSixXixsnTyFGJ9xIPU9z0fPOsWtJH1phMXmc0Z2gHp4/Gk6C9v2o/E
-dfofnE3hg7R/iL7UMIDpZNJrkVgamh8jLl6wCuRFMPbMDIEIcgDcfjYnpUSLUI8K
-pMt+JOe2F5UxgBsZQQ14IuslMY3yYAQNPcBED7NamGSGz9fGmvY=
-=UNB+
+klCTWxAArXbex/ovD8m9tVDVL3DJHDVc2bVx+yPU3PCwgpMEQ0fEGAuKaB7Afy+c
+MOG5s0YZyJglRksveUuWJ3592u9MZksdF8Fgy0QXwCP+p5HOa+RYHobNek/VK2Ge
+ro+7uqm4oa9HJrCM4O2+z/GJkydbha8VXKgAl2NveeG88wY1qyE4ZyUBAN514rNY
+/6w3aSSAICd5epJS/hAye9h8v3sVclwDwg1Tv64Iq/+5zEdqkfrWVmKYOLkF2nd8
+3BCca5Rybzjh/XcQjNpvAmv1ZsFK03cQ8WuJDNPO6F3pDXhvVUyZVxQISR1vEH9I
+WEiD3JCI3nePKaFvK/2O1hvbJ+HjabTqB+0fnCCrwRb/bpgsZmTfAzvWXC58Bhej
+eQ2OuRciux0pw9eCf+zHE+p07RscNMvS6og8/D/f4u3TpB8z47PLua3XN03usGsX
+bGm8AIAQN4PhAGdjp75ZyiXV/SZPr5Kt3DVEMf5b4NawxeuEeK0YId/9lgGbI2Ge
+L/7C9Lwx/2xKQl9G88LE3XEiwv+R5jM20WqVh0oj5qXlpT29cnusPuOIcXstV7YV
+PrAujw7gJL5aAfuqpu/HIuG5FZHrqTr+Xd/NKGy5x6bD530H6L7a02FqIBu+G+K8
+BVlDCOWN9RMoBwXn0tbPYSmOom0t20h7s1lcPv7MqJ+NuqUpCbA=
+=y45t
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 922089ff3588..8408c19895e0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Aug 2022 19:10:35 +0000
+Sat, 27 Aug 2022 01:09:58 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index edeb82ad6277..d649cc68ae2f 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 81fd62ab2330..199982f4f1bf 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/serf-0.10.0 b/metadata/md5-cache/app-admin/serf-0.10.0
new file mode 100644
index 000000000000..69f6f8e0a964
--- /dev/null
+++ b/metadata/md5-cache/app-admin/serf-0.10.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=Service orchestration and management tool
+EAPI=7
+HOMEPAGE=https://www.serfdom.io/
+INHERIT=go-module systemd
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD MIT
+RDEPEND=acct-user/serf acct-group/serf
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/serf/archive/v0.10.0.tar.gz -> serf-0.10.0.tar.gz https://dev.gentoo.org/~zmedico/dist/serf-0.10.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1c8da28ac6c65e3fde56fa067b281416
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 577635936753..2b0d090cd827 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/buildah-1.27.0 b/metadata/md5-cache/app-containers/buildah-1.27.0
new file mode 100644
index 000000000000..5877101b91c0
--- /dev/null
+++ b/metadata/md5-cache/app-containers/buildah-1.27.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=app-crypt/gpgme:= app-containers/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+DESCRIPTION=A tool that facilitates building OCI images
+EAPI=7
+HOMEPAGE=https://github.com/containers/buildah
+INHERIT=bash-completion-r1 go-module
+IUSE=selinux
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=app-crypt/gpgme:= app-containers/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/containers/buildah/archive/v1.27.0.tar.gz -> buildah-1.27.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=052e1dc8878222755f5f9e368e4e94c1
diff --git a/metadata/md5-cache/app-containers/cri-tools-1.25.0 b/metadata/md5-cache/app-containers/cri-tools-1.25.0
new file mode 100644
index 000000000000..0d42fde5f151
--- /dev/null
+++ b/metadata/md5-cache/app-containers/cri-tools-1.25.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=dev-lang/go
+DESCRIPTION=CLI and validation tools for Kubelet Container Runtime (CRI)
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes-sigs/cri-tools
+INHERIT=bash-completion-r1 go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes-sigs/cri-tools/archive/v1.25.0.tar.gz -> cri-tools-1.25.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4c840d1da58ffe26d5db9fb0c0cd68d5
diff --git a/metadata/md5-cache/app-containers/snapd-2.57.1 b/metadata/md5-cache/app-containers/snapd-2.57.1
new file mode 100644
index 000000000000..9874dd664927
--- /dev/null
+++ b/metadata/md5-cache/app-containers/snapd-2.57.1
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-lang/go-1.9 dev-python/docutils sys-devel/gettext sys-fs/xfsprogs sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma]
+DESCRIPTION=Service and tools for management of snap packages
+EAPI=7
+HOMEPAGE=http://snapcraft.io/
+INHERIT=autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
+IUSE=apparmor +forced-devmode gtk kde systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT
+PDEPEND=sys-auth/polkit[gtk?,kde?]
+RDEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma]
+REQUIRED_USE=!forced-devmode? ( apparmor ) systemd
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/snapcore/snapd/releases/download/2.57.1/snapd_2.57.1.vendor.tar.xz -> snapd-2.57.1.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f0bba1878b6255e873b18696bef1b1ff
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 5d64156fde0c..13362a4bd7a3 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.36-r2 b/metadata/md5-cache/app-emulation/virtualbox-6.1.36-r2
index 7191cc056179..820acce2e9d9 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.36-r2
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.36-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
 INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
 IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.36 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( sdl? ( media-libs/libsdl:0[X,video] ) x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.36/VirtualBox-6.1.36.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8e83c76a3ca5a69de165f1fdc17c9ff8
+_md5_=f415ed54543f921fb13810538226db9b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.36 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.36
index b08326924b73..4cf76df55900 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.36
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=CD image containing guest additions for VirtualBox
 EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RESTRICT=mirror
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.36/VBoxGuestAdditions_6.1.36.iso
-_md5_=e7ea0ff9eb658e544c5d8f71d1b0d05f
+_md5_=171803b393047635aaa2c3d207d59e10
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.36 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.36
index 3ff92b867912..99017bfc63ca 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.36
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=PUEL extensions for VirtualBox
 EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=PUEL
 RDEPEND==app-emulation/virtualbox-6.1.36*
 RESTRICT=bindist mirror strip
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.36/Oracle_VM_VirtualBox_Extension_Pack-6.1.36.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.36.tar.gz
-_md5_=1df13d75497e063d608096af4b52c889
+_md5_=d988507f4ab6c7672b56f93ab0d4ec29
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.36 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.36
index 3373a10d761e..3da90e546ad9 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.36
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
 INHERIT=edo linux-mod systemd toolchain-funcs udev
 IUSE=X dist-kernel
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.36/VirtualBox-6.1.36.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	56708ddc53d8b607ed88fd97a56e59dc	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=93ac3efcf88afd900ba5b7b5971becc8
+_md5_=6582589a5a2932e7dc968bdfb12d2a9f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36
index ae0534752963..79c192e42ff7 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.36
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
 INHERIT=linux-mod toolchain-funcs
 IUSE=pax-kernel dist-kernel
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://github.com/ceamac/virtualbox-modules-dist/releases/download/v6.1.36/vbox-kernel-module-src-6.1.36.tar.xz
 _eclasses_=linux-info	56708ddc53d8b607ed88fd97a56e59dc	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6fac20f4a65e16163ac678572e74a53b
+_md5_=b7dccbab0ef6e1c5a93941cf3e5b6d76
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index b1992c798e9e..2f74842acca6 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/redis_exporter-1.44.0 b/metadata/md5-cache/app-metrics/redis_exporter-1.44.0
new file mode 100644
index 000000000000..9d96ae70fda7
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/redis_exporter-1.44.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=acct-user/redis_exporter acct-group/redis_exporter
+DESCRIPTION=Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x
+EAPI=7
+HOMEPAGE=https://github.com/oliver006/redis_exporter
+INHERIT=go-module systemd
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD
+RDEPEND=acct-user/redis_exporter acct-group/redis_exporter
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/oliver006/redis_exporter/archive/v1.44.0.tar.gz -> redis_exporter-1.44.0.tar.gz https://dev.gentoo.org/~zmedico/dist/redis_exporter-1.44.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c56249235dc0ee4335575980dc66edc6
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 8229578e5b9c..0415cee3d3d3 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/dasel-1.26.1 b/metadata/md5-cache/app-misc/dasel-1.26.1
new file mode 100644
index 000000000000..a9e2ec71ae1e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/dasel-1.26.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Query, update and convert data structures from the command line
+EAPI=7
+HOMEPAGE=https://github.com/TomWright/dasel
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD BSD-2 ISC
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/TomWright/dasel/archive/v1.26.1.tar.gz -> dasel-1.26.1.tar.gz https://dev.gentoo.org/~zmedico/dist/dasel-1.24.3-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=ce1600e259c6e673a4252b4c13bd1e25
diff --git a/metadata/md5-cache/app-misc/openrgb-0.6-r1 b/metadata/md5-cache/app-misc/openrgb-0.6-r1
deleted file mode 100644
index 1201662c83aa..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/hidapi:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/libusb:1 dev-cpp/nlohmann_json
-DESCRIPTION=Open source RGB lighting control that doesn't depend on manufacturer software
-EAPI=7
-HOMEPAGE=https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/
-INHERIT=flag-o-matic qmake-utils
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/hidapi:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/libusb:1
-SLOT=0/1
-SRC_URI=https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.6/OpenRGB-release_0.6.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d8997f3d55a2a26678981f26618b1694
diff --git a/metadata/md5-cache/app-misc/openrgb-0.7 b/metadata/md5-cache/app-misc/openrgb-0.7
index 08c577b91a1b..1854242f094a 100644
--- a/metadata/md5-cache/app-misc/openrgb-0.7
+++ b/metadata/md5-cache/app-misc/openrgb-0.7
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-li
 SLOT=0/2
 SRC_URI=https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.7/OpenRGB-release_0.7.tar.bz2
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a6d877b1b1c22f99da3afca9d4b28743
+_md5_=e76d5a8bc366a50f60e3a2886ad3f855
diff --git a/metadata/md5-cache/app-misc/openrgb-0.7-r1 b/metadata/md5-cache/app-misc/openrgb-0.7-r1
new file mode 100644
index 000000000000..70a885f57e53
--- /dev/null
+++ b/metadata/md5-cache/app-misc/openrgb-0.7-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1 dev-cpp/nlohmann_json
+DESCRIPTION=Open source RGB lighting control that doesn't depend on manufacturer software
+EAPI=8
+HOMEPAGE=https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/
+INHERIT=flag-o-matic qmake-utils udev
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1
+SLOT=0/2
+SRC_URI=https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.7/OpenRGB-release_0.7.tar.bz2
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=6be3a17584942f8a12743f95acd98a9a
diff --git a/metadata/md5-cache/app-misc/openrgb-9999 b/metadata/md5-cache/app-misc/openrgb-9999
index fe0d6a3c224c..0798f4ce3279 100644
--- a/metadata/md5-cache/app-misc/openrgb-9999
+++ b/metadata/md5-cache/app-misc/openrgb-9999
@@ -1,13 +1,13 @@
-BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install postinst postrm prepare unpack
 DEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1 dev-cpp/nlohmann_json
 DESCRIPTION=Open source RGB lighting control that doesn't depend on manufacturer software
 EAPI=8
 HOMEPAGE=https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/
-INHERIT=flag-o-matic qmake-utils git-r3
+INHERIT=flag-o-matic qmake-utils udev git-r3
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1
 SLOT=0/2
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=458ee848164a2435d6270c9c8e693d74
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=8ae686f441fd9c23c1996bb0008d92ee
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-effects-0_p20210619-r1 b/metadata/md5-cache/app-misc/openrgb-plugin-effects-0_p20210619-r1
deleted file mode 100644
index 8d777a1a4689..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-plugin-effects-0_p20210619-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND==app-misc/openrgb-0.6*:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/openal dev-cpp/nlohmann_json
-DESCRIPTION=Plugin for OpenRGB with various Effects that can be synced across devices
-EAPI=7
-HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin
-INHERIT=qmake-utils
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND==app-misc/openrgb-0.6*:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/openal
-SLOT=0
-SRC_URI=https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/archive/a8ea7eef586d9dc341fbe67f60cb8cb4d69a9504/OpenRGBEffectsPlugin-a8ea7eef586d9dc341fbe67f60cb8cb4d69a9504.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=77294d8881b0a8dca3e24b615514aaaf
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-skin-0_p20210601-r1 b/metadata/md5-cache/app-misc/openrgb-plugin-skin-0_p20210601-r1
deleted file mode 100644
index bdef12b07f74..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-plugin-skin-0_p20210601-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND==app-misc/openrgb-0.6*:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-cpp/nlohmann_json
-DESCRIPTION=Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB
-EAPI=7
-HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/openrgbskinplugin
-INHERIT=qmake-utils
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND==app-misc/openrgb-0.6*:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gitlab.com/OpenRGBDevelopers/openrgbskinplugin/-/archive/3d937cf5112a98052f98a106dc0f5de1eafc20ea/openrgbskinplugin-3d937cf5112a98052f98a106dc0f5de1eafc20ea.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5f8bbe1754052d5e4be76a6283bedc88
diff --git a/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0_p20210614-r1 b/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0_p20210614-r1
deleted file mode 100644
index 7fecc68569fc..000000000000
--- a/metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0_p20210614-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND==app-misc/openrgb-0.6*:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-cpp/nlohmann_json
-DESCRIPTION=Plugin for OpenRGB to create virtual devices out of multiple real ones
-EAPI=7
-HOMEPAGE=https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin
-INHERIT=qmake-utils
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND==app-misc/openrgb-0.6*:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/b603bb994719c765cc52c116c6f9f3983fc2a7b2/OpenRGBVisualMapPlugin-b603bb994719c765cc52c116c6f9f3983fc2a7b2.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=23274b8d71a1f0f6d0beae4eecb21a90
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index acbfb7f687e0..947b9fc6e7f5 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/libplist-2.2.0-r4 b/metadata/md5-cache/app-pda/libplist-2.2.0-r4
index 687fc0f043ab..01a3db58a0d0 100644
--- a/metadata/md5-cache/app-pda/libplist-2.2.0-r4
+++ b/metadata/md5-cache/app-pda/libplist-2.2.0-r4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.libimobiledevice.org/
 INHERIT=autotools python-r1 toolchain-funcs
 IUSE=python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm arm64 ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0/2.0-3
 SRC_URI=https://cgit.libimobiledevice.org/libplist.git/snapshot/libplist-2.2.0.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4ae2482ad31cdd92e24929edea9e3635
+_md5_=da05ecfcbe515279cbe79787ba3e22a1
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index fe8f13194e11..0dc8692e3d33 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/bash-5.1_p16-r2 b/metadata/md5-cache/app-shells/bash-5.1_p16-r2
new file mode 100644
index 000000000000..3cd68787bb84
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-5.1_p16-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/yacc verify-sig? ( sec-keys/openpgp-keys-chetramey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=7
+HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html
+INHERIT=flag-o-matic toolchain-funcs prefix verify-sig
+IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.1.tar.gz.sig ) mirror://gnu//bash-5.1-patches/bash51-001 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-001.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001.sig ) mirror://gnu//bash-5.1-patches/bash51-002 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-002.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002.sig ) mirror://gnu//bash-5.1-patches/bash51-003 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-003.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003.sig ) mirror://gnu//bash-5.1-patches/bash51-004 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-004.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004.sig ) mirror://gnu//bash-5.1-patches/bash51-005 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-005.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005.sig ) mirror://gnu//bash-5.1-patches/bash51-006 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-006.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006.sig ) mirror://gnu//bash-5.1-patches/bash51-007 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-007.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007.sig ) mirror://gnu//bash-5.1-patches/bash51-008 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-008.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008.sig ) mirror://gnu//bash-5.1-patches/bash51-009 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-009.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009.sig ) mirror://gnu//bash-5.1-patches/bash51-010 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-010.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010.sig ) mirror://gnu//bash-5.1-patches/bash51-011 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-011.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011.sig ) mirror://gnu//bash-5.1-patches/bash51-012 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-012.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012.sig ) mirror://gnu//bash-5.1-patches/bash51-013 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-013.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013.sig ) mirror://gnu//bash-5.1-patches/bash51-014 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-014.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014.sig ) mirror://gnu//bash-5.1-patches/bash51-015 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-015.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015.sig ) mirror://gnu//bash-5.1-patches/bash51-016 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-016.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016.sig ) https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-5.1_p16-patches.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=69a76736092ac0e8b15bd1b044d21989
diff --git a/metadata/md5-cache/app-shells/bash-5.2_rc2-r1 b/metadata/md5-cache/app-shells/bash-5.2_rc2
index 7c80ed6a1e51..05f4d4708013 100644
--- a/metadata/md5-cache/app-shells/bash-5.2_rc2-r1
+++ b/metadata/md5-cache/app-shells/bash-5.2_rc2
@@ -1,14 +1,14 @@
 BDEPEND=pgo? ( dev-util/gperf ) verify-sig? ( sec-keys/openpgp-keys-chetramey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl )
+DEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
 DESCRIPTION=The standard GNU Bourne again shell
 EAPI=7
 HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git
 INHERIT=flag-o-matic toolchain-funcs prefix verify-sig
 IUSE=afs bashlogger examples mem-scramble +net nls plugins pgo +readline verify-sig
 LICENSE=GPL-3+
-RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl )
+RDEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.2-rc2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.2-rc2.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.2-rc2.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/bash-5.2-rc2.tar.gz.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e7feb3124e752888f795be8fc2de59f2
+_md5_=684170934a0831b0a4dbd462af6d5c4f
diff --git a/metadata/md5-cache/app-shells/bash-5.2_rc3 b/metadata/md5-cache/app-shells/bash-5.2_rc3
new file mode 100644
index 000000000000..1b9e2a3e28c1
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-5.2_rc3
@@ -0,0 +1,14 @@
+BDEPEND=pgo? ( dev-util/gperf ) verify-sig? ( sec-keys/openpgp-keys-chetramey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=7
+HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git
+INHERIT=flag-o-matic toolchain-funcs prefix verify-sig
+IUSE=afs bashlogger examples mem-scramble +net nls plugins pgo +readline verify-sig
+LICENSE=GPL-3+
+RDEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-5.2-rc3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.2-rc3.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.2-rc3.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/bash-5.2-rc3.tar.gz.sig )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=684170934a0831b0a4dbd462af6d5c4f
diff --git a/metadata/md5-cache/app-shells/bash-9999 b/metadata/md5-cache/app-shells/bash-9999
index 35488026bb95..a587e1588fae 100644
--- a/metadata/md5-cache/app-shells/bash-9999
+++ b/metadata/md5-cache/app-shells/bash-9999
@@ -1,14 +1,14 @@
 BDEPEND=pgo? ( dev-util/gperf ) verify-sig? ( sec-keys/openpgp-keys-chetramey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl )
+DEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
 DESCRIPTION=The standard GNU Bourne again shell
-EAPI=8
+EAPI=7
 HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git
 INHERIT=flag-o-matic toolchain-funcs prefix verify-sig git-r3
 IUSE=afs bashlogger examples mem-scramble +net nls plugins pgo +readline verify-sig
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl )
+RDEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
 SLOT=0
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=9b626cafb087f9858b5dcdff24fa824f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=684170934a0831b0a4dbd462af6d5c4f
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index be8941ad5da8..94e3012913ec 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/sqlmap-1.6.8 b/metadata/md5-cache/dev-db/sqlmap-1.6.8
index d86aeb93d78e..c9cdc8867b3b 100644
--- a/metadata/md5-cache/dev-db/sqlmap-1.6.8
+++ b/metadata/md5-cache/dev-db/sqlmap-1.6.8
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://sqlmap.org/
 INHERIT=bash-completion-r1 python-single-r1 wrapper
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/sqlmapproject/sqlmap/archive/refs/tags/1.6.8.tar.gz -> sqlmap-1.6.8.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4606b4a8897b4a44f149581559358717
+_md5_=b0e401850e7993ac1d9c6196ea5aa726
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 8024e3a269d1..26dd9ab20036 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/gopls-0.9.0 b/metadata/md5-cache/dev-go/gopls-0.9.0
deleted file mode 100644
index 355a4acd9475..000000000000
--- a/metadata/md5-cache/dev-go/gopls-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 >=dev-lang/go-1.16 app-arch/unzip
-DEFINED_PHASES=compile install prepare test unpack
-DESCRIPTION="Go please" is the official Go language server
-EAPI=7
-HOMEPAGE=https://github.com/golang/tools/blob/master/gopls/README.md
-INHERIT=go-module
-KEYWORDS=~amd64
-LICENSE=BSD
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/golang/tools/archive/refs/tags/gopls/v0.9.0.tar.gz -> gopls-0.9.0.tar.gz https://dev.gentoo.org/~zmedico/dist/gopls-0.9.0-deps.tar.xz
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
-_md5_=4ad8b8ab21f758d93e24745e199f5480
diff --git a/metadata/md5-cache/dev-go/gopls-0.8.3 b/metadata/md5-cache/dev-go/gopls-0.9.4
index 9efcaa93961e..d5f9d5da8df7 100644
--- a/metadata/md5-cache/dev-go/gopls-0.8.3
+++ b/metadata/md5-cache/dev-go/gopls-0.9.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/golang/tools/archive/refs/tags/gopls/v0.8.3.tar.gz -> gopls-0.8.3.tar.gz https://dev.gentoo.org/~zmedico/dist/gopls-0.8.3-deps.tar.xz
+SRC_URI=https://github.com/golang/tools/archive/refs/tags/gopls/v0.9.4.tar.gz -> gopls-0.9.4.tar.gz https://dev.gentoo.org/~zmedico/dist/gopls-0.9.4-deps.tar.xz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
 _md5_=4ad8b8ab21f758d93e24745e199f5480
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 727637483de3..e36209178ede 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/angus-activation-1.0.0-r1 b/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
index 4f133563680d..e210bdf86c76 100644
--- a/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/angus-activation-1.0.0-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/eclipse-ee4j/angus-activation
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0
 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/angus-activation/archive/1.0.0.tar.gz -> angus-activation-1.0.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=2bffde46da3bcc4545c3fe04d202cc99
+_md5_=b16ce2302a00a68ea3ee76320ecdd221
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1 b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1
index fb20319da37c..2f63e10dfcc3 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://eclipse-ee4j.github.io/mail/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0 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 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse-ee4j/mail/archive/2.1.0.tar.gz -> jakarta-mail-api-2.1.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=c2e523cf0ebed18f8e0e6ee4e50ea6f1
+_md5_=0810dff242e2f1357599c43528311fad
diff --git a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2 b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
index 3d17a7e733f4..927c0496d12f 100644
--- a/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
+++ b/metadata/md5-cache/dev-java/joda-convert-2.2.2-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.joda.org/joda-convert/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-convert/archive/v2.2.2.tar.gz -> joda-convert-2.2.2.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=8d0615b3febf46a56a6b5f74220b5e8b
+_md5_=ad7d4d09859c742a3e23f31d33dbd0d7
diff --git a/metadata/md5-cache/dev-java/joda-time-2.10.14 b/metadata/md5-cache/dev-java/joda-time-2.10.14
index d5ab0367d997..658cfb58c8d7 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.10.14
+++ b/metadata/md5-cache/dev-java/joda-time-2.10.14
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.joda.org/joda-time/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/joda-convert-2.2.2-r2:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/archive/v2.10.14.tar.gz -> joda-time-2.10.14.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=b84e37277fe200f76a36a301e0e3bbe6
+_md5_=03527808d82fae06bbe8bd1365181cfe
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index f2825ee87453..650eb99cdb37 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/elixir-1.13.4 b/metadata/md5-cache/dev-lang/elixir-1.13.4
index 708118bc1732..9a49064188db 100644
--- a/metadata/md5-cache/dev-lang/elixir-1.13.4
+++ b/metadata/md5-cache/dev-lang/elixir-1.13.4
@@ -4,10 +4,10 @@ DESCRIPTION=Elixir programming language
 EAPI=8
 HOMEPAGE=https://elixir-lang.org
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~sparc x86
 LICENSE=Apache-2.0 ErlPL-1.1
 RDEPEND=>=dev-lang/erlang-22:0=[ssl] !!sci-biology/phylip
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.13.4.tar.gz -> elixir-1.13.4.tar.gz
-_md5_=b5dca5b2b442a84645a67dc9dd64e9c8
+_md5_=fc4da49b7f7cb68d741e61c473b95054
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 34456a896e7d..2672a925f759 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/libgit2-1.5.0 b/metadata/md5-cache/dev-libs/libgit2-1.5.0
index 75cebc270b75..9388a0826dc7 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.5.0
+++ b/metadata/md5-cache/dev-libs/libgit2-1.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://libgit2.org/
 INHERIT=cmake python-any-r1
 IUSE=examples gssapi +ssh test +threads trace
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 RESTRICT=!test? ( test )
 SLOT=0/1.5
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.5.0.tar.gz -> libgit2-1.5.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2b34a5a5baf43d70c576009c9f4ec129
+_md5_=f254fb9f969231c77d5a9c6bff436105
diff --git a/metadata/md5-cache/dev-libs/re2-0.2022.06.01 b/metadata/md5-cache/dev-libs/re2-0.2022.06.01
index 48a52083116f..57210f221eae 100644
--- a/metadata/md5-cache/dev-libs/re2-0.2022.06.01
+++ b/metadata/md5-cache/dev-libs/re2-0.2022.06.01
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/re2
 INHERIT=multilib-minimal toolchain-funcs
 IUSE=icu abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=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(-)?] )
 SLOT=0/9
 SRC_URI=https://github.com/google/re2/archive/2022-06-01.tar.gz -> re2-2022-06-01.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=43f415f833e05eba6cea8529dc17ef15
+_md5_=190ee37c63222aa0063435fdf9ea66f2
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c23231b11966..a36b1f407d66 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/ansible-runner-2.2.1 b/metadata/md5-cache/dev-python/ansible-runner-2.2.1
new file mode 100644
index 000000000000..1e744b6db678
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ansible-runner-2.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-daemon[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A tool and python library that helps when interfacing with Ansible
+EAPI=8
+HOMEPAGE=https://github.com/ansible/ansible-runner
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-daemon[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-runner/ansible-runner-2.2.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=43d901c3554cccefa835c3f1eb204444
diff --git a/metadata/md5-cache/dev-python/dominate-2.7.0 b/metadata/md5-cache/dev-python/dominate-2.7.0
index f120e9765a09..25c5432fd8b8 100644
--- a/metadata/md5-cache/dev-python/dominate-2.7.0
+++ b/metadata/md5-cache/dev-python/dominate-2.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Knio/dominate/ https://pypi.org/project/dominate/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dominate/dominate-2.7.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7f99719c9732a87af1daf1146e845776
+_md5_=78b46a1d94de4e3a7ebb21b043db747d
diff --git a/metadata/md5-cache/dev-python/executing-0.9.1 b/metadata/md5-cache/dev-python/executing-0.9.1
index 20fb5251a85a..7cd5f902560f 100644
--- a/metadata/md5-cache/dev-python/executing-0.9.1
+++ b/metadata/md5-cache/dev-python/executing-0.9.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/alexmojaki/executing/ https://pypi.org/project/executing/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexmojaki/executing/archive/v0.9.1.tar.gz -> executing-0.9.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9231c76bfc314563dbfec4612580ab3c
+_md5_=79e13db5be39f2eab41de78508aece57
diff --git a/metadata/md5-cache/dev-python/fakeredis-1.8.2 b/metadata/md5-cache/dev-python/fakeredis-1.8.2
index 81a5a129e1e6..e513e288174f 100644
--- a/metadata/md5-cache/dev-python/fakeredis-1.8.2
+++ b/metadata/md5-cache/dev-python/fakeredis-1.8.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/dsoftwareinc/fakeredis-py/ https://pypi.org/project/fakeredis/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/redis-py-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.16.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dsoftwareinc/fakeredis-py/archive/v1.8.2.tar.gz -> fakeredis-py-1.8.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0c2b65d8db95b3e258683f4d1c988002
+_md5_=0b31bb4db91590924dcd645f9b20911e
diff --git a/metadata/md5-cache/dev-python/graphviz-0.20.1 b/metadata/md5-cache/dev-python/graphviz-0.20.1
index d70981958cb1..3a208c3c6eb5 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.20.1
+++ b/metadata/md5-cache/dev-python/graphviz-0.20.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://graphviz.readthedocs.io/ https://github.com/xflr6/graphviz/ https://pypi.org/project/graphviz/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=media-gfx/graphviz python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xflr6/graphviz/archive/0.20.1.tar.gz -> graphviz-0.20.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a3e49789a336e700f632985151d293ed
+_md5_=6119e839a60f10b987adc36e0008181b
diff --git a/metadata/md5-cache/dev-python/lz4-4.0.2 b/metadata/md5-cache/dev-python/lz4-4.0.2
index aabad48ebbf6..64971c61bd9d 100644
--- a/metadata/md5-cache/dev-python/lz4-4.0.2
+++ b/metadata/md5-cache/dev-python/lz4-4.0.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-arch/lz4:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-4.0.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=69140f900f0869e9b1f005484fbc55dd
+_md5_=6da08f22cb45d99a74f3612aeb103112
diff --git a/metadata/md5-cache/dev-python/nbconvert-6.5.0-r2 b/metadata/md5-cache/dev-python/nbconvert-6.5.0-r2
index 368361073e6c..743ad275df6f 100644
--- a/metadata/md5-cache/dev-python/nbconvert-6.5.0-r2
+++ b/metadata/md5-cache/dev-python/nbconvert-6.5.0-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://nbconvert.readthedocs.io/ https://github.com/jupyter/nbconvert/ https://pypi.org/project/nbconvert/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/entrypoints-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab_pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbconvert/nbconvert-6.5.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9b3e45f9df1ca46830ffa074e0e84943
+_md5_=84f2e886b5619b3afe91f4ef0ddbde45
diff --git a/metadata/md5-cache/dev-python/pygit2-1.10.0 b/metadata/md5-cache/dev-python/pygit2-1.10.0
index 3e6f41609415..c8b64a0ad68a 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.10.0
+++ b/metadata/md5-cache/dev-python/pygit2-1.10.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libgit2/pygit2/ https://pypi.org/project/pygit2/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2-with-linking-exception
 RDEPEND==dev-libs/libgit2-1.5*:= >=dev-python/cffi-1.9.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libgit2/pygit2/archive/v1.10.0.tar.gz -> pygit2-1.10.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=53ac41c8c6c700116635960dd4962b37
+_md5_=0a837309ef2165e126a50ceb9a135d11
diff --git a/metadata/md5-cache/dev-python/tinycss2-1.1.1-r1 b/metadata/md5-cache/dev-python/tinycss2-1.1.1-r1
index ecf47ce76f3a..3e0bec74e104 100644
--- a/metadata/md5-cache/dev-python/tinycss2-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/tinycss2-1.1.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.courtbouillon.org/tinycss2 https://github.com/Kozea/tinycss2/ https://pypi.org/project/tinycss2/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/webencodings-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kozea/tinycss2/archive/v1.1.1.tar.gz -> tinycss2-1.1.1.gh.tar.gz test? ( https://github.com/SimonSapin/css-parsing-tests/archive/c5749e51dda3868b3e8062e65a36584c2fec8059.tar.gz -> css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4a097a38be6b5f0a8a8bbd9a3ece8281
+_md5_=6ede705b174375009675637fac8567a8
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.2.0 b/metadata/md5-cache/dev-python/werkzeug-2.2.0
index 040bd4f4af87..015b3788d02f 100644
--- a/metadata/md5-cache/dev-python/werkzeug-2.2.0
+++ b/metadata/md5-cache/dev-python/werkzeug-2.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://palletsprojects.com/p/werkzeug/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/2.2.0.tar.gz -> werkzeug-2.2.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=15f2d2d4d43d88fbb1c1b8e8533c615f
+_md5_=b054d41fd177e9caa4962a61bc2ce593
diff --git a/metadata/md5-cache/dev-python/xarray-2022.6.0 b/metadata/md5-cache/dev-python/xarray-2022.6.0
index eda204bb4297..da49831832b3 100644
--- a/metadata/md5-cache/dev-python/xarray-2022.6.0
+++ b/metadata/md5-cache/dev-python/xarray-2022.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://xarray.pydata.org/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-2022.6.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4e6930df1791fae97d50dbfe954ea879
+_md5_=ffbeb73a1376873c3cf78d941992a653
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 9fe2c89cb794..1a3f05887394 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/jfrog-cli-2.21.0 b/metadata/md5-cache/dev-util/jfrog-cli-2.25.0
index 4fbe3c432e03..7e8a80e6177e 100644
--- a/metadata/md5-cache/dev-util/jfrog-cli-2.21.0
+++ b/metadata/md5-cache/dev-util/jfrog-cli-2.25.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/jfrog/jfrog-cli/archive/v2.21.0.tar.gz -> jfrog-cli-2.21.0.tar.gz https://dev.gentoo.org/~zmedico/dist/jfrog-cli-2.21.0-deps.tar.xz
+SRC_URI=https://github.com/jfrog/jfrog-cli/archive/v2.25.0.tar.gz -> jfrog-cli-2.25.0.tar.gz https://dev.gentoo.org/~zmedico/dist/jfrog-cli-2.25.0-deps.tar.xz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
 _md5_=0cb917d6634de26ba041223a368c0468
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 1c356f5aec79..a67ba32a2971 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kate-addons-22.08.0 b/metadata/md5-cache/kde-apps/kate-addons-22.08.0-r1
index 7a7523e514aa..7bb99ff4e623 100644
--- a/metadata/md5-cache/kde-apps/kate-addons-22.08.0
+++ b/metadata/md5-cache/kde-apps/kate-addons-22.08.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Addons used by Kate
 EAPI=8
 HOMEPAGE=https://kate-editor.org/ https://apps.kde.org/kate/
 INHERIT=ecm flag-o-matic gear.kde.org optfeature
-IUSE=+filebrowser lspclient +projects plasma +snippets sql test debug test
+IUSE=+filebrowser lspclient plasma +projects +snippets sql test debug test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2 LGPL-2+ MIT
 RDEPEND=>=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 ~kde-apps/kate-lib-22.08.0:5 >=kde-frameworks/kcodecs-5.96.0:5 >=kde-frameworks/kcompletion-5.96.0:5 >=kde-frameworks/kconfig-5.96.0:5 >=kde-frameworks/kconfigwidgets-5.96.0:5 >=kde-frameworks/kcoreaddons-5.96.0:5 >=kde-frameworks/kcrash-5.96.0:5 >=kde-frameworks/kdbusaddons-5.96.0:5 >=kde-frameworks/kguiaddons-5.96.0:5 >=kde-frameworks/ki18n-5.96.0:5 >=kde-frameworks/kiconthemes-5.96.0:5 >=kde-frameworks/kio-5.96.0:5 >=kde-frameworks/kitemviews-5.96.0:5 >=kde-frameworks/kjobwidgets-5.96.0:5 >=kde-frameworks/kparts-5.96.0:5 >=kde-frameworks/kservice-5.96.0:5 >=kde-frameworks/ktexteditor-5.96.0:5 >=kde-frameworks/kwidgetsaddons-5.96.0:5 >=kde-frameworks/kwindowsystem-5.96.0:5 >=kde-frameworks/kxmlgui-5.96.0:5 >=kde-frameworks/syntax-highlighting-5.96.0:5 filebrowser? ( >=kde-frameworks/kbookmarks-5.96.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.96.0:5 ) plasma? ( >=kde-frameworks/plasma-5.96.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.96.0:5 >=kde-frameworks/threadweaver-5.96.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.96.0:5 ) sql? ( >=dev-qt/qtsql-5.15.5:5 >=kde-frameworks/kwallet-5.96.0:5 ) !<kde-apps/kate-22.08.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.08.0/src/kate-22.08.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	6f19455c3ec51029d40be1fdc6cdb8e0	flag-o-matic	29a755b1291d64133634d80b0328f153	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2236d1165fd864365cce05f1dfbdbf9c
+_md5_=aad638f3db63dd6faf4e4d6cea3a4270
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 69ddffde80b7..fc1853d42c0b 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/pianobar-2022.04.01 b/metadata/md5-cache/media-sound/pianobar-2022.04.01
index b3c962bd79a3..835a118cbfd3 100644
--- a/metadata/md5-cache/media-sound/pianobar-2022.04.01
+++ b/metadata/md5-cache/media-sound/pianobar-2022.04.01
@@ -5,10 +5,10 @@ DESCRIPTION=A console-based replacement for Pandora's flash player
 EAPI=8
 HOMEPAGE=https://6xq.net/pianobar/
 INHERIT=toolchain-funcs flag-o-matic
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/json-c:= dev-libs/libgcrypt:= media-libs/libao >=media-video/ffmpeg-3.3:= net-misc/curl
 SLOT=0
 SRC_URI=https://6xq.net/pianobar/pianobar-2022.04.01.tar.bz2
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=979d0d92d6b5bef9a101e6f98f511f93
+_md5_=62d925d306ec988aeedebd9164cbe5d4
diff --git a/metadata/md5-cache/media-sound/strawberry-1.0.7 b/metadata/md5-cache/media-sound/strawberry-1.0.7
index fe6ee50056f9..099921af6523 100644
--- a/metadata/md5-cache/media-sound/strawberry-1.0.7
+++ b/metadata/md5-cache/media-sound/strawberry-1.0.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.strawberrymusicplayer.org/
 INHERIT=cmake flag-o-matic plocale xdg
 IUSE=cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc
-KEYWORDS=~amd64 ~ppc64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/taglib x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( media-libs/libgpod ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( media-libs/libmtp ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=cdda? ( gstreamer ) || ( gstreamer vlc )
 SLOT=0
 SRC_URI=https://github.com/strawberrymusicplayer/strawberry/releases/download/1.0.7/strawberry-1.0.7.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=98cceda4e3b140971782691fee6781cf
+_md5_=14f8ec08e4bb6fa2a242cd148d35d401
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 709263899773..19b563d53cc1 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libssh-0.10.0 b/metadata/md5-cache/net-libs/libssh-0.10.0
new file mode 100644
index 000000000000..1e4c1140fd1f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libssh-0.10.0
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!gcrypt? ( !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cmocka-0.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elibc_musl? ( sys-libs/argp-standalone ) )
+DESCRIPTION=Access a working SSH implementation by means of a library
+EAPI=8
+HOMEPAGE=https://www.libssh.org/
+INHERIT=cmake-multilib
+IUSE=debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=!gcrypt? ( !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=?? ( gcrypt mbedtls )
+RESTRICT=!test? ( test )
+SLOT=0/4
+SRC_URI=https://www.libssh.org/files/0.10/libssh-0.10.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d920ceb0bc3a8c3df3bc2294f7ea5a99
diff --git a/metadata/md5-cache/net-libs/libssh-9999 b/metadata/md5-cache/net-libs/libssh-9999
index e221611392f2..36094c1c4695 100644
--- a/metadata/md5-cache/net-libs/libssh-9999
+++ b/metadata/md5-cache/net-libs/libssh-9999
@@ -2,7 +2,7 @@ BDEPEND=doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=!gcrypt? ( !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cmocka-0.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elibc_musl? ( sys-libs/argp-standalone ) )
 DESCRIPTION=Access a working SSH implementation by means of a library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.libssh.org/
 INHERIT=cmake-multilib git-r3
 IUSE=debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
@@ -12,5 +12,5 @@ RDEPEND=!gcrypt? ( !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,ab
 REQUIRED_USE=?? ( gcrypt mbedtls )
 RESTRICT=!test? ( test )
 SLOT=0/4
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6e35c9c4a89759e89e82d1eca5fe12b6
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d920ceb0bc3a8c3df3bc2294f7ea5a99
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index f38110540b05..7e33b0a9d6d5 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/mu-1.8.7 b/metadata/md5-cache/net-mail/mu-1.8.7
index e73b2d0e5488..c1cc3e5f026c 100644
--- a/metadata/md5-cache/net-mail/mu-1.8.7
+++ b/metadata/md5-cache/net-mail/mu-1.8.7
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
 INHERIT=elisp-common meson
 IUSE=emacs readline
-KEYWORDS=~amd64 arm arm64 ~riscv x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.7/mu-1.8.7.tar.xz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ec9873cd03e36afd02ed16a39381e3a2
+_md5_=c79a9b4867770297eab6ab95b3c42c21
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 140f475501a4..4541c6f246f3 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/electron-cash-4.2.11 b/metadata/md5-cache/net-misc/electron-cash-4.2.11
new file mode 100644
index 000000000000..1acd6b1814b7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electron-cash-4.2.11
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonrpclib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathvalidate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/stem[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] amodem? ( dev-python/amodem[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( dev-lang/python ) dev-libs/libsecp256k1 >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DESCRIPTION=Lightweight Bitcoin Cash client (BCH fork of Electrum)
+EAPI=7
+HOMEPAGE=https://github.com/Electron-Cash/Electron-Cash
+INHERIT=desktop distutils-r1 xdg-utils
+IUSE=amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb l10n_es l10n_ja l10n_pt l10n_zh-CN test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonrpclib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathvalidate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/stem[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] amodem? ( dev-python/amodem[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( dev-lang/python ) dev-libs/libsecp256k1 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] )
+REQUIRED_USE=|| ( cli ncurses qt5 ) amodem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/4.2.11.tar.gz -> electron-cash-4.2.11.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b2ce54ee613ce008b2eb1b544b812ba2
diff --git a/metadata/md5-cache/net-misc/openssh-9.0_p1-r2 b/metadata/md5-cache/net-misc/openssh-9.0_p1-r2
index c49031dd52d9..abcadf321c9c 100644
--- a/metadata/md5-cache/net-misc/openssh-9.0_p1-r2
+++ b/metadata/md5-cache/net-misc/openssh-9.0_p1-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.openssh.com/
 INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
 IUSE=abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss verify-sig
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth )
 REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.0p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.0p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.4.1/openssh-9.0p1+x509-13.4.1.diff.gz ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.0p1.tar.gz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	user-info	69a1ed744ec33cf2c910ff2bd6084d11	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0e17608e7003f3e1d36fc659891319fb
+_md5_=a6f656c8b0544adc582831dd6d7148b4
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 3511e5dcc7e3..ddb7423bf89e 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/bolt-0.9.2 b/metadata/md5-cache/sys-apps/bolt-0.9.2
index 7f3402cb0c8f..406c78b1be10 100644
--- a/metadata/md5-cache/sys-apps/bolt-0.9.2
+++ b/metadata/md5-cache/sys-apps/bolt-0.9.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/bolt/bolt
 INHERIT=linux-info meson udev
 IUSE=test
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=LGPL-2.1 GPL-2+
 RDEPEND=>=dev-libs/glib-2.56.0:2 virtual/libudev:= virtual/udev sys-auth/polkit[introspection]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.9.2/bolt-0.9.2.tar.gz
 _eclasses_=linux-info	56708ddc53d8b607ed88fd97a56e59dc	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=a6077abf340bd82c7bb7e04bcc333288
+_md5_=c9f764ab8088c0a6a0e7a4f1ad2778a5
diff --git a/metadata/md5-cache/sys-apps/bolt-0.9.3 b/metadata/md5-cache/sys-apps/bolt-0.9.3
new file mode 100644
index 000000000000..961448afd8e9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bolt-0.9.3
@@ -0,0 +1,16 @@
+BDEPEND=app-text/asciidoc dev-util/glib-utils virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-libs/glib-2.56.0:2 virtual/libudev:= virtual/udev sys-auth/polkit[introspection] test? ( dev-util/umockdev )
+DESCRIPTION=Userspace system daemon to enable security levels for Thunderbolt 3
+EAPI=8
+HOMEPAGE=https://gitlab.freedesktop.org/bolt/bolt
+INHERIT=linux-info meson udev
+IUSE=test
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=LGPL-2.1 GPL-2+
+RDEPEND=>=dev-libs/glib-2.56.0:2 virtual/libudev:= virtual/udev sys-auth/polkit[introspection]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.9.3/bolt-0.9.3.tar.gz
+_eclasses_=linux-info	56708ddc53d8b607ed88fd97a56e59dc	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=a6077abf340bd82c7bb7e04bcc333288
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.14.0 b/metadata/md5-cache/sys-apps/flatpak-1.14.0
new file mode 100644
index 000000000000..98f53ce13a4c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/flatpak-1.14.0
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( app-text/xmlto dev-libs/libxslt ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pyparsing[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) )
+DEFINED_PHASES=configure install prepare setup
+DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Linux application sandboxing and distribution framework
+EAPI=7
+HOMEPAGE=https://flatpak.org/
+INHERIT=linux-info python-any-r1
+IUSE=doc introspection policykit seccomp systemd X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=sys-apps/xdg-desktop-portal
+RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.14.0/flatpak-1.14.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=dc198cc965d9e95f44eeae418f061ece
diff --git a/metadata/md5-cache/sys-apps/fwupd-efi-1.3 b/metadata/md5-cache/sys-apps/fwupd-efi-1.3
index 30b386d254d8..c1c398b4475e 100644
--- a/metadata/md5-cache/sys-apps/fwupd-efi-1.3
+++ b/metadata/md5-cache/sys-apps/fwupd-efi-1.3
@@ -5,10 +5,10 @@ DESCRIPTION=EFI executable for fwupd
 EAPI=8
 HOMEPAGE=https://fwupd.org
 INHERIT=meson python-any-r1 toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=!<sys-apps/fwupd-1.6.0
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd-efi/archive/1.3.tar.gz -> fwupd-efi-1.3.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=74c8c5d1b23209a7cc9dfc57020d04ac
+_md5_=9286ba24a86d262ffe85223db735ea54
diff --git a/metadata/md5-cache/sys-apps/plocate-1.1.16 b/metadata/md5-cache/sys-apps/plocate-1.1.16
index 235fb46a3679..c810bd8e0739 100644
--- a/metadata/md5-cache/sys-apps/plocate-1.1.16
+++ b/metadata/md5-cache/sys-apps/plocate-1.1.16
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://plocate.sesse.net/
 INHERIT=linux-info meson systemd
 IUSE=+io-uring
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2 GPL-2+
 RDEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
 SLOT=0
 SRC_URI=https://plocate.sesse.net/download/plocate-1.1.16.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	56708ddc53d8b607ed88fd97a56e59dc	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fef4b5c6d1221b5d9d02732b888a772c
+_md5_=1ef19c6b8fbcbd22858fa7d29ce873a2
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 212c8d4046a3..2a4a7f821d04 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.24.2_p1 b/metadata/md5-cache/sys-cluster/k3s-1.24.2_p1
deleted file mode 100644
index f813ad842747..000000000000
--- a/metadata/md5-cache/sys-cluster/k3s-1.24.2_p1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=app-misc/yq net-firewall/conntrack-tools sys-fs/btrfs-progs rootless? ( app-containers/slirp4netns )
-DESCRIPTION=Lightweight Kubernetes
-EAPI=7
-HOMEPAGE=https://k3s.io
-INHERIT=go-module linux-info systemd
-IUSE=+kubectl-symlink rootless
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=kubectl-symlink? ( !sys-cluster/kubectl )
-REQUIRED_USE=|| ( amd64 )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/zmedico/k3s/archive/refs/tags/v1.24.2+k3s1-vendor.tar.gz -> k3s-1.24.2_p1-vendor.tar.gz https://github.com/k3s-io/containerd/archive/refs/tags/v1.6.6-k3s1.tar.gz -> k3s-containerd-1.6.6-k3s1.tar.gz https://github.com/opencontainers/runc/archive/refs/tags/v1.1.2.tar.gz -> k3s-runc-v1.1.2-r1.tar.gz https://helm.traefik.io/traefik/traefik-10.19.3.tgz https://github.com/rancher/plugins/archive/refs/tags/v1.1.1-k3s1.tar.gz -> k3s-cni-plugins-1.1.1.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.11.0/k3s-root-amd64.tar -> k3s-root-amd64-0.11.0.tar )
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2f384524686d1ede9c3e9ce58e76ee93
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.24.2_p2 b/metadata/md5-cache/sys-cluster/k3s-1.24.4_p1
index a2fe95e955e6..91e21efb8d2b 100644
--- a/metadata/md5-cache/sys-cluster/k3s-1.24.2_p2
+++ b/metadata/md5-cache/sys-cluster/k3s-1.24.4_p1
@@ -12,6 +12,6 @@ RDEPEND=kubectl-symlink? ( !sys-cluster/kubectl )
 REQUIRED_USE=|| ( amd64 )
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/zmedico/k3s/archive/refs/tags/v1.24.2+k3s2-vendor.tar.gz -> k3s-1.24.2_p2-vendor.tar.gz https://github.com/k3s-io/containerd/archive/refs/tags/v1.6.6-k3s1.tar.gz -> k3s-containerd-1.6.6-k3s1.tar.gz https://github.com/opencontainers/runc/archive/refs/tags/v1.1.2.tar.gz -> k3s-runc-v1.1.2-r1.tar.gz https://helm.traefik.io/traefik/traefik-10.19.3.tgz https://github.com/rancher/plugins/archive/refs/tags/v1.1.1-k3s1.tar.gz -> k3s-cni-plugins-1.1.1.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.11.0/k3s-root-amd64.tar -> k3s-root-amd64-0.11.0.tar )
+SRC_URI=https://github.com/zmedico/k3s/archive/refs/tags/v1.24.4+k3s1-vendor.tar.gz -> k3s-1.24.4_p1-vendor.tar.gz https://github.com/k3s-io/containerd/archive/refs/tags/v1.6.6-k3s1.tar.gz -> k3s-containerd-1.6.6-k3s1.tar.gz https://github.com/opencontainers/runc/archive/refs/tags/v1.1.3.tar.gz -> k3s-runc-v1.1.3.tar.gz https://helm.traefik.io/traefik/traefik-10.19.3.tgz https://github.com/rancher/plugins/archive/refs/tags/v1.1.1-k3s1.tar.gz -> k3s-cni-plugins-1.1.1.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.11.0/k3s-root-amd64.tar -> k3s-root-amd64-0.11.0.tar )
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2f384524686d1ede9c3e9ce58e76ee93
+_md5_=67173dc4fc7845c2628d2553ed6ee12a
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index a1694151361a..7e2823025ef0 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.27 b/metadata/md5-cache/sys-libs/libblockdev-2.27
index 9b5cd37e4fc8..4db9d282f8a1 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.27
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.27
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/storaged-project/libblockdev
 INHERIT=autotools python-single-r1 xdg-utils
 IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) escrow? ( cryptsetup )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.27-1/libblockdev-2.27.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a095c98b98cff0f8cbfd57d55914d7b5
+_md5_=d412e276d4bbf1d0301f96c9e8b6ffec
diff --git a/metadata/md5-cache/sys-libs/readline-8.1_p2-r1 b/metadata/md5-cache/sys-libs/readline-8.1_p2-r1
new file mode 100644
index 000000000000..c0f73bf2482d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/readline-8.1_p2-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-chetramey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,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=Another cute console display library
+EAPI=7
+HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
+INHERIT=flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig
+IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/8
+SRC_URI=mirror://gnu/readline/readline-8.1.tar.gz verify-sig? ( mirror://gnu/readline/readline-8.1.tar.gz.sig ) mirror://gnu//readline-8.1-patches/readline81-001 verify-sig? ( mirror://gnu//readline-8.1-patches/readline81-001.sig ) ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-001.sig ) mirror://gnu//readline-8.1-patches/readline81-002 verify-sig? ( mirror://gnu//readline-8.1-patches/readline81-002.sig ) ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-002.sig )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=3dd24d5c243b1e3598fbf3ef9bec354c
diff --git a/metadata/md5-cache/sys-libs/readline-8.2_rc2 b/metadata/md5-cache/sys-libs/readline-8.2_rc3
index 9cf9e1b7e90d..916bd0e2a2a1 100644
--- a/metadata/md5-cache/sys-libs/readline-8.2_rc2
+++ b/metadata/md5-cache/sys-libs/readline-8.2_rc3
@@ -9,6 +9,6 @@ IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 a
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8
-SRC_URI=mirror://gnu/readline/readline-8.2-rc2.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.2-rc2.tar.gz verify-sig? ( mirror://gnu/readline/readline-8.2-rc2.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/readline-8.2-rc2.tar.gz.sig )
+SRC_URI=mirror://gnu/readline/readline-8.2-rc3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.2-rc3.tar.gz verify-sig? ( mirror://gnu/readline/readline-8.2-rc3.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/readline-8.2-rc3.tar.gz.sig )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c7b3fce2711717f0c0782ddbd32536f4
+_md5_=c1abb1c1764f9ac2a6ba4b59511ce527
diff --git a/metadata/md5-cache/sys-libs/readline-9999 b/metadata/md5-cache/sys-libs/readline-9999
index 1ff92a8807e2..b72d63800257 100644
--- a/metadata/md5-cache/sys-libs/readline-9999
+++ b/metadata/md5-cache/sys-libs/readline-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c7b3fce2711717f0c0782ddbd32536f4
+_md5_=c1abb1c1764f9ac2a6ba4b59511ce527
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2022a b/metadata/md5-cache/sys-libs/timezone-data-2022a
index fb502ce01336..290a26708122 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2022a
+++ b/metadata/md5-cache/sys-libs/timezone-data-2022a
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.iana.org/time-zones
 INHERIT=toolchain-funcs flag-o-matic
 IUSE=nls leaps-timezone zic-slim
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD public-domain
 RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
 SLOT=0
 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2022a.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2022a.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c99bf2417d4c0599d8a278a272611a56
+_md5_=dfe06eb704139ea76b5966313a30b1c6
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 598922c0a067..ff79d0cd8d8e 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/parallel-20220722 b/metadata/md5-cache/sys-process/parallel-20220722
index 87b183edee25..54c412f53f76 100644
--- a/metadata/md5-cache/sys-process/parallel-20220722
+++ b/metadata/md5-cache/sys-process/parallel-20220722
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
 INHERIT=verify-sig
 IUSE=verify-sig
-KEYWORDS=~amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20220722.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20220722.tar.bz2.sig )
 _eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=e3be6da86dfa1575891c272366c45e94
+_md5_=1914107741f25dd16a29b24c56c14ddc
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 0696d3aa017c..8a51ebbf01e0 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-26T19:10:38Z
+TIMESTAMP 2022-08-27T01:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMJGq5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMJbuxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBL1xAAigg9Ar2IMcaYxzB5IxbumgUJkcPlEjOvcVIDv2LWspJm5FLiUnxD6wfZ
-FhWzlZQ57+SLgv8owbXHP/A01xki7xx+V/xx2XvtU9P//pQ6pNwG5dBfy5DnadzJ
-bBKJeuezJnu56ty6LuLxG1qidEV8Co4eXBLo1f6KVCgPiZOm2AR4ihmDYCxh4TqV
-zm/hFRxAjEBebAskvbIjKEyMmMN0Ft8Dz18QWHG8UunpgJzK8W1TQLZT6cWUGFIy
-fBUOtQe3OX0TAOEm619+Di/5+9/wkmSb/DpQ5MLOJA2+2eZmFblYG5nQ629cO5oY
-1YBv1KQ8anUptKeWuvbCFUOng/HdRu/eqODCWKzypbuUwDRyr9zk8bjOO0ULfj6w
-v9zDp5fOlunMQKFdWzGcD+IhtSruFzDtOT6UB/FdsPe6fW8uV0sAo5VTKL13dvj6
-lKh6fzHR3sU9LwmnOkt0Q+lO2A9ns2F9248/PsdNRQKMY3kE2FC5yKm9d/ordYZc
-dMFMLa7m6SEfxV/ow6DhpLTOhFVa/0NoQNoV1EC9nPxLYn1oh72NJiy+uc19BKtq
-8eSKociPcPLp42JgtYE82H6hhkq0DtMJjC8Vyp1Gj2j3waIC1z4gv8PHCoa0mmcz
-nJzp8p9RuvTOlp9CQWYNvfo4db9i2TMLD2/pTNTzR2N4pOeR3R8=
-=ZKHZ
+klBftg/9ETLa4JdbdQ48yFdrww6lKnUWqucrLmCweXzaNUQ9XHoiJ2F4E51aQ9fq
+vJxzN820YNd4kgtaYQb65rsyLTL2xA+EWSzcRQ+G25prpQo0v7eU7eGW4fPy8Tc7
+IAM8ghYyDbsJUA+9i4TN39IO9HimYL/lbwmCoqMMvml8rDI+UUMFtMpYKbW2/Jol
+GrbaVx2u5cUKnYt1F4+OtrSh9tf6MDpk7uIzNA32fhtFiNEdo3UD0KHNSkPBhfGv
+2IIRh03pGag8hIpTavUP29n5+jc9jO5T9G4eDiab7LKF5ZHljiAmko/rLE4yYrai
+jjd8k95zYPgT5W6E6P9Ue2YFZ3DlQJTPjlngYvhai6aEIzxGumzgH5bdrFeFPpKU
+xnfoisYkYjXMngodElq/iyQDdouBti+yo/cz2HlUNJpRdpJOv8Z2AnqDrUMmzjPY
+neyUqNq16cNJY/n38Bd7rhM7muHmAhODitYHYabK2gJD4WWfil2GH97fJsGmP7c4
+vynpDHj/YJ7M+L2iCY5HnC7/mXrGJ85L+dfgA98LE1YpykiEuWhV7jgtR9CKfecF
+TujPqzOXDUnJP5ugI5mod6bAaDHtEKZKOBsAh4gDmmFTtUSmmCzn/rynan9/LHgl
+ccyTOMzb1nNlb6IUpDlrx9UPk0rP2jkHvkrYXVoJe6zqTthnwas=
+=9t6B
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 922089ff3588..8408c19895e0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Aug 2022 19:10:35 +0000
+Sat, 27 Aug 2022 01:09:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7f95dbcb2ab4..44e162d4dd02 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Aug 26 07:10:34 PM UTC 2022
+Sat Aug 27 01:09:58 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 12ba12746345..10cd9d3360d3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Aug 2022 19:15:01 +0000
+Sat, 27 Aug 2022 01:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3575229c3116..f9ce812f236b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-2695e51658b7e207c3615fd1bfdac8e060eba10d 1661539945 2022-08-26T18:52:25+00:00
+3cedbb9d67688e884b6e8213da9a61de7064ba27 1661560740 2022-08-27T00:39:00+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3dabee7d787e..884dcafb5fac 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1661541001 Fri 26 Aug 2022 07:10:01 PM UTC
+1661562601 Sat 27 Aug 2022 01:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3ea8731cc59c..8408c19895e0 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Aug 2022 19:10:34 +0000
+Sat, 27 Aug 2022 01:09:58 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 89decab448b5..1f4a1065f577 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 3dfa88ce68a8..fe0188bdd3e5 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,5 +1,7 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
+DIST libssh-0.10.0.tar.xz 553384 BLAKE2B 4a57e2095a4f56d06b2be591e02c9b9ded5e1fa28ed2774389a2902a8277f6e6b99014f8868f0740ca2900409d33b968f65c9eaa312e259926436afb49fc108c SHA512 d97235f78b94a980aabc844ee7614108944967441219f0c2417b207734d5200eb26efd5fd6de0da97a34fb612b843dc0a3b32a3364c1d8333e4c49680212aaaa
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1
+EBUILD libssh-0.10.0.ebuild 3235 BLAKE2B 1baf12eaae4002ea04742900310076a7f7e87781018162211f0529f53c8fea173304afdd993df3a2a42c1e6e740215615ac63a90811baea61c3525767ee7b559 SHA512 d94cf9bf306f5affdc32be9dfbfc27276d75c91f8401be090853e3658f5da887891023bb44d0306dcaee53ac18f4287319c58482be17b6fb417bb7c4b688ebd3
 EBUILD libssh-0.9.6.ebuild 3249 BLAKE2B 262c8a347a8f2f22fbd8f64d592666b6f41272709ced4caa7f7b8642bfa0047e208494938073acc22c35251aa5742b4391ad863bd57438661368328c5635ea7b SHA512 f6cc5499261f82c457740bdfe2665f380d62a23447857d0ee9eb5c7c4dc28b064bb49ccb86265921eb9ff47d366f298f84caa9751cb175a9f7b963442833e513
-EBUILD libssh-9999.ebuild 3257 BLAKE2B 7641d31df4309fcf66c6d0ae208db2799c2133398ee1f0361f951910b2eca7ba043d059130b003547c05c316f33758c4823290aa86a1dbc4d1dfb80985eb3b0d SHA512 c6ee8faf4e5ab98cf06079ea24a8a3ad4c68627cb7dec9f3148b4cc5469f37610737d9f0901da70cfa968581a5d3a7f67ec3769246f502341d5f4245a6cf98e5
+EBUILD libssh-9999.ebuild 3235 BLAKE2B 1baf12eaae4002ea04742900310076a7f7e87781018162211f0529f53c8fea173304afdd993df3a2a42c1e6e740215615ac63a90811baea61c3525767ee7b559 SHA512 d94cf9bf306f5affdc32be9dfbfc27276d75c91f8401be090853e3658f5da887891023bb44d0306dcaee53ac18f4287319c58482be17b6fb417bb7c4b688ebd3
 MISC metadata.xml 629 BLAKE2B 7e39c205fc187646d471362dd85d59f3d7988a151eec3b758c6d830ff0b0f472f4d49e38d9bfe9c99b504b52d7db1db384c9286cc41d9627fdf9a5f3c1989aab SHA512 02a38b6ec328a0b638ea94745e97a2e0f3bdf767044124b3136a6425120fbfcd377ae2b0d78a22c62569dbd8e90d795c47ce3ede81f5acbf8ba26582f36c45e2
diff --git a/net-libs/libssh/libssh-0.10.0.ebuild b/net-libs/libssh/libssh-0.10.0.ebuild
new file mode 100644
index 000000000000..9b897cf8885e
--- /dev/null
+++ b/net-libs/libssh/libssh-0.10.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
+else
+	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!gcrypt? (
+		!mbedtls? (
+			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
+		elibc_musl? ( sys-libs/argp-standalone )
+	)
+"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+DOCS=( AUTHORS CHANGELOG README )
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# just install the examples, do not compile them
+	cmake_comment_add_subdirectory examples
+
+	# keyfile torture test is currently broken
+	sed -e "/torture_keyfiles/d" \
+		-i tests/unittests/CMakeLists.txt || die
+
+	# disable tests that take too long (bug #677006)
+	if use sparc; then
+		sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
+			-i tests/unittests/CMakeLists.txt || die
+	fi
+
+	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
+		-i ConfigureChecks.cmake || die
+
+	if use test && use elibc_musl; then
+		sed -e "/SOLARIS/d" \
+			-i tests/CMakeLists.txt || die
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_NACL=OFF
+		-DWITH_STACK_PROTECTOR=OFF
+		-DWITH_STACK_PROTECTOR_STRONG=OFF
+		-DWITH_DEBUG_CALLTRACE=$(usex debug)
+		-DWITH_DEBUG_CRYPTO=$(usex debug)
+		-DWITH_GCRYPT=$(usex gcrypt)
+		-DWITH_GSSAPI=$(usex gssapi)
+		-DWITH_MBEDTLS=$(usex mbedtls)
+		-DWITH_PCAP=$(usex pcap)
+		-DWITH_SERVER=$(usex server)
+		-DWITH_SFTP=$(usex sftp)
+		-DBUILD_STATIC_LIB=$(usex static-libs)
+		-DUNIT_TESTING=$(usex test)
+		-DWITH_ZLIB=$(usex zlib)
+	)
+
+	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	multilib_is_native_abi && use doc && cmake_src_compile docs
+}
+
+multilib_src_install() {
+	cmake_src_install
+	multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+	use static-libs && dolib.a src/libssh.a
+
+	# compatibility symlink until all consumers have been updated
+	# to no longer use libssh_threads.so
+	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
+}
+
+multilib_src_install_all() {
+	use mbedtls && DOCS+=( README.mbedtls )
+	einstalldocs
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
+	fi
+}
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index d49e399b64d4..9b897cf8885e 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
 HOMEPAGE="https://www.libssh.org/"
 
-if [[ "${PV}" == *9999 ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
@@ -22,10 +22,8 @@ IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs tes
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="!test? ( test )"
 
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
 RDEPEND="
 	!gcrypt? (
 		!mbedtls? (
@@ -40,15 +38,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
-		elibc_musl? ( sys-libs/argp-standalone ) )
+		elibc_musl? ( sys-libs/argp-standalone )
+	)
 "
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
-DOCS=( AUTHORS README ChangeLog )
+DOCS=( AUTHORS CHANGELOG README )
 
 PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
-RESTRICT+=" !test? ( test )"
-
 src_prepare() {
 	cmake_src_prepare
 
@@ -79,17 +77,17 @@ multilib_src_configure() {
 		-DWITH_NACL=OFF
 		-DWITH_STACK_PROTECTOR=OFF
 		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DBUILD_STATIC_LIB="$(usex static-libs)"
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_ZLIB="$(usex zlib)"
+		-DWITH_DEBUG_CALLTRACE=$(usex debug)
+		-DWITH_DEBUG_CRYPTO=$(usex debug)
+		-DWITH_GCRYPT=$(usex gcrypt)
+		-DWITH_GSSAPI=$(usex gssapi)
+		-DWITH_MBEDTLS=$(usex mbedtls)
+		-DWITH_PCAP=$(usex pcap)
+		-DWITH_SERVER=$(usex server)
+		-DWITH_SFTP=$(usex sftp)
+		-DBUILD_STATIC_LIB=$(usex static-libs)
+		-DUNIT_TESTING=$(usex test)
+		-DWITH_ZLIB=$(usex zlib)
 	)
 
 	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
@@ -104,7 +102,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	cmake_src_install
-	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
 	use static-libs && dolib.a src/libssh.a
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index e2c3bf82e49b..2acc4127909f 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 2b829b7cf548..e0847a0da6ac 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -6,7 +6,7 @@ DIST mu-1.8.8.tar.xz 540092 BLAKE2B 3cd3d5f41aaf145dee66fc6d5e71256a650b16d0ee99
 DIST mu-1.8.9.tar.xz 541308 BLAKE2B 418458f5e04d15cce9aa0ea650e06377c5eb2a3f08e47610ce8ac63b68f5e7914b3d70ec4e07c5b89399aaad8a6e340dd6943980e6de94b02ff299358d99d07f SHA512 534bf2c0889d436601638afa7f214492b927f1a3aa4f36509ac607132dcc17f2181e7b1d2113fdf00989bf5eb71cf7ad9b19411393fe1edbb8de162b7f7636bf
 EBUILD mu-1.8.5.ebuild 2099 BLAKE2B c695a17f01602bc7d0f7d9aef41fac4ae585d7183f9ffb880b618f139b1328a91679ca69eee6e1fd076517062f72d706f48f514eec5a74b9818643bd9c7d0431 SHA512 f51afffe20c60bef08b3da69ed129103bb13c3ebb9d106d3de89b4a8fbc602637e44bd2f4d534ef26218ef018c028a388c505528277818189b9068a66b126504
 EBUILD mu-1.8.6.ebuild 2103 BLAKE2B 3def0840baba20487d6256076c9327c2762cca569af1e1c48589ee7308569f20e88aa32245b449eca9416dc4f819937f1720a0c569799d7ae29cbc7b595eb07a SHA512 f24cb94e4c8d62559a5ef824472d2684ff7b8a5239c9112c8bace36a4df6c0c38089a707bf9138928b874ef445165efd5e18bca644659fb140f1a90abb548459
-EBUILD mu-1.8.7.ebuild 2107 BLAKE2B dc73892acf868957b6f3e115ee549e351bf478b0311d6bf13684edfe38f70ce8fcd089afd3417c7e2fbbec42d0a19dad6015d1b190ea99301ed2513111cd60b9 SHA512 d64018469203e69073e3b17588c03d468d29099aabfe7ee19aab3c8ef4c1b6b1f0bc4f26cab82738857e350d9a0d17148dce39394c83b6d12b3097bdff622c4d
+EBUILD mu-1.8.7.ebuild 2106 BLAKE2B 7da6a51b1de0124d20aede38a1826eb75a91e92518518393cc0cfa8320f3c26f4a0f5fbe2e8e229eea38f58eb11b6dd09733965043bfd0bed3fee38ad250efbe SHA512 21f779ba0ca3b2f48724fc27c60cc243a501fb0d36a189246750f4d6c9913f7062fbabd8f206019d20417f0bd2913ba0789582a216f8db257bc304b3458806c0
 EBUILD mu-1.8.8.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
 EBUILD mu-1.8.9.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/mu-1.8.7.ebuild b/net-mail/mu/mu-1.8.7.ebuild
index 57080672e76f..62b981bf5db6 100644
--- a/net-mail/mu/mu-1.8.7.ebuild
+++ b/net-mail/mu/mu-1.8.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~riscv x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
 IUSE="emacs readline"
 
 DEPEND="
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index efb6cbbcb7f4..6926ae790939 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index 48708b43f39f..a22299a5d9f8 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,6 +1,8 @@
 AUX 3.3.6-no-user-root.patch 1261 BLAKE2B 6035a47b73ce13a92ef66177d6131f5744a498bb4360aa289aca6a09c6ef3e7b663914590f4c9be635078fed0bc82ae706f0cb4c7280acab88bbb1f5211d6473 SHA512 bed6b2108b3a8c8960b43eff854b8292d5e6fbd0fdd8383e43e020cac51767cbd70a1c371a3dffe1bc51145f97f930cb966fd4eee1ecc3ca021cbcfac0ea1a81
 DIST electron-cash-4.2.10.tar.gz 8023055 BLAKE2B e79c000f4278c323a8f14aa8d960c25c2971a8c5736e31a6f18f4b5faae11a8ff5339de3193e191c21373075bd6472570770d14262c9b5d41e3eca2b91e633d3 SHA512 f90a11f6a5d79024f982f8ab148c9c079049114bcb0c405da9f54b62620afbda462e074abde01bed7fa12d0090a842e393e24e66ff74031a87f0c79f6323895a
+DIST electron-cash-4.2.11.tar.gz 8039918 BLAKE2B 3139647fd22aaa88ff9a514b83e12dd3b36abb6affe9b51b270e1936f4d37ec3ea867ebcfe388f428392093996d2bf7d1268ee0b2447c5d559a39c3e35745dfc SHA512 7b01d2d94b29a3f054738cd89344a7c15136f90d6aa66dd587da315471aeb053bee1d7bbeab46016054b7dd98915bb2225a381d082a8fd137997c05957e2d44a
 DIST electron-cash-4.2.9.tar.gz 8023098 BLAKE2B 37a55e2161a8f7c2d9b11c1bc564d77ace84ad745be677bb41f07af2b8c18c223e6cf37c7df42dea170341f276babd8eda4bd9564e9069fc9623a059cc92f09b SHA512 e27dda4a4c8b81ad7b303652fdb2d893c3d53e76eb0f7e295753a7f92676c895ea8087e424a43bbb2d32db9a4f0e8c03b779cf9daf2ff8e51d4813a097ac9c6c
 EBUILD electron-cash-4.2.10.ebuild 3785 BLAKE2B 35214f7792a4dbfbfdaccb802a5e95b5479ca8a3dfec6763d49feeea0874267e87102b9258cd2fa3d087d31aa393a5df8bccee3a6f38ad64ae1984ab6d0b422d SHA512 9c2b44d48c6236a98457cfc90952a7ef1aecd444a3247076e590234bfbda5ee22f86981e213b1172657c01f3fb54bd99c32f38e3f983b5965a882f1112ca2c40
+EBUILD electron-cash-4.2.11.ebuild 3785 BLAKE2B 35214f7792a4dbfbfdaccb802a5e95b5479ca8a3dfec6763d49feeea0874267e87102b9258cd2fa3d087d31aa393a5df8bccee3a6f38ad64ae1984ab6d0b422d SHA512 9c2b44d48c6236a98457cfc90952a7ef1aecd444a3247076e590234bfbda5ee22f86981e213b1172657c01f3fb54bd99c32f38e3f983b5965a882f1112ca2c40
 EBUILD electron-cash-4.2.9.ebuild 3736 BLAKE2B 923872b101367b68dfcb37ff78150e7824d7e080b6985ea0821c65cc7bc430d6791dd4e916f98cf893f4277ed2c7b6b3182e67f6f2015bd464a532c6a7496ab2 SHA512 e103992e65ea1d1d6c188aecaa674264e208cdaf18dcec20216d407f4b9714efaa624c121008dc46bc8a602ac40945e90ae603f5a96abf740c234ef3dd5f7882
 MISC metadata.xml 981 BLAKE2B 10c823bd62005a00acf1e410e78a5e2917af126f1cc4c98608ab8277570c4defe53b3e282168189ac3c18634860a93b664c83cde1959553b0182069830c6f3a3 SHA512 30538ee18680bf39e49cc434977376b6bce2be717204781d2e17dffcdcfe4970a772834474511c12b94906d05f026882d3b6ffde8dd3992eb1030d3ee78c77d6
diff --git a/net-misc/electron-cash/electron-cash-4.2.11.ebuild b/net-misc/electron-cash/electron-cash-4.2.11.ebuild
new file mode 100644
index 000000000000..fc56ca7c306e
--- /dev/null
+++ b/net-misc/electron-cash/electron-cash-4.2.11.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+MY_P="Electron-Cash-${PV}"
+DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
+HOMEPAGE="https://github.com/Electron-Cash/Electron-Cash"
+SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+	l10n_es l10n_ja l10n_pt l10n_zh-CN"
+RESTRICT+=" test"
+
+REQUIRED_USE="
+	|| ( cli ncurses qt5 )
+	amodem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	vkb? ( qt5 )
+"
+
+RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pathvalidate[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	net-libs/stem[${PYTHON_USEDEP}]
+	amodem? ( dev-python/amodem[${PYTHON_USEDEP}] )
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+	dev-libs/libsecp256k1
+"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.3.6-no-user-root.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	if use qt5; then
+		pyrcc5 icons.qrc -o electroncash_gui/qt/icons_rc.py || die
+	else
+		sed "s|'electroncash_gui.qt',||" -i setup.py || die
+	fi
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja '' japanese) \
+		$(usex l10n_pt '' portuguese) \
+		$(usex l10n_es '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
+	; do
+		rm -f "electroncash/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" electroncash/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		$(usex qt5      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm electroncash_gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt5      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' "${PN}" || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex amodem          '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		trezor  \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r electroncash_plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 211fc509c90a..d4707f83812f 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -35,5 +35,5 @@ DIST openssh-9.0p1.tar.gz 1822183 BLAKE2B 49724a400951964d659d136908657940f79e15
 DIST openssh-9.0p1.tar.gz.asc 833 BLAKE2B e29ff08f10feee7347c02a7ce4b33b8d9c71a26656f0430a2511c25bc6b5006f1683d845826a68ff4eed068b30c911e273cb34e5b4880854d55a776415474019 SHA512 7b1445764058435d2fa8a9c7553643983650d4232036c088e46e44beeb538d32cba88f775b1be9da5f21a01d6caea59b3dc4714507781e9cb946546fa54f169f
 EBUILD openssh-8.9_p1-r2.ebuild 17076 BLAKE2B 6f236af760da98ff31643f2bf22560c65d7fc0b00a00502b84657739039663e230b78db2a0cc3cc02eea6fc3f030157bc22053955501ecaa055698eea5a70bca SHA512 4d2d05fc3a15318687d769c99b779bdc41998a5456650b7d174828e4d557711036d2def92f7f8465c9c4e38180e614f12462e58ca7e0653d7be7e242e4408bb5
 EBUILD openssh-9.0_p1-r1.ebuild 16937 BLAKE2B 34b2fa4021a8f55c017af579bac3e07f20debc330450c56b0fe562bcf8822397fd527902fc5bed3f9f2a7c687ab96d67a33ce29a894eea641db154301d15e505 SHA512 de3849679d4440d2e2d69b68c2c2d5d01bf240aff3868dcae1d53b120468098f3dedebcefc826b0898ea8fcea61107a177e6c1df6f5ba54e600e2f41ae67d772
-EBUILD openssh-9.0_p1-r2.ebuild 16930 BLAKE2B e70e6264ea67180f1e195d9a05ccc5be8d8b42890fe4d4eb1ec4eab0dbe689447f4c2ef09193b2b765860290e1324f903c94df8f118922fa44a1657bb0cf32f6 SHA512 ff3e42ecf3c774516cfee346cb9cddfad1e71935e7d5a1a9817f9dc0410767c40e5b146f6dc5503dfc197401196cf6df69a6e71ba51358d080305d4827bf099c
+EBUILD openssh-9.0_p1-r2.ebuild 16929 BLAKE2B a218c0faba8bb8218841f2c621584bd7b381629a12620e27f54cb5c563fcd1d56a21b2f10be20b77c7492eb2d89be31c209fc250252be86cb88d427642123ebe SHA512 d7a865cbf8bd64fd4518966b43a4af8f3156cd125cb6b91a4d9a63ba1c02625155bd641f082056d753c5f84172c2965e3fc5e5376a6d68b72edf651c8f7b5d55
 MISC metadata.xml 2047 BLAKE2B 87356343744e121075383ad94ba6b821d2db5c3f5af16745130078f939e53b6a83281c19b89f272d20509753bc734bfdd3aab024d72651c7d5c69df27b36841a SHA512 a5b69ff7fa94b00062e78eba36b6d321fd923d27e953fc24ae81d8e25040bebde9ccb8b1555912726eff2b39ee0256aee0da52359e326fb4b1edd394e4f1e406
diff --git a/net-misc/openssh/openssh-9.0_p1-r2.ebuild b/net-misc/openssh/openssh-9.0_p1-r2.ebuild
index 75e9c1d0ecc3..decc6b4c0401 100644
--- a/net-misc/openssh/openssh-9.0_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-9.0_p1-r2.ebuild
@@ -38,7 +38,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1515629712ea..d03cbab6c3d6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index fc393b8bedba..9cb59e8b3171 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -2,6 +2,8 @@ AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9
 AUX bolt.openrc-r1 374 BLAKE2B 91dcbfb842166837d4a89c12e7c8b39db9810ba1ffd18eb1ee61798f3634952440b1bb79118d1486819c34916b266a8c47b4398df42ba8f0c3411d482e2e4874 SHA512 3731459efce91c89e5a601b649acc7ed4faee4d08d2a52a5784dc53b914a15113003516e8fed64e532dc703e019ed53b37ec9a4414b770165c1e46813392f9d3
 DIST bolt-0.9.1.tar.gz 250978 BLAKE2B a3b1ea51704e2b54abb0135013019b9cad6ed9c0acfdb56797e19c9b5a1abe9f921446cfcc5b664f73bbbff857cf8d420f588517d4c633d1b3776a35c37fc882 SHA512 c925c290de75d3fa2dfb9e86b2f14ea39279b3f2ab6bebeced72a7853c901d44de02157d684534af2b54edd3a2e0b2ba61e889579ab1b192f99e98a2d73685d9
 DIST bolt-0.9.2.tar.gz 252532 BLAKE2B 45ea8ae2e77a90099152e708dafe68e63492d0370b734612b516d4a772507174c3df75ddd7d6bdea4be5022a88e1e286a738d3b8df6a662ef3b0b92ac7328730 SHA512 69e7ffa58a6dbc8a1b14fd7e11e2291fa60227896ead1a449839716b581c6ab0e351d3ed62f9b51c5e44a5a33ba5e23dc5af73a1b4eef87f733b3231d5454e90
+DIST bolt-0.9.3.tar.gz 253085 BLAKE2B 7547a35aa16a7681737989c72dfd2e13245eb50c7b814de979974750e3c8805156fd22054308d715299baab3ebd4144923aacc04ef301ee039e84b6370cbcba7 SHA512 2160831011090e75cf54408525f53ead6c0e7797de8a4afdd07ef5a035f8e1aa58f34efb9bd52e6e7cd93ac17751e72ff27e99f2b372a5720b2cbadd6abb3c26
 EBUILD bolt-0.9.1.ebuild 1354 BLAKE2B dedb9b7de3679ed6aafd054c58d746b02dacf315f434dd274c18389836aeb9623f691ba835f452719bd7b73123ae277e43cff7d28dee8cf311464453c1897fcc SHA512 d7d47c0bcfb543d3c701de1ddd8e328663bfb1dfa6766b8429dc91633aa6de4bb3bebbd506cf1b0290113453c42171cd4a452a08e3ce89c15d186a7761b367a3
-EBUILD bolt-0.9.2.ebuild 1452 BLAKE2B b683cc6d4e8d9f7f9b1ea4984307f7e973e6a027bb68e19f1b9fdac696bf8d4b0fc0f4199b3dfbca9f16dfc2b8eae1ac3da35b77d1eefcb3fdc6d9fd4eb79bab SHA512 ad9da5d13b4c9d02f6fdfa1e6e7125285fecff867ba96b5ec753398377a8bd16a9969ae6fe5c905b7cafc106836752cf45c8941bc53d1957daabd7cfc5caffb1
+EBUILD bolt-0.9.2.ebuild 1450 BLAKE2B 7a047210803131dd54a5da571884275ae37bbfc745ab85bf40dbc49d630863b38055239cf7e98ce22f7db087f09a9fdf8788fa74bb2f343b0e9cab2fd2b83ac6 SHA512 4d2da55e031e4133342fe3f6726378e4b64f3600d13e00eed4b6540e13d4fa20138906223c69e6e0516770f01eefca5b5400d361996699f8f0d1bb76364c1969
+EBUILD bolt-0.9.3.ebuild 1452 BLAKE2B b683cc6d4e8d9f7f9b1ea4984307f7e973e6a027bb68e19f1b9fdac696bf8d4b0fc0f4199b3dfbca9f16dfc2b8eae1ac3da35b77d1eefcb3fdc6d9fd4eb79bab SHA512 ad9da5d13b4c9d02f6fdfa1e6e7125285fecff867ba96b5ec753398377a8bd16a9969ae6fe5c905b7cafc106836752cf45c8941bc53d1957daabd7cfc5caffb1
 MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/sys-apps/bolt/bolt-0.9.2.ebuild b/sys-apps/bolt/bolt-0.9.2.ebuild
index b6e173c5433b..d1044fd43ad2 100644
--- a/sys-apps/bolt/bolt-0.9.2.ebuild
+++ b/sys-apps/bolt/bolt-0.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/bolt/bolt-0.9.3.ebuild b/sys-apps/bolt/bolt-0.9.3.ebuild
new file mode 100644
index 000000000000..b6e173c5433b
--- /dev/null
+++ b/sys-apps/bolt/bolt-0.9.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson udev
+
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
+HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2
+	virtual/libudev:=
+	virtual/udev
+	sys-auth/polkit[introspection]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/umockdev )
+"
+BDEPEND="
+	app-text/asciidoc
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	if use kernel_linux && kernel_is lt 5 6; then
+		CONFIG_CHECK="~THUNDERBOLT"
+		ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
+	else
+		CONFIG_CHECK="~USB4"
+		ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support."
+	fi
+	CONFIG_CHECK+=" ~HOTPLUG_PCI"
+	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
+
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dman=true
+		--sysconfdir="${EPREFIX}"/etc
+		--localstatedir="${EPREFIX}"/var
+		--sharedstatedir="${EPREFIX}"/var/lib
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newinitd "${FILESDIR}"/${PN}.openrc-r1 boltd
+	keepdir /var/lib/boltd
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 6a59427056fb..32cbdbea3a88 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -2,8 +2,10 @@ DIST flatpak-1.12.3.tar.xz 1555340 BLAKE2B 512b3f6abfb06d242aedad2c27c9870750254
 DIST flatpak-1.12.7.tar.xz 1562920 BLAKE2B e0bd3fcf8e0bc329c237ba409f82d6bfad1734101068966c11f03c9e45302680f590162b04e2314b5ed93324e61b4c06c33496dba7ba59778c885f50dd00d9db SHA512 425f9d330c649de1079f3286cb6ad8cf7b6e5838921effa4fd6f51020b9bf7991ded9071566ec7032b9868ef3f7e14d1fb7c2be96f903e3af23a075592b78f50
 DIST flatpak-1.13.2.tar.xz 1626616 BLAKE2B a896c1ef5166be9085c7b66bde3df510e4d592f920795706c7d0b68f717ccfd0694b306797a862d3db35c71ced5dcdb71438119d95ff5455b4b6a6b6adfa0d0e SHA512 d7e1d0a9965332220f829caa5724d7547280db10f7428b4e9add87152da1d7dad97edcde85668501d5a50e6a7c1031bfd15e8f4cbc7196e1c0f7cc3d2e333fe1
 DIST flatpak-1.13.3.tar.xz 1679196 BLAKE2B bae60931eabdf61ae7de057dcd99014c65a7eccc9ed91aa75358ee058a22c2f55bd004355e0b2c52f3668d17404dcc7083339fcce35f3920fa3953e22e0a2417 SHA512 8aeef0b0c00a958b04d3d40b9bc6fa6afd3b4875fea6aa4a64ed1fe4e5e67a6e17543fa42e20d7e0e99e22d26821fb392849206f27f1ee7c6cf4c78f8aed2cfe
+DIST flatpak-1.14.0.tar.xz 1636864 BLAKE2B f7f211480577eb5bd422c49790ebfb84da5e5a03cc6dee3815af786bfcd347bd7b01e853c027a42a1510fba68d667c4a25f6b9f998753466baae61a765c73864 SHA512 88f011534a8da6c2421d7d24043756bfe6c46957b6d09ba96b269002a5f0d0372b51f4a8643af2020ef4ed8c5b5f102994ddab54a7052cfba15f8e3b160e8a83
 EBUILD flatpak-1.12.3.ebuild 2355 BLAKE2B f9ebfea4165e01d8dec3a1a1b951e54faa716cf60d3fabc620f81f768117e3e71afd50b3d3da92f4fef2bce0445b4a378642d5c6ffad07430286f6a609ffba48 SHA512 50a22836eaa9db267ca87d4cb9c3df095013623182abbae65dc917def226f19419960e2d78317f053dfb3b3742d2773cbb66d79fd84d41cdc4f2b78a016705f8
 EBUILD flatpak-1.12.7.ebuild 2358 BLAKE2B ed0db5c59539c85be5a111a723aadbd4882b83452d2f4d17ac9b3eae2c8b4402ce57acc5c8d0d2adaf611504b9259a99944ba7a932951a019f8be5cef5632881 SHA512 a05185ba209ac0a96101dcf6483250e8b61fe6286dd7c81757f57c91c093228d38bf461e234031c83f5860f2ea8e2eac99381be27a55b1335c83cd621b09054b
 EBUILD flatpak-1.13.2.ebuild 2532 BLAKE2B dc2d7fafbf83738f1be4bafb06d4979810c3f963df9364f24ed6d455b0f22f46db2ef28a048c0f26ee48ef81a2d52d972571fe1f00fdd6696c2e5e899145afe4 SHA512 151d99f03271e17f01b2b3966d80a136d1ecfdd7a1e2611f04d0ab0f86e10b32847f3385e07919fe9584f1deaa88b5f775d0496f3380e9dedc72799c526534d1
 EBUILD flatpak-1.13.3.ebuild 2532 BLAKE2B dc2d7fafbf83738f1be4bafb06d4979810c3f963df9364f24ed6d455b0f22f46db2ef28a048c0f26ee48ef81a2d52d972571fe1f00fdd6696c2e5e899145afe4 SHA512 151d99f03271e17f01b2b3966d80a136d1ecfdd7a1e2611f04d0ab0f86e10b32847f3385e07919fe9584f1deaa88b5f775d0496f3380e9dedc72799c526534d1
+EBUILD flatpak-1.14.0.ebuild 2528 BLAKE2B b255d4c498b1fe0fd5b879bf4543227167ec627ad33220505e999e62013139e99860f04a67f3b5ff409062cd8647a5fca911e3bbf7bb01ff0e3c9e9a25a9713f SHA512 5c367fb85fb1cb18b6672f148fd911a58579b81608fd1c750286ddd41c7df6528564fe2d0618a92370314b414013a794fd5e7a2125230373a2bc80f520e3d679
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.14.0.ebuild b/sys-apps/flatpak/flatpak-1.14.0.ebuild
new file mode 100644
index 000000000000..601af539a594
--- /dev/null
+++ b/sys-apps/flatpak/flatpak-1.14.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit linux-info python-any-r1
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+DESCRIPTION="Linux application sandboxing and distribution framework"
+HOMEPAGE="https://flatpak.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc introspection policykit seccomp systemd X"
+RESTRICT+=" test"
+
+RDEPEND="
+	acct-group/flatpak
+	acct-user/flatpak
+	>=app-arch/libarchive-2.8:=
+	app-arch/zstd:=
+	>=app-crypt/gpgme-1.1.8:=
+	>=dev-libs/appstream-0.12:=
+	>=dev-libs/appstream-glib-0.5.10:=
+	>=dev-libs/glib-2.56:2=
+	>=dev-libs/libxml2-2.4:=
+	dev-libs/json-glib:=
+	dev-libs/libassuan:=
+	>=dev-util/ostree-2020.8:=[gpg(+)]
+	|| (
+		dev-util/ostree[curl]
+		dev-util/ostree[soup]
+	)
+	>=gnome-base/dconf-0.26:=
+	>=net-libs/libsoup-2.4:=
+	sys-apps/bubblewrap
+	sys-apps/dbus
+	>=sys-fs/fuse-2.9.9:0=
+	sys-apps/xdg-dbus-proxy
+	X? (
+		x11-apps/xauth
+		x11-libs/libXau:=
+	)
+	x11-libs/gdk-pixbuf:2=
+	policykit? ( >=sys-auth/polkit-0.98:= )
+	seccomp? ( sys-libs/libseccomp:= )
+	systemd? ( sys-apps/systemd:= )
+"
+
+DEPEND="${RDEPEND}"
+# pyparsing version pinned for https://bugs.gentoo.org/825230
+BDEPEND="
+	>=sys-devel/automake-1.13.4
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	sys-devel/bison
+	introspection? ( >=dev-libs/gobject-introspection-1.40 )
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt
+	)
+	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
+"
+
+PDEPEND="sys-apps/xdg-desktop-portal"
+
+python_check_deps() {
+	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="~USER_NS"
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# This line fails because locales are in /usr/lib/locale/locale-archive.
+	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-sandboxed-triggers
+		--localstatedir="${EPREFIX}"/var
+		--with-system-bubblewrap
+		--with-system-dbus-proxy
+		$(use_enable X xauth)
+		$(use_enable doc documentation)
+		$(use_enable doc docbook-docs)
+		$(use_enable introspection)
+		$(use_enable policykit system-helper)
+		$(use_enable seccomp)
+		$(use_with systemd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index cadefd46aaf9..0927d7017aa2 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,5 +1,5 @@
 DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b
 DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb
 EBUILD fwupd-efi-1.1.ebuild 1067 BLAKE2B 2dd3c612da1d7fa6603aa6df5589c6d04f3d73a2256952c991114e93842bb0a9f020843416a9fecd44af2361b62a76c91a8dcec8abf97c55717bd58a26a49694 SHA512 014fb50779f0f0dced8f8a6affe6cc4b12171f1e24562f6c27539e458e9ca6396a59e9db18ac1e320cfd05d1a413674be3099b6331087e13ac2b82271ae0bc48
-EBUILD fwupd-efi-1.3.ebuild 1083 BLAKE2B 12395707aa8dbe9cd84a99e1a265ff33574c74b25eaa12dc9fd4501420a5014be1f403a847005dfcdc1351fa2c6a9f1da1a603b3170e2999aa685046b3bfb9cd SHA512 9bc27d5b2c28ef3a001c60cb81244cb1439b3ae7a3a341a8047330708b7b39b45fda22d2055b9f01a7bb07c2639d43b65126f6ca46dca21c8b83691b7236e4cb
+EBUILD fwupd-efi-1.3.ebuild 1082 BLAKE2B 896a7737d1255074acb44ef839e9312bf79da988867ab73588fb3c3777c009d9374d9ba8f4476bfc5d4b43546073ecba11adb1674e4690408f54331d5a5f5dfe SHA512 f51345006621b0b049d5c5c75ee9a3c4d8efb133dbf63fef76cfd7df52972ac1b5bec5e2e9f79aca46e5b8cb9630d2e4e0a61d9423be7121ce518cd48440d6f0
 MISC metadata.xml 502 BLAKE2B 37525a0056ad72eab2b2b7b15436181a8581075053704012670e1f0434c8af74bd0780f16f31fa5cd2c8836bc2e4d8f55dfd5a77140be83ebffda5ca9e1a1382 SHA512 70ccf403ddb8e4d33ee9cc6ba438583d42ab313784c3251919b74a6596c4e3593263a6400513605c1004bc0d3ebb1677febc31449096b825f688ed1cc7052c31
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
index 3aca3e43e660..69a7f4ed58d6 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git"
 else
 	SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index c74e61a2b964..aafb683bf701 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -7,5 +7,5 @@ AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a0
 DIST plocate-1.1.15.tar.gz 73274 BLAKE2B 72dba287ba3357d2fa541542bf5e9d283eac672b7f3b2eebab687ecec930d6e91400eeb0f24c97d6133d69cae0308bc4473b7c8cbc5e263dd18ae8a7728a42a4 SHA512 772f82af38fd7b61fa51ac31f71d4a855542cfa617867da54b5ad8202f49f9e1861064a01e9b8f0937c3da902d84f19a50c1d0e4f037a491a9a6819b2413cfa1
 DIST plocate-1.1.16.tar.gz 73397 BLAKE2B b6706145e9cba8b386761229cfbf23f8a9490596210b0a8dc467dfa6a6ed5b349c8f84cfcbe0430e89691afb50e257a3d331b1dcdc638611407587c8b623e72b SHA512 01dfc3ba434e6164f3e582fb102bd7ec0167a8f93e4cf9c3e72af804a8eda9b69b04fec20ee34fc19549d810b97076342f3a83b46705d0311ada6004d05da26c
 EBUILD plocate-1.1.15.ebuild 2195 BLAKE2B 707f602b2d22ab6a2856221c1d51b865d1cae1cfbc982e2ff839e70e0a7ff24ce15b9a967b30ca0a4fe7c9101d7e6e9e0ce782734752ced52098c65cd4b8121d SHA512 6394a30fb3ebb738d230c25d9e4857aca2ab5f31e279490b6b477dd871aaddf03cf5152b4dadbc92b8e87a06ccb8aaa3b8eec25af7fa92b0c2986ca136978ede
-EBUILD plocate-1.1.16.ebuild 2317 BLAKE2B 943fce0b44252d0eabee8dc41cd6f1d68e405f2218fde801b09fe9edfd92490210cab90aff103a9467043e892de398c374a1bea9dabb2d6d91e064adc8ad9728 SHA512 f2e7f7d1bfcd0b67c6d1d0c9cdb17f956a1fe267331bc04e571c9274aaefb7f583c3f3fb11c82aef144d1aa5f5d3e7cb78cf43a8d785ab67bb05b211bcb86343
+EBUILD plocate-1.1.16.ebuild 2316 BLAKE2B a139caa087043bd224f577cc0e1066adefd863c364b54cdd1df10a92fb601049ab6ce1111b2c887cf91fc43b7832e46ca88dcb4faae525052fe4d459a429ea81 SHA512 5c0c49b974ab304754724f3bba87180ddc59c1dc6ee3cd408278d53adf6fb77f5fbe87a4a0a85c6f75a504ec12a986d1f005724bfbfb0d8594e664bd4ef46003
 MISC metadata.xml 1437 BLAKE2B d3aece3d36e8cc4ceaf9947f0b535c7e2187a25cbb88910f704b1d72a2784831bfb746cca323c98183964688e6b5f2f2fa6bf54c97f8fc99eeea4ee946983e0d SHA512 b24d79da1b27531a7f3353128f7fbc583ef064f4aff58894e9d37dfa9144203c1f1898113aa31f82604aea93de66423e3313924bad25e31e075832c77a99c39e
diff --git a/sys-apps/plocate/plocate-1.1.16.ebuild b/sys-apps/plocate/plocate-1.1.16.ebuild
index ea20d3fb9b1c..5a06dd6b84b6 100644
--- a/sys-apps/plocate/plocate-1.1.16.ebuild
+++ b/sys-apps/plocate/plocate-1.1.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
 # GPL-2+ for plocate itself
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="+io-uring"
 
 RDEPEND="
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 3d41f33161cb..385fc23da1c2 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest
index 84f785ff510c..7fd4a01af2cb 100644
--- a/sys-cluster/k3s/Manifest
+++ b/sys-cluster/k3s/Manifest
@@ -2,16 +2,13 @@ AUX k3s.confd 49 BLAKE2B 1320691aa5dce4b97374c1456e52732e4c7f3dca2a0fcb781db9264
 AUX k3s.initd 976 BLAKE2B 155d1598f307b613b0aab30098105551860048ae17f783920976c73d902535303e8d2cad02bd054af75e0936a17eb592813f3acb3f405e50ec07b5022b587f19 SHA512 21538ca90ac3903deb6c882a9efa60869002f25784d06a59c67b882b611442ce24beb86ee793bcd2b37c3ab9a32ca7b74b69acdd30b1438c66705d749f522b4c
 AUX k3s.logrotated 37 BLAKE2B 8e106b2ae826d1724adb3cf6970cb46b53247ce77a8206ce9ffdaea372ee36f164f38ae8044afe814f9a3aa24d1f3c8d8d75452949ffaee0644948a6ae92fb52 SHA512 f0732ad9d003df155ab9f919909db8c62024c546412f77b3fc6c1a94faf150c532de61e73421a880b7be55edaa4367e01084f59b6f99211a3dcaac1a38f28d68
 AUX k3s.service 597 BLAKE2B 067ea095d2ad948a59e6fcc6ecc569d3f8fa4e802e381e5ccc48988c70c5e8e9e4335afc7cf5a2e830d22bd89cabffbc6fb9161da73599be75b305eb28bea14a SHA512 9741575f844da8ed96e230c443ec6662bff22be8602b420eb74fc6a72d09f36a5fddb8426894e63b7a8c2918a36fc717a38dfbcf003b56f47c13c06c4fc96825
-DIST k3s-1.24.2_p1-vendor.tar.gz 31410828 BLAKE2B 410dc4de95201fb8654571c343458e458e17c52b2b1e2bcf2777df04a50ae54bb119fa88086ee61b7f569d905b0e58df12446c5bd145b46027930a57f5aa033a SHA512 ace54126bc47bc25bf2d2dc13c7ad085d2815d6303ab851ec8738aff5765b9e6f77e6a23fd41375999e03dd215d6b3d54d122d820559dd36dabd87e41ba95093
-DIST k3s-1.24.2_p2-vendor.tar.gz 31418274 BLAKE2B d0fb00c1419cf894eebb83b4f7d29f260628dd06a3a6376cf60257bcc0b571e743954013877e6e85de6b22eb643799a09bf79d898419383951270944ea0e6fe4 SHA512 d0dd6e9804e1e5f7abc9b9429bf0e208baa9da0ee405f7fc3b241e03f39a40284ad098cf1832ac3292f7ee12de66711f9cfc6b01a99ad97fb6653e6236badbb8
 DIST k3s-1.24.3_p1-vendor.tar.gz 31433160 BLAKE2B 33328690ac94c101fd02bc2ef166f09eb5b54a1404da9206a3ff7fdf3c212a2dea96563b6d1da9a25105a15f69cc71664e3d1cb6f35f18f18faae50a67607d80 SHA512 e742b01960a4dc35f80e923fc9fbf41ae2913a24b66de7acd8c8b7a78681cca55821adc5e42df527fc6a9c42146f8b39de85c1060e2981198cd6712dcf300231
+DIST k3s-1.24.4_p1-vendor.tar.gz 31949072 BLAKE2B 60f152f7085039f061461e932a5ccada68404ff5a6de88602aeffd07141b825b441ea4a58d6fc5eb8b73bc8f02df81cb1c710fc8f05e1f6d8d8a1ecd4adf564b SHA512 3b27e3dc3834ba509e57f32b5cff68903cb8160d5b0b1c5dd753b66021c0fbd547f7df7d5cb8d3820e1fa0d495087eb98f6197ec29ff9127b713c6f9ab4f1710
 DIST k3s-cni-plugins-1.1.1.tar.gz 3122345 BLAKE2B 270283ffb746ca97ad147b368143c56bd9641b7ebcb1b2b61f80ffea3336b240b28c9b9496bd2f6eb6d7e5382da4979c26e37eca30ac19fd362ed822ba94f300 SHA512 53dcd363231325553a5c9e804fc9005471fe5c05c87aae0340214c146eba66a3761d73976ba0145d86a663a2b0a1941e6cc5823b6d05e002a9ef18e41e10ac3c
 DIST k3s-containerd-1.6.6-k3s1.tar.gz 10337871 BLAKE2B c4d038c2654243f61f907942a7ddc6d6584c50a04db3cd539f8cbb46901737744b39ca7c31ef51e84ba87faafbfa1962a36e2912a1bfee9d922e2f15e3253970 SHA512 11a2247ea8deb498fb8f0fbd90735d5c4e980d3744ddf1c17b1bf438379c55124a57838a27bc6df7a0b0421881d6072f0cd0bbb4c4835aa34ea894af02334fa8
 DIST k3s-root-amd64-0.11.0.tar 11878400 BLAKE2B 6227ba08e305f062ed814a6b997313415c08e469b05f0501c86f7df25e8a3c9ecb43675613337f6d038faa5153aae98eb44cad9bc170967e0a216ba5ec27559e SHA512 d181117230ad941b40173c3b7dc3d2bb0f3d44a28e9715d85c752193c6058bb6be4a4b8f061df73fed690629a7b2b330185b38bb90ce7fcc9c808096516cb0a3
-DIST k3s-runc-v1.1.2-r1.tar.gz 2332953 BLAKE2B e6047baa799e97d201630f5ff438ca8742ef4c9f465c3728fe2e4bd7f18a571172cb8f994c0e9ffba4f7ae75088626583602f49e0e9f4764c96157820c332b5b SHA512 61d8cc82f49e3bc1cf4cc4ae18a9d9c8f4ae93e8380ce6fa9034b154bd1b915339ee65babdf7518021d015a3c31545fcbad5bbf0c4579c7eb50988877121f049
 DIST k3s-runc-v1.1.3.tar.gz 2333384 BLAKE2B 7530faa80a6d51c840a1ea702ec59580a3e42514f5932a7dd4df9f80ff93245bde05accd572a942190b6be76316f38a408566b003ad380611376e73abe3cb5c0 SHA512 27fce2569d0dc710a0f90095957be30c29da24ce1d2b8e115b9dc11d36f5226d98c4b2d8b92ecfa7581eade90bc51c5d9bccaf15fcb2542dafebe4fabc6e1cd9
 DIST traefik-10.19.3.tgz 25287 BLAKE2B c43a5e066d78e066bc4449ad1d7a3796c99c5f029244dac5494a452592424a9be057b6a3d8eddd174d8daab2b322c4f54e39eae53fba67e97e1ebdb92ce2fd65 SHA512 6df4b186c4caad09abf47469757c1d26d3b593531704af53eb262208f1efa27b5b09b178c6dd6721e78362877e6ba3b2c8c3bfbc91fe152ce090b53ac283acf9
-EBUILD k3s-1.24.2_p1.ebuild 4071 BLAKE2B a8a9b4a1ddd84152447bbd85c9e417b4f68271830b3c377b849131f118f41412227c77fffeb0dc2dde3548bc0704688a564ac18f41059d98135544318343b517 SHA512 936279e847898a756f33fd652ad3dc968031bdb77f55ae4203a531170b09acea7738381f38c147b0a75852a8f029c3f2ba17673bf1fcbab4fb7b8bd5ad6e321a
-EBUILD k3s-1.24.2_p2.ebuild 4071 BLAKE2B a8a9b4a1ddd84152447bbd85c9e417b4f68271830b3c377b849131f118f41412227c77fffeb0dc2dde3548bc0704688a564ac18f41059d98135544318343b517 SHA512 936279e847898a756f33fd652ad3dc968031bdb77f55ae4203a531170b09acea7738381f38c147b0a75852a8f029c3f2ba17673bf1fcbab4fb7b8bd5ad6e321a
 EBUILD k3s-1.24.3_p1.ebuild 4065 BLAKE2B 1447c500e3148b85695aa86710abffb2d880199746c42980604c5f3cb3bde30844365b44a8ce4c8e7633088ca0026f5f3ccb07f314ce59bc6e7ce96b5d8c6ed2 SHA512 be6a093a10d9aef4799e5651c27671790bd8a13caa2c12049cef66d8b5d6d97d4e762f90fc916866cd5d9ddf4fdd67414baef2245d18af65f05a3d131eea6d8f
+EBUILD k3s-1.24.4_p1.ebuild 4065 BLAKE2B 1447c500e3148b85695aa86710abffb2d880199746c42980604c5f3cb3bde30844365b44a8ce4c8e7633088ca0026f5f3ccb07f314ce59bc6e7ce96b5d8c6ed2 SHA512 be6a093a10d9aef4799e5651c27671790bd8a13caa2c12049cef66d8b5d6d97d4e762f90fc916866cd5d9ddf4fdd67414baef2245d18af65f05a3d131eea6d8f
 MISC metadata.xml 515 BLAKE2B dc5e9d23a7b4d84ec392036cd87975b9117133b3a68eb1a69a38637dfca36f4e721be42dbd1ee0dd73585602800ef49d4255ff736be7cdc97e7f2d07b59af99b SHA512 8ee732afdfd59151faa18dbc68075d0c528113b8ea3f9939d0a83fbf7f06deefe2dee27079b7317ee98ea165e81cf4514f1d305564e21b3e1fc4760d2350fd46
diff --git a/sys-cluster/k3s/k3s-1.24.2_p2.ebuild b/sys-cluster/k3s/k3s-1.24.2_p2.ebuild
deleted file mode 100644
index e01a71ae45a5..000000000000
--- a/sys-cluster/k3s/k3s-1.24.2_p2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info systemd
-
-DESCRIPTION="Lightweight Kubernetes"
-HOMEPAGE="https://k3s.io"
-K3S_CONTAINERD_VERSION=1.6.6-k3s1
-K3S_RUNC_VERSION=v1.1.2
-K3S_ROOT_VERSION=0.11.0
-K3S_TRAEFIK_VERSION=10.19.3
-K3S_TRAEFIK_PACKAGE_VERSION=00
-K3S_CNIPLUGINS_VERSION=1.1.1
-CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
-
-MY_PV=${PV%_p*}+k3s${PV#*_p}
-SRC_URI="https://github.com/zmedico/k3s/archive/refs/tags/v${MY_PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
-	${EGO_SUM_SRC_URI}
-	https://github.com/k3s-io/containerd/archive/refs/tags/v${K3S_CONTAINERD_VERSION}.tar.gz -> k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz
-	https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz
-	https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz
-	https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
-	amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+kubectl-symlink rootless"
-REQUIRED_USE="|| ( amd64 )"
-DEPEND="
-	app-misc/yq
-	net-firewall/conntrack-tools
-	sys-fs/btrfs-progs
-	rootless? ( app-containers/slirp4netns )
-"
-RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
-RESTRICT+=" test"
-
-S=${WORKDIR}/${PN}-${MY_PV/+/-}-vendor
-
-src_unpack() {
-	unpack ${P}-vendor.tar.gz
-	cd "${S}" || die
-	mkdir -p bin/aux build/static/charts cache etc || die
-	cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/traefik-${K3S_TRAEFIK_VERSION}${K3S_TRAEFIK_PACKAGE_VERSION}.tgz || die
-	cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
-}
-
-src_prepare() {
-	local filename pattern replacement
-	default
-
-	local CONTAINERD_DIR=build/src/github.com/containerd/containerd
-	mkdir -p "${CONTAINERD_DIR}" || die
-	tar -x --strip-components=1 -f "${DISTDIR}/k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz" -C "${CONTAINERD_DIR}" || die
-	if has_version -b ">=dev-lang/go-1.18"; then
-		# https://bugs.gentoo.org/835601
-		sed -i -e "/github.com\/containerd\/containerd => .\/.empty-mod/d" "${CONTAINERD_DIR}"/{go.mod,vendor/modules.txt} || die
-	fi
-
-	local RUNC_DIR=build/src/github.com/opencontainers/runc
-	mkdir -p "${RUNC_DIR}" || die
-	tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz" -C "${RUNC_DIR}" || die
-
-	# Disable download for files fetched via SRC_URI.
-	sed -e 's:^[[:space:]]*curl:#\0:' \
-		-e 's:^[[:space:]]*git:#\0:' \
-		-e 's:^rm -rf \${CHARTS_DIR}:#\0:' \
-		-e 's:^rm -rf \${RUNC_DIR}:#\0:' \
-		-e 's:^rm -rf \${CONTAINERD_DIR}:#\0:' \
-		-e 's:yq e :yq -r :' \
-		-e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \
-		-i scripts/download || die
-	sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
-	pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
-	filename=scripts/build
-	grep -qF "${pattern}" "${filename}" || \
-		die "failed to locate plugins clone command"
-	sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \
-		-e 's|rm -rf $TMPDIR||' \
-		-i "${filename}" || die
-	sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
-}
-
-src_compile() {
-	mkdir -p build/data || die
-	"${BASH}" -ex ./scripts/download || die
-	./scripts/build || die
-	./scripts/package-cli || die
-}
-
-src_install() {
-	dobin "dist/artifacts/${PN}"
-	use kubectl-symlink && dosym k3s /usr/bin/kubectl
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	dodoc README.md
-}
diff --git a/sys-cluster/k3s/k3s-1.24.2_p1.ebuild b/sys-cluster/k3s/k3s-1.24.4_p1.ebuild
index e01a71ae45a5..37d109813df1 100644
--- a/sys-cluster/k3s/k3s-1.24.2_p1.ebuild
+++ b/sys-cluster/k3s/k3s-1.24.4_p1.ebuild
@@ -7,7 +7,7 @@ inherit go-module linux-info systemd
 DESCRIPTION="Lightweight Kubernetes"
 HOMEPAGE="https://k3s.io"
 K3S_CONTAINERD_VERSION=1.6.6-k3s1
-K3S_RUNC_VERSION=v1.1.2
+K3S_RUNC_VERSION=v1.1.3
 K3S_ROOT_VERSION=0.11.0
 K3S_TRAEFIK_VERSION=10.19.3
 K3S_TRAEFIK_PACKAGE_VERSION=00
@@ -18,7 +18,7 @@ MY_PV=${PV%_p*}+k3s${PV#*_p}
 SRC_URI="https://github.com/zmedico/k3s/archive/refs/tags/v${MY_PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
 	${EGO_SUM_SRC_URI}
 	https://github.com/k3s-io/containerd/archive/refs/tags/v${K3S_CONTAINERD_VERSION}.tar.gz -> k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz
-	https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz
+	https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}.tar.gz
 	https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz
 	https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
 	amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
@@ -61,7 +61,7 @@ src_prepare() {
 
 	local RUNC_DIR=build/src/github.com/opencontainers/runc
 	mkdir -p "${RUNC_DIR}" || die
-	tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz" -C "${RUNC_DIR}" || die
+	tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}.tar.gz" -C "${RUNC_DIR}" || die
 
 	# Disable download for files fetched via SRC_URI.
 	sed -e 's:^[[:space:]]*curl:#\0:' \
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index bfb354210032..e9a373a01b31 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index e9ff898d32b9..7c4e0e7717c6 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,6 +1,6 @@
 DIST libblockdev-2.26.tar.gz 932129 BLAKE2B 39d95db69de917449e6009fa0160b6288327b2c49b64309d17a1e4e028756d1ce170779ce1c4df926c8796d8a8ed7b9131b5d4b51115a3ea901dacdaa971961a SHA512 ddd4e9c22135bd7dad0bb9bc254ac0c63e3bacc592e7c5a0c846e367da3fc248bf6187f1c81407c3bce599d3b0ceeec9a8a0030ad8e981e245f715b35eaec523
 DIST libblockdev-2.27.tar.gz 914021 BLAKE2B 1e02a364ac918cc9bb288d3b8745cb09378317c4b509224326d13ff8b6481ba3d44502f248680801316a9a94d7d5eac353c5659eca55a681c88511da5dfc83da SHA512 fa9faf3efefc1c76165c9456936175b2addb336a5257c43c1e41403db200386fd660203ef17559529f57b2f57b9ef768686ecd31493c58527434297c31712c10
 EBUILD libblockdev-2.26.ebuild 2886 BLAKE2B 47d5ba20e91c343e66f2fd2e4027abf5dbdc21df8c3124f86f25ceafb23d89698bbeceb419b0ed43faecb2f69182789e66148676e6bf047f3081222f94709118 SHA512 a843b16f05ddb8eb9af48a245b692a31503e805bf2d32362c102283ed8ebdc733f03be45cd8b61cc373d4d0be203bab6f85fb4822e3b802d12e790f8904a6524
-EBUILD libblockdev-2.27.ebuild 2888 BLAKE2B 7162c05824ee8d98b0a2c1039d6b202ed5455fcf0dea3b82da3a20e5df49fa1f955c3ce603476c096ade97d8c3abee947617734d9aecd2e06a3a7ef2bc4f7527 SHA512 7f325b67db3b36b64c69cfa5e1a1fa0b95741cac6046caf0bb2fe0c22bbbcb4da62dc2cdd509f14c648ae94643f9838e48fdd955d9ec8279dec35d7fc640239d
+EBUILD libblockdev-2.27.ebuild 2887 BLAKE2B f44f7df71ed68e5bdbc224112164874a1a5429ac690a40aadb43612731bc6a0a31636b05ff8972e6c97f53b395ea7f7bf3bca2650aca0fcc5f9092485fc4cc99 SHA512 4c8d4c3eb67e6f622ab1aa62e3bbc2d49a8f29513fe93f3c975f44bc2d7aeaeb7a6cb1be4c54f9824b439894ec9d4fbaa2073d650ff8d3753312444583251055
 EBUILD libblockdev-9999.ebuild 2878 BLAKE2B 1ca3949ee417424809ea318ab1da22becd0b17cc3cbee9e4037e148adddae90852f49285159cd7ae4b7d9654c69bc395856fbd49499bc87d827baf2603dc8011 SHA512 7cb18160d77d20fd8c16d2ac6ea87453b3b52cffaea85ebbcda65996b06c313fb60394e37b5adb5beecc867f1a49e13bea86e270fca5a6d01b1c8e66d52af0f7
 MISC metadata.xml 1233 BLAKE2B 68512209e8f458b5b52a9d82eb86c1c831837681b2976d5050c578c3b3fdb032640c4cc99da9621aae7c061ae8332825ea5010a8f1138fbbbc34e92fccbeddeb SHA512 eb47faef934a8eafe1beeea6f901ddd6b0e7202823f57b3848f6ef131b2a5ffc968740d980a68163696d3de34a98ebef8561e63d26ffe213a42e1022577a9270
diff --git a/sys-libs/libblockdev/libblockdev-2.27.ebuild b/sys-libs/libblockdev/libblockdev-2.27.ebuild
index bec06dd1e99f..b456b1709e05 100644
--- a/sys-libs/libblockdev/libblockdev-2.27.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.27.ebuild
@@ -19,7 +19,7 @@ else
 	#MY_P="${PN}-${MY_PV}"
 	#SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 	#S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2+"
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 2efbc011d4cd..7fc8562b84b9 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -6,14 +6,15 @@ AUX readline-8.0-headers.patch 577 BLAKE2B b8fe6cdf51188f68c852d3c9052e7840a0bcb
 AUX readline-8.1-windows-signals.patch 569 BLAKE2B af1ad52b09a1a49e6045bd640d57f3932f2b8db450b2eb7e0787a4326f6c61445ad83395620caf489da14107e8a51aed5d5fdf8e3268fab83d8ff04d393b1a59 SHA512 37aa778a21e360708d371aaf3f08274f75b15d8b2c42b030bda8d65dda81b1713c748644e45b6662c608da14ad413d6d83e43800ea58309fa60256a18317f5ae
 DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
 DIST readline-8.1.tar.gz.sig 95 BLAKE2B 8a297ef2ebf815ac53f02d6395aa2ff9f24234aef6b9793bfcd5a610cd3a5024182ad8ec8beb75eadd5cf876c57cd56d4226075578a86e0e2421d2e9b1677aa5 SHA512 42a6052d5882f16e5b6f8cd16433d793a9cbb43cf1886b2d858dc65ce067a4c39c8dda7331e52f76426c43de02c358f9ffdaf5c8fd7b089479008c1e5aa19112
-DIST readline-8.2-rc2.tar.gz 3041602 BLAKE2B 1a9ad2c2d52486fd47b7aada15eae186bf5538cc0864a8a102306b4150ad0e560f4b09d3098f9905cb00918e5b119ad472acaf0d1814a63be8cab90192e880fa SHA512 cc327569e138a6d4a5fd41c6092d6229fba89befd2d68996b6b2b60baa2d2f7805666260327779571a5f82670c55daa36c9bd773ea818e5722ad808bbc6eeddd
-DIST readline-8.2-rc2.tar.gz.sig 95 BLAKE2B 57bcfb4493d1323bf30bdff221b967b69f90392feab6c869f4f3a40b6991f1db40ee05f2928a821c5230850cf7471224aa89cf007228a2e92279671c4b8f6153 SHA512 a244b46c1f33fbb230ae71ea0e8f408a1598d9aa2d01f3a7480bd4a395b79307ac7e28fba4bc2eb32056fd62cd786301893780d7d6eb87bfd8e2c5332eeb3baf
+DIST readline-8.2-rc3.tar.gz 3043957 BLAKE2B 49d68306f84add2f4e07a151c417aae9829761d0c94aaab5c2ec4dde49bcfdbd8c43907a5f5a00366850309c30a725f2628641e7105257108569efbc70420588 SHA512 136a04e070457b7152325951cd9e414d5598bcc28e41d31f6651d21b584a08282bab7c0e07edf786ef6855a6cdc346ab55ee670d06de7fdda7847a1c9b551e03
+DIST readline-8.2-rc3.tar.gz.sig 95 BLAKE2B 4af655b0a4d3faf5f9be011459f56737f48204d7d6757cd8571f5a3cfd7bc1e820def8fb7227b5431d19660a48713e5a04c95d8f5ea43439483f3ce858cb1d77 SHA512 06aec40b24f67eff72dc53b902b6f1c5df926a56b4d67df530b6243200d261747d3d2112b16ff83f921376437cfd941b8ddbe157babf9302ce60ff54a022e65d
 DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
 DIST readline81-001.sig 95 BLAKE2B 7d523d0fc21772cb03aa4b5d66ea58c1a99a6c0e4a8625e89cad015cbff63cd68e08207ca5150819225300ac864806032888104bbbea64ca38ebf89e28c24b7e SHA512 7fa3747e388aecb26f2d4f8346b89b367710ea99a14618c625066b820901dc467bd156ec37340fde1f86f0fe0d6b33044c1ed5768cf8ed1a25386d32dc6419a6
 DIST readline81-002 1242 BLAKE2B 4ef0404561bd8fc5559e8e5f675ae3f12c467178a8954f54f3204c2d09b88ccec960e807c7af0ec3514b489b676e3be51f98351e377fb18e3d7a14d33d4da69d SHA512 e47c029b82cf3a4d44e85c4348f7e059c56726694c190d84186822e1c893e1c006e7ec75f33c36791112f81abd792a2e2fdae9a65cd128f3c89ff4ffd9a9a1ff
 DIST readline81-002.sig 95 BLAKE2B f85d8a65a7326d6e18b32a603c8082952e4b81c53b6a1bd1668c7b0064ecce6ef04a41e2a042f100424dbf152e4db32c0e07ff166d528aa4ac4a9bd7daf4c7a9 SHA512 9ffb6cc697499f57df133f5ebaa5e43e24d33df5eb450d94a02144e94c833424218594c366f21101bc63331c1d532299c9327bd447d0a9849b0bbedce206a5b7
 EBUILD readline-8.1_p1-r1.ebuild 5901 BLAKE2B 4819d05f4e9fd9d9b737eeabf14cedb8e9879f554b5bb3cf2d1635ca2f3e07382e16dec40693aa183d51cd2d362f77942614f5129392363ce5097fd401b59795 SHA512 54c1365e53e218e3a404fffe2343627218b4230db5be183ce7c79c417ae8c083ac00cf5f619c7344284635155ff2dbf6071ba631283c0f3c2ace8aa1cd7b2581
+EBUILD readline-8.1_p2-r1.ebuild 6493 BLAKE2B c1ee458f0da6071892662004573330e9efe9d2c99542fca89cb6aae781f05c44ddd46426aaead49ab476ee00023e6ce2b5a69a66ee2cebb38e9d29a713ba9453 SHA512 b7f6bb49afba91e657363a84310a7d6a22f839c68a70d1041594c842b2bd0004873760bfb894896a894f19ea9f5acc409e99cbf03380d2aa94de410f4106c423
 EBUILD readline-8.1_p2.ebuild 6266 BLAKE2B df1a758c63118e9f8b23bbc6831cc2d3fb975e332fd4212d5b94cb6b43885d4d3713a664d4b11729d6a447b5c57808b07d40a426d1738b85874da7c7d7880006 SHA512 e8a21619d26dd11d4fa0b2d8accb9ba89405a9ae66f6ef7c73a3122bb25b769f013691ff1688583a560911da303c15bd85f2a7863b41ec802607ec5f7df444ae
-EBUILD readline-8.2_rc2.ebuild 6873 BLAKE2B 610cc7f4aca1eb9f7b60c67f1e1733767bcec8e992f88297f1b74d87f304a4f7a593903e242e5107d92eb95e8bc620c264865c50d46c1814c9c8e12e7d7470bb SHA512 65fa964b499ec9996ff26f16dcdf9c187ceb3b8f924d187dac023ba7d0e2c639324ac4793a34ed81d95b853709e82426356ccb4aae8fefc484ffe018ffce5284
-EBUILD readline-9999.ebuild 6873 BLAKE2B 610cc7f4aca1eb9f7b60c67f1e1733767bcec8e992f88297f1b74d87f304a4f7a593903e242e5107d92eb95e8bc620c264865c50d46c1814c9c8e12e7d7470bb SHA512 65fa964b499ec9996ff26f16dcdf9c187ceb3b8f924d187dac023ba7d0e2c639324ac4793a34ed81d95b853709e82426356ccb4aae8fefc484ffe018ffce5284
+EBUILD readline-8.2_rc3.ebuild 7133 BLAKE2B a01b5f0750a279f668f93f466c197a89b679d8a60502aaebaf8cb99d78dfe60687e37904528e73af82955e2a4e2af8e088d494c78c041400af64e15f2827f2c4 SHA512 815112467350989b6ffb353ffe403b254a160c8f6620f77cfc6cccf3d82ad27cae44bbd3b6efe366d7db0511c94225e7a54b8ac81f10c826e9705593ff76fb69
+EBUILD readline-9999.ebuild 7133 BLAKE2B a01b5f0750a279f668f93f466c197a89b679d8a60502aaebaf8cb99d78dfe60687e37904528e73af82955e2a4e2af8e088d494c78c041400af64e15f2827f2c4 SHA512 815112467350989b6ffb353ffe403b254a160c8f6620f77cfc6cccf3d82ad27cae44bbd3b6efe366d7db0511c94225e7a54b8ac81f10c826e9705593ff76fb69
 MISC metadata.xml 473 BLAKE2B 95401399d6edc2a1a28f9c0f42123b07568d5c517c49be38eff09e1f23a9b5df4d5b302495db8880c8ed65081ea2920f194e6b32402ab0d6049221e9ee6a4eed SHA512 e54e4ce57f3178aa8646acb6798f46074eb33173ab63d61f62bc9ab1d35ef823ce9ee3e173234f8866e2cb635519869c76a449f5073c3a5b7cfd29cd23c16462
diff --git a/sys-libs/readline/readline-8.1_p2-r1.ebuild b/sys-libs/readline/readline-8.1_p2-r1.ebuild
new file mode 100644
index 000000000000..2732f7d7ae6a
--- /dev/null
+++ b/sys-libs/readline/readline-8.1_p2-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
+
+case ${PV} in
+	*_alpha*|*_beta*|*_rc*)
+		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+		SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+	;;
+
+	*)
+		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+		SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
+
+		if [[ ${PLEVEL} -gt 0 ]] ; then
+			# bash-5.1 -> bash51
+			my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+			patch_url=
+			my_patch_index=
+
+			for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+				for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+					patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
+					SRC_URI+=" ${patch_url}"
+					SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+				done
+
+				MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
+			done
+
+			unset my_pn patch_url my_patch_index
+		fi
+	;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0/8"  # subslot matches SONAME major
+[[ ${PV} == *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs +unicode utils"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+	"${FILESDIR}"/${PN}-7.0-headers.patch
+	"${FILESDIR}"/${PN}-8.0-headers.patch
+	"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
+	"${FILESDIR}"/${PN}-8.1-windows-signals.patch
+)
+
+# Needed because we don't want the patches being unpacked
+# (which emits annoying and useless error messages)
+src_unpack() {
+	verify-sig_src_unpack
+
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
+
+	default
+
+	if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then
+		# If we're bootstrapping, make a guess. We don't have pkg-config
+		# around yet. bug #818103.
+		# Incorrectly populating this leads to underlinked libreadline.
+		local ncurses_libs
+		local ncurses_libs_suffix=$(usex unicode w '')
+
+		ncurses_libs="-lncurses${ncurses_libs_suffix}"
+
+		if has_version "sys-libs/ncurses[tinfo(+)]" ; then
+			ncurses_libs+=" -ltinfo${ncurses_libs_suffix}"
+		fi
+	else
+		# Force ncurses linking. #71420
+		# Use pkg-config to get the right values. #457558
+		local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
+	fi
+
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline || die # for local readline headers
+}
+
+src_configure() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	export ac_cv_prog_AR=$(tc-getAR)
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
+		export bash_cv_func_ctype_nonascii='yes'
+		export bash_cv_wcwidth_broken='no' #503312
+	fi
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--cache-file="${BUILD_DIR}"/config.cache
+		--with-curses
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+		ECONF_SOURCE="${S}"/examples/rlfe \
+		econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
+			ln -s ../../lib${l}.a lib${l}.a || die
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if use utils && ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
+	dodoc USAGE
+	docinto ps
+	dodoc doc/*.ps
+}
+pkg_preinst() {
+	# bug #29865
+	# Reappeared in #595324 with paludis so keeping this for now...
+	preserve_old_lib \
+		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 7)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify \
+		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 7)
+}
diff --git a/sys-libs/readline/readline-8.2_rc2.ebuild b/sys-libs/readline/readline-8.2_rc3.ebuild
index 934a8b1ce368..4bc9fb0d90a8 100644
--- a/sys-libs/readline/readline-8.2_rc2.ebuild
+++ b/sys-libs/readline/readline-8.2_rc3.ebuild
@@ -16,28 +16,20 @@ PLEVEL="${PV##*_p}"
 MY_PV="${PV/_p*}"
 MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
 is_release() {
 	case ${PV} in
-		9999|*_alpha*|*_beta*|*_rc*) return 1 ;;
-		*) return 0 ;;
+		9999|*_alpha*|*_beta*|*_rc*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
 	esac
 }
+
 [[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in mirror://gnu/${PN} ftp://ftp.cwru.edu/pub/bash ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-			printf "${u}/${PN}-${MY_PV}-patches/%s.sig " "$@"
-		done
-	fi
-}
 
 DESCRIPTION="Another cute console display library"
 HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html https://git.savannah.gnu.org/cgit/readline.git"
@@ -47,8 +39,28 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH=devel
 	inherit git-r3
 elif is_release ; then
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+		patch_url=
+		my_patch_index=
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+				patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
+				SRC_URI+=" ${patch_url}"
+				SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+			done
+
+			MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
+		done
+
+		unset my_pn patch_url my_patch_index
+	fi
 else
 	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
@@ -74,7 +86,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch # bug #385091
 	"${FILESDIR}"/${PN}-7.0-headers.patch
 	"${FILESDIR}"/${PN}-8.0-headers.patch
 
@@ -94,7 +106,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
+
 	default
 
 	is_release || eautoreconf
@@ -112,8 +125,8 @@ src_prepare() {
 			ncurses_libs+=" -ltinfo${ncurses_libs_suffix}"
 		fi
 	else
-		# Force ncurses linking. #71420
-		# Use pkg-config to get the right values. #457558
+		# Force ncurses linking, bug #71420.
+		# Use pkg-config to get the right values, bug #457558.
 		local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
 	fi
 
@@ -124,21 +137,22 @@ src_prepare() {
 		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
 		examples/rlfe/configure || die
 
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# Fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
 	# objformat for years, so we don't want to rely on that.
 	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
 
-	ln -s ../.. examples/rlfe/readline || die # for local readline headers
+	# For local readline headers
+	ln -s ../.. examples/rlfe/readline || die
 }
 
 src_configure() {
-	# fix implicit decls with widechar funcs
+	# Fix implicit decls with widechar funcs
 	append-cppflags -D_GNU_SOURCE
 	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
 	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
 
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
+	# Make sure configure picks a better ar than `ar`, bug #484866
+	export ac_cv_prog_AR="$(tc-getAR)"
 
 	# Force the test since we used sed above to force it.
 	export bash_cv_termcap_lib=ncurses
@@ -147,9 +161,10 @@ src_configure() {
 	# In cases where the C library doesn't support wide characters, readline
 	# itself won't work correctly, so forcing the answer below should be OK.
 	if tc-is-cross-compiler ; then
-		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
+		use kernel_Winnt || export bash_cv_func_sigsetjmp="present"
+		export bash_cv_func_ctype_nonascii="yes"
+		# bug #503312
+		export bash_cv_wcwidth_broken="no"
 	fi
 
 	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
@@ -165,14 +180,15 @@ multilib_src_configure() {
 		--with-curses
 		$(use_enable static-libs static)
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
 	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
+		# Code is full of AC_TRY_RUN()
 		mkdir -p examples/rlfe || die
 		cd examples/rlfe || die
-		ECONF_SOURCE="${S}"/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
+
+		ECONF_SOURCE="${S}"/examples/rlfe econf --cache-file="${BUILD_DIR}"/config.cache
 	fi
 }
 
@@ -180,7 +196,7 @@ multilib_src_compile() {
 	emake
 
 	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
+		# Code is full of AC_TRY_RUN()
 		cd examples/rlfe || die
 		local l
 		for l in readline history ; do
@@ -195,7 +211,8 @@ multilib_src_install() {
 	default
 
 	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
+		# bug #4411
+		gen_usr_ldscript -a readline history
 
 		if use utils && ! tc-is-cross-compiler; then
 			dobin examples/rlfe/rlfe
@@ -205,13 +222,14 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
+
 	dodoc USAGE
 	docinto ps
 	dodoc doc/*.ps
 }
 pkg_preinst() {
 	# bug #29865
-	# Reappeared in #595324 with paludis so keeping this for now...
+	# Reappeared in bug #595324 with paludis so keeping this for now...
 	preserve_old_lib \
 		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
 		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
diff --git a/sys-libs/readline/readline-9999.ebuild b/sys-libs/readline/readline-9999.ebuild
index 934a8b1ce368..4bc9fb0d90a8 100644
--- a/sys-libs/readline/readline-9999.ebuild
+++ b/sys-libs/readline/readline-9999.ebuild
@@ -16,28 +16,20 @@ PLEVEL="${PV##*_p}"
 MY_PV="${PV/_p*}"
 MY_PV="${MY_PV/_/-}"
 MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
 is_release() {
 	case ${PV} in
-		9999|*_alpha*|*_beta*|*_rc*) return 1 ;;
-		*) return 0 ;;
+		9999|*_alpha*|*_beta*|*_rc*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
 	esac
 }
+
 [[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in mirror://gnu/${PN} ftp://ftp.cwru.edu/pub/bash ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-			printf "${u}/${PN}-${MY_PV}-patches/%s.sig " "$@"
-		done
-	fi
-}
 
 DESCRIPTION="Another cute console display library"
 HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html https://git.savannah.gnu.org/cgit/readline.git"
@@ -47,8 +39,28 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH=devel
 	inherit git-r3
 elif is_release ; then
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+		patch_url=
+		my_patch_index=
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+				patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
+				SRC_URI+=" ${patch_url}"
+				SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+			done
+
+			MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
+		done
+
+		unset my_pn patch_url my_patch_index
+	fi
 else
 	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
@@ -74,7 +86,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch # bug #385091
 	"${FILESDIR}"/${PN}-7.0-headers.patch
 	"${FILESDIR}"/${PN}-8.0-headers.patch
 
@@ -94,7 +106,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
+
 	default
 
 	is_release || eautoreconf
@@ -112,8 +125,8 @@ src_prepare() {
 			ncurses_libs+=" -ltinfo${ncurses_libs_suffix}"
 		fi
 	else
-		# Force ncurses linking. #71420
-		# Use pkg-config to get the right values. #457558
+		# Force ncurses linking, bug #71420.
+		# Use pkg-config to get the right values, bug #457558.
 		local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
 	fi
 
@@ -124,21 +137,22 @@ src_prepare() {
 		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
 		examples/rlfe/configure || die
 
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# Fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
 	# objformat for years, so we don't want to rely on that.
 	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
 
-	ln -s ../.. examples/rlfe/readline || die # for local readline headers
+	# For local readline headers
+	ln -s ../.. examples/rlfe/readline || die
 }
 
 src_configure() {
-	# fix implicit decls with widechar funcs
+	# Fix implicit decls with widechar funcs
 	append-cppflags -D_GNU_SOURCE
 	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
 	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
 
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
+	# Make sure configure picks a better ar than `ar`, bug #484866
+	export ac_cv_prog_AR="$(tc-getAR)"
 
 	# Force the test since we used sed above to force it.
 	export bash_cv_termcap_lib=ncurses
@@ -147,9 +161,10 @@ src_configure() {
 	# In cases where the C library doesn't support wide characters, readline
 	# itself won't work correctly, so forcing the answer below should be OK.
 	if tc-is-cross-compiler ; then
-		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
+		use kernel_Winnt || export bash_cv_func_sigsetjmp="present"
+		export bash_cv_func_ctype_nonascii="yes"
+		# bug #503312
+		export bash_cv_wcwidth_broken="no"
 	fi
 
 	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
@@ -165,14 +180,15 @@ multilib_src_configure() {
 		--with-curses
 		$(use_enable static-libs static)
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
 	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
+		# Code is full of AC_TRY_RUN()
 		mkdir -p examples/rlfe || die
 		cd examples/rlfe || die
-		ECONF_SOURCE="${S}"/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
+
+		ECONF_SOURCE="${S}"/examples/rlfe econf --cache-file="${BUILD_DIR}"/config.cache
 	fi
 }
 
@@ -180,7 +196,7 @@ multilib_src_compile() {
 	emake
 
 	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
+		# Code is full of AC_TRY_RUN()
 		cd examples/rlfe || die
 		local l
 		for l in readline history ; do
@@ -195,7 +211,8 @@ multilib_src_install() {
 	default
 
 	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
+		# bug #4411
+		gen_usr_ldscript -a readline history
 
 		if use utils && ! tc-is-cross-compiler; then
 			dobin examples/rlfe/rlfe
@@ -205,13 +222,14 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
+
 	dodoc USAGE
 	docinto ps
 	dodoc doc/*.ps
 }
 pkg_preinst() {
 	# bug #29865
-	# Reappeared in #595324 with paludis so keeping this for now...
+	# Reappeared in bug #595324 with paludis so keeping this for now...
 	preserve_old_lib \
 		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
 		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 2a2bca7af113..e4c531261a69 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -5,6 +5,6 @@ DIST tzdata2021e.tar.gz 422509 BLAKE2B e0e1189a1bbfb2ee641b9c4c8d00775372638d46d
 DIST tzdata2022a.tar.gz 425833 BLAKE2B 0af5b785a6f5d871b017237ad58d3d9bedd0de38cf18ac51b32cd8df9811215af7af913d8cd3966de695ce65df3f49f52e239196e93b953094763814cc56ecd0 SHA512 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9
 DIST tzdata2022c.tar.gz 432721 BLAKE2B 087a0e728c6052f91142ef11ad2092e573de99d787ed1e8ff62476b870ff2e3d222a19df01ad624cf06e543aa7e40df89dcd888b9e5fd12f8b5af90bdffc9ac9 SHA512 e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b
 EBUILD timezone-data-2021e.ebuild 5675 BLAKE2B ebb7b82895a58585f688b164655c2d52dbc54d5c2f7234167fa8bcbe87d1189b88e9449cfec7b80aa46edd8e7d2a29047409b81fbd6c8114546668914e49c362 SHA512 1cee878422e1f7939066b439a987883cfb3a3148ab7aa2218cf4c6b83ba5b7fc12301709862339be283dd2e0e4726ac295aaa19eb526c9fdaf0fc32eadf62434
-EBUILD timezone-data-2022a.ebuild 5683 BLAKE2B 71c20dcc1b267bbeeaf2ecc15ab6c75f01f85e6e917ddb5522f82b2d7049049eb58b20e4c84ce18feaddde623f16af69e979ba521423e9b3b04e58e1aca1734b SHA512 66fb346df90d92a54b6aa9f004023a287c3b38fb9183379fe4c8e827ad1b5a5bd51aa255eda6cf4fbddaea9812a8b5fdffa9e808a5234cab7e50e32a081e2663
+EBUILD timezone-data-2022a.ebuild 5682 BLAKE2B 4e63f33cd24b6a51999a34f932d06cc27bb0f9f03b1dbdb373cd3eefc01018f82a98a386571bf361ae48064197438127e28aff0bcc261c539238f228dec0955b SHA512 52720190d1b8e1d1a51a6f2ffa1823b643e1ad1bb4a38cfe4bba62de97b2a009ff6ff44c293771902b0e330016b1fcfa999496131e56f279724c0a28cf7be97e
 EBUILD timezone-data-2022c.ebuild 5732 BLAKE2B 092c43966a67c21070b7e03118e8b51dada506b713c83ac8e7e205a72b22f8aa4405c75d60179d64323aa392603d616dad18deb0ca41ef332723e53453a2c986 SHA512 afde51b2aab6ce0a29988f2ed31e92aa03c475a5c8dfadd2719d8accac17b35a2d340571a9d034decdb5ec2714e6638f67a1f3774a9627a55a2f808e8d40a3c8
 MISC metadata.xml 807 BLAKE2B 24b09c4228c232b607e6e6c165a20e364136d77aa970e72c70124636a038cd3b672bad16ddd68c0b75373be6a09f969e59bc38f7e451bb2869cd46c521e2ca82 SHA512 0b95b32d79651493a04032f175f3320d8975cea714b43fa56aa528f10f51a7c52b58a934828f98a770855485af6f8db048bd2bfa3010802cff8c26ae05bb16e2
diff --git a/sys-libs/timezone-data/timezone-data-2022a.ebuild b/sys-libs/timezone-data/timezone-data-2022a.ebuild
index 25c344148110..7a4135560885 100644
--- a/sys-libs/timezone-data/timezone-data-2022a.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2022a.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls leaps-timezone zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 8db70cc10d7c..1954a61b51e8 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 6c77b2ace69a..8dde98e2de1d 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -9,6 +9,6 @@ DIST parallel-20220822.tar.bz2 2389888 BLAKE2B 95e94064eaecf661a46d45f33f61c51c3
 DIST parallel-20220822.tar.bz2.sig 2080 BLAKE2B 12b41f979f8a8c69c370cb1c0ff3687d1d7f12447060f3174d6379ed50caa8fb08682a71f7591bfb73e7f975a2f28cceda8e00a646afc5467caed4664767e6a8 SHA512 f0c6e1ddb08751da577d27a9cc1be725bfd7fce6fecb3b48f0fbddae42d5fdef264da36530cdf722bd19fa19308a77d9f7d16703f9f54697e60c4ea03286f58d
 EBUILD parallel-20220522.ebuild 902 BLAKE2B a4512917d2f84af15c20c017823678ad5d9ee8218fa7562428baca03bd7de0b2c05f42f004848c8cb2e00b4e2763525d4cc1a8e5097423bf6bd7c44c6d5be0e1 SHA512 0d8150b78add55c45b6a47be0435af29a451056dc2c0e749cc27dcaeb7bce4292cb6ad2c1986fa65ecc88d6736f8e43200222aeac21de0e39d32d6ec68f8beb9
 EBUILD parallel-20220622-r1.ebuild 1074 BLAKE2B cf1ec5101469a0ff10f56e78d76e8cea886b822b5282bae5e6545f5f1f2634769c4d0ff5d2590b70a51fcabe4a9182d983e8aa990ad38d47e961f1fc88dba4ff SHA512 cc24de895fd1d80666ed6caca4c171db9e7683119fd042714045c1d067181bac449d8f3508cc253adbd3bf07a69aa80b86f1a250100ce34e8e44247d4b645233
-EBUILD parallel-20220722.ebuild 906 BLAKE2B 30eee39a3f69973cce5db2046328d1114ae4ca4bdffea10294993e7d9664fe362c3bb7a35fdb7c69d9761bdf1d6bc927826aeaa8a0376a83a391ddfb7f84a684 SHA512 72625354f49bd699efd0dc6d2f1cc3857b2d2460715a9d54a491c5800f9bdd17d4bf16f5ccf8c51b1e26f663a47a6f44cbdd2cc1d2afe34d273ddbfead8d9611
+EBUILD parallel-20220722.ebuild 905 BLAKE2B 97af6a0e201cef8e35b18d39385f6e631d0f8272935f2f749e445f0464bfcfa7123913b85106b682ad7bba8436c655e8c4e8f5a804b59223e51ed842275a7dd4 SHA512 13dc53c700f0651ba79142c42402304b37f28da042eebf7f8771f3074e346c4516820f4f451d5186404ba3daeb4eb9a9a5c7e0dbbfb5d01e3c144a1768363af8
 EBUILD parallel-20220822.ebuild 909 BLAKE2B 6874c466cbf7beae2e851b4f4cf0d2668ea46afce7e362a9a00b9bec552eb5d37be05e93cbced0896bd69da2c09ab076cb546f5ff8f1d5570ff57528e19cba29 SHA512 aa19025c50738d5d73070c34d88a538511a6924264b04193d958868d5871b2b96f62bd01dd2e018dac52060a9a4be058922f8609810eabf35292b3350107b292
 MISC metadata.xml 1078 BLAKE2B 190d48305a18559658e87132e6be2831db9d8c314b29cf4e5808b6308cf86cb5d46a1b80214fcb8f45f12578a18ebefad8b0b91912c9fbb68126be66ae62ad55 SHA512 80b649870b5b9e12b436f82ce8fd3efad8b3e251c919a90b8c32945332bb3dd88e5bfc96acca6a12a38f2d6e1ce63effa593ef975c8109bad3a85d2d69b2ed98
diff --git a/sys-process/parallel/parallel-20220722.ebuild b/sys-process/parallel/parallel-20220722.ebuild
index 6fcb47a1f595..35785e7adb17 100644
--- a/sys-process/parallel/parallel-20220722.ebuild
+++ b/sys-process/parallel/parallel-20220722.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
author	V3n3RiX <venerix@koprulu.sector>	2022-08-27 02:53:16 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-27 02:53:16 +0100
commit	f1aa825b8483db57bf28d0772acfa10aeebe83c3 (patch)
tree	d56ade77461ea49cbbb4943bd2e100eb6b97bb76
parent	0e83ee97d831abe38c8e764fb9bbfef9de04daf2 (diff)